diff options
author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2021-07-27 18:01:01 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-07-27 18:01:01 +0000 |
commit | db6a26db02044f51f34029f43f4a585ff555e669 (patch) | |
tree | 8947fad04b6bb1794606e14813ed9307764d7422 /nixos/modules/services/networking | |
parent | 2692c2e4277b0b1b3b01299462f238efccba91e2 (diff) | |
parent | 407ef1dc6f91f9ecf7f61e4dfaedcde052f2bd17 (diff) | |
download | nixpkgs-db6a26db02044f51f34029f43f4a585ff555e669.tar nixpkgs-db6a26db02044f51f34029f43f4a585ff555e669.tar.gz nixpkgs-db6a26db02044f51f34029f43f4a585ff555e669.tar.bz2 nixpkgs-db6a26db02044f51f34029f43f4a585ff555e669.tar.lz nixpkgs-db6a26db02044f51f34029f43f4a585ff555e669.tar.xz nixpkgs-db6a26db02044f51f34029f43f4a585ff555e669.tar.zst nixpkgs-db6a26db02044f51f34029f43f4a585ff555e669.zip |
Merge master into staging-next
Diffstat (limited to 'nixos/modules/services/networking')
-rw-r--r-- | nixos/modules/services/networking/networkmanager.nix | 3 | ||||
-rw-r--r-- | nixos/modules/services/networking/wpa_supplicant.nix | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/nixos/modules/services/networking/networkmanager.nix b/nixos/modules/services/networking/networkmanager.nix index 4be9fc952a8..c8861171dd6 100644 --- a/nixos/modules/services/networking/networkmanager.nix +++ b/nixos/modules/services/networking/networkmanager.nix @@ -6,7 +6,6 @@ let cfg = config.networking.networkmanager; basePackages = with pkgs; [ - crda modemmanager networkmanager networkmanager-fortisslvpn @@ -414,6 +413,8 @@ in { } ]; + hardware.wirelessRegulatoryDatabase = true; + environment.etc = with pkgs; { "NetworkManager/NetworkManager.conf".source = configFile; diff --git a/nixos/modules/services/networking/wpa_supplicant.nix b/nixos/modules/services/networking/wpa_supplicant.nix index c0a4ce40760..494d21cc867 100644 --- a/nixos/modules/services/networking/wpa_supplicant.nix +++ b/nixos/modules/services/networking/wpa_supplicant.nix @@ -241,7 +241,8 @@ in { environment.systemPackages = [ package ]; services.dbus.packages = [ package ]; - services.udev.packages = [ pkgs.crda ]; + + hardware.wirelessRegulatoryDatabase = true; # FIXME: start a separate wpa_supplicant instance per interface. systemd.services.wpa_supplicant = let |