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

Fixed rescue-cd-configurable.nix

Browse Source 
svn path=/nixos/trunk/; revision=11999
This commit is contained in:
Michael Raskin 2008-06-06 10:04:27 +00:00
parent 96a8dbfd58
commit 120ee1d150
2 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
configuration/closed-install.nix
View File

@ -4,7 +4,6 @@ let
in in
(isoFun { (isoFun {
inherit platform; inherit platform;
lib = (import ../pkgs/lib);
networkNixpkgs = ""; networkNixpkgs = "";
manualEnabled = true; manualEnabled = true;

16
configuration/rescue-cd-configurable.nix
View File

@ -1,5 +1,5 @@
{ {
lib lib ? null
,platform ? __currentSystem ,platform ? __currentSystem
,networkNixpkgs ? "" ,networkNixpkgs ? ""
,nixpkgsMd5 ? "" ,nixpkgsMd5 ? ""
@ -39,8 +39,15 @@
list of: {source, target} list of: {source, target}
*/ */
,additionalFiles ? [] ,additionalFiles ? []
,compressImage ? false
,nixpkgsPath ? ../../nixpkgs
}: }:
let let
realLib = if lib != null then lib else (import (nixpkgsPath+"/pkgs/lib"));
in
let
lib = realLib;
ttyCount = lib.fold builtins.add 0 [ ttyCount = lib.fold builtins.add 0 [
(if rogueEnabled then 1 else 0) (if rogueEnabled then 1 else 0)
(if manualEnabled then 1 else 0) (if manualEnabled then 1 else 0)
@ -49,7 +56,7 @@ let
systemPackBuilder = {suffix, configuration} : systemPackBuilder = {suffix, configuration} :
{ {
system = (import ../system/system.nix) { system = (import ../system/system.nix) {
inherit configuration platform; /* To refactor later - x86+x86_64 DVD */ inherit configuration platform nixpkgsPath; /* To refactor later - x86+x86_64 DVD */
stage2Init = "/init"+suffix; stage2Init = "/init"+suffix;
}; };
inherit suffix configuration; inherit suffix configuration;
@ -319,7 +326,7 @@ rec {
# The NixOS manual, with a backward compatibility hack for Nix <= # The NixOS manual, with a backward compatibility hack for Nix <=
# 0.11 (you won't get the manual). # 0.11 (you won't get the manual).
manual = if builtins ? unsafeDiscardStringContext manual = if builtins ? unsafeDiscardStringContext
then "${import ../doc/manual}/manual.html" then "${import ../doc/manual {inherit nixpkgsPath;}}/manual.html"
else pkgs.writeText "dummy-manual" "Manual not included in this build!"; else pkgs.writeText "dummy-manual" "Manual not included in this build!";
@ -356,7 +363,7 @@ rec {
nixpkgsTarball = if networkNixpkgs != "" then pkgs.fetchurl { nixpkgsTarball = if networkNixpkgs != "" then pkgs.fetchurl {
url = configuration.installer.nixpkgsURL + "/" + nixpkgsRel + ".tar.bz2"; url = configuration.installer.nixpkgsURL + "/" + nixpkgsRel + ".tar.bz2";
md5 = "6a793b877e2a4fa79827515902e1dfd8"; md5 = "6a793b877e2a4fa79827515902e1dfd8";
} else makeNixPkgsTarball "nixpkgs.tar.bz2" ("" + ./../../nixpkgs); } else makeNixPkgsTarball "nixpkgs.tar.bz2" ("" + nixpkgsPath);
nixosServicesTarball = makeNixPkgsTarball "nixos-services.tar.bz2" ("" + ./../../services); nixosServicesTarball = makeNixPkgsTarball "nixos-services.tar.bz2" ("" + ./../../services);
@ -379,6 +386,7 @@ rec {
# the initrd produced above, and the closure of the stage 2 init. # the initrd produced above, and the closure of the stage 2 init.
rescueCD = import ../helpers/make-iso9660-image.nix { rescueCD = import ../helpers/make-iso9660-image.nix {
inherit (pkgs) stdenv perl cdrkit; inherit (pkgs) stdenv perl cdrkit;
inherit compressImage nixpkgsPath;
isoName = "nixos-${platform}.iso"; isoName = "nixos-${platform}.iso";
# Single files to be copied to fixed locations on the CD. # Single files to be copied to fixed locations on the CD.