Clone of https://github.com/NixOS/nixpkgs.git (to stress-test knotserver)

Merge pull request #121530 from symphorien/wifireg

nixos: add option to load wireless regulatory database as firmware

authored by Guillaume Girol and committed by GitHub 407ef1dc 9b3caf1d

+16 -2
+12
nixos/modules/hardware/all-firmware.nix
··· 35 ''; 36 }; 37 38 }; 39 40 ··· 58 ++ optionals (versionOlder config.boot.kernelPackages.kernel.version "4.13") [ 59 rtl8723bs-firmware 60 ]; 61 }) 62 (mkIf cfg.enableAllFirmware { 63 assertions = [{ ··· 74 b43Firmware_6_30_163_46 75 b43FirmwareCutter 76 ] ++ optional (pkgs.stdenv.hostPlatform.isi686 || pkgs.stdenv.hostPlatform.isx86_64) facetimehd-firmware; 77 }) 78 ]; 79 }
··· 35 ''; 36 }; 37 38 + hardware.wirelessRegulatoryDatabase = mkOption { 39 + default = false; 40 + type = types.bool; 41 + description = '' 42 + Load the wireless regulatory database at boot. 43 + ''; 44 + }; 45 + 46 }; 47 48 ··· 66 ++ optionals (versionOlder config.boot.kernelPackages.kernel.version "4.13") [ 67 rtl8723bs-firmware 68 ]; 69 + hardware.wirelessRegulatoryDatabase = true; 70 }) 71 (mkIf cfg.enableAllFirmware { 72 assertions = [{ ··· 83 b43Firmware_6_30_163_46 84 b43FirmwareCutter 85 ] ++ optional (pkgs.stdenv.hostPlatform.isi686 || pkgs.stdenv.hostPlatform.isx86_64) facetimehd-firmware; 86 + }) 87 + (mkIf cfg.wirelessRegulatoryDatabase { 88 + hardware.firmware = [ pkgs.wireless-regdb ]; 89 }) 90 ]; 91 }
+2 -1
nixos/modules/services/networking/networkmanager.nix
··· 6 cfg = config.networking.networkmanager; 7 8 basePackages = with pkgs; [ 9 - crda 10 modemmanager 11 networkmanager 12 networkmanager-fortisslvpn ··· 403 ''; 404 } 405 ]; 406 407 environment.etc = with pkgs; { 408 "NetworkManager/NetworkManager.conf".source = configFile;
··· 6 cfg = config.networking.networkmanager; 7 8 basePackages = with pkgs; [ 9 modemmanager 10 networkmanager 11 networkmanager-fortisslvpn ··· 402 ''; 403 } 404 ]; 405 + 406 + hardware.wirelessRegulatoryDatabase = true; 407 408 environment.etc = with pkgs; { 409 "NetworkManager/NetworkManager.conf".source = configFile;
+2 -1
nixos/modules/services/networking/wpa_supplicant.nix
··· 241 environment.systemPackages = [ package ]; 242 243 services.dbus.packages = [ package ]; 244 - services.udev.packages = [ pkgs.crda ]; 245 246 # FIXME: start a separate wpa_supplicant instance per interface. 247 systemd.services.wpa_supplicant = let
··· 241 environment.systemPackages = [ package ]; 242 243 services.dbus.packages = [ package ]; 244 + 245 + hardware.wirelessRegulatoryDatabase = true; 246 247 # FIXME: start a separate wpa_supplicant instance per interface. 248 systemd.services.wpa_supplicant = let