diff options
author | Vladimír Čunát <v@cunat.cz> | 2019-05-12 15:17:10 +0200 |
---|---|---|
committer | Vladimír Čunát <v@cunat.cz> | 2019-05-12 15:17:10 +0200 |
commit | 0fb181b8ceae97e3ca1695db13b15e4457ad5353 (patch) | |
tree | 232ae4e4a6c78a5dc89e49c42191dfdffea26949 /pkgs/build-support | |
parent | 359a7340d78175b0eba53009051e3fcc22ef1e8d (diff) | |
parent | e07c5ec107c720b9f1ace4bfa87fe8f359e358c0 (diff) | |
download | nixlib-0fb181b8ceae97e3ca1695db13b15e4457ad5353.tar nixlib-0fb181b8ceae97e3ca1695db13b15e4457ad5353.tar.gz nixlib-0fb181b8ceae97e3ca1695db13b15e4457ad5353.tar.bz2 nixlib-0fb181b8ceae97e3ca1695db13b15e4457ad5353.tar.lz nixlib-0fb181b8ceae97e3ca1695db13b15e4457ad5353.tar.xz nixlib-0fb181b8ceae97e3ca1695db13b15e4457ad5353.tar.zst nixlib-0fb181b8ceae97e3ca1695db13b15e4457ad5353.zip |
Merge #59422: patchutils: 0.3.3 -> 0.3.4, keep 0.3.3 for fetchpatch
Diffstat (limited to 'pkgs/build-support')
-rw-r--r-- | pkgs/build-support/fetchpatch/default.nix | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/pkgs/build-support/fetchpatch/default.nix b/pkgs/build-support/fetchpatch/default.nix index 89d72f512f7f..2fb32b2324f2 100644 --- a/pkgs/build-support/fetchpatch/default.nix +++ b/pkgs/build-support/fetchpatch/default.nix @@ -5,6 +5,10 @@ # stripLen acts as the -p parameter when applying a patch. { lib, fetchurl, buildPackages }: +let + # 0.3.4 would change hashes: https://github.com/NixOS/nixpkgs/issues/25154 + patchutils = buildPackages.patchutils_0_3_3; +in { stripLen ? 0, extraPrefix ? null, excludes ? [], includes ? [], revert ? false, ... }@args: fetchurl ({ @@ -14,10 +18,10 @@ fetchurl ({ echo "error: Fetched patch file '$out' is empty!" 1>&2 exit 1 fi - "${buildPackages.patchutils}/bin/lsdiff" "$out" \ + "${patchutils}/bin/lsdiff" "$out" \ | sort -u | sed -e 's/[*?]/\\&/g' \ | xargs -I{} \ - "${buildPackages.patchutils}/bin/filterdiff" \ + "${patchutils}/bin/filterdiff" \ --include={} \ --strip=${toString stripLen} \ ${lib.optionalString (extraPrefix != null) '' @@ -32,7 +36,7 @@ fetchurl ({ cat "$out" 1>&2 exit 1 fi - ${buildPackages.patchutils}/bin/filterdiff \ + ${patchutils}/bin/filterdiff \ -p1 \ ${builtins.toString (builtins.map (x: "-x ${lib.escapeShellArg x}") excludes)} \ ${builtins.toString (builtins.map (x: "-i ${lib.escapeShellArg x}") includes)} \ @@ -46,7 +50,7 @@ fetchurl ({ exit 1 fi '' + lib.optionalString revert '' - ${buildPackages.patchutils}/bin/interdiff "$out" /dev/null > "$tmpfile" + ${patchutils}/bin/interdiff "$out" /dev/null > "$tmpfile" mv "$tmpfile" "$out" '' + (args.postFetch or ""); meta.broken = excludes != [] && includes != []; |