From a8693e7cc253ca0059783f55b14fe9cb07049da9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?PedroHLC=20=E2=98=AD?= Date: Mon, 13 Mar 2023 10:57:00 -0300 Subject: [PATCH] zfsUnstable: increase compatiblity range (to linux 6.2) --- pkgs/os-specific/linux/zfs/default.nix | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/zfs/default.nix b/pkgs/os-specific/linux/zfs/default.nix index 1c909f3208ea..cd31cb14fa09 100644 --- a/pkgs/os-specific/linux/zfs/default.nix +++ b/pkgs/os-specific/linux/zfs/default.nix @@ -17,6 +17,7 @@ # for determining the latest compatible linuxPackages , linuxPackages_6_1 ? pkgs.linuxKernel.packages.linux_6_1 +, linuxPackages_6_2 ? pkgs.linuxKernel.packages.linux_6_2 }: let @@ -233,8 +234,17 @@ in { zfsUnstable = common { # check the release notes for compatible kernels - kernelCompatible = kernel.kernelOlder "6.2"; - latestCompatibleLinuxPackages = linuxPackages_6_1; + # NOTE: + # zfs-2.1.9<=x<=2.1.10 is broken with aarch64-linux-6.2 + # for future releases, please delete this condition. + kernelCompatible = + if kernel.stdenv.isx86_64 + then kernel.kernelOlder "6.3" + else kernel.kernelOlder "6.2"; + latestCompatibleLinuxPackages = + if kernel.stdenv.isx86_64 + then linuxPackages_6_2 + else linuxPackages_6_1; # this package should point to a version / git revision compatible with the latest kernel release # IMPORTANT: Always use a tagged release candidate or commits from the