From d735743b3984a9b0a0808adab35ccc8c174bdd95 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Tue, 24 Jun 2025 12:41:55 +0200 Subject: [PATCH] linux/common-config: enable AX25 This will allow dropping the linuxPackages_ham variant. Fedora sets these in their default kernel, so I don't anticipate any problem with us doing the same. Tested building linux_5_4, linux, and linux_latest on x86_64. --- nixos/tests/ax25.nix | 1 - pkgs/os-specific/linux/kernel/common-config.nix | 4 ++++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/nixos/tests/ax25.nix b/nixos/tests/ax25.nix index df4e3de04cb1..abfa003a077e 100644 --- a/nixos/tests/ax25.nix +++ b/nixos/tests/ax25.nix @@ -7,7 +7,6 @@ let socatPort = 1234; createAX25Node = nodeId: { - boot.kernelPackages = pkgs.linuxPackages_ham; boot.kernelModules = [ "ax25" ]; networking.firewall.allowedTCPPorts = [ socatPort ]; diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix index 2e233e073177..0408659f19c6 100644 --- a/pkgs/os-specific/linux/kernel/common-config.nix +++ b/pkgs/os-specific/linux/kernel/common-config.nix @@ -398,6 +398,10 @@ let # Enable debugfs for wireless drivers CFG80211_DEBUGFS = yes; MAC80211_DEBUGFS = yes; + + # HAM radio + HAMRADIO = yes; + AX25 = module; } // lib.optionalAttrs (stdenv.hostPlatform.system == "aarch64-linux") { # Not enabled by default, hides modules behind it