public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* Installer: pull the manifest properly.

Browse Source 
svn path=/nixos/trunk/; revision=7594
This commit is contained in:
Eelco Dolstra 2007-01-09 21:19:06 +00:00
parent d4183887a8
commit cbe4c2e0b8
3 changed files with 20 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
configuration/rescue-cd.nix
View File

@ -1,6 +1,9 @@
rec { rec {
nixpkgsRel = "nixpkgs-0.11pre7577";
configuration = { configuration = {
boot = { 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. # Get a recent copy of Nixpkgs.
nixpkgsRel = "nixpkgs-0.11pre7577";
nixpkgsURL = http://nix.cs.uu.nl/dist/nix/ + nixpkgsRel;
nixpkgsTarball = pkgs.fetchurl { nixpkgsTarball = pkgs.fetchurl {
url = nixpkgsURL + "/" + nixpkgsRel + ".tar.bz2"; url = configuration.installer.nixpkgsURL + "/" + nixpkgsRel + ".tar.bz2";
md5 = "0949415aa342679f206fdb7ee9b04b46"; md5 = "0949415aa342679f206fdb7ee9b04b46";
}; };

11
system/options.nix
View File

@ -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.
";
}
] ]

1
system/system.nix
View File

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