about summary refs log tree commit diff
path: root/pkgs/os-specific/linux/zfs
diff options
context:
space:
mode:
authorAlyssa Ross <hi@alyssa.is>2021-09-01 07:47:01 +0000
committerAlyssa Ross <hi@alyssa.is>2021-09-01 07:47:01 +0000
commitc13cf1e76f118c6b5942a5f2af8a469cef86e4b5 (patch)
tree7902588669d8abe4ed13b411fc1a397bb0b70205 /pkgs/os-specific/linux/zfs
parent3ba32e04a7e8fd164684e1b79a8a172f07d631d4 (diff)
parent538f369fb5289c9ad04dce965f57be3531761267 (diff)
Merge remote-tracking branch 'nixpkgs/master' into staging-next
Diffstat (limited to 'pkgs/os-specific/linux/zfs')
-rw-r--r--pkgs/os-specific/linux/zfs/default.nix7
1 files changed, 4 insertions, 3 deletions
diff --git a/pkgs/os-specific/linux/zfs/default.nix b/pkgs/os-specific/linux/zfs/default.nix
index 6f0f32d5230bc..a896e907a4dff 100644
--- a/pkgs/os-specific/linux/zfs/default.nix
+++ b/pkgs/os-specific/linux/zfs/default.nix
@@ -210,13 +210,14 @@ in {
 
   zfsUnstable = common {
     # check the release notes for compatible kernels
-    kernelCompatible = kernel.kernelAtLeast "3.10" && kernel.kernelOlder "5.14";
+    kernelCompatible = kernel.kernelAtLeast "3.10" && kernel.kernelOlder "5.15";
     latestCompatibleLinuxPackages = linuxPackages_5_13;
 
     # this package should point to a version / git revision compatible with the latest kernel release
-    version = "2.1.0";
+    version = "unstable-2021-08-30";
+    rev = "3b89d9518df2c7fd747e349873a3d4d498beb20e";
 
-    sha256 = "sha256-YdY4SStXZGBBdAHdM3R/unco7ztxI3s0/buPSNSeh5o=";
+    sha256 = "sha256-wVbjpVrPQmhJmMqdGUf0IwlCIoOsT7Zfj5lxSKcOsgg=";
 
     isUnstable = true;
   };