From 821de7706a4a44d919c95f0e990ac01840788c94 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 10 Dec 2008 11:06:23 +0000 Subject: [PATCH] * Glibc 2.9. Got rid of 2.8 because we never used it. * Kernel headers 2.6.27. However, they don't work yet because they have a Perl dependency, which is annoying during the bootstrap. svn path=/nixpkgs/branches/stdenv-updates/; revision=13605 --- .../glibc-2.8/nss-skip-unavail.patch | 25 ------------------- .../{glibc-2.8 => glibc-2.9}/builder.sh | 0 .../{glibc-2.8 => glibc-2.9}/default.nix | 6 ++--- .../glibc-2.9/nss-skip-unavail.patch | 25 +++++++++++++++++++ .../linux/kernel-headers/2.6.21.3.nix | 21 ---------------- .../{2.6.25.4.nix => 2.6.27.8.nix} | 6 ++--- pkgs/top-level/all-packages.nix | 12 +++------ 7 files changed, 35 insertions(+), 60 deletions(-) delete mode 100644 pkgs/development/libraries/glibc-2.8/nss-skip-unavail.patch rename pkgs/development/libraries/{glibc-2.8 => glibc-2.9}/builder.sh (100%) rename pkgs/development/libraries/{glibc-2.8 => glibc-2.9}/default.nix (91%) create mode 100644 pkgs/development/libraries/glibc-2.9/nss-skip-unavail.patch delete mode 100644 pkgs/os-specific/linux/kernel-headers/2.6.21.3.nix rename pkgs/os-specific/linux/kernel-headers/{2.6.25.4.nix => 2.6.27.8.nix} (77%) diff --git a/pkgs/development/libraries/glibc-2.8/nss-skip-unavail.patch b/pkgs/development/libraries/glibc-2.8/nss-skip-unavail.patch deleted file mode 100644 index 4d29082f941..00000000000 --- a/pkgs/development/libraries/glibc-2.8/nss-skip-unavail.patch +++ /dev/null @@ -1,25 +0,0 @@ -diff -rc glibc-2.7-orig/sysdeps/posix/getaddrinfo.c glibc-2.7/sysdeps/posix/getaddrinfo.c -*** glibc-2.7-orig/sysdeps/posix/getaddrinfo.c 2007-10-17 18:05:12.000000000 +0200 ---- glibc-2.7/sysdeps/posix/getaddrinfo.c 2008-04-08 12:17:09.000000000 +0200 -*************** -*** 498,505 **** - int no_data = 0; - int no_inet6_data = 0; - service_user *nip = NULL; -- enum nss_status inet6_status = NSS_STATUS_UNAVAIL; -- enum nss_status status = NSS_STATUS_UNAVAIL; - int no_more; - int old_res_options; - ---- 498,503 ---- -*************** -*** 689,694 **** ---- 687,694 ---- - - while (!no_more) - { -+ enum nss_status inet6_status = NSS_STATUS_UNAVAIL; -+ enum nss_status status = NSS_STATUS_UNAVAIL; - nss_gethostbyname3_r fct = NULL; - if (req->ai_flags & AI_CANONNAME) - /* No need to use this function if we do not look for diff --git a/pkgs/development/libraries/glibc-2.8/builder.sh b/pkgs/development/libraries/glibc-2.9/builder.sh similarity index 100% rename from pkgs/development/libraries/glibc-2.8/builder.sh rename to pkgs/development/libraries/glibc-2.9/builder.sh diff --git a/pkgs/development/libraries/glibc-2.8/default.nix b/pkgs/development/libraries/glibc-2.9/default.nix similarity index 91% rename from pkgs/development/libraries/glibc-2.8/default.nix rename to pkgs/development/libraries/glibc-2.9/default.nix index 6f39ebbf8d4..a5469dc8a6f 100644 --- a/pkgs/development/libraries/glibc-2.8/default.nix +++ b/pkgs/development/libraries/glibc-2.9/default.nix @@ -4,13 +4,13 @@ }: stdenv.mkDerivation rec { - name = "glibc-2.8-20081006"; + name = "glibc-2.9"; builder = ./builder.sh; src = fetchurl { - url = "ftp://sources.redhat.com/pub/glibc/snapshots/${name}.tar.bz2"; - sha256 = "e32021c14f0bda55b6a5d2a98ac878a03b2c6f78a1ab4a11f0386a51eda1d58e"; + url = http://nixos.org/tarballs/glibc-2.9-20081208.tar.bz2; + sha256 = "0zhxbgcsl97pf349m0lz8d5ljvvzrcqc23yf08d888xlk4ms8m3h"; }; inherit kernelHeaders installLocales; diff --git a/pkgs/development/libraries/glibc-2.9/nss-skip-unavail.patch b/pkgs/development/libraries/glibc-2.9/nss-skip-unavail.patch new file mode 100644 index 00000000000..dc09b509870 --- /dev/null +++ b/pkgs/development/libraries/glibc-2.9/nss-skip-unavail.patch @@ -0,0 +1,25 @@ +diff -rc glibc-2.9-20081208-orig/sysdeps/posix/getaddrinfo.c glibc-2.9-20081208/sysdeps/posix/getaddrinfo.c +*** glibc-2.9-20081208-orig/sysdeps/posix/getaddrinfo.c 2008-07-30 21:14:22.000000000 +0200 +--- glibc-2.9-20081208/sysdeps/posix/getaddrinfo.c 2008-12-10 11:39:32.000000000 +0100 +*************** +*** 505,512 **** + int no_data = 0; + int no_inet6_data = 0; + service_user *nip = NULL; +- enum nss_status inet6_status = NSS_STATUS_UNAVAIL; +- enum nss_status status = NSS_STATUS_UNAVAIL; + int no_more; + int old_res_options; + +--- 505,510 ---- +*************** +*** 702,707 **** +--- 700,707 ---- + + while (!no_more) + { ++ enum nss_status inet6_status = NSS_STATUS_UNAVAIL; ++ enum nss_status status = NSS_STATUS_UNAVAIL; + nss_gethostbyname4_r fct4 + = __nss_lookup_function (nip, "gethostbyname4_r"); + if (fct4 != NULL) diff --git a/pkgs/os-specific/linux/kernel-headers/2.6.21.3.nix b/pkgs/os-specific/linux/kernel-headers/2.6.21.3.nix deleted file mode 100644 index 2f0b00fcd5f..00000000000 --- a/pkgs/os-specific/linux/kernel-headers/2.6.21.3.nix +++ /dev/null @@ -1,21 +0,0 @@ -{stdenv, fetchurl}: - -assert stdenv.isLinux; - -stdenv.mkDerivation { - name = "linux-headers-2.6.21.3"; - builder = ./builder.sh; - src = fetchurl { - url = "mirror://kernel/linux/kernel/v2.6/linux-2.6.21.3.tar.bz2"; - sha256 = "17rxvw42z4amijb8nya54c2h6bb8gnxnr628arv8shmsccf8qsp5"; - }; - - platform = - if stdenv.system == "i686-linux" then "i386" else - if stdenv.system == "x86_64-linux" then "x86_64" else - if stdenv.system == "powerpc-linux" then "powerpc" else - abort "don't know what the kernel include directory is called for this platform"; - - extraIncludeDirs = - if stdenv.system == "powerpc-linux" then ["ppc"] else []; -} diff --git a/pkgs/os-specific/linux/kernel-headers/2.6.25.4.nix b/pkgs/os-specific/linux/kernel-headers/2.6.27.8.nix similarity index 77% rename from pkgs/os-specific/linux/kernel-headers/2.6.25.4.nix rename to pkgs/os-specific/linux/kernel-headers/2.6.27.8.nix index c6d1cc409fc..b585c462a28 100644 --- a/pkgs/os-specific/linux/kernel-headers/2.6.25.4.nix +++ b/pkgs/os-specific/linux/kernel-headers/2.6.27.8.nix @@ -3,13 +3,13 @@ assert stdenv.isLinux; stdenv.mkDerivation { - name = "linux-headers-2.6.25.4"; + name = "linux-headers-2.6.27.8"; builder = ./builder.sh; src = fetchurl { - url = "mirror://kernel/linux/kernel/v2.6/linux-2.6.25.4.tar.bz2"; - sha256 = "0hp36pwphw5rs9kwm5ksr7ynfmzgpcd8gi45rigbilvcvmsdnxf3"; + url = "mirror://kernel/linux/kernel/v2.6/linux-2.6.27.8.tar.bz2"; + sha256 = "0pgh2zg4md9jvv64s03m3dkwdnliygjl7mxjmg1qki89jc2s62ik"; }; platform = diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 21439923d69..99c2a5095c9 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2945,14 +2945,14 @@ let inherit fetchurl stdenv pkgconfig gettext; }; - glibc = useFromStdenv "glibc" glibc28; + glibc = useFromStdenv "glibc" glibc29; glibc27 = import ../development/libraries/glibc-2.7 { inherit fetchurl stdenv kernelHeaders; #installLocales = false; }; - glibc28 = import ../development/libraries/glibc-2.8 { + glibc29 = import ../development/libraries/glibc-2.9 { inherit fetchurl stdenv kernelHeaders; installLocales = getPkgConfig "glibc" "locales" true; }; @@ -6023,19 +6023,15 @@ let inherit fetchurl stdenv unifdef; }; - kernelHeaders_2_6_21 = import ../os-specific/linux/kernel-headers/2.6.21.3.nix { - inherit fetchurl stdenv; - }; - kernelHeaders_2_6_23 = import ../os-specific/linux/kernel-headers/2.6.23.16.nix { inherit fetchurl stdenv; }; - kernelHeaders_2_6_25 = import ../os-specific/linux/kernel-headers/2.6.25.4.nix { + kernelHeaders_2_6_26 = import ../os-specific/linux/kernel-headers/2.6.26.2.nix { inherit fetchurl stdenv; }; - kernelHeaders_2_6_26 = import ../os-specific/linux/kernel-headers/2.6.26.2.nix { + kernelHeaders_2_6_27 = import ../os-specific/linux/kernel-headers/2.6.27.8.nix { inherit fetchurl stdenv; };