summary refs log tree commit diff
path: root/pkgs/os-specific/linux/zfs
diff options
context:
space:
mode:
authorRyan Burns <52847440+r-burns@users.noreply.github.com>2022-12-04 04:29:37 -0800
committerGitHub <noreply@github.com>2022-12-04 04:29:37 -0800
commit4b61dc8b89a5fc2b53dde9a0a16792919a0187dd (patch)
treebbe24cef0edab21a4bb59851efb9100d3263d106 /pkgs/os-specific/linux/zfs
parent11cd8b5a037aeac4aa2b3fa6030db0125b00f439 (diff)
parent782d97768bcd30777187ad71b120d05ee81bb793 (diff)
downloadnixpkgs-4b61dc8b89a5fc2b53dde9a0a16792919a0187dd.tar
nixpkgs-4b61dc8b89a5fc2b53dde9a0a16792919a0187dd.tar.gz
nixpkgs-4b61dc8b89a5fc2b53dde9a0a16792919a0187dd.tar.bz2
nixpkgs-4b61dc8b89a5fc2b53dde9a0a16792919a0187dd.tar.lz
nixpkgs-4b61dc8b89a5fc2b53dde9a0a16792919a0187dd.tar.xz
nixpkgs-4b61dc8b89a5fc2b53dde9a0a16792919a0187dd.tar.zst
nixpkgs-4b61dc8b89a5fc2b53dde9a0a16792919a0187dd.zip
Merge pull request #204043 from r-burns/zfs
zfs: 2.1.6 -> 2.1.7
Diffstat (limited to 'pkgs/os-specific/linux/zfs')
-rw-r--r--pkgs/os-specific/linux/zfs/default.nix15
1 files changed, 7 insertions, 8 deletions
diff --git a/pkgs/os-specific/linux/zfs/default.nix b/pkgs/os-specific/linux/zfs/default.nix
index 918cc7a770e..eb4e8875f04 100644
--- a/pkgs/os-specific/linux/zfs/default.nix
+++ b/pkgs/os-specific/linux/zfs/default.nix
@@ -16,7 +16,6 @@
 , enablePython ? true
 
 # for determining the latest compatible linuxPackages
-, linuxPackages_5_15 ? pkgs.linuxKernel.packages.linux_5_15
 , linuxPackages_6_0 ? pkgs.linuxKernel.packages.linux_6_0
 }:
 
@@ -217,13 +216,13 @@ in {
   # to be adapted
   zfsStable = common {
     # check the release notes for compatible kernels
-    kernelCompatible = kernel.kernelOlder "5.20";
-    latestCompatibleLinuxPackages = linuxPackages_5_15;
+    kernelCompatible = kernel.kernelOlder "6.1";
+    latestCompatibleLinuxPackages = linuxPackages_6_0;
 
     # this package should point to the latest release.
-    version = "2.1.6";
+    version = "2.1.7";
 
-    sha256 = "sha256-gd5WlNtnoSiVj4sKUGf0WhR7Z1GPebwu3Z1mkNsoC/I=";
+    sha256 = "sha256-vLm6RE11nqOCoYXne79JU3nUQnVEUNbwrULwFfghWcI=";
   };
 
   zfsUnstable = common {
@@ -235,10 +234,10 @@ in {
     # 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.7-staging-2022-11-08";
-    rev = "0f4ee295ba94803e5833f57481cfdbee5d1160d4";
+    version = "2.1.8-staging-2022-12-01";
+    rev = "21bd7661334cd865d17934bebbcaf8d3356279ee";
 
-    sha256 = "sha256-AixYjnr8MgST/VxEPY4NdcAvpoKiJ3zrvOai5bJjC/U=";
+    sha256 = "sha256-vLm6RE11nqOCoYXne79JU3nUQnVEUNbwrULwFfghWcI=";
 
     isUnstable = true;
   };