From aa6adfc324b44c840a488a4b0a5cd4c1c66f80c7 Mon Sep 17 00:00:00 2001 From: John Ericson Date: Mon, 4 Jun 2018 22:29:22 -0400 Subject: [PATCH] fetchpatch: Add includes to compliment excludes, and require that both not be non-empty. This commit was originally introduced as part of #41420 and then reverted with the rest of that PR. However there was no reason to revert his particular commit. --- pkgs/build-support/fetchpatch/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/build-support/fetchpatch/default.nix b/pkgs/build-support/fetchpatch/default.nix index c185497e6913..16343d626ce7 100644 --- a/pkgs/build-support/fetchpatch/default.nix +++ b/pkgs/build-support/fetchpatch/default.nix @@ -5,7 +5,7 @@ # stripLen acts as the -p parameter when applying a patch. { lib, fetchurl, patchutils }: -{ stripLen ? 0, extraPrefix ? null, excludes ? [], ... }@args: +{ stripLen ? 0, extraPrefix ? null, excludes ? [], includes ? [], ... }@args: fetchurl ({ postFetch = '' @@ -24,7 +24,9 @@ fetchurl ({ ${patchutils}/bin/filterdiff \ -p1 \ ${builtins.toString (builtins.map (x: "-x ${x}") excludes)} \ + ${builtins.toString (builtins.map (x: "-i ${x}") includes)} \ "$tmpfile" > "$out" ${args.postFetch or ""} ''; -} // builtins.removeAttrs args ["stripLen" "extraPrefix" "excludes" "postFetch"]) + meta.broken = excludes != [] && includes != []; +} // builtins.removeAttrs args ["stripLen" "extraPrefix" "excludes" "includes" "postFetch"])