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

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

pkgs/development/libraries/icu/default.nix

@@ -13,13 +13,15 @@ stdenv.mkDerivation {
     sha256 = "0sv6hgkm92pm27zgjxgk284lcxxbsl0syi40ckw2b7yj7d8sxrc7";
   };
 
-  postUnpack = "
-    sourceRoot=\${sourceRoot}/source
-    echo Source root reset to \${sourceRoot}
-  ";
+  postUnpack = ''
+    sourceRoot=''${sourceRoot}/source
+    echo Source root reset to ''${sourceRoot}
+  '';
 
   configureFlags = "--disable-debug";
 
+  enableParallelBuilding = true;
+
   meta = {
     description = "Unicode and globalization support library";
     homepage = http://site.icu-project.org/;