glibc: Update to 2.17

Note that glibc-ports is now part of the main glibc tarball.

pkgs/development/libraries/glibc/2.17/common.nix

@@ -11,24 +11,12 @@ cross:
 , preConfigure ? "", ... }@args:
 
 let
-  version = "2.16.0";
 
-  needsPortsNative = stdenv.isMips || stdenv.isArm;
+  version = "2.17";
-  needsPortsCross = cross.arch == "mips" || cross.arch == "arm";
-  needsPorts =
-    if stdenv.cross or null != null && hurdHeaders == null then true
-    else if cross == null then needsPortsNative
-    else needsPortsCross;
-
-  srcPorts = fetchurl {
-    url = "mirror://gnu/glibc/glibc-ports-${version}.tar.bz2";
-    sha256 = "0qw4n71rqykl83ybq0c92w1n8afsx079sw3hn5nyib5nw6iphrfm";
-  };
 
 in
 
 assert cross != null -> gccCross != null;
-
 assert mig != null -> machHeaders != null;
 assert machHeaders != null -> hurdHeaders != null;
 assert hurdHeaders != null -> libpthreadHeaders != null;
@@ -151,7 +139,7 @@ stdenv.mkDerivation ({
 
   src = fetchurl {
     url = "mirror://gnu/glibc/glibc-${version}.tar.gz";
-    sha256 = "0vlz4x6cgz7h54qq4528q526qlhnsjzbsvgc4iizn76cb0bfanx7";
+    sha256 = "0ym3zk9ii64279wgw7pw9xkbxczy2ci7ka6mnfs05rhlainhicm3";
   };
 
   # Remove absolute paths from `configure' & co.; build out-of-tree.
@@ -163,8 +151,6 @@ stdenv.mkDerivation ({
         sed -i "$i" -e "s^/bin/pwd^$PWD_P^g"
     done
 
-    ${if needsPorts then "tar xvf ${srcPorts}" else ""}
-
     mkdir ../build
     cd ../build
 

pkgs/top-level/all-packages.nix

@@ -3624,7 +3624,7 @@ let
 
   glfw = callPackage ../development/libraries/glfw { };
 
-  glibc = glibc216;
+  glibc = glibc217;
 
   glibcCross = glibc213Cross;
 
@@ -3649,7 +3649,7 @@ let
         inherit fetchgit;
       }));
 
-  glibc216 = callPackage ../development/libraries/glibc/2.16 {
+  glibc217 = callPackage ../development/libraries/glibc/2.17 {
     kernelHeaders = linuxHeaders;
     installLocales = config.glibc.locales or false;
     machHeaders = null;