movefasta/nixpkgs
1
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-06-10 03:23:29 +03:00
Code Issues Projects Releases Packages Wiki Activity

nixos/iso-image: Include latest kernel specialisation.

Browse source 
Now that ISOs include the latest kernel as a specialisation, separate
ISOs for the new kernel are no longer necessary.
This commit is contained in:
Will Fancher 2024-11-13 02:07:33 -05:00
parent f2204986a7
commit 0aad0248ce
4 changed files with 33 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

14
nixos/modules/installer/cd-dvd/installation-cd-minimal-combined.nix Normal file
View file

@ -0,0 +1,14 @@
{ lib, ... }:
{
imports = [ ./installation-cd-minimal.nix ];
isoImage.configurationName = lib.mkDefault "(Linux LTS)";
specialisation.latest_kernel.configuration =
{ config, ... }:
{
imports = [ ./latest-kernel.nix ];
isoImage.configurationName = "(Linux ${config.boot.kernelPackages.kernel.version})";
};
}

5
nixos/modules/installer/cd-dvd/latest-kernel.nix Normal file
View file

@ -0,0 +1,5 @@
{ lib, pkgs, ... }:
{
boot.kernelPackages = pkgs.linuxPackages_latest;
boot.supportedFilesystems.zfs = false;
}

21
nixos/modules/profiles/base.nix
View file

@ -48,14 +48,19 @@
]; ];
# Include support for various filesystems and tools to create / manipulate them. # Include support for various filesystems and tools to create / manipulate them.
boot.supportedFilesystems = [ boot.supportedFilesystems = lib.mkMerge [
"btrfs" [
"cifs" "btrfs"
"f2fs" "cifs"
"ntfs" "f2fs"
"vfat" "ntfs"
"xfs" "vfat"
] ++ lib.optional (lib.meta.availableOn pkgs.stdenv.hostPlatform config.boot.zfs.package) "zfs"; "xfs"
]
(lib.mkIf (lib.meta.availableOn pkgs.stdenv.hostPlatform config.boot.zfs.package) {
zfs = lib.mkDefault true;
})
];
# Configure host id for ZFS to work # Configure host id for ZFS to work
networking.hostId = lib.mkDefault "8425e349"; networking.hostId = lib.mkDefault "8425e349";

18
nixos/release.nix
View file

@ -164,7 +164,7 @@ in rec {
}); });
iso_minimal = forAllSystems (system: makeIso { iso_minimal = forAllSystems (system: makeIso {
module = ./modules/installer/cd-dvd/installation-cd-minimal.nix; module = ./modules/installer/cd-dvd/installation-cd-minimal-combined.nix;
type = "minimal"; type = "minimal";
inherit system; inherit system;
}); });
@ -187,22 +187,6 @@ in rec {
inherit system; inherit system;
}); });
# A variant with a more recent (but possibly less stable) kernel that might support more hardware.
# This variant keeps zfs support enabled, hoping it will build and work.
iso_minimal_new_kernel = forMatchingSystems [ "x86_64-linux" "aarch64-linux" ] (system: makeIso {
module = ./modules/installer/cd-dvd/installation-cd-minimal-new-kernel.nix;
type = "minimal-new-kernel";
inherit system;
});
# A variant with a more recent (but possibly less stable) kernel that might support more hardware.
# ZFS support disabled since it is unlikely to support the latest kernel.
iso_minimal_new_kernel_no_zfs = forMatchingSystems [ "x86_64-linux" "aarch64-linux" ] (system: makeIso {
module = ./modules/installer/cd-dvd/installation-cd-minimal-new-kernel-no-zfs.nix;
type = "minimal-new-kernel-no-zfs";
inherit system;
});
sd_image = forMatchingSystems [ "armv6l-linux" "armv7l-linux" "aarch64-linux" ] (system: makeSdImage { sd_image = forMatchingSystems [ "armv6l-linux" "armv7l-linux" "aarch64-linux" ] (system: makeSdImage {
module = { module = {
armv6l-linux = ./modules/installer/sd-card/sd-image-raspberrypi-installer.nix; armv6l-linux = ./modules/installer/sd-card/sd-image-raspberrypi-installer.nix;