* Installer: pull the manifest properly.

svn path=/nixos/trunk/; revision=7594

configuration/rescue-cd.nix

@@ -1,6 +1,9 @@
 rec {
 
   
+  nixpkgsRel = "nixpkgs-0.11pre7577";
+
+
   configuration = {
   
     boot = {
@@ -45,6 +48,10 @@ rec {
       };
       
     };
+
+    installer = {
+      nixpkgsURL = http://nix.cs.uu.nl/dist/nix/ + nixpkgsRel;
+    };
     
   };
 
@@ -85,11 +92,8 @@ rec {
 
 
   # Get a recent copy of Nixpkgs.
-  nixpkgsRel = "nixpkgs-0.11pre7577";
-  nixpkgsURL = http://nix.cs.uu.nl/dist/nix/ + nixpkgsRel;
-
   nixpkgsTarball = pkgs.fetchurl {
-    url = nixpkgsURL + "/" + nixpkgsRel + ".tar.bz2";
+    url = configuration.installer.nixpkgsURL + "/" + nixpkgsRel + ".tar.bz2";
     md5 = "0949415aa342679f206fdb7ee9b04b46";
   };
 

system/options.nix

@@ -485,4 +485,15 @@
   }
 
   
+  {
+    name = ["installer" "nixpkgsURL"];
+    default = "";
+    example = http://nix.cs.uu.nl/dist/nix/nixpkgs-0.11pre7577;
+    description = "
+      URL of the Nixpkgs distribution to use when building the
+      installation CD.
+    ";
+  }
+
+  
 ]

system/system.nix

@@ -106,6 +106,7 @@ rec {
   nixosInstaller = import ../installer/nixos-installer.nix {
     inherit (pkgs) stdenv runCommand substituteAll;
     inherit nix;
+    nixpkgsURL = config.get ["installer" "nixpkgsURL"];
   };