about summary refs log tree commit diff
path: root/pkgs/os-specific
diff options
context:
space:
mode:
authorBernardo Meurer <bernardo@meurer.org>2022-03-25 10:29:39 -0700
committerGitHub <noreply@github.com>2022-03-25 10:29:39 -0700
commitf33719eda108fea4611a95d7d54a0dfb91c9ebc5 (patch)
tree616fcbd2185f9dfb37d83b6447ad0434ddca7f96 /pkgs/os-specific
parent4a732dfba66531a7521d3d9844fe21bb7cfcfdbf (diff)
parent53c1fe6b2e78eca736370ea8900f465393317b9b (diff)
downloadnixlib-f33719eda108fea4611a95d7d54a0dfb91c9ebc5.tar
nixlib-f33719eda108fea4611a95d7d54a0dfb91c9ebc5.tar.gz
nixlib-f33719eda108fea4611a95d7d54a0dfb91c9ebc5.tar.bz2
nixlib-f33719eda108fea4611a95d7d54a0dfb91c9ebc5.tar.lz
nixlib-f33719eda108fea4611a95d7d54a0dfb91c9ebc5.tar.xz
nixlib-f33719eda108fea4611a95d7d54a0dfb91c9ebc5.tar.zst
nixlib-f33719eda108fea4611a95d7d54a0dfb91c9ebc5.zip
Merge pull request #165698 from gkleen/zfs
zfs: 2.1.3 -> 2.1.4
Diffstat (limited to 'pkgs/os-specific')
-rw-r--r--pkgs/os-specific/linux/zfs/default.nix18
1 files changed, 9 insertions, 9 deletions
diff --git a/pkgs/os-specific/linux/zfs/default.nix b/pkgs/os-specific/linux/zfs/default.nix
index b5260d47caa4..6747d511694b 100644
--- a/pkgs/os-specific/linux/zfs/default.nix
+++ b/pkgs/os-specific/linux/zfs/default.nix
@@ -16,7 +16,7 @@
 , enablePython ? true
 
 # for determining the latest compatible linuxPackages
-, linuxPackages_5_16 ? pkgs.linuxKernel.packages.linux_5_16
+, linuxPackages_5_17 ? pkgs.linuxKernel.packages.linux_5_17
 }:
 
 let
@@ -216,28 +216,28 @@ in {
   # to be adapted
   zfsStable = common {
     # check the release notes for compatible kernels
-    kernelCompatible = kernel.kernelAtLeast "3.10" && kernel.kernelOlder "5.17";
-    latestCompatibleLinuxPackages = linuxPackages_5_16;
+    kernelCompatible = kernel.kernelAtLeast "3.10" && kernel.kernelOlder "5.18";
+    latestCompatibleLinuxPackages = linuxPackages_5_17;
 
     # this package should point to the latest release.
-    version = "2.1.3";
+    version = "2.1.4";
 
-    sha256 = "10p9s835wj5msspqwnqbfbnh8jmcazzd2v0gj4hn7vvni4p48gfl";
+    sha256 = "sha256-pHz1N2j+d9p1xleEBwwrmK9mN5gEyM69Suy0dsrkZT4=";
   };
 
   zfsUnstable = common {
     # check the release notes for compatible kernels
-    kernelCompatible = kernel.kernelAtLeast "3.10" && kernel.kernelOlder "5.17";
-    latestCompatibleLinuxPackages = linuxPackages_5_16;
+    kernelCompatible = kernel.kernelAtLeast "3.10" && kernel.kernelOlder "5.18";
+    latestCompatibleLinuxPackages = linuxPackages_5_17;
 
     # 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.3";
+    version = "2.1.4";
     # rev = "0000000000000000000000000000000000000000";
 
-    sha256 = "10p9s835wj5msspqwnqbfbnh8jmcazzd2v0gj4hn7vvni4p48gfl";
+    sha256 = "sha256-pHz1N2j+d9p1xleEBwwrmK9mN5gEyM69Suy0dsrkZT4=";
 
     isUnstable = true;
   };