summary refs log tree commit diff
path: root/pkgs/os-specific
diff options
context:
space:
mode:
authorMaximilian Bosch <maximilian@mbosch.me>2023-01-23 10:30:56 +0100
committerGitHub <noreply@github.com>2023-01-23 10:30:56 +0100
commit18fb9f9d9d91d5b90f022fe9da0cf048d52b9989 (patch)
tree45ff60ac07a35bc41098f04d37c2aadff48669fa /pkgs/os-specific
parent5fa6306fd5690439a3b8358e3cfd11c6d4341b50 (diff)
parent12cb062985575535fd4d6514cbce74b1f086bc29 (diff)
downloadnixpkgs-18fb9f9d9d91d5b90f022fe9da0cf048d52b9989.tar
nixpkgs-18fb9f9d9d91d5b90f022fe9da0cf048d52b9989.tar.gz
nixpkgs-18fb9f9d9d91d5b90f022fe9da0cf048d52b9989.tar.bz2
nixpkgs-18fb9f9d9d91d5b90f022fe9da0cf048d52b9989.tar.lz
nixpkgs-18fb9f9d9d91d5b90f022fe9da0cf048d52b9989.tar.xz
nixpkgs-18fb9f9d9d91d5b90f022fe9da0cf048d52b9989.tar.zst
nixpkgs-18fb9f9d9d91d5b90f022fe9da0cf048d52b9989.zip
Merge pull request #211886 from toastal/zfs-2.1.8
zfs: 2.1.7 → 2.1.8
Diffstat (limited to 'pkgs/os-specific')
-rw-r--r--pkgs/os-specific/linux/zfs/default.nix20
1 files changed, 10 insertions, 10 deletions
diff --git a/pkgs/os-specific/linux/zfs/default.nix b/pkgs/os-specific/linux/zfs/default.nix
index af13f856027..481827474ee 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_6_0 ? pkgs.linuxKernel.packages.linux_6_0
+, linuxPackages_6_1 ? pkgs.linuxKernel.packages.linux_6_1
 }:
 
 let
@@ -222,28 +222,28 @@ in {
   # to be adapted
   zfsStable = common {
     # check the release notes for compatible kernels
-    kernelCompatible = kernel.kernelOlder "6.1";
-    latestCompatibleLinuxPackages = linuxPackages_6_0;
+    kernelCompatible = kernel.kernelOlder "6.2";
+    latestCompatibleLinuxPackages = linuxPackages_6_1;
 
     # this package should point to the latest release.
-    version = "2.1.7";
+    version = "2.1.8";
 
-    sha256 = "sha256-vLm6RE11nqOCoYXne79JU3nUQnVEUNbwrULwFfghWcI=";
+    sha256 = "sha256-/+23SEtywa7b1dgvQNmEGrfqXzM1mlk00TSpuiCkQOk=";
   };
 
   zfsUnstable = common {
     # check the release notes for compatible kernels
-    kernelCompatible = kernel.kernelOlder "6.1";
-    latestCompatibleLinuxPackages = linuxPackages_6_0;
+    kernelCompatible = kernel.kernelOlder "6.2";
+    latestCompatibleLinuxPackages = linuxPackages_6_1;
 
     # 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.8-staging-2023-01-10";
-    rev = "0156253d29a303bdcca3e535958e754d8f086e33";
+    version = "2.1.9-staging-2023-01-19";
+    rev = "04b02785b67f9b976c43643dd52ce6cdbc22e11e";
 
-    sha256 = "sha256-2+vymBesmNLB3fuaCwQOojEzn3aYqtxIo35MvlwOoNw=";
+    sha256 = "sha256-/+23SEtywa7b1dgvQNmEGrfqXzM1mlk00TSpuiCkQOk=";
 
     isUnstable = true;
   };