Import overhaul!

This commit is contained in:
kat witch 2021-08-18 00:31:04 +01:00
parent 1e53ee9d2e
commit 8a32942d0e
No known key found for this signature in database
GPG key ID: 1B477797DCA5EC72
16 changed files with 95 additions and 93 deletions

View file

@ -20,7 +20,7 @@ let
filterAttrNamesToList = filter: set:
lib.foldl' (a: b: a ++ b) [ ]
(map (e: if (filter e set.${e}) then [ e ] else [ ]) (lib.attrNames set));
depotNames = lib.unique (lib.folderList ./depot ["trusted"] ++ lib.folderList ./depot/trusted ["pkgs"]);
depotNames = lib.unique (lib.folderList ./depot ["trusted"] ++ lib.folderList ./depot/trusted ["pkgs" "tf"]);
depot = lib.mapListToAttrs (folder: lib.nameValuePair folder (lib.domainMerge {
inherit folder;
folderPaths = [ (./depot + "/${folder}") (./depot/trusted + "/${folder}") ];
@ -64,5 +64,5 @@ let
* do not use common, it is tf-nix specific config ingested at line 66 of config/modules/meta/deploy.nix for every target.
* services -> the specialArg generated from services/
*/
self = config // { inherit pkgs lib sourceCache sources; } // depot;
self = config // { inherit pkgs lib sourceCache sources; } // depot;
in self