nixos-iso: Re-enable new kernel iso images (close #2839)

authored by William A. Kennington III and committed by Vladimír Čunát 86711e41 d619f0ef

+17 -23
+7
nixos/modules/installer/cd-dvd/installation-cd-graphical-new-kernel.nix
··· 1 + { config, pkgs, ... }: 2 + 3 + { 4 + imports = [ ./installation-cd-graphical.nix ]; 5 + 6 + boot.kernelPackages = pkgs.linuxPackages_latest; 7 + }
+1 -2
nixos/modules/installer/cd-dvd/installation-cd-minimal-new-kernel.nix
··· 3 3 { 4 4 imports = [ ./installation-cd-minimal.nix ]; 5 5 6 - boot.kernelPackages = pkgs.linuxPackages_3_10; 7 - boot.vesa = false; 6 + boot.kernelPackages = pkgs.linuxPackages_latest; 8 7 }
-8
nixos/modules/installer/cd-dvd/installation-cd-new-kernel.nix
··· 1 - { config, pkgs, ... }: 2 - 3 - { 4 - imports = [ ./installation-cd-graphical.nix ]; 5 - 6 - boot.kernelPackages = pkgs.linuxPackages_3_10; 7 - boot.vesa = false; 8 - }
+9 -13
nixos/release.nix
··· 122 122 inherit system; 123 123 }); 124 124 125 - /* 126 - iso_minimal_new_kernel = forAllSystems (system: makeIso { 127 - module = ./modules/installer/cd-dvd/installation-cd-minimal-new-kernel.nix; 128 - type = "minimal-new-kernel"; 129 - inherit system; 130 - }); 131 - */ 132 - 133 125 iso_graphical = forAllSystems (system: makeIso { 134 126 module = ./modules/installer/cd-dvd/installation-cd-graphical.nix; 135 127 type = "graphical"; ··· 138 130 139 131 # A variant with a more recent (but possibly less stable) kernel 140 132 # that might support more hardware. 141 - /* 142 - iso_new_kernel = forAllSystems (system: makeIso { 143 - module = ./modules/installer/cd-dvd/installation-cd-new-kernel.nix; 144 - type = "new-kernel"; 133 + iso_minimal_new_kernel = forAllSystems (system: makeIso { 134 + module = ./modules/installer/cd-dvd/installation-cd-minimal-new-kernel.nix; 135 + type = "minimal-new-kernel"; 136 + inherit system; 137 + }); 138 + 139 + iso_graphical_new_kernel = forAllSystems (system: makeIso { 140 + module = ./modules/installer/cd-dvd/installation-cd-graphical-new-kernel.nix; 141 + type = "graphical-new-kernel"; 145 142 inherit system; 146 143 }); 147 - */ 148 144 149 145 150 146 # A bootable VirtualBox virtual appliance as an OVA file (i.e. packaged OVF).