From d89cbdcbe4386829e89596e0b0d790732f1a39b1 Mon Sep 17 00:00:00 2001
From: toastal <toastal@posteo.net>
Date: Wed, 26 Oct 2022 19:02:12 +0700
Subject: [PATCH] =?UTF-8?q?zfsUnstable:=202.1.6=20=E2=86=92=202.1.7-stagin?=
 =?UTF-8?q?g?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

With 5.19 kernels now being EoL and my laptop demanding at least 5.17 to
function, I want to get ahead of the curve and add support for 6.0
kernels. The 2.1.6 tag was cut so late that it support 6.0 but isn’t as
well tested according to the conversations I read. There aren’t many
commits in the `2.1.7-staging` at this point, but this will help keep my
system afloat until the real `2.1.7` release. I’ve booted my laptop into
this and everything appears to be functioning normally.
---
 pkgs/os-specific/linux/zfs/default.nix | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/pkgs/os-specific/linux/zfs/default.nix b/pkgs/os-specific/linux/zfs/default.nix
index 080a198b0f40..00afcfbda934 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_5_19 ? pkgs.linuxKernel.packages.linux_5_19
+, linuxPackages_6_0 ? pkgs.linuxKernel.packages.linux_6_0
 }:
 
 let
@@ -227,17 +228,17 @@ in {
 
   zfsUnstable = common {
     # check the release notes for compatible kernels
-    kernelCompatible = kernel.kernelOlder "5.20";
-    latestCompatibleLinuxPackages = linuxPackages_5_19;
+    kernelCompatible = kernel.kernelOlder "6.1";
+    latestCompatibleLinuxPackages = linuxPackages_6_0;
 
     # 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
     # zfs-<version>-staging branch, because this is tested by the OpenZFS
     # maintainers.
-    version = "2.1.6";
-    # rev = "0000000000000000000000000000000000000000";
+    version = "2.1.7-staging-2022-10-27";
+    rev = "04f1983aab16d378be376768275856bc38be48bd";
 
-    sha256 = "sha256-gd5WlNtnoSiVj4sKUGf0WhR7Z1GPebwu3Z1mkNsoC/I=";
+    sha256 = "sha256-6s9Qcw6Qqq7+JU9UPa8DDu2yzhD1OV3piLlYsgEoIhg=";
 
     isUnstable = true;
   };