diff --git a/nixos/modules/installer/cd-dvd/installation-cd-new-kernel.nix b/nixos/modules/installer/cd-dvd/installation-cd-graphical-new-kernel.nix similarity index 52% rename from nixos/modules/installer/cd-dvd/installation-cd-new-kernel.nix rename to nixos/modules/installer/cd-dvd/installation-cd-graphical-new-kernel.nix index 93bcbf00b25..506b9292b01 100644 --- a/nixos/modules/installer/cd-dvd/installation-cd-new-kernel.nix +++ b/nixos/modules/installer/cd-dvd/installation-cd-graphical-new-kernel.nix @@ -3,6 +3,5 @@ { imports = [ ./installation-cd-graphical.nix ]; - boot.kernelPackages = pkgs.linuxPackages_3_10; - boot.vesa = false; + boot.kernelPackages = pkgs.linuxPackages_latest; } diff --git a/nixos/modules/installer/cd-dvd/installation-cd-minimal-new-kernel.nix b/nixos/modules/installer/cd-dvd/installation-cd-minimal-new-kernel.nix index 38d02ffd162..4363c8e6c93 100644 --- a/nixos/modules/installer/cd-dvd/installation-cd-minimal-new-kernel.nix +++ b/nixos/modules/installer/cd-dvd/installation-cd-minimal-new-kernel.nix @@ -3,6 +3,5 @@ { imports = [ ./installation-cd-minimal.nix ]; - boot.kernelPackages = pkgs.linuxPackages_3_10; - boot.vesa = false; + boot.kernelPackages = pkgs.linuxPackages_latest; } diff --git a/nixos/release.nix b/nixos/release.nix index e5eadb57fe6..8a8b77de5a5 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).