mdebray/tvl-depot
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix(readTree): Apply .skip-subtree to Nix-file children as well

Browse source 
This behaviour was previously confusing, since readTree's data
structure treats children from Nix files and directories as identical
but only one of them would be affected by .skip-subtree

The "subtree" to be skipped here refers to all children of the
structure.

Change-Id: Idf596c9823f09cc2acf49523916bde4b801b8519
This commit is contained in:
Vincent Ambo 2021-12-07 12:54:50 +03:00 committed by tazjin
parent 14bf3f3cd9
commit 2fa157ccd6
1 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
nix/readTree/default.nix
View file

@ -100,7 +100,8 @@ let
}) (filter filterDir (attrNames dir)); }) (filter filterDir (attrNames dir));
# Import Nix files # Import Nix files
nixFiles = filter (f: f != null) (map nixFileName (attrNames dir)); nixFiles = if hasAttr ".skip-subtree" dir then []
else filter (f: f != null) (map nixFileName (attrNames dir));
nixChildren = map (c: let nixChildren = map (c: let
p = joinChild (c + ".nix"); p = joinChild (c + ".nix");
childParts = parts ++ [ c ]; childParts = parts ++ [ c ];