* 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

1 files changed, 10 insertions, 6 deletions

diff --git a/release.nix b/release.nix
index 17e34f42fb4..abf1ed95669 100644
--- a/release.nix
+++ b/release.nix
@@ -1,4 +1,4 @@
-{ nixpkgs ? ../nixpkgs-wc }:
+{ nixpkgs ? ../nixpkgs }:
 
 let
 
@@ -16,12 +16,11 @@ let
 
       version = builtins.readFile ./VERSION + (if officialRelease then "" else "pre${toString nixosSrc.rev}");
 
+      versionModule = { system.nixosVersion = version; };
+      
       iso = (import lib/eval-config.nix {
-        inherit system nixpkgs;        
-        configuration =
-          { require = module;
-            system.nixosVersion = version;
-          };
+        inherit system nixpkgs;
+        modules = [ module versionModule ];
       }).config.system.build.isoImage;
 
     in
@@ -75,6 +74,11 @@ let
 
       import "${nixosSrc}/doc/manual" {
         pkgs = import nixpkgs {};
+        optionDeclarations =
+          (import lib/eval-config.nix {
+            inherit nixpkgs;
+            modules = [ ];
+          }).optionDeclarations;
       };