From 0b1f1a522c655ef8b16242be975bf3314ed6dbe9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Tue, 25 Oct 2011 18:35:41 +0000 Subject: [PATCH] Updating glibc from 2.13 to 2.14.1 svn path=/nixpkgs/branches/stdenv-updates/; revision=30023 --- .../{glibc-2.13 => glibc-2.14}/builder.sh | 0 .../{glibc-2.13 => glibc-2.14}/common.nix | 8 ++++---- .../{glibc-2.13 => glibc-2.14}/default.nix | 0 .../glibc-elf-localscope.patch | 0 .../libraries/{glibc-2.13 => glibc-2.14}/info.nix | 0 .../{glibc-2.13 => glibc-2.14}/locales-builder.sh | 0 .../{glibc-2.13 => glibc-2.14}/locales.nix | 0 .../nix-locale-archive.patch | 0 .../nss-skip-unavail.patch | 0 .../{glibc-2.13 => glibc-2.14}/rpcgen-path.patch | 0 pkgs/top-level/all-packages.nix | 14 +++++++------- 11 files changed, 11 insertions(+), 11 deletions(-) rename pkgs/development/libraries/{glibc-2.13 => glibc-2.14}/builder.sh (100%) rename pkgs/development/libraries/{glibc-2.13 => glibc-2.14}/common.nix (96%) rename pkgs/development/libraries/{glibc-2.13 => glibc-2.14}/default.nix (100%) rename pkgs/development/libraries/{glibc-2.13 => glibc-2.14}/glibc-elf-localscope.patch (100%) rename pkgs/development/libraries/{glibc-2.13 => glibc-2.14}/info.nix (100%) rename pkgs/development/libraries/{glibc-2.13 => glibc-2.14}/locales-builder.sh (100%) rename pkgs/development/libraries/{glibc-2.13 => glibc-2.14}/locales.nix (100%) rename pkgs/development/libraries/{glibc-2.13 => glibc-2.14}/nix-locale-archive.patch (100%) rename pkgs/development/libraries/{glibc-2.13 => glibc-2.14}/nss-skip-unavail.patch (100%) rename pkgs/development/libraries/{glibc-2.13 => glibc-2.14}/rpcgen-path.patch (100%) diff --git a/pkgs/development/libraries/glibc-2.13/builder.sh b/pkgs/development/libraries/glibc-2.14/builder.sh similarity index 100% rename from pkgs/development/libraries/glibc-2.13/builder.sh rename to pkgs/development/libraries/glibc-2.14/builder.sh diff --git a/pkgs/development/libraries/glibc-2.13/common.nix b/pkgs/development/libraries/glibc-2.14/common.nix similarity index 96% rename from pkgs/development/libraries/glibc-2.13/common.nix rename to pkgs/development/libraries/glibc-2.14/common.nix index 15941c2a43b7..87b808cda4b6 100644 --- a/pkgs/development/libraries/glibc-2.13/common.nix +++ b/pkgs/development/libraries/glibc-2.14/common.nix @@ -11,7 +11,7 @@ cross : let # For GNU/Hurd, see below. - version = if hurdHeaders != null then "20100512" else "2.13"; + version = if hurdHeaders != null then "20100512" else "2.14.1"; needsPortsNative = stdenv.isMips || stdenv.isArm; needsPortsCross = cross.arch == "mips" || cross.arch == "arm"; @@ -20,8 +20,8 @@ let else needsPortsCross; srcPorts = fetchurl { - url = "mirror://gnu/glibc/glibc-ports-2.13.tar.bz2"; - sha256 = "0npffql62m1xba15l1wkaqf2p0l2bvb33720gx28764jmq0la75i"; + url = "mirror://gnu/glibc/glibc-ports-2.14.1.tar.bz2"; + sha256 = "1acs4sd5mjzmssmd0md6dfqwnziph2am7v09mbnnd8aadpxhm0qw"; }; in @@ -148,7 +148,7 @@ stdenv.mkDerivation ({ } else fetchurl { url = "mirror://gnu/glibc/glibc-${version}.tar.bz2"; - sha256 = "1cnv319ysc8nkwpqw6f6ymb6b8hbl0nyvyx48sddkrj50lmcjwq1"; + sha256 = "0fsvf5d6sib483rp7asdy8hs0dysxqkrvw316c82hsxy7vxa51bf"; }; # `fetchurl' is a function and thus should not be passed to the diff --git a/pkgs/development/libraries/glibc-2.13/default.nix b/pkgs/development/libraries/glibc-2.14/default.nix similarity index 100% rename from pkgs/development/libraries/glibc-2.13/default.nix rename to pkgs/development/libraries/glibc-2.14/default.nix diff --git a/pkgs/development/libraries/glibc-2.13/glibc-elf-localscope.patch b/pkgs/development/libraries/glibc-2.14/glibc-elf-localscope.patch similarity index 100% rename from pkgs/development/libraries/glibc-2.13/glibc-elf-localscope.patch rename to pkgs/development/libraries/glibc-2.14/glibc-elf-localscope.patch diff --git a/pkgs/development/libraries/glibc-2.13/info.nix b/pkgs/development/libraries/glibc-2.14/info.nix similarity index 100% rename from pkgs/development/libraries/glibc-2.13/info.nix rename to pkgs/development/libraries/glibc-2.14/info.nix diff --git a/pkgs/development/libraries/glibc-2.13/locales-builder.sh b/pkgs/development/libraries/glibc-2.14/locales-builder.sh similarity index 100% rename from pkgs/development/libraries/glibc-2.13/locales-builder.sh rename to pkgs/development/libraries/glibc-2.14/locales-builder.sh diff --git a/pkgs/development/libraries/glibc-2.13/locales.nix b/pkgs/development/libraries/glibc-2.14/locales.nix similarity index 100% rename from pkgs/development/libraries/glibc-2.13/locales.nix rename to pkgs/development/libraries/glibc-2.14/locales.nix diff --git a/pkgs/development/libraries/glibc-2.13/nix-locale-archive.patch b/pkgs/development/libraries/glibc-2.14/nix-locale-archive.patch similarity index 100% rename from pkgs/development/libraries/glibc-2.13/nix-locale-archive.patch rename to pkgs/development/libraries/glibc-2.14/nix-locale-archive.patch diff --git a/pkgs/development/libraries/glibc-2.13/nss-skip-unavail.patch b/pkgs/development/libraries/glibc-2.14/nss-skip-unavail.patch similarity index 100% rename from pkgs/development/libraries/glibc-2.13/nss-skip-unavail.patch rename to pkgs/development/libraries/glibc-2.14/nss-skip-unavail.patch diff --git a/pkgs/development/libraries/glibc-2.13/rpcgen-path.patch b/pkgs/development/libraries/glibc-2.14/rpcgen-path.patch similarity index 100% rename from pkgs/development/libraries/glibc-2.13/rpcgen-path.patch rename to pkgs/development/libraries/glibc-2.14/rpcgen-path.patch diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e31114ca5731..c15f1f093d0e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3384,7 +3384,7 @@ let glfw = callPackage ../development/libraries/glfw { }; - glibc = glibc213; + glibc = glibc214; glibc25 = callPackage ../development/libraries/glibc-2.5 { kernelHeaders = linuxHeaders_2_6_28; @@ -3408,15 +3408,15 @@ let installLocales = getConfig [ "glibc" "locales" ] false; }); - glibc213 = (callPackage ../development/libraries/glibc-2.13 { + glibc214 = (callPackage ../development/libraries/glibc-2.14 { kernelHeaders = linuxHeaders; installLocales = getConfig [ "glibc" "locales" ] false; machHeaders = null; hurdHeaders = null; gccCross = null; - }) // (if crossSystem != null then { hostDrv = glibc213Cross; } else {}); + }) // (if crossSystem != null then { hostDrv = glibc214Cross; } else {}); - glibc213Cross = forceBuildDrv (makeOverridable (import ../development/libraries/glibc-2.13) + glibc214Cross = forceBuildDrv (makeOverridable (import ../development/libraries/glibc-2.14) (let crossGNU = (crossSystem != null && crossSystem.config == "i586-pc-gnu"); in ({ inherit stdenv fetchurl; @@ -3431,7 +3431,7 @@ let then { inherit machHeaders hurdHeaders mig fetchgit; } else { })))); - glibcCross = glibc213Cross; + glibcCross = glibc214Cross; # We can choose: libcCrossChooser = name : if (name == "glibc") then glibcCross @@ -3446,9 +3446,9 @@ let installLocales = getConfig [ "glibc" "locales" ] false; }; - glibcLocales = callPackage ../development/libraries/glibc-2.13/locales.nix { }; + glibcLocales = callPackage ../development/libraries/glibc-2.14/locales.nix { }; - glibcInfo = callPackage ../development/libraries/glibc-2.13/info.nix { }; + glibcInfo = callPackage ../development/libraries/glibc-2.14/info.nix { }; glibc_multi = runCommand "${glibc.name}-multi"