diff options
author | toastal <toastal@posteo.net> | 2023-04-20 21:47:38 +0700 |
---|---|---|
committer | toastal <toastal@posteo.net> | 2023-04-20 21:47:38 +0700 |
commit | abd2c440971083bb3b7b2db56d0e96897a2bfe55 (patch) | |
tree | cd29f1b1e9ec130b1a8b4f5f24d13b6d51b9ac89 /pkgs/os-specific/linux/zfs | |
parent | 6132a7001e4885bbd0101b5c0b7f0801dca0e282 (diff) | |
download | nixpkgs-abd2c440971083bb3b7b2db56d0e96897a2bfe55.tar nixpkgs-abd2c440971083bb3b7b2db56d0e96897a2bfe55.tar.gz nixpkgs-abd2c440971083bb3b7b2db56d0e96897a2bfe55.tar.bz2 nixpkgs-abd2c440971083bb3b7b2db56d0e96897a2bfe55.tar.lz nixpkgs-abd2c440971083bb3b7b2db56d0e96897a2bfe55.tar.xz nixpkgs-abd2c440971083bb3b7b2db56d0e96897a2bfe55.tar.zst nixpkgs-abd2c440971083bb3b7b2db56d0e96897a2bfe55.zip |
zfs: 2.1.9 → 2.1.11
Skipping over 2.1.10 now that it was found to have possible data corruptions Release notes @ OpenZFS’s Git forge: https://github.com/openzfs/zfs/releases/tag/zfs-2.1.11
Diffstat (limited to 'pkgs/os-specific/linux/zfs')
-rw-r--r-- | pkgs/os-specific/linux/zfs/default.nix | 28 |
1 files changed, 13 insertions, 15 deletions
diff --git a/pkgs/os-specific/linux/zfs/default.nix b/pkgs/os-specific/linux/zfs/default.nix index 8655bd2ed32..c66852f32f0 100644 --- a/pkgs/os-specific/linux/zfs/default.nix +++ b/pkgs/os-specific/linux/zfs/default.nix @@ -223,13 +223,19 @@ in { # to be adapted zfsStable = common { # check the release notes for compatible kernels - kernelCompatible = kernel.kernelOlder "6.2"; - latestCompatibleLinuxPackages = linuxPackages_6_1; + kernelCompatible = + if stdenv'.isx86_64 + then kernel.kernelOlder "6.3" + else kernel.kernelOlder "6.2"; + latestCompatibleLinuxPackages = + if stdenv'.isx86_64 + then linuxPackages_6_2 + else linuxPackages_6_1; # this package should point to the latest release. - version = "2.1.9"; + version = "2.1.11"; - sha256 = "RT2ijcXhdw5rbz1niDjrqg6G/uOjyrJiTlS4qijiWqc="; + sha256 = "tJLwyqUj1l5F0WKZDeMGrEFa8fc/axKqm31xtN51a5M="; }; zfsUnstable = common { @@ -250,19 +256,11 @@ 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.10-staging-2023-03-15"; - rev = "a5c469c5f380b09705ad0bee15e2ca7a5f78213c"; + version = "2.1.12-staging-2023-04-18"; + rev = "e25f9131d679692704c11dc0c1df6d4585b70c35"; - sha256 = "sha256-CdPuyZMXFzANEdnsr/rB5ckkT8X5uziniY5vmRCKl1U="; + sha256 = "tJLwyqUj1l5F0WKZDeMGrEFa8fc/axKqm31xtN51a5M="; isUnstable = true; - - # Necessary for 6.2.8+ and 6.3 compatibility, see https://github.com/openzfs/zfs/issues/14658 - extraPatches = [ - (fetchpatch { - url = "https://github.com/openzfs/zfs/pull/14668.patch"; - hash = "sha256-PR7hxxdjLkjszADdw0R0JRmBPfDlsXG6D+VfC7QzEhk="; - }) - ]; }; } |