From a8f5f36adebf7ed25337651dbd80473d7696703d Mon Sep 17 00:00:00 2001
From: Mark Nipper <nipsy@bitgnome.net>
Date: Wed, 13 May 2026 21:41:38 -0700
Subject: Bump kernel to 7.0 and ZFS to master branch @caladan

---
 hosts/caladan/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/hosts/caladan/default.nix b/hosts/caladan/default.nix
index 48b91ed..47259bb 100644
--- a/hosts/caladan/default.nix
+++ b/hosts/caladan/default.nix
@@ -6,7 +6,7 @@
       "kernel.split_lock_mitigate" = 0; # https://lwn.net/Articles/911219/
       #"net.ipv4.tcp_congestion_control" = "reno";
     };
-    kernelPackages = pkgs.linuxPackages_6_18;
+    kernelPackages = pkgs.linuxPackages_7_0;
     #kernelParams = [
     #  "amdgpu.ppfeaturemask=0xfffd3fff"
     #  "split_lock_detect=off"
@@ -28,7 +28,7 @@
     supportedFilesystems = [ "zfs" ];
     zfs = {
       forceImportRoot = false;
-      package = pkgs.zfs_2_4;
+      package = pkgs.master.zfs_2_4;
     };
   };
 
@@ -46,7 +46,7 @@
     #pkgs.igir
     pkgs.kobodeluxe
     pkgs.linux-firmware
-    pkgs.linuxKernel.packages.linux_6_18.turbostat
+    pkgs.linuxKernel.packages.linux_7_0.turbostat
     pkgs.lrzsz
     pkgs.mailutils
     pkgs.minicom
-- 
cgit v1.3