mirrors/nixpkgs
1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-22 21:50:55 +00:00
Code Issues Wiki Activity

findutils: 4.4.2 -> 4.6.0

Browse source 
The first findutils update in six years! Changes:

https://lists.gnu.org/archive/html/info-gnu/2015-12/msg00014.html
This commit is contained in:
Eelco Dolstra 2016-02-27 23:15:31 +01:00
parent 8726c6d506
commit 015c7afffa
4 changed files with 5 additions and 45 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
pkgs/tools/misc/findutils/change_echo_path.patch
View file

@ -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;

14
pkgs/tools/misc/findutils/default.nix
View file

@ -1,16 +1,14 @@
{stdenv, fetchurl, coreutils}:
{ 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];
patches = [ ./findutils-path.patch ./change_echo_path.patch ./disable-test-canonicalize.patch ];
nativeBuildInputs = [ coreutils ];
doCheck = true;
@ -19,9 +17,7 @@ stdenv.mkDerivation rec {
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/;

12
pkgs/tools/misc/findutils/disable-test-canonicalize.patch
View file

@ -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

12
pkgs/tools/misc/findutils/findutils-path.patch
View file

@ -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"}