From 482fbb9834ecf9621b1370664d56a01802cd8034 Mon Sep 17 00:00:00 2001 From: Mark Nipper Date: Thu, 12 Dec 2024 09:06:06 -0800 Subject: Switch to ZFS 2.2.7 @{kaitain,richese} --- hosts/kaitain/default.nix | 7 +++++-- hosts/richese/default.nix | 7 +++++-- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/hosts/kaitain/default.nix b/hosts/kaitain/default.nix index 72aadff..573777a 100644 --- a/hosts/kaitain/default.nix +++ b/hosts/kaitain/default.nix @@ -1,14 +1,17 @@ { config, inputs, lib, outputs, pkgs, ... }: { boot = { initrd.kernelModules = [ "zfs" ]; - #kernelPackages = pkgs.linuxPackages_6_10; + 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/richese/default.nix b/hosts/richese/default.nix index d612b07..15f58b3 100644 --- a/hosts/richese/default.nix +++ b/hosts/richese/default.nix @@ -1,10 +1,13 @@ { config, inputs, lib, outputs, pkgs, ... }: { boot = { initrd.kernelModules = [ "zfs" ]; - #kernelPackages = pkgs.linuxPackages_6_10; + kernelPackages = pkgs.master.linuxPackages_6_12; loader.grub.enable = true; 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