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

* Put "minimal" or "graphical" in the ISO name to distinguish between

Browse Source 
the files.

svn path=/nixos/trunk/; revision=26901
This commit is contained in:
Eelco Dolstra 2011-04-20 10:48:52 +00:00
parent 76d3721a53
commit ee3269cbbd
3 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
modules/installer/cd-dvd/installation-cd-base.nix
View File

@ -39,7 +39,7 @@ in
]; ];
# ISO naming. # ISO naming.
isoImage.isoName = "nixos-${config.system.nixosVersion}-${pkgs.stdenv.system}.iso"; isoImage.isoName = "${config.isoImage.isoBaseName}-${config.system.nixosVersion}-${pkgs.stdenv.system}.iso";
isoImage.volumeID = "NIXOS_INSTALL_CD_${config.system.nixosVersion}"; isoImage.volumeID = "NIXOS_INSTALL_CD_${config.system.nixosVersion}";

9
modules/installer/cd-dvd/iso-image.nix
View File

@ -11,12 +11,19 @@ let
options = { options = {
isoImage.isoName = mkOption { isoImage.isoName = mkOption {
default = "cd.iso"; default = "${config.isoImage.isoName}.iso";
description = '' description = ''
Name of the generated ISO image file. Name of the generated ISO image file.
''; '';
}; };
isoImage.isoBaseName = mkOption {
default = "nixos";
description = ''
Prefix of the name of the generated ISO image file.
'';
};
isoImage.compressImage = mkOption { isoImage.compressImage = mkOption {
default = false; default = false;
description = '' description = ''

11
release.nix
View File

@ -4,7 +4,7 @@ let
makeIso = makeIso =
{ module, description, maintainers ? ["eelco"]}: { module, type, description ? type, maintainers ? ["eelco"] }:
{ nixosSrc ? {outPath = ./.; rev = 1234;} { nixosSrc ? {outPath = ./.; rev = 1234;}
, officialRelease ? false , officialRelease ? false
, system ? "i686-linux" , system ? "i686-linux"
@ -16,7 +16,10 @@ let
version = builtins.readFile ./VERSION + (if officialRelease then "" else "pre${toString nixosSrc.rev}"); version = builtins.readFile ./VERSION + (if officialRelease then "" else "pre${toString nixosSrc.rev}");
versionModule = { system.nixosVersion = version; }; versionModule =
{ system.nixosVersion = version;
isoImage.isoBaseName = "nixos-${type}";
};
config = (import lib/eval-config.nix { config = (import lib/eval-config.nix {
inherit system nixpkgs; inherit system nixpkgs;
@ -119,12 +122,12 @@ let
iso_minimal = makeIso { iso_minimal = makeIso {
module = ./modules/installer/cd-dvd/installation-cd-minimal.nix; module = ./modules/installer/cd-dvd/installation-cd-minimal.nix;
description = "minimal"; type = "minimal";
}; };
iso_graphical = makeIso { iso_graphical = makeIso {
module = ./modules/installer/cd-dvd/installation-cd-graphical.nix; module = ./modules/installer/cd-dvd/installation-cd-graphical.nix;
description = "graphical"; type = "graphical";
}; };
# Provide a tarball that can be unpacked into an SD card, and easily # Provide a tarball that can be unpacked into an SD card, and easily