summary refs log tree commit diff
path: root/pkgs/tools/text/gnupatch
diff options
context:
space:
mode:
authorEelco Dolstra <eelco.dolstra@logicblox.com>2012-09-18 14:48:31 -0400
committerEelco Dolstra <eelco.dolstra@logicblox.com>2012-09-18 14:48:31 -0400
commit37b44ed6902b5ae3c6a50ec11b87764045004dc7 (patch)
treeb1cd589a5dc44c36d62ed6011aa97ab381bbe847 /pkgs/tools/text/gnupatch
parent6d3ce2e3478438feb06a35d0be4bf583935fed4b (diff)
downloadnixlib-37b44ed6902b5ae3c6a50ec11b87764045004dc7.tar
nixlib-37b44ed6902b5ae3c6a50ec11b87764045004dc7.tar.gz
nixlib-37b44ed6902b5ae3c6a50ec11b87764045004dc7.tar.bz2
nixlib-37b44ed6902b5ae3c6a50ec11b87764045004dc7.tar.lz
nixlib-37b44ed6902b5ae3c6a50ec11b87764045004dc7.tar.xz
nixlib-37b44ed6902b5ae3c6a50ec11b87764045004dc7.tar.zst
nixlib-37b44ed6902b5ae3c6a50ec11b87764045004dc7.zip
patch: Update to 2.7
Diffstat (limited to 'pkgs/tools/text/gnupatch')
-rw-r--r--pkgs/tools/text/gnupatch/default.nix16
1 files changed, 6 insertions, 10 deletions
diff --git a/pkgs/tools/text/gnupatch/default.nix b/pkgs/tools/text/gnupatch/default.nix
index a7a166c95c3b..0495134d1123 100644
--- a/pkgs/tools/text/gnupatch/default.nix
+++ b/pkgs/tools/text/gnupatch/default.nix
@@ -1,14 +1,16 @@
 { stdenv, fetchurl, ed }:
 
-stdenv.mkDerivation (rec {
-  name = "patch-2.6.1";
+stdenv.mkDerivation rec {
+  name = "patch-2.7";
 
   src = fetchurl {
     url = "mirror://gnu/patch/${name}.tar.gz";
-    sha256 = "1fc1jyq80nswkf492fiqdbl2bhvlw2wb44ghqlfd3zngx4qkfmni";
+    sha256 = "0j10lq37ywcc4qiakan6wpm00abfrnnccq3ags129ad0z9b9zhjr";
   };
 
-  buildInputs = (stdenv.lib.optional doCheck ed);
+  patches = stdenv.lib.optional stdenv.isDarwin ./darwin-fix.patch;
+
+  buildInputs = stdenv.lib.optional doCheck ed;
 
   crossAttrs = {
     configureFlags = [ "ac_cv_func_strnlen_working=yes" ];
@@ -33,9 +35,3 @@ stdenv.mkDerivation (rec {
     platforms = stdenv.lib.platforms.all;
   };
 }
-
-//
-
-(stdenv.lib.optionalAttrs stdenv.isDarwin {
-  patches = [ ./darwin-fix.patch ];
-}))