about summary refs log tree commit diff
diff options
context:
space:
mode:
authorVincent Ambo <mail@tazj.in>2020-08-26T22·53+0100
committertazjin <mail@tazj.in>2020-08-26T23·49+0000
commitdbda84bac359cd877924d6cf765a447f948e0341 (patch)
treed9e13ba84fc60cf829d6fa401a93b6859037d300
parent475d41f698415919093ca98f676ffcda218093ac (diff)
fix(readTree): Add __readTree attribute to folders r/1719
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>
-rw-r--r--ci-builds.nix2
-rw-r--r--nix/readTree/default.nix2
2 files changed, 2 insertions, 2 deletions
diff --git a/ci-builds.nix b/ci-builds.nix
index 51fa11bd453c..78aadf1d61c5 100644
--- a/ci-builds.nix
+++ b/ci-builds.nix
@@ -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
diff --git a/nix/readTree/default.nix b/nix/readTree/default.nix
index 9793310eeda0..3ceb03299190 100644
--- a/nix/readTree/default.nix
+++ b/nix/readTree/default.nix
@@ -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) ]