From 0899575b3dac350f4d0e16a9794b886b3fd29be7 Mon Sep 17 00:00:00 2001 From: Raito Bezarius Date: Wed, 26 Jul 2023 18:32:59 +0200 Subject: [PATCH 1/2] zfs: stable supports up to Linux 6.4 ZFS stable supports up to Linux 6.4 in fact, this is not clearly communicated in the META file but it does not matter, I have been running 6.4 for a while with ZFS (and even bcachefs). --- pkgs/os-specific/linux/zfs/stable.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/zfs/stable.nix b/pkgs/os-specific/linux/zfs/stable.nix index e208bcba9c7fd..fa06709a71c35 100644 --- a/pkgs/os-specific/linux/zfs/stable.nix +++ b/pkgs/os-specific/linux/zfs/stable.nix @@ -13,10 +13,10 @@ callPackage ./generic.nix args { # check the release notes for compatible kernels kernelCompatible = if stdenv'.isx86_64 || removeLinuxDRM - then kernel.kernelOlder "6.4" + then kernel.kernelOlder "6.5" else kernel.kernelOlder "6.2"; latestCompatibleLinuxPackages = if stdenv'.isx86_64 || removeLinuxDRM then - linuxKernel.packages.linux_6_3 + linuxKernel.packages.linux_6_4 else linuxKernel.packages.linux_6_1; From 2a9ca3a075a24b55d0f6d3e3a0fa5191bf8af5ac Mon Sep 17 00:00:00 2001 From: Raito Bezarius Date: Wed, 26 Jul 2023 18:36:24 +0200 Subject: [PATCH 2/2] zfs: clear up maintainer list The former maintainers are not active anymore. --- pkgs/os-specific/linux/zfs/generic.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/zfs/generic.nix b/pkgs/os-specific/linux/zfs/generic.nix index 347b4a2997104..cb73d2d141ecc 100644 --- a/pkgs/os-specific/linux/zfs/generic.nix +++ b/pkgs/os-specific/linux/zfs/generic.nix @@ -225,7 +225,7 @@ stdenv'.mkDerivation { with lib.systems.inspect.patterns; map (p: p // isLinux) [ isx86_32 isx86_64 isPower isAarch64 isSparc ]; - maintainers = with lib.maintainers; [ jcumming jonringer globin raitobezarius ]; + maintainers = with lib.maintainers; [ raitobezarius ]; mainProgram = "zfs"; # If your Linux kernel version is not yet supported by zfs, try zfsUnstable. # On NixOS set the option boot.zfs.enableUnstable.