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

nix: Remove ugly toJSON hack

Browse source 
We now evaluate with --strict.
This commit is contained in:
Zhaofeng Li 2021-12-07 23:13:31 -08:00
parent eebded1786
commit 31fc98cfa7
2 changed files with 6 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -455,10 +455,10 @@ let
toplevel = lib.mapAttrs (name: eval: eval.config.system.build.toplevel) nodes;
deploymentConfigJson = toJSON (lib.mapAttrs (name: eval: eval.config.deployment) nodes);
deploymentConfig = lib.mapAttrs (name: eval: eval.config.deployment) nodes;
deploymentConfigJsonSelected = names: toJSON
(listToAttrs (map (name: { inherit name; value = nodes.${name}.config.deployment; }) names));
deploymentConfigSelected = names:
listToAttrs (map (name: { inherit name; value = nodes.${name}.config.deployment; }) names);
evalAll = evalSelected nodeNames;
evalSelected = names: let
@ -472,7 +472,7 @@ let
in {
inherit
nodes toplevel
deploymentConfigJson deploymentConfigJsonSelected
deploymentConfig deploymentConfigSelected
evalAll evalSelected introspect;
meta = hive.meta;