From 409317adb30b74fbf552294eae3760f2bbb85283 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Wed, 17 Dec 2025 19:08:38 +0100 Subject: [PATCH] linux/common-config: fix for Linux 5.10.y on aarch64 Until 5.15, HYPERV only supports x86, so forcing module broke configuration of 5.10 on aarch64. Our kernel configuration script sets every module it can to "m" anyway, so it was redundant and breakage-prone to set any value here for pre-6.18. I've confiremd that HYPERV is still set to "m" on 6.12 after this change. Fixes: e9b977bc41dc ("linux/common-config: update for 6.18") --- pkgs/os-specific/linux/kernel/common-config.nix | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix index 5f285fa3eb5f..c41023c8cd4d 100644 --- a/pkgs/os-specific/linux/kernel/common-config.nix +++ b/pkgs/os-specific/linux/kernel/common-config.nix @@ -567,10 +567,7 @@ let (stdenv.hostPlatform.system == "x86_64-linux" || stdenv.hostPlatform.system == "aarch64-linux") { # Enable Hyper-V guest stuff - HYPERV = lib.mkMerge [ - (whenOlder "6.18" module) - (whenAtLeast "6.18" yes) - ]; + HYPERV = whenAtLeast "6.18" yes; # Enable Hyper-V Synthetic DRM Driver DRM_HYPERV = whenAtLeast "5.14" module; # And disable the legacy framebuffer driver when we have the new one