From ca1270849ff0ea2a5a0ea318f5f6676f9294a933 Mon Sep 17 00:00:00 2001 From: aszlig Date: Mon, 22 Nov 2021 20:39:57 +0100 Subject: machines/gunnr: Fix evaluation of kernelPackages The boot.kernelPackages option is already defined in devhell/profiles/base.nix to be linuxPackages_latest with the same priority (100) as in the machine configuration of "gunnr". While generally I leave it for respective owners of the machine configuration to fix, this however breaks evaluation of all of our tests. Given that "latestCompatibleLinuxPackages" is used on a ZFS system, I assume that this is what the author wanted with higher priority back in 678754b4a5ac5a468e2223e1b701b8e9e2375c30. Signed-off-by: aszlig Cc: @devhell --- machines/devhell/gunnr.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'machines/devhell') diff --git a/machines/devhell/gunnr.nix b/machines/devhell/gunnr.nix index 3ca2a195..fd695214 100644 --- a/machines/devhell/gunnr.nix +++ b/machines/devhell/gunnr.nix @@ -31,7 +31,8 @@ kernelModules = [ "kvm-amd" ]; extraModulePackages = [ ]; blacklistedKernelModules = [ ]; - kernelPackages = config.boot.zfs.package.latestCompatibleLinuxPackages; + kernelPackages = lib.mkForce + config.boot.zfs.package.latestCompatibleLinuxPackages; }; hardware = { -- cgit 1.4.1