summary refs log tree commit diff
diff options
context:
space:
mode:
authorAdam Stephens <adam@valkor.net>2023-09-27 22:38:53 -0400
committerAdam Stephens <adam@valkor.net>2023-09-28 08:10:52 -0400
commit94146957746e894891d3932423449c0d9d7577e0 (patch)
tree0b8754e5dd9010d086d926f1690f00861a59b9a2
parentb58b0b0311f083da10dbb936539fe1cb85c1a6fb (diff)
downloadnixpkgs-94146957746e894891d3932423449c0d9d7577e0.tar
nixpkgs-94146957746e894891d3932423449c0d9d7577e0.tar.gz
nixpkgs-94146957746e894891d3932423449c0d9d7577e0.tar.bz2
nixpkgs-94146957746e894891d3932423449c0d9d7577e0.tar.lz
nixpkgs-94146957746e894891d3932423449c0d9d7577e0.tar.xz
nixpkgs-94146957746e894891d3932423449c0d9d7577e0.tar.zst
nixpkgs-94146957746e894891d3932423449c0d9d7577e0.zip
zfs: 2.1.12 -> 2.1.13
-rw-r--r--pkgs/os-specific/linux/zfs/stable.nix11
1 files changed, 7 insertions, 4 deletions
diff --git a/pkgs/os-specific/linux/zfs/stable.nix b/pkgs/os-specific/linux/zfs/stable.nix
index 14cda12e6f3..1a77396300e 100644
--- a/pkgs/os-specific/linux/zfs/stable.nix
+++ b/pkgs/os-specific/linux/zfs/stable.nix
@@ -14,10 +14,13 @@ callPackage ./generic.nix args {
   # check the release notes for compatible kernels
   kernelCompatible =
     if stdenv'.isx86_64 || removeLinuxDRM
-    then kernel.kernelOlder "6.4"
+    then kernel.kernelOlder "6.6"
     else kernel.kernelOlder "6.2";
-  latestCompatibleLinuxPackages = linuxKernel.packages.linux_6_1;
+  latestCompatibleLinuxPackages = if stdenv'.isx86_64 || removeLinuxDRM
+    then linuxKernel.packages.linux_6_5
+    else linuxKernel.packages.linux_6_1;
   extraPatches = [
+    # applied in version 2.2.x
     (fetchpatch {
       name = "musl.patch";
       url = "https://github.com/openzfs/zfs/commit/1f19826c9ac85835cbde61a7439d9d1fefe43a4a.patch";
@@ -26,7 +29,7 @@ callPackage ./generic.nix args {
   ];
 
   # this package should point to the latest release.
-  version = "2.1.12";
+  version = "2.1.13";
 
-  sha256 = "eYUR5d4gpTrlFu6j1uL83DWL9uPGgAUDRdSEb73V5i4=";
+  sha256 = "tqUCn/Hf/eEmyWRQthWQdmTJK2sDspnHiiEfn9rz2Kc=";
 }