summary refs log tree commit diff
path: root/nixos/release.nix
diff options
context:
space:
mode:
authorWilliam A. Kennington III <william@wkennington.com>2014-06-05 16:00:25 -0500
committerVladimír Čunát <vcunat@gmail.com>2014-06-17 21:23:52 +0200
commit86711e4120634672ae891571c7628dfecee37af7 (patch)
treeee83ee0b8501fd24b8452d6eee57311b245dccea /nixos/release.nix
parentd619f0ef6d8495b52472c35e571f7b28ed728659 (diff)
downloadnixlib-86711e4120634672ae891571c7628dfecee37af7.tar
nixlib-86711e4120634672ae891571c7628dfecee37af7.tar.gz
nixlib-86711e4120634672ae891571c7628dfecee37af7.tar.bz2
nixlib-86711e4120634672ae891571c7628dfecee37af7.tar.lz
nixlib-86711e4120634672ae891571c7628dfecee37af7.tar.xz
nixlib-86711e4120634672ae891571c7628dfecee37af7.tar.zst
nixlib-86711e4120634672ae891571c7628dfecee37af7.zip
nixos-iso: Re-enable new kernel iso images (close #2839)
Diffstat (limited to 'nixos/release.nix')
-rw-r--r--nixos/release.nix22
1 files changed, 9 insertions, 13 deletions
diff --git a/nixos/release.nix b/nixos/release.nix
index e5eadb57fe62..8a8b77de5a5b 100644
--- a/nixos/release.nix
+++ b/nixos/release.nix
@@ -122,14 +122,6 @@ in rec {
     inherit system;
   });
 
-  /*
-  iso_minimal_new_kernel = forAllSystems (system: makeIso {
-    module = ./modules/installer/cd-dvd/installation-cd-minimal-new-kernel.nix;
-    type = "minimal-new-kernel";
-    inherit system;
-  });
-  */
-
   iso_graphical = forAllSystems (system: makeIso {
     module = ./modules/installer/cd-dvd/installation-cd-graphical.nix;
     type = "graphical";
@@ -138,13 +130,17 @@ in rec {
 
   # A variant with a more recent (but possibly less stable) kernel
   # that might support more hardware.
-  /*
-  iso_new_kernel = forAllSystems (system: makeIso {
-    module = ./modules/installer/cd-dvd/installation-cd-new-kernel.nix;
-    type = "new-kernel";
+  iso_minimal_new_kernel = forAllSystems (system: makeIso {
+    module = ./modules/installer/cd-dvd/installation-cd-minimal-new-kernel.nix;
+    type = "minimal-new-kernel";
+    inherit system;
+  });
+
+  iso_graphical_new_kernel = forAllSystems (system: makeIso {
+    module = ./modules/installer/cd-dvd/installation-cd-graphical-new-kernel.nix;
+    type = "graphical-new-kernel";
     inherit system;
   });
-  */
 
 
   # A bootable VirtualBox virtual appliance as an OVA file (i.e. packaged OVF).