cyclone: Use kernel 6.14
This additionally applies several overrides to use ZFS on 6.14.
This commit is contained in:
parent
53dfab212e
commit
561f72cd98
1 changed files with 27 additions and 8 deletions
|
@ -14,17 +14,36 @@
|
||||||
};
|
};
|
||||||
|
|
||||||
initrd.availableKernelModules = [ "xhci_pci" "ahci" "nvme" "usbhid" "usb_storage" "sd_mod" ];
|
initrd.availableKernelModules = [ "xhci_pci" "ahci" "nvme" "usbhid" "usb_storage" "sd_mod" ];
|
||||||
# Use the latest kernel.
|
|
||||||
# As such, we'll also use unstable ZFS.
|
# Where possible, we'd like to use the latest kernel version,
|
||||||
kernelPackages = pkgs.linuxPackages_6_13;
|
# alongside the latest version of ZFS.
|
||||||
|
#
|
||||||
|
# The latest version of ZFS (as of writing, 2.3.1)
|
||||||
|
# supports kernel 6.14 with no changes necessary.
|
||||||
|
#
|
||||||
|
# We'll temporarily override it to not mark it as broken.
|
||||||
|
kernelPackages = pkgs.linuxPackages_6_14.extend (final: prev: {
|
||||||
|
zfs_unstable = prev.zfs_unstable.overrideAttrs (oldAttrs: {
|
||||||
|
# Well.. that's partially a lie, it does need
|
||||||
|
# one patch to specify it's compatible.
|
||||||
|
patches = [
|
||||||
|
(pkgs.fetchpatch {
|
||||||
|
url = "https://patch-diff.githubusercontent.com/raw/openzfs/zfs/pull/17172.patch";
|
||||||
|
hash = "sha256-c8YP1a36uwYvvW+h4yT6s3PIKkHq6IMjVal2CcNI4p4=";
|
||||||
|
})
|
||||||
|
];
|
||||||
|
meta.broken = false;
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
zfs = {
|
zfs = {
|
||||||
package = pkgs.zfs_unstable;
|
package = pkgs.zfs_unstable.overrideAttrs (oldAttrs: rec {
|
||||||
|
meta.broken = false;
|
||||||
|
});
|
||||||
# For reasons unbeknownst to humanity, this drive
|
# For reasons unbeknownst to humanity, this drive
|
||||||
# appears to keep changing identifiers or similar.
|
# appeared to keep changing identifiers.
|
||||||
# Prefer by-partuuid instead.
|
|
||||||
#
|
#
|
||||||
# (We could also do by-uuid, but it'd be best not
|
# We're forcing its device to be read from by-uuid.
|
||||||
# to have a drive's serial number publicly.)
|
|
||||||
devNodes = "/dev/disk/by-uuid";
|
devNodes = "/dev/disk/by-uuid";
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue