DGNum/colmena
10
0
Fork 2
Code Issues 6 Pull requests 3 Projects Releases Packages Wiki Activity

eval.nix: Support specifying a list of configs

Browse source
This commit is contained in:
Zhaofeng Li 2022-01-01 16:41:35 -08:00
parent bc3450b3ce
commit cdbb69617f
2 changed files with 32 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

14
src/nix/hive/eval.nix
View file

@ -302,6 +302,13 @@ let
};
in mergedHive // meta;
configsFor = node: let
nodeConfig = hive.${node};
in
assert lib.assertMsg (!elem node reservedNames) "\"${node}\" is a reserved name and cannot be used as the name of a node";
if typeOf nodeConfig == "list" then nodeConfig
else [ nodeConfig ];
mkNixpkgs = configName: pkgConf: let
uninitializedError = typ: ''
Passing ${typ} as ${configName} is no longer accepted with Flakes.
@ -348,7 +355,7 @@ let
lib = pkgs.lib;
reservedNames = [ "defaults" "network" "meta" ];
evalNode = name: config: let
evalNode = name: configs: let
npkgs =
if hasAttr name hive.meta.nodeNixpkgs
then mkNixpkgs "meta.nodeNixpkgs.${name}" hive.meta.nodeNixpkgs.${name}
@ -436,8 +443,7 @@ let
keyChownModule
deploymentOptions
hive.defaults
config
] ++ (import (npkgs.path + "/nixos/modules/module-list.nix"));
] ++ configs ++ (import (npkgs.path + "/nixos/modules/module-list.nix"));
specialArgs = hive.meta.specialArgs // {
inherit name nodes;
modulesPath = npkgs.path + "/nixos/modules";
@ -452,7 +458,7 @@ let
nodes = listToAttrs (map (name: {
inherit name;
value = evalNode name hive.${name};
value = evalNode name (configsFor name);
}) nodeNames);
toplevel = lib.mapAttrs (name: eval: eval.config.system.build.toplevel) nodes;