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

fix(readTree): Add __readTree attribute to folders

Browse source 
This is required to automatically walk the tree (see subsequent
commits).

Note: Lisp packages are removed from the CI builds in this commit
because the attrValues of third_party.lisp will contain an element
that is simply `true`, which causes a type error.

These packages are re-added when CI refactoring is complete.

Change-Id: I21e2b719e6c7161c23d2867a216f4daa1c6c8394
Reviewed-on: https://cl.tvl.fyi/c/depot/+/1848
Tested-by: BuildkiteCI
Reviewed-by: glittershark <grfn@gws.fyi>
This commit is contained in:
Vincent Ambo 2020-08-26 23:53:48 +01:00 committed by tazjin
parent 475d41f698
commit dbda84bac3
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
ci-builds.nix
View file

@ -68,7 +68,7 @@ in lib.fix (self: {
nix.test-vm nix.test-vm
openldap openldap
rapidcheck rapidcheck
] ++ builtins.attrValues lisp; ];
gerrit = with depot.third_party.gerrit_plugins; [ gerrit = with depot.third_party.gerrit_plugins; [
depot.third_party.gerrit depot.third_party.gerrit

2
nix/readTree/default.nix
View file

@ -70,5 +70,5 @@ let
}) nixFiles; }) nixFiles;
in if dir ? "default.nix" in if dir ? "default.nix"
then (if isAttrs self then self // (listToAttrs children) else self) then (if isAttrs self then self // (listToAttrs children) else self)
else listToAttrs (nixChildren ++ children); else (listToAttrs (nixChildren ++ children) // { __readTree = true; });
in readTree initPath [ (baseNameOf initPath) ] in readTree initPath [ (baseNameOf initPath) ]