diff options
author | aszlig <aszlig@redmoonstudios.org> | 2015-03-18 01:37:41 +0100 |
---|---|---|
committer | aszlig <aszlig@redmoonstudios.org> | 2015-03-18 01:42:55 +0100 |
commit | 2b8256b060f1c2fd635e92749d167d9a57268212 (patch) | |
tree | 211ae22d25aaa9cecc6a7d261737f53335cc1e7b /release.nix | |
parent | 174317d1489b72687df8559a9cc02ca068e2ba0c (diff) |
machines: Move own machines into machines/aszlig.
Introduces callMachine in machines/default.nix, which returns an attribute set containing the (input) configuration and also a build attribute containing the output configuration and thus also the builds. However, we still have references to ../../common-workstation.nix which we need to refactor very soon. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
Diffstat (limited to 'release.nix')
-rw-r--r-- | release.nix | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/release.nix b/release.nix index df248706..72442bba 100644 --- a/release.nix +++ b/release.nix @@ -4,9 +4,9 @@ let in with pkgs.lib; with builtins; { - machines = mapAttrs (name: configuration: (import <nixpkgs/nixos> { - inherit configuration; - }).system) (import ./network.nix); + machines = mapAttrsRecursiveCond (m: !(m ? build)) (path: attrs: + attrs.build.config.system.build.toplevel + ) (import ./machines { inherit system; }); tests = { i3 = import ./tests/i3.nix { inherit system; }; |