fix(readTree): Add __readTree attribute to folders
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:
parent
475d41f698
commit
dbda84bac3
2 changed files with 2 additions and 2 deletions
|
@ -68,7 +68,7 @@ in lib.fix (self: {
|
|||
nix.test-vm
|
||||
openldap
|
||||
rapidcheck
|
||||
] ++ builtins.attrValues lisp;
|
||||
];
|
||||
|
||||
gerrit = with depot.third_party.gerrit_plugins; [
|
||||
depot.third_party.gerrit
|
||||
|
|
|
@ -70,5 +70,5 @@ let
|
|||
}) nixFiles;
|
||||
in if dir ? "default.nix"
|
||||
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) ]
|
||||
|
|
Loading…
Reference in a new issue