patch: 2.7.3 -> 2.7.5

pkgs/tools/text/gnupatch/bashishms.patch

@@ -1,67 +0,0 @@
-http://lists.gnu.org/archive/html/bug-patch/2012-11/msg00001.html
-Tested on Illumos, where ksh is /bin/sh.
-
---- patch-2.7.1/tests/test-lib.sh
-+++ patch-2.7.1/tests/test-lib.sh
-@@ -118,7 +118,7 @@
- }
- 
- if test -z "`echo -n`"; then
--    if eval 'test -n "${BASH_LINENO[0]}" 2>/dev/null'; then
-+    if (eval 'test -n "${BASH_LINENO[0]}"') 2>/dev/null; then
- 	eval '
- 	    _start_test() {
- 		echo -n "[${BASH_LINENO[2]}] $* -- "
-
---- patch-2.7.1/tests/crlf-handling
-+++ patch-2.7.1/tests/crlf-handling
-@@ -14,7 +14,7 @@
- use_tmpdir
- 
- lf2crlf() {
--    while read l; do echo -e "$l\r"; done
-+    while read l; do printf "%s\r\n" "$l"; done
- }
- 
- echo 1 > a
-
---- patch-2.7.1/tests/merge
-+++ patch-2.7.1/tests/merge
-@@ -32,18 +32,20 @@
-     shift
-     done > a.sed
-     echo "$body" | sed -f a.sed > b
--    shift
--    while test $# -gt 0 ; do
--	echo "$1"
-+    if test $# -gt 0 ; then
- 	shift
--    done > b.sed
-+    while test $# -gt 0 ; do
-+	echo "$1"
-+	shift
-+    done
-+    fi > b.sed
-     echo "$body" | sed -f b.sed > c
-     rm -f a.sed b.sed
-     output=`diff -u a b | patch $ARGS -f c`
-     status=$?
-     echo "$output" | sed -e '/^$/d' -e '/^patching file c$/d'
-     cat c
--    test $status == 0 || echo "Status: $status"
-+    test $status = 0 || echo "Status: $status"
- }
- 
- x() {
-
---- patch-2.7.1/tests/read-only-files
-+++ patch-2.7.1/tests/read-only-files
-@@ -16,7 +16,7 @@
-
- : > read-only
- chmod a-w read-only
--if : 2> /dev/null > read-only; then
-+if (: > read-only) 2> /dev/null; then
-     echo "Files with read-only permissions are writable" \
-         "(probably running as superuser)" >&2
-     exit 77

pkgs/tools/text/gnupatch/default.nix

@@ -1,11 +1,11 @@
 { stdenv, fetchurl, ed }:
 
 stdenv.mkDerivation rec {
-  name = "patch-2.7.3";
+  name = "patch-2.7.5";
 
   src = fetchurl {
-    url = "mirror://gnu/patch/${name}.tar.bz2";
-    sha256 = "0za8wh4lgjk8k9s0rd7y5gjid99126myrh3nkifpi4ny6rkj9xh2";
+    url = "mirror://gnu/patch/${name}.tar.xz";
+    sha256 = "16d2r9kpivaak948mxzc0bai45mqfw73m113wrkmbffnalv1b5gx";
   };
 
   buildInputs = stdenv.lib.optional doCheck ed;
@@ -14,8 +14,6 @@ stdenv.mkDerivation rec {
     configureFlags = [ "ac_cv_func_strnlen_working=yes" ];
   };
 
-  patches = [ ./bashishms.patch ];
-
   doCheck = true;
 
   meta = {