diff options
| author | Vincent Ambo <mail@tazj.in> | 2021-11-13T17·33+0100 |
|---|---|---|
| committer | tazjin <mail@tazj.in> | 2021-11-15T12·54+0000 |
| commit | ac41d89ba5d715918324c49630d0eac8283c4895 (patch) | |
| tree | 5ca73b4474a2c26797a3ee319ed9ebdfaa395232 | |
| parent | dc8d3e869d30f59c128877933f916475554e71cc (diff) | |
refactor(readTree): Flip argument order of argFilter r/3070
Since the filters return 'args', this makes nesting of filters more readable. Change-Id: I775252460e3e077cc6db2fab6f3948414a95ecbf Reviewed-on: https://cl.tvl.fyi/c/depot/+/3873 Tested-by: BuildkiteCI Reviewed-by: sterni <sternenseemann@systemli.org>
| -rw-r--r-- | default.nix | 2 | ||||
| -rw-r--r-- | nix/readTree/default.nix | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/default.nix b/default.nix index 5c93e9501e10..fcd83d07ad48 100644 --- a/default.nix +++ b/default.nix @@ -20,7 +20,7 @@ let # Create a readTree filter disallowing access to the specified # top-level folder in other parts of the depot, except for specific # exceptions specified by their (full) paths. - restrictFolder = { folder, exceptions ? [], reason }: args: parts: + restrictFolder = { folder, exceptions ? [], reason }: parts: args: if (elemAt parts 0) == folder || elem parts exceptions then args else args // { diff --git a/nix/readTree/default.nix b/nix/readTree/default.nix index 2746d8c9076d..c3955c6c884e 100644 --- a/nix/readTree/default.nix +++ b/nix/readTree/default.nix @@ -64,7 +64,7 @@ let in if pathType != "lambda" then builtins.throw "readTree: trying to import ${toString path}, but it’s a ${pathType}, you need to make it a function like { depot, pkgs, ... }" - else importedFile (filter (argsWithPath args parts) parts); + else importedFile (filter parts (argsWithPath args parts)); nixFileName = file: let res = match "(.*)\\.nix" file; @@ -129,7 +129,7 @@ in { __functor = _: { path , args - , filter ? (x: _parts: x) + , filter ? (_parts: x: x) , scopedArgs ? {} }: readTree { inherit args scopedArgs; |