Merge branch 'master' into closure-size

Beware that stdenv doesn't build. It seems something more will be needed
than just resolution of merge conflicts.

pkgs/tools/misc/findutils/default.nix

@@ -1,29 +1,25 @@
 { stdenv, fetchurl, coreutils }:
 
 stdenv.mkDerivation rec {
-  name = "findutils-4.4.2";
+  name = "findutils-4.6.0";
 
   src = fetchurl {
     url = "mirror://gnu/findutils/${name}.tar.gz";
-    sha256 = "0amn0bbwqvsvvsh6drfwz20ydc2czk374lzw5kksbh6bf78k4ks3";
+    sha256 = "178nn4dl7wbcw499czikirnkniwnx36argdnqgz4ik9i6zvwkm6y";
   };
 
-  nativeBuildInputs = [coreutils];
+  nativeBuildInputs = [ coreutils ];
 
-  patches = [ ./findutils-path.patch ./change_echo_path.patch ./disable-test-canonicalize.patch ];
+  doCheck = !stdenv.isDarwin;
 
   outputs = [ "out" "info" ];
 
-  doCheck = true;
-
   crossAttrs = {
     # http://osdir.com/ml/bug-findutils-gnu/2009-08/msg00026.html
     configureFlags = [ "gl_cv_func_wcwidth_works=yes" ];
   };
 
-  preConfigure = if stdenv.isCygwin then ''
-    sed -i gnulib/lib/fpending.h -e '/include <stdio_ext.h>/d'
-  '' else null;
+  enableParallelBuilding = true;
 
   meta = {
     homepage = http://www.gnu.org/software/findutils/;