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

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

Browse Source
This commit is contained in:
William A. Kennington III 2014-06-05 16:00:25 -05:00 committed by Vladimír Čunát
parent d619f0ef6d
commit 86711e4120
3 changed files with 11 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
nixos/modules/installer/cd-dvd/installation-cd-new-kernel.nix → nixos/modules/installer/cd-dvd/installation-cd-graphical-new-kernel.nix
View File

@ -3,6 +3,5 @@
{ {
imports = [ ./installation-cd-graphical.nix ]; imports = [ ./installation-cd-graphical.nix ];
boot.kernelPackages = pkgs.linuxPackages_3_10; boot.kernelPackages = pkgs.linuxPackages_latest;
boot.vesa = false;
} }

3
nixos/modules/installer/cd-dvd/installation-cd-minimal-new-kernel.nix
View File

@ -3,6 +3,5 @@
{ {
imports = [ ./installation-cd-minimal.nix ]; imports = [ ./installation-cd-minimal.nix ];
boot.kernelPackages = pkgs.linuxPackages_3_10; boot.kernelPackages = pkgs.linuxPackages_latest;
boot.vesa = false;
} }

22
nixos/release.nix
View File

@ -122,14 +122,6 @@ in rec {
inherit system; 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 { iso_graphical = forAllSystems (system: makeIso {
module = ./modules/installer/cd-dvd/installation-cd-graphical.nix; module = ./modules/installer/cd-dvd/installation-cd-graphical.nix;
type = "graphical"; type = "graphical";
@ -138,13 +130,17 @@ in rec {
# A variant with a more recent (but possibly less stable) kernel # A variant with a more recent (but possibly less stable) kernel
# that might support more hardware. # that might support more hardware.
/* iso_minimal_new_kernel = forAllSystems (system: makeIso {
iso_new_kernel = forAllSystems (system: makeIso { module = ./modules/installer/cd-dvd/installation-cd-minimal-new-kernel.nix;
module = ./modules/installer/cd-dvd/installation-cd-new-kernel.nix; type = "minimal-new-kernel";
type = "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; inherit system;
}); });
*/
# A bootable VirtualBox virtual appliance as an OVA file (i.e. packaged OVF). # A bootable VirtualBox virtual appliance as an OVA file (i.e. packaged OVF).