diff options
author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2016-02-27 20:42:55 +0100 |
---|---|---|
committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2016-02-27 20:48:12 +0100 |
commit | d4636fa2548a1980b3541dd386b6977c56218964 (patch) | |
tree | 152ce4d75458a510af87f4f7a4ed84d693696d98 /nixos/default.nix | |
parent | a6347a34777161817640dce5f96a23da33dd5705 (diff) |
Revert "Add a way to pin a NixOS version within the module system."
This reverts commit a5992ad61b314104aff7e28a41ce101a1b0e7c35. Motivation:
https://github.com/NixOS/nixpkgs/commit/a5992ad61b314104aff7e28a41ce101a1b0e7c35#commitcomment-14986820
Diffstat (limited to 'nixos/default.nix')
-rw-r--r-- | nixos/default.nix | 16 |
1 files changed, 4 insertions, 12 deletions
diff --git a/nixos/default.nix b/nixos/default.nix index 6359d10c8805..5d69b79e13a6 100644 --- a/nixos/default.nix +++ b/nixos/default.nix @@ -1,20 +1,12 @@ { configuration ? import ./lib/from-env.nix "NIXOS_CONFIG" <nixos-config> , system ? builtins.currentSystem -, extraModules ? [] - # This attribute is used to specify a different nixos version, a different - # system or additional modules which might be set conditionally. -, reEnter ? false }: let - reEnterModule = { - config.nixos.path = with (import ../lib); mkIf reEnter (mkForce null); - config.nixos.configuration = configuration; - }; eval = import ./lib/eval-config.nix { inherit system; - modules = [ configuration reEnterModule ] ++ extraModules; + modules = [ configuration ]; }; inherit (eval) pkgs; @@ -22,14 +14,14 @@ let # This is for `nixos-rebuild build-vm'. vmConfig = (import ./lib/eval-config.nix { inherit system; - modules = [ configuration reEnterModule ./modules/virtualisation/qemu-vm.nix ] ++ extraModules; + 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; modules = - [ configuration reEnterModule + [ configuration ./modules/virtualisation/qemu-vm.nix { virtualisation.useBootLoader = true; } ]; @@ -38,7 +30,7 @@ let in { - inherit (eval.config.nixos.reflect) config options; + inherit (eval) config options; system = eval.config.system.build.toplevel; |