about summary refs log tree commit diff
path: root/machines/devhell
diff options
context:
space:
mode:
authoraszlig <aszlig@nix.build>2021-11-22 20:39:57 +0100
committeraszlig <aszlig@nix.build>2021-11-22 20:39:57 +0100
commitca1270849ff0ea2a5a0ea318f5f6676f9294a933 (patch)
tree5db26a02e691840f64c87fb01d659f481755ff83 /machines/devhell
parent926d5f260a308c37f6c1e2fea44077c9ee1054e4 (diff)
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 <aszlig@nix.build>
Cc: @devhell
Diffstat (limited to 'machines/devhell')
-rw-r--r--machines/devhell/gunnr.nix3
1 files changed, 2 insertions, 1 deletions
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 = {