summary refs log tree commit diff
path: root/pkgs/os-specific/linux/zfs
diff options
context:
space:
mode:
authorAndrew Marshall <andrew@johnandrewmarshall.com>2021-12-15 21:32:48 -0500
committerAndrew Marshall <andrew@johnandrewmarshall.com>2021-12-15 22:03:17 -0500
commit04ae83ae6b4c5b7a7a9db87f091eaf9f977965bf (patch)
tree9cdaccd0510891a7922c9d6f30fc14058390e288 /pkgs/os-specific/linux/zfs
parent9339e8e093c76e8764e5baf3fad887d8140a9146 (diff)
downloadnixpkgs-04ae83ae6b4c5b7a7a9db87f091eaf9f977965bf.tar
nixpkgs-04ae83ae6b4c5b7a7a9db87f091eaf9f977965bf.tar.gz
nixpkgs-04ae83ae6b4c5b7a7a9db87f091eaf9f977965bf.tar.bz2
nixpkgs-04ae83ae6b4c5b7a7a9db87f091eaf9f977965bf.tar.lz
nixpkgs-04ae83ae6b4c5b7a7a9db87f091eaf9f977965bf.tar.xz
nixpkgs-04ae83ae6b4c5b7a7a9db87f091eaf9f977965bf.tar.zst
nixpkgs-04ae83ae6b4c5b7a7a9db87f091eaf9f977965bf.zip
zfs: 2.1.1 -> 2.1.2
Diffstat (limited to 'pkgs/os-specific/linux/zfs')
-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 361c5fcb620..7341240f95a 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_10 ? pkgs.linuxKernel.packages.linux_5_10
+, linuxPackages_5_15 ? pkgs.linuxKernel.packages.linux_5_15
 }:
 
 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.15";
-    latestCompatibleLinuxPackages = linuxPackages_5_10;
+    kernelCompatible = kernel.kernelAtLeast "3.10" && kernel.kernelOlder "5.16";
+    latestCompatibleLinuxPackages = linuxPackages_5_15;
 
     # this package should point to the latest release.
-    version = "2.1.1";
+    version = "2.1.2";
 
-    sha256 = "sha256-UUuJa5w/GsEvsgH/BnXFsP/dsOt9wwmPqKzDxLPrhiY=";
+    sha256 = "sha256-7oSFZlmjCr+egImIVf429GrFOKn3L3r4SMnK3LHHmL8=";
   };
 
   zfsUnstable = common {
     # check the release notes for compatible kernels
-    kernelCompatible = kernel.kernelAtLeast "3.10" && kernel.kernelOlder "5.15";
-    latestCompatibleLinuxPackages = linuxPackages_5_10;
+    kernelCompatible = kernel.kernelAtLeast "3.10" && kernel.kernelOlder "5.16";
+    latestCompatibleLinuxPackages = linuxPackages_5_15;
 
     # 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.1";
+    version = "2.1.2";
     # rev = "0000000000000000000000000000000000000000";
 
-    sha256 = "sha256-UUuJa5w/GsEvsgH/BnXFsP/dsOt9wwmPqKzDxLPrhiY=";
+    sha256 = "sha256-7oSFZlmjCr+egImIVf429GrFOKn3L3r4SMnK3LHHmL8=";
 
     isUnstable = true;
   };