diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2009-08-27 11:57:43 +0000 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2009-08-27 11:57:43 +0000 |
| commit | 2892aed71227bc326fc619d03062a6e5a2130880 (patch) | |
| tree | 3308d53b22ccf6dce21b4e4107db54676fcfb760 /default.nix | |
| parent | 6f1b1aefde5a06d3317e1350d61a33b263cfc3e7 (diff) | |
* lib/eval-config.nix: combined "configuration" and "extraModules"
into one argument "modules".
* release.nix: fixed the manual job.
* ISO generation: break an infinite recursion. Don't know why this
suddenly happens. Probably because of the nixpkgs.config change,
but I don't see why. Maybe the option evaluation is too strict.
svn path=/nixos/trunk/; revision=16878
Diffstat (limited to '')
| -rw-r--r-- | default.nix | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/default.nix b/default.nix index 863a8339f122..28049ebd146a 100644 --- a/default.nix +++ b/default.nix @@ -3,13 +3,12 @@ let - eval = import ./lib/eval-config.nix {inherit configuration;}; + eval = import ./lib/eval-config.nix { modules = [ configuration ]; }; inherit (eval) config pkgs; vmConfig = (import ./lib/eval-config.nix { - inherit configuration; - extraModules = [./modules/virtualisation/qemu-vm.nix]; + modules = [ configuration ./modules/virtualisation/qemu-vm.nix ]; }).config; in |