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.

4 files changed, 5 insertions, 45 deletions

diff --git a/pkgs/tools/misc/findutils/change_echo_path.patch b/pkgs/tools/misc/findutils/change_echo_path.patch
deleted file mode 100644
index 5bbd9aea9ac..00000000000
--- a/pkgs/tools/misc/findutils/change_echo_path.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Naur findutils-4.2.30/xargs/xargs.c findutils-4.2.30_new/xargs/xargs.c
---- findutils-4.2.30/xargs/xargs.c	2007-02-27 11:21:08.000000000 +0100
-+++ findutils-4.2.30_new/xargs/xargs.c	2007-07-17 19:02:05.000000000 +0200
-@@ -402,7 +402,7 @@
-   int show_limits = 0;			/* --show-limits */
-   int always_run_command = 1;
-   char *input_file = "-"; /* "-" is stdin */
--  char *default_cmd = "/bin/echo";
-+  char *default_cmd = "echo";
-   int (*read_args) PARAMS ((void)) = read_line;
-   void (*act_on_init_result)(void) = noop;
-   int env_too_big = 0;
diff --git a/pkgs/tools/misc/findutils/default.nix b/pkgs/tools/misc/findutils/default.nix
index c59283fb7c3..1271aa8c986 100644
--- a/pkgs/tools/misc/findutils/default.nix
+++ b/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/;
diff --git a/pkgs/tools/misc/findutils/disable-test-canonicalize.patch b/pkgs/tools/misc/findutils/disable-test-canonicalize.patch
deleted file mode 100644
index 3a8d42eb560..00000000000
--- a/pkgs/tools/misc/findutils/disable-test-canonicalize.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ruN findutils-4.4.2/tests/test-canonicalize.sh findutils-4.4.2_edited/tests/test-canonicalize.sh
---- findutils-4.4.2/tests/test-canonicalize.sh	2008-12-23 12:50:15.000000000 +0000
-+++ findutils-4.4.2_edited/tests/test-canonicalize.sh	2015-06-14 10:51:19.000000000 +0000
-@@ -1,5 +1,8 @@
- #!/bin/sh
- 
-+# skipped because user might not have directory listing permission for all parents of TMPDIR
-+exit 77
-+
- tmpfiles=""
- trap 'rm -fr $tmpfiles' 1 2 3 15
- 
diff --git a/pkgs/tools/misc/findutils/findutils-path.patch b/pkgs/tools/misc/findutils/findutils-path.patch
deleted file mode 100644
index be8d85be303..00000000000
--- a/pkgs/tools/misc/findutils/findutils-path.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ruN findutils-4.2.20/locate/updatedb.sh findutils-4.2.20.new/locate/updatedb.sh
---- findutils-4.2.20/locate/updatedb.sh	2005-01-24 17:12:35.000000000 +0100
-+++ findutils-4.2.20.new/locate/updatedb.sh	2005-08-23 14:37:10.000000000 +0200
-@@ -141,7 +141,7 @@
- : ${code:=${LIBEXECDIR}/@code@}
- 
- 
--PATH=/bin:/usr/bin:${BINDIR}; export PATH
-+PATH=/bin:/usr/bin:${BINDIR}:${PATH}; export PATH
- 
- : ${PRUNEFS="nfs NFS proc afs proc smbfs autofs iso9660 ncpfs coda devpts ftpfs devfs mfs sysfs shfs"}
-