[Nix-commits] SVN commit: nix - r26901 - in nixos/trunk: . modules/installer/cd-dvd

[Eelco Dolstra]

Author: eelco
Date: Wed Apr 20 10:48:52 2011
New Revision: 26901
URL: https://svn.nixos.org/websvn/nix/?rev=26901&sc=1

Log:
* Put "minimal" or "graphical" in the ISO name to distinguish between
  the files.

Modified:
   nixos/trunk/modules/installer/cd-dvd/installation-cd-base.nix
   nixos/trunk/modules/installer/cd-dvd/iso-image.nix
   nixos/trunk/release.nix

Modified: nixos/trunk/modules/installer/cd-dvd/installation-cd-base.nix
==============================================================================
--- nixos/trunk/modules/installer/cd-dvd/installation-cd-base.nix       Wed Apr 
20 09:30:46 2011        (r26900)
+++ nixos/trunk/modules/installer/cd-dvd/installation-cd-base.nix       Wed Apr 
20 10:48:52 2011        (r26901)
@@ -39,7 +39,7 @@
     ];
 
   # 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}";
   

Modified: nixos/trunk/modules/installer/cd-dvd/iso-image.nix
==============================================================================
--- nixos/trunk/modules/installer/cd-dvd/iso-image.nix  Wed Apr 20 09:30:46 
2011        (r26900)
+++ nixos/trunk/modules/installer/cd-dvd/iso-image.nix  Wed Apr 20 10:48:52 
2011        (r26901)
@@ -11,12 +11,19 @@
   options = {
 
     isoImage.isoName = mkOption {
-      default = "cd.iso";
+      default = "${config.isoImage.isoName}.iso";
       description = ''
         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 {
       default = false;
       description = ''

Modified: nixos/trunk/release.nix
==============================================================================
--- nixos/trunk/release.nix     Wed Apr 20 09:30:46 2011        (r26900)
+++ nixos/trunk/release.nix     Wed Apr 20 10:48:52 2011        (r26901)
@@ -4,7 +4,7 @@
 
 
   makeIso =
-    { module, description, maintainers ? ["eelco"]}:
+    { module, type, description ? type, maintainers ? ["eelco"] }:
     { nixosSrc ? {outPath = ./.; rev = 1234;}
     , officialRelease ? false
     , system ? "i686-linux"
@@ -16,7 +16,10 @@
 
       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 {
         inherit system nixpkgs;
@@ -119,12 +122,12 @@
 
     iso_minimal = makeIso {
       module = ./modules/installer/cd-dvd/installation-cd-minimal.nix;
-      description = "minimal";
+      type = "minimal";
     };
 
     iso_graphical = makeIso {
       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
_______________________________________________
nix-commits mailing list
nix-comm...@cs.uu.nl
http://mail.cs.uu.nl/mailman/listinfo/nix-commits