diff options
| author | DavHau <hsngrmpf+github@gmail.com> | 2021-12-20 05:09:32 +0100 |
|---|---|---|
| committer | Jan Tojnar <jtojnar@gmail.com> | 2022-02-02 12:15:47 +0100 |
| commit | ac728c1e96d40e740f79da1165e30b727030e954 (patch) | |
| tree | 9da7d2cec879eb43e914c2f001b75932c61ff8c3 | |
| parent | dfcc51def70b321ba11f985fbedeec088a8a9e88 (diff) | |
| download | nixpkgs-ac728c1e96d40e740f79da1165e30b727030e954.tar nixpkgs-ac728c1e96d40e740f79da1165e30b727030e954.tar.gz nixpkgs-ac728c1e96d40e740f79da1165e30b727030e954.tar.bz2 nixpkgs-ac728c1e96d40e740f79da1165e30b727030e954.tar.lz nixpkgs-ac728c1e96d40e740f79da1165e30b727030e954.tar.xz nixpkgs-ac728c1e96d40e740f79da1165e30b727030e954.tar.zst nixpkgs-ac728c1e96d40e740f79da1165e30b727030e954.zip | |
fetchpatch: Clean up
Co-Authored-By: Ivar Scholten <ivar.scholten@protonmail.com>
| -rw-r--r-- | pkgs/build-support/fetchpatch/default.nix | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/pkgs/build-support/fetchpatch/default.nix b/pkgs/build-support/fetchpatch/default.nix index 6d45ff6340d..740baa8cff5 100644 --- a/pkgs/build-support/fetchpatch/default.nix +++ b/pkgs/build-support/fetchpatch/default.nix @@ -9,15 +9,24 @@ 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: +{ stripLen ? 0 +, extraPrefix ? null +, excludes ? [] +, includes ? [] +, revert ? false +, postFetch ? "" +, ... +}@args: fetchurl ({ postFetch = '' tmpfile="$TMPDIR/patch" + if [ ! -s "$out" ]; then echo "error: Fetched patch file '$out' is empty!" 1>&2 exit 1 fi + "${patchutils}/bin/lsdiff" "$out" \ | sort -u | sed -e 's/[*?]/\\&/g' \ | xargs -I{} \ @@ -29,6 +38,7 @@ fetchurl ({ --addnewprefix=b/${extraPrefix} \ ''} \ --clean "$out" > "$tmpfile" + if [ ! -s "$tmpfile" ]; then echo "error: Normalized patch '$tmpfile' is empty (while the fetched file was not)!" 1>&2 echo "Did you maybe fetch a HTML representation of a patch instead of a raw patch?" 1>&2 @@ -36,6 +46,7 @@ fetchurl ({ cat "$out" 1>&2 exit 1 fi + ${patchutils}/bin/filterdiff \ -p1 \ ${builtins.toString (builtins.map (x: "-x ${lib.escapeShellArg x}") excludes)} \ @@ -52,6 +63,6 @@ fetchurl ({ '' + lib.optionalString revert '' ${patchutils}/bin/interdiff "$out" /dev/null > "$tmpfile" mv "$tmpfile" "$out" - '' + (args.postFetch or ""); + '' + postFetch; meta.broken = excludes != [] && includes != []; } // builtins.removeAttrs args ["stripLen" "extraPrefix" "excludes" "includes" "revert" "postFetch"]) |