From e1f0179e3bc06e18e812990eabdb85acf13d89f0 Mon Sep 17 00:00:00 2001 From: Infinidoge Date: Wed, 25 Sep 2024 00:56:51 -0400 Subject: [PATCH] hosts/*: remove deprecated zfs.latestCompatiblePackages --- hosts/Infini-DL360/disks.nix | 4 ++-- hosts/Infini-SD/default.nix | 4 ++-- hosts/Infini-STICK/default.nix | 4 ++-- modules/global/packages.nix | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/hosts/Infini-DL360/disks.nix b/hosts/Infini-DL360/disks.nix index 9c5f6c0..505a0be 100644 --- a/hosts/Infini-DL360/disks.nix +++ b/hosts/Infini-DL360/disks.nix @@ -1,4 +1,4 @@ -{ config, lib, ... }: +{ pkgs, lib, ... }: with lib.our.disko; let inherit (builtins) mapAttrs; @@ -6,7 +6,7 @@ let mountOptions = defaultMountOptions; in { - boot.kernelPackages = lib.mkForce config.boot.zfs.package.latestCompatibleLinuxPackages; + boot.kernelPackages = pkgs.linuxPackages; boot.zfs.extraPools = [ "zssd" "zhdd" ]; diff --git a/hosts/Infini-SD/default.nix b/hosts/Infini-SD/default.nix index 070c631..0a1b955 100644 --- a/hosts/Infini-SD/default.nix +++ b/hosts/Infini-SD/default.nix @@ -1,4 +1,4 @@ -{ lib, config, ... }: { +{ lib, config, pkgs, ... }: { imports = [ ./hardware-configuration.nix ./filesystems.nix @@ -6,7 +6,7 @@ networking.hostId = "3275c7d3"; - boot.kernelPackages = lib.mkForce config.boot.zfs.package.latestCompatibleLinuxPackages; + boot.kernelPackages = pkgs.linuxPackages; hardware.infiniband = { enable = true; diff --git a/hosts/Infini-STICK/default.nix b/hosts/Infini-STICK/default.nix index 1705892..780e26b 100644 --- a/hosts/Infini-STICK/default.nix +++ b/hosts/Infini-STICK/default.nix @@ -1,4 +1,4 @@ -{ lib, config, ... }: { +{ lib, config, pkgs, ... }: { imports = [ ./hardware-configuration.nix ./filesystems.nix @@ -7,7 +7,7 @@ system.stateVersion = "24.11"; networking.hostId = "06a3f197"; - boot.kernelPackages = lib.mkForce config.boot.zfs.package.latestCompatibleLinuxPackages; + boot.kernelPackages = pkgs.linuxPackages; modules = { hardware = { diff --git a/modules/global/packages.nix b/modules/global/packages.nix index 4e6303f..cf1d094 100644 --- a/modules/global/packages.nix +++ b/modules/global/packages.nix @@ -1,7 +1,7 @@ { config, pkgs, lib, ... }: { # Use the latest Linux kernel - boot.kernelPackages = pkgs.linuxPackages_latest; + boot.kernelPackages = lib.mkDefault pkgs.linuxPackages_latest; # Remove all default packages environment.defaultPackages = lib.mkForce [ ];