Incorporate labernix's release.nix into vuizvui's.

The only thing that was missing was the pkgs attribute.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>

2 files changed, 6 insertions, 22 deletions

diff --git a/labernix/release.nix b/labernix/release.nix
deleted file mode 100644
index 1edf284a..00000000
--- a/labernix/release.nix
+++ /dev/null
@@ -1,22 +0,0 @@
-with import <nixpkgs/lib>;
-
-let
-  system = "x86_64-linux";
-
-  genMachine = name: cfg: (import <nixpkgs/nixos/lib/eval-config.nix> {
-    inherit system;
-    modules = [ cfg ];
-  }).config.system.build.toplevel;
-
-in {
-  machines = mapAttrs genMachine (import ./default.nix).machines;
-  tests = {
-    heinrich = import ./tests/heinrich.nix { inherit system; };
-  };
-
-  pkgs = import ./pkgs {
-    pkgs = import <nixpkgs> {
-      inherit system;
-    };
-  };
-}
diff --git a/release.nix b/release.nix
index 1193e1bd..ab7a46c1 100644
--- a/release.nix
+++ b/release.nix
@@ -12,6 +12,12 @@ in with pkgs.lib; with builtins; {
     inherit system;
   });
 
+  pkgs = import ./pkgs {
+    pkgs = import <nixpkgs> {
+      inherit system;
+    };
+  };
+
   manual = let
     modules = import <nixpkgs/nixos/lib/eval-config.nix> {
       modules = import ./modules/module-list.nix;