From 72f2df014702d2ed9614496b5deccca5ba2a4932 Mon Sep 17 00:00:00 2001 From: toastal Date: Tue, 16 Jul 2024 15:14:03 +0700 Subject: [PATCH] Linux 6.10 compat patches Since this is *zfs_unstable*, & these patches are merged. It seems like this could let folks test out 6.10 as others have had sucess while setting the new bar to 6.9. --- pkgs/os-specific/linux/zfs/unstable.nix | 23 +++++++++++++++++++++-- 1 file changed, 21 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/zfs/unstable.nix b/pkgs/os-specific/linux/zfs/unstable.nix index 3a83cd376250..faf3514dba3e 100644 --- a/pkgs/os-specific/linux/zfs/unstable.nix +++ b/pkgs/os-specific/linux/zfs/unstable.nix @@ -3,6 +3,7 @@ , stdenv , linuxKernel , nixosTests +, fetchpatch , ... } @ args: @@ -14,9 +15,9 @@ callPackage ./generic.nix args { # this attribute is the correct one for this package. kernelModuleAttribute = "zfs_unstable"; # check the release notes for compatible kernels - kernelCompatible = kernel.kernelOlder "6.10"; + kernelCompatible = kernel.kernelOlder "6.11"; - latestCompatibleLinuxPackages = linuxKernel.packages.linux_6_8; + latestCompatibleLinuxPackages = linuxKernel.packages.linux_6_9; # 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 @@ -30,5 +31,23 @@ callPackage ./generic.nix args { nixosTests.zfs.unstable ]; + # 6.10 patches approved+merged to the default branch, not in staging yet + # https://github.com/openzfs/zfs/pull/16250 + extraPatches = [ + (fetchpatch { + url = "https://github.com/openzfs/zfs/commit/7ca7bb7fd723a91366ce767aea53c4f5c2d65afb.patch"; + hash = "sha256-vUX4lgywh5ox6DjtIfeC90KjbLoW3Ol0rK/L65jOENo="; + }) + (fetchpatch { + url = "https://github.com/openzfs/zfs/commit/e951dba48a6330aca9c161c50189f6974e6877f0.patch"; + hash = "sha256-A1h0ZLY+nlReBMTlEm3O9kwBqto1cgsZdnJsHpR6hw0="; + }) + (fetchpatch { + url = "https://github.com/openzfs/zfs/commit/b409892ae5028965a6fe98dde1346594807e6e45.patch"; + hash = "sha256-pW1b8ktglFhwVRapTB5th9UCyjyrPmCVPg53nMENax8="; + }) + + ]; + hash = "sha256-7vZeIzA2yDW/gSCcS2AM3+C9qbRIbA9XbCRUxikW2+M="; }