summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGregor Kleen <20089782+gkleen@users.noreply.github.com>2022-03-24 21:59:56 +0100
committerJonathan Ringer <jonringer@users.noreply.github.com>2022-03-25 16:27:21 -0700
commite80f8f4d8336f5249d475d5c671a4e53b9d36634 (patch)
tree266b8de6dc090896be8818df366a8fc8005c22cd
parentd89f18a17e51532ed5f4d45297b0ddf11e46b9c8 (diff)
zfs: 2.1.3 -> 2.1.4
(cherry picked from commit 53c1fe6b2e78eca736370ea8900f465393317b9b)
-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 e3a856c12a4c..cc5f3788264e 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
}:
with lib;
@@ -215,28 +215,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;
};