diff options
author | aszlig <aszlig@redmoonstudios.org> | 2015-03-18 18:38:47 +0100 |
---|---|---|
committer | aszlig <aszlig@redmoonstudios.org> | 2015-03-18 18:38:47 +0100 |
commit | 58ff88492066a01db4348a7ec54390373ee5b0a3 (patch) | |
tree | 23b6fa3ff241f61a0b3de05bfc0b3fbd9350a59b | |
parent | 012fc8e4f399af06ab013ba136fe1d2cffb913f1 (diff) |
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>
-rw-r--r-- | labernix/release.nix | 22 | ||||
-rw-r--r-- | release.nix | 6 |
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; |