summary refs log tree commit diff
path: root/pkgs/os-specific
diff options
context:
space:
mode:
authorJörg Thalheim <Mic92@users.noreply.github.com>2021-07-03 18:46:31 +0100
committerGitHub <noreply@github.com>2021-07-03 18:46:31 +0100
commit2b0da61cbdeda741bc661db58b8484b725cacff5 (patch)
treee984fa2cf394f111ff32314a4290efcb0cf304e7 /pkgs/os-specific
parentede1785d110103d43a75c19db7573ad5808bd3b3 (diff)
parent6f1b155d37337dc0cf7dc075b9291f3b2dedca69 (diff)
downloadnixpkgs-2b0da61cbdeda741bc661db58b8484b725cacff5.tar
nixpkgs-2b0da61cbdeda741bc661db58b8484b725cacff5.tar.gz
nixpkgs-2b0da61cbdeda741bc661db58b8484b725cacff5.tar.bz2
nixpkgs-2b0da61cbdeda741bc661db58b8484b725cacff5.tar.lz
nixpkgs-2b0da61cbdeda741bc661db58b8484b725cacff5.tar.xz
nixpkgs-2b0da61cbdeda741bc661db58b8484b725cacff5.tar.zst
nixpkgs-2b0da61cbdeda741bc661db58b8484b725cacff5.zip
Merge pull request #129026 from jonringer/bump-zfs
zfs*: bump
Diffstat (limited to 'pkgs/os-specific')
-rw-r--r--pkgs/os-specific/linux/zfs/default.nix10
1 files changed, 5 insertions, 5 deletions
diff --git a/pkgs/os-specific/linux/zfs/default.nix b/pkgs/os-specific/linux/zfs/default.nix
index 7d715cc3c09..7784aa8e03f 100644
--- a/pkgs/os-specific/linux/zfs/default.nix
+++ b/pkgs/os-specific/linux/zfs/default.nix
@@ -195,12 +195,12 @@ in {
   # to be adapted
   zfsStable = common {
     # check the release notes for compatible kernels
-    kernelCompatible = kernel.kernelAtLeast "3.10" && kernel.kernelOlder "5.13";
+    kernelCompatible = kernel.kernelAtLeast "3.10" && kernel.kernelOlder "5.14";
 
     # this package should point to the latest release.
-    version = "2.0.5";
+    version = "2.1.0";
 
-    sha256 = "0n0d8ab7ibxxa8znfsprh7jxwgighx5g291v7hi8272vfjrmk1mj";
+    sha256 = "sha256-YdY4SStXZGBBdAHdM3R/unco7ztxI3s0/buPSNSeh5o=";
   };
 
   zfsUnstable = common {
@@ -208,9 +208,9 @@ in {
     kernelCompatible = kernel.kernelAtLeast "3.10" && kernel.kernelOlder "5.14";
 
     # this package should point to a version / git revision compatible with the latest kernel release
-    version = "2.1.0-rc8";
+    version = "2.1.0";
 
-    sha256 = "0c53ca6xd59c30h3b2hmvyy63yqyk745x1kdfypnfqj3lnsj1pac";
+    sha256 = "sha256-YdY4SStXZGBBdAHdM3R/unco7ztxI3s0/buPSNSeh5o=";
 
     isUnstable = true;
   };