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>

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; };