From 8c1b7661ae7801233df2ef5cacb07c7382d74fdd Mon Sep 17 00:00:00 2001 From: aszlig Date: Tue, 15 Dec 2015 04:30:10 +0100 Subject: lib/call-machine: Clean up expression This gets rid of the use attribute, which is now called "config". We had the "config" attribute before but it was kinda pointless, because it was just the import of the path and nothing else. So the config attribute now is the machine configuration with all of the vuizvui modules imported as well. The "build" attribute is now called "eval", which is more appropriate, because it's the evaluation of the configuration and not the finished system build. Signed-off-by: aszlig --- release.nix | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'release.nix') diff --git a/release.nix b/release.nix index b023ef6e..04bc5218 100644 --- a/release.nix +++ b/release.nix @@ -48,8 +48,8 @@ let in with pkgsUpstream.lib; with builtins; { - machines = mapAttrsRecursiveCond (m: !(m ? build)) (path: attrs: - attrs.build.config.system.build.toplevel + machines = mapAttrsRecursiveCond (m: !(m ? eval)) (path: attrs: + attrs.eval.config.system.build.toplevel ) allMachines; isoImages = let @@ -68,9 +68,9 @@ in with pkgsUpstream.lib; with builtins; { in mapAttrsRecursiveCond (m: !(m ? iso)) (const buildIso) allMachines; tests = let - machineList = collect (m: m ? build) allMachines; + machineList = collect (m: m ? eval) allMachines; activatedTests = unique (concatMap (machine: - machine.build.config.vuizvui.requiresTests + machine.eval.config.vuizvui.requiresTests ) machineList); mkTest = path: setAttrByPath path (getAttrFromPath path allTests); in fold recursiveUpdate {} (map mkTest activatedTests) // { @@ -98,10 +98,10 @@ in with pkgsUpstream.lib; with builtins; { in { generic = mkChannel {}; - machines = mapAttrsRecursiveCond (m: !(m ? build)) (path: attrs: mkChannel { + machines = mapAttrsRecursiveCond (m: !(m ? eval)) (path: attrs: mkChannel { name = "machine-${last path}"; - constituents = singleton attrs.build.config.system.build.toplevel - ++ gatherTests attrs.build.config.vuizvui.requiresTests; + constituents = singleton attrs.eval.config.system.build.toplevel + ++ gatherTests attrs.eval.config.vuizvui.requiresTests; }) allMachines; }; -- cgit 1.4.1