From 05138d351d3fe86f7bb710846543d4ae2cbc1104 Mon Sep 17 00:00:00 2001
From: Mark Nipper <nipsy@bitgnome.net>
Date: Wed, 11 Dec 2024 23:09:13 -0800
Subject: Switch to ZFS 2.2.7 @{planets}

---
 hosts/jupiter/default.nix | 6 +++++-
 hosts/neptune/default.nix | 6 +++++-
 hosts/saturn/default.nix  | 6 +++++-
 hosts/uranus/default.nix  | 6 +++++-
 4 files changed, 20 insertions(+), 4 deletions(-)

diff --git a/hosts/jupiter/default.nix b/hosts/jupiter/default.nix
index 2486fb1..fb39743 100644
--- a/hosts/jupiter/default.nix
+++ b/hosts/jupiter/default.nix
@@ -4,13 +4,17 @@
     #kernel.sysctl = {
     #  "net.ipv4.ip_forward" = true;
     #};
+    kernelPackages = pkgs.master.linuxPackages_6_12;
     loader = {
       efi.canTouchEfiVariables = true;
       systemd-boot.enable = true;
       timeout = 3;
     };
     supportedFilesystems = [ "zfs" ];
-    zfs.devNodes = "/dev/disk/by-label";
+    zfs = {
+      devNodes = "/dev/disk/by-label";
+      package = pkgs.master.zfs;
+    };
   };
 
   environment.systemPackages = with pkgs; [
diff --git a/hosts/neptune/default.nix b/hosts/neptune/default.nix
index df17c49..8be9a8c 100644
--- a/hosts/neptune/default.nix
+++ b/hosts/neptune/default.nix
@@ -4,13 +4,17 @@
     #kernel.sysctl = {
     #  "net.ipv4.ip_forward" = true;
     #};
+    kernelPackages = pkgs.master.linuxPackages_6_12;
     loader = {
       efi.canTouchEfiVariables = true;
       systemd-boot.enable = true;
       timeout = 3;
     };
     supportedFilesystems = [ "zfs" ];
-    zfs.devNodes = "/dev/disk/by-label";
+    zfs = {
+      devNodes = "/dev/disk/by-label";
+      package = pkgs.master.zfs;
+    };
   };
 
   environment.systemPackages = with pkgs; [
diff --git a/hosts/saturn/default.nix b/hosts/saturn/default.nix
index 10e199d..ff51ac2 100644
--- a/hosts/saturn/default.nix
+++ b/hosts/saturn/default.nix
@@ -4,13 +4,17 @@
     #kernel.sysctl = {
     #  "net.ipv4.ip_forward" = true;
     #};
+    kernelPackages = pkgs.master.linuxPackages_6_12;
     loader = {
       efi.canTouchEfiVariables = true;
       systemd-boot.enable = true;
       timeout = 3;
     };
     supportedFilesystems = [ "zfs" ];
-    zfs.devNodes = "/dev/disk/by-label";
+    zfs = {
+      devNodes = "/dev/disk/by-label";
+      package = pkgs.master.zfs;
+    };
   };
 
   environment.systemPackages = with pkgs; [
diff --git a/hosts/uranus/default.nix b/hosts/uranus/default.nix
index 2256bc9..b7b3f35 100644
--- a/hosts/uranus/default.nix
+++ b/hosts/uranus/default.nix
@@ -4,13 +4,17 @@
     #kernel.sysctl = {
     #  "net.ipv4.ip_forward" = true;
     #};
+    kernelPackages = pkgs.master.linuxPackages_6_12;
     loader = {
       efi.canTouchEfiVariables = true;
       systemd-boot.enable = true;
       timeout = 3;
     };
     supportedFilesystems = [ "zfs" ];
-    zfs.devNodes = "/dev/disk/by-label";
+    zfs = {
+      devNodes = "/dev/disk/by-label";
+      package = pkgs.master.zfs;
+    };
   };
 
   environment.systemPackages = with pkgs; [
-- 
cgit v1.2.3