git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #107715 from NixOS/revert-106172-nix-gitignore-perf

Reverts https://github.com/NixOS/nixpkgs/pull/106172 ef3ed45c1240197b721f38a01ec48e7dc6e7c179 This change causes issues with negative patterns. Reverting now until those can be resolved.

commitbfa497bc2b858148d344126ec68a2e217f338123 authorKevin Cox <kevincox@kevincox.ca> dateSun 3 Jan 2021, 08:01 (6 years ago) parent3f6797211e522c
1 file changed+12−14
pkgs/build-support/nix-gitignore/default.nix+12−14
pkgs/build-support/nix-gitignore/default.nix+12−14
@@ -20,13 +20,14 @@ let
2020in rec {
2121 # [["good/relative/source/file" true] ["bad.tmpfile" false]] -> root -> path
2222 filterPattern = patterns: root:
23− let
24− filters = map (pair: relPath: if match (head pair) relPath == null then true else last pair) patterns;
25− in
26− name: _type:
27− let
28− relPath = lib.removePrefix ((toString root) + "/") name;
29− in foldl' (acc: f: if acc == true then f relPath else acc) true filters;
23+ (name: _type:
24+ let
25+ relPath = lib.removePrefix ((toString root) + "/") name;
26+ matches = pair: (match (head pair) relPath) != null;
27+ matched = map (pair: [(matches pair) (last pair)]) patterns;
28+ in
29+ last (last ([[true true]] ++ (filter head matched)))
30+ );
3031
3132 # string -> [[regex bool]]
3233 gitignoreToPatterns = gitignore:
@@ -90,9 +91,7 @@ in rec {
9091 (filter (l: !isList l && !isComment l)
9192 (split "\n" gitignore));
9293
93− gitignoreFilter = ign: let
94− patterns = gitignoreToPatterns ign;
95− in root: filterPattern patterns root;
94+ gitignoreFilter = ign: root: filterPattern (gitignoreToPatterns ign) root;
9695
9796 # string|[string|file] (→ [string|file] → [string]) -> string
9897 gitignoreCompileIgnore = file_str_patterns: root:
@@ -101,10 +100,9 @@ in rec {
101100 str_patterns = map (onPath readFile) (lib.toList file_str_patterns);
102101 in concatStringsSep "\n" str_patterns;
103102
104− gitignoreFilterPure = filter: patterns: root: let
105− compiledFilter = gitignoreCompileIgnore patterns root;
106− filterFn = gitignoreFilter compiledFilter;
107− in name: type: filterFn root name type && filter name type;
103+ gitignoreFilterPure = filter: patterns: root: name: type:
104+ gitignoreFilter (gitignoreCompileIgnore patterns root) root name type
105+ && filter name type;
108106
109107 # This is a very hacky way of programming this!
110108 # A better way would be to reuse existing filtering by making multiple gitignore functions per each root.