Updating glibc from 2.13 to 2.14.1

svn path=/nixpkgs/branches/stdenv-updates/; revision=30023

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

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"