Merge changes from branch 'master' into stdenv-updates.

Conflicts:
	pkgs/development/libraries/icu/default.nix
	pkgs/tools/misc/coreutils/default.nix

pkgs/development/compilers/gcc/4.6/default.nix

@@ -333,6 +333,7 @@ stdenv.mkDerivation ({
 
   crossAttrs = {
     patches = patches ++ [ ./hurd-sigrtmin.patch ];
+    postPatch = "";
     AR = "${stdenv.cross.config}-ar";
     LD = "${stdenv.cross.config}-ld";
     CC = "${stdenv.cross.config}-gcc";

pkgs/development/compilers/gcc/4.7/default.nix

@@ -49,7 +49,7 @@ assert langGo -> langCC;
 with stdenv.lib;
 with builtins;
 
-let version = "4.7.2";
+let version = "4.7.3";
 
     # Whether building a cross-compiler for GNU/Hurd.
     crossGNU = cross != null && cross.config == "i586-pc-gnu";
@@ -197,7 +197,7 @@ stdenv.mkDerivation ({
 
   src = fetchurl {
     url = "mirror://gnu/gcc/gcc-${version}/gcc-${version}.tar.bz2";
-    sha256 = "115h03hil99ljig8lkrq4qk426awmzh0g99wrrggxf8g07bq74la";
+    sha256 = "1hx9h64ivarlzi4hxvq42as5m9vlr5cyzaaq4gzj4i619zmkfz1g";
   };
 
   inherit patches;