diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2013-10-01 15:48:39 +0200 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2013-10-10 13:28:22 +0200 |
| commit | 31203732b3104125e107a3141578399cab5d478f (patch) | |
| tree | 5af3aa2bb43acababf53db5fef2d9ea9f679b394 /nixos/default.nix | |
| parent | 041da5a6f9dfa39b20a8b4f9743e57c15a131d36 (diff) | |
| download | nixpkgs-31203732b3104125e107a3141578399cab5d478f.tar nixpkgs-31203732b3104125e107a3141578399cab5d478f.tar.gz nixpkgs-31203732b3104125e107a3141578399cab5d478f.tar.bz2 nixpkgs-31203732b3104125e107a3141578399cab5d478f.tar.lz nixpkgs-31203732b3104125e107a3141578399cab5d478f.tar.xz nixpkgs-31203732b3104125e107a3141578399cab5d478f.tar.zst nixpkgs-31203732b3104125e107a3141578399cab5d478f.zip | |
Update the release expressions and the channel generators
Diffstat (limited to 'nixos/default.nix')
| -rw-r--r-- | nixos/default.nix | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/nixos/default.nix b/nixos/default.nix index d38e70d21f9..88f82a82482 100644 --- a/nixos/default.nix +++ b/nixos/default.nix @@ -1,12 +1,11 @@ { configuration ? import ./lib/from-env.nix "NIXOS_CONFIG" <nixos-config> , system ? builtins.currentSystem -, nixpkgs ? <nixpkgs> }: let eval = import ./lib/eval-config.nix { - inherit system nixpkgs; + inherit system; modules = [ configuration ]; }; @@ -14,13 +13,13 @@ let # This is for `nixos-rebuild build-vm'. vmConfig = (import ./lib/eval-config.nix { - inherit system nixpkgs; + inherit system; modules = [ configuration ./modules/virtualisation/qemu-vm.nix ]; }).config; # This is for `nixos-rebuild build-vm-with-bootloader'. vmWithBootLoaderConfig = (import ./lib/eval-config.nix { - inherit system nixpkgs; + inherit system; modules = [ configuration ./modules/virtualisation/qemu-vm.nix |