From ce63b61a909583c99da309d9cc224f37816eec82 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Fri, 25 Feb 2011 15:28:17 +0000 Subject: [PATCH] GNU libc 2.13. svn path=/nixpkgs/branches/stdenv-updates/; revision=26116 --- .../{glibc-2.12 => glibc-2.13}/builder.sh | 0 .../{glibc-2.12 => glibc-2.13}/common.nix | 6 +++--- .../{glibc-2.12 => glibc-2.13}/default.nix | 0 .../libraries/{glibc-2.12 => glibc-2.13}/info.nix | 0 .../{glibc-2.12 => glibc-2.13}/locales-builder.sh | 0 .../{glibc-2.12 => glibc-2.13}/locales.nix | 0 .../nix-locale-archive.patch | 0 .../nss-skip-unavail.patch | 0 .../{glibc-2.12 => glibc-2.13}/rpcgen-path.patch | 0 pkgs/top-level/all-packages.nix | 14 +++++++------- 10 files changed, 10 insertions(+), 10 deletions(-) rename pkgs/development/libraries/{glibc-2.12 => glibc-2.13}/builder.sh (100%) rename pkgs/development/libraries/{glibc-2.12 => glibc-2.13}/common.nix (97%) rename pkgs/development/libraries/{glibc-2.12 => glibc-2.13}/default.nix (100%) rename pkgs/development/libraries/{glibc-2.12 => glibc-2.13}/info.nix (100%) rename pkgs/development/libraries/{glibc-2.12 => glibc-2.13}/locales-builder.sh (100%) rename pkgs/development/libraries/{glibc-2.12 => glibc-2.13}/locales.nix (100%) rename pkgs/development/libraries/{glibc-2.12 => glibc-2.13}/nix-locale-archive.patch (100%) rename pkgs/development/libraries/{glibc-2.12 => glibc-2.13}/nss-skip-unavail.patch (100%) rename pkgs/development/libraries/{glibc-2.12 => glibc-2.13}/rpcgen-path.patch (100%) diff --git a/pkgs/development/libraries/glibc-2.12/builder.sh b/pkgs/development/libraries/glibc-2.13/builder.sh similarity index 100% rename from pkgs/development/libraries/glibc-2.12/builder.sh rename to pkgs/development/libraries/glibc-2.13/builder.sh diff --git a/pkgs/development/libraries/glibc-2.12/common.nix b/pkgs/development/libraries/glibc-2.13/common.nix similarity index 97% rename from pkgs/development/libraries/glibc-2.12/common.nix rename to pkgs/development/libraries/glibc-2.13/common.nix index 0ffc8d7a0e8..460deb1019b 100644 --- a/pkgs/development/libraries/glibc-2.12/common.nix +++ b/pkgs/development/libraries/glibc-2.13/common.nix @@ -11,7 +11,7 @@ cross : let # For GNU/Hurd, see below. - version = if hurdHeaders != null then "20100512" else "2.12.2"; + version = if hurdHeaders != null then "20100512" else "2.13"; needsPortsNative = stdenv.isMips || stdenv.isArm; needsPortsCross = cross.arch == "mips" || cross.arch == "arm"; @@ -20,7 +20,7 @@ let else needsPortsCross; srcPorts = fetchurl { - # These should work equally well for 2.12.2 + # These should work equally well for 2.13 url = "mirror://gnu/glibc/glibc-ports-2.12.1.tar.bz2"; sha256 = "041ix0nq7nc5r7jf80jsdlw4idah2mjp5nf7khybhc4cs1kc31ir"; }; @@ -147,7 +147,7 @@ stdenv.mkDerivation ({ } else fetchurl { url = "mirror://gnu/glibc/glibc-${version}.tar.bz2"; - sha256 = "05hjz816a2hmzc44gxxi9vrdx6l9f23az794zj45xsxr94yfpy12"; + sha256 = "1cnv319ysc8nkwpqw6f6ymb6b8hbl0nyvyx48sddkrj50lmcjwq1"; }; # `fetchurl' is a function and thus should not be passed to the diff --git a/pkgs/development/libraries/glibc-2.12/default.nix b/pkgs/development/libraries/glibc-2.13/default.nix similarity index 100% rename from pkgs/development/libraries/glibc-2.12/default.nix rename to pkgs/development/libraries/glibc-2.13/default.nix diff --git a/pkgs/development/libraries/glibc-2.12/info.nix b/pkgs/development/libraries/glibc-2.13/info.nix similarity index 100% rename from pkgs/development/libraries/glibc-2.12/info.nix rename to pkgs/development/libraries/glibc-2.13/info.nix diff --git a/pkgs/development/libraries/glibc-2.12/locales-builder.sh b/pkgs/development/libraries/glibc-2.13/locales-builder.sh similarity index 100% rename from pkgs/development/libraries/glibc-2.12/locales-builder.sh rename to pkgs/development/libraries/glibc-2.13/locales-builder.sh diff --git a/pkgs/development/libraries/glibc-2.12/locales.nix b/pkgs/development/libraries/glibc-2.13/locales.nix similarity index 100% rename from pkgs/development/libraries/glibc-2.12/locales.nix rename to pkgs/development/libraries/glibc-2.13/locales.nix diff --git a/pkgs/development/libraries/glibc-2.12/nix-locale-archive.patch b/pkgs/development/libraries/glibc-2.13/nix-locale-archive.patch similarity index 100% rename from pkgs/development/libraries/glibc-2.12/nix-locale-archive.patch rename to pkgs/development/libraries/glibc-2.13/nix-locale-archive.patch diff --git a/pkgs/development/libraries/glibc-2.12/nss-skip-unavail.patch b/pkgs/development/libraries/glibc-2.13/nss-skip-unavail.patch similarity index 100% rename from pkgs/development/libraries/glibc-2.12/nss-skip-unavail.patch rename to pkgs/development/libraries/glibc-2.13/nss-skip-unavail.patch diff --git a/pkgs/development/libraries/glibc-2.12/rpcgen-path.patch b/pkgs/development/libraries/glibc-2.13/rpcgen-path.patch similarity index 100% rename from pkgs/development/libraries/glibc-2.12/rpcgen-path.patch rename to pkgs/development/libraries/glibc-2.13/rpcgen-path.patch diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c8588aa435f..1823eab018e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2970,7 +2970,7 @@ let glfw = callPackage ../development/libraries/glfw { }; - glibc = glibc212; + glibc = glibc213; glibc25 = callPackage ../development/libraries/glibc-2.5 { kernelHeaders = linuxHeaders; @@ -2994,15 +2994,15 @@ let installLocales = getPkgConfig "glibc" "locales" false; }); - glibc212 = (callPackage ../development/libraries/glibc-2.12 { + glibc213 = (callPackage ../development/libraries/glibc-2.13 { kernelHeaders = linuxHeaders; installLocales = getPkgConfig "glibc" "locales" false; machHeaders = null; hurdHeaders = null; gccCross = null; - }) // (if crossSystem != null then { hostDrv = glibc212Cross; } else {}); + }) // (if crossSystem != null then { hostDrv = glibc213Cross; } else {}); - glibc212Cross = forceBuildDrv (makeOverridable (import ../development/libraries/glibc-2.12) + glibc213Cross = forceBuildDrv (makeOverridable (import ../development/libraries/glibc-2.13) (let crossGNU = (crossSystem != null && crossSystem.config == "i586-pc-gnu"); in ({ inherit stdenv fetchurl; @@ -3017,7 +3017,7 @@ let then { inherit machHeaders hurdHeaders mig fetchgit; } else { })))); - glibcCross = glibc212Cross; + glibcCross = glibc213Cross; # We can choose: libcCrossChooser = name : if (name == "glibc") then glibcCross @@ -3038,9 +3038,9 @@ let installLocales = getPkgConfig "glibc" "locales" false; }; - glibcLocales = callPackage ../development/libraries/glibc-2.12/locales.nix { }; + glibcLocales = callPackage ../development/libraries/glibc-2.13/locales.nix { }; - glibcInfo = callPackage ../development/libraries/glibc-2.12/info.nix { }; + glibcInfo = callPackage ../development/libraries/glibc-2.13/info.nix { }; glibc_multi = runCommand "${glibc.name}-multi"