diff options
author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2021-01-03 18:38:32 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-01-03 18:38:32 +0000 |
commit | 07165c7226bb5300ea0b56b52a5d9401fbb20fd4 (patch) | |
tree | 7a16b89664d7a4ab330bf9aaab2ebdd9f94eb30b /pkgs/build-support | |
parent | 3c9adde0f1fc0f078c5826888cd7f1b9363122c4 (diff) | |
parent | 0ec29efbb76dee52e6534089778930bc76810f34 (diff) |
Merge staging-next into staging
Diffstat (limited to 'pkgs/build-support')
-rw-r--r-- | pkgs/build-support/nix-gitignore/default.nix | 26 |
1 files changed, 12 insertions, 14 deletions
diff --git a/pkgs/build-support/nix-gitignore/default.nix b/pkgs/build-support/nix-gitignore/default.nix index abfe67ea4304..5d7b945bf1b1 100644 --- a/pkgs/build-support/nix-gitignore/default.nix +++ b/pkgs/build-support/nix-gitignore/default.nix @@ -20,13 +20,14 @@ let in rec { # [["good/relative/source/file" true] ["bad.tmpfile" false]] -> root -> path filterPattern = patterns: root: - let - filters = map (pair: relPath: if match (head pair) relPath == null then true else last pair) patterns; - in - name: _type: - let - relPath = lib.removePrefix ((toString root) + "/") name; - in foldl' (acc: f: if acc == true then f relPath else acc) true filters; + (name: _type: + let + relPath = lib.removePrefix ((toString root) + "/") name; + matches = pair: (match (head pair) relPath) != null; + matched = map (pair: [(matches pair) (last pair)]) patterns; + in + last (last ([[true true]] ++ (filter head matched))) + ); # string -> [[regex bool]] gitignoreToPatterns = gitignore: @@ -90,9 +91,7 @@ in rec { (filter (l: !isList l && !isComment l) (split "\n" gitignore)); - gitignoreFilter = ign: let - patterns = gitignoreToPatterns ign; - in root: filterPattern patterns root; + gitignoreFilter = ign: root: filterPattern (gitignoreToPatterns ign) root; # string|[string|file] (→ [string|file] → [string]) -> string gitignoreCompileIgnore = file_str_patterns: root: @@ -101,10 +100,9 @@ in rec { str_patterns = map (onPath readFile) (lib.toList file_str_patterns); in concatStringsSep "\n" str_patterns; - gitignoreFilterPure = filter: patterns: root: let - compiledFilter = gitignoreCompileIgnore patterns root; - filterFn = gitignoreFilter compiledFilter; - in name: type: filterFn root name type && filter name type; + gitignoreFilterPure = filter: patterns: root: name: type: + gitignoreFilter (gitignoreCompileIgnore patterns root) root name type + && filter name type; # This is a very hacky way of programming this! # A better way would be to reuse existing filtering by making multiple gitignore functions per each root. |