public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #65335 from Baughn/wifi-crda

Browse Source 
wifi: Include CRDA regulatory database
This commit is contained in:
Jörg Thalheim
2019-07-29 07:02:22 +01:00
committed by GitHub
parent 232df51ea8 d28a8cc4af
commit 3b0f0741ea
4 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
nixos/modules/services/networking/networkmanager.nix
+1 -1
View File
@@ -177,7 +177,7 @@ in {
basePackages = mkOption {
type = types.attrsOf types.package;
default = { inherit (pkgs)
networkmanager modemmanager wpa_supplicant
networkmanager modemmanager wpa_supplicant crda
networkmanager-openvpn networkmanager-vpnc
networkmanager-openconnect networkmanager-fortisslvpn
networkmanager-l2tp networkmanager-iodine; };
nixos/modules/services/networking/wpa_supplicant.nix
+1
View File
@@ -204,6 +204,7 @@ in {
environment.systemPackages = [ pkgs.wpa_supplicant ];
services.dbus.packages = [ pkgs.wpa_supplicant ];
services.udev.packages = [ pkgs.crda ];
# FIXME: start a separate wpa_supplicant instance per interface.
systemd.services.wpa_supplicant = let
nixos/modules/services/x11/desktop-managers/gnome3.nix
+1 -1
View File
@@ -229,7 +229,7 @@ in {
# Use the correct gnome3 packageSet
networking.networkmanager.basePackages =
{ inherit (pkgs) networkmanager modemmanager wpa_supplicant;
{ inherit (pkgs) networkmanager modemmanager wpa_supplicant crda;
inherit (pkgs.gnome3) networkmanager-openvpn networkmanager-vpnc
networkmanager-openconnect networkmanager-fortisslvpn
networkmanager-iodine networkmanager-l2tp; };
nixos/modules/services/x11/desktop-managers/pantheon.nix
+1 -1
View File
@@ -147,7 +147,7 @@ in
networking.networkmanager.enable = mkDefault true;
networking.networkmanager.basePackages =
{ inherit (pkgs) networkmanager modemmanager wpa_supplicant;
{ inherit (pkgs) networkmanager modemmanager wpa_supplicant crda;
inherit (pkgs.gnome3) networkmanager-openvpn networkmanager-vpnc
networkmanager-openconnect networkmanager-fortisslvpn
networkmanager-iodine networkmanager-l2tp; };