From dbda84bac359cd877924d6cf765a447f948e0341 Mon Sep 17 00:00:00 2001 From: Vincent Ambo Date: Wed, 26 Aug 2020 23:53:48 +0100 Subject: 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 --- ci-builds.nix | 2 +- nix/readTree/default.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ci-builds.nix b/ci-builds.nix index 51fa11bd45..78aadf1d61 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 9793310eed..3ceb032991 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) ] -- cgit 1.4.1