about summary refs log tree commit diff
path: root/pkgs/os-specific
diff options
context:
space:
mode:
authorgithub-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>2024-02-25 00:02:21 +0000
committerGitHub <noreply@github.com>2024-02-25 00:02:21 +0000
commit9261fbbb673d08dec19e7aed68ae692f268db6ad (patch)
tree8aabaaedbcec6bd3b628da802fba8b8cc0f6943e /pkgs/os-specific
parentb9a08a7a0312c2d57883d81884d091297b7f298a (diff)
parent7794d8a78570335f10b0f97ae72b14b33c6addc2 (diff)
downloadnixlib-9261fbbb673d08dec19e7aed68ae692f268db6ad.tar
nixlib-9261fbbb673d08dec19e7aed68ae692f268db6ad.tar.gz
nixlib-9261fbbb673d08dec19e7aed68ae692f268db6ad.tar.bz2
nixlib-9261fbbb673d08dec19e7aed68ae692f268db6ad.tar.lz
nixlib-9261fbbb673d08dec19e7aed68ae692f268db6ad.tar.xz
nixlib-9261fbbb673d08dec19e7aed68ae692f268db6ad.tar.zst
nixlib-9261fbbb673d08dec19e7aed68ae692f268db6ad.zip
Merge master into staging-next
Diffstat (limited to 'pkgs/os-specific')
-rw-r--r--pkgs/os-specific/linux/zfs/stable.nix8
1 files changed, 4 insertions, 4 deletions
diff --git a/pkgs/os-specific/linux/zfs/stable.nix b/pkgs/os-specific/linux/zfs/stable.nix
index 5f879320b4dc..df06ea9a3285 100644
--- a/pkgs/os-specific/linux/zfs/stable.nix
+++ b/pkgs/os-specific/linux/zfs/stable.nix
@@ -17,20 +17,20 @@ callPackage ./generic.nix args {
   # check the release notes for compatible kernels
   kernelCompatible =
     if stdenv'.isx86_64 || removeLinuxDRM
-    then kernel.kernelOlder "6.7"
+    then kernel.kernelOlder "6.8"
     else kernel.kernelOlder "6.2";
 
   latestCompatibleLinuxPackages = if stdenv'.isx86_64 || removeLinuxDRM
-    then linuxKernel.packages.linux_6_6
+    then linuxKernel.packages.linux_6_7
     else linuxKernel.packages.linux_6_1;
 
   # this package should point to the latest release.
-  version = "2.2.2";
+  version = "2.2.3";
 
   tests = [
     nixosTests.zfs.installer
     nixosTests.zfs.stable
   ];
 
-  hash = "sha256-CqhETAwhWMhbld5ib3Rz1dxms+GQbLwjEZw/V7U/2nE=";
+  hash = "sha256-Bzkow15OitUUQ+mTYhCXgTrQl+ao/B4feleHY/rSSjg=";
 }