diff options
| author | Jörg Thalheim <Mic92@users.noreply.github.com> | 2019-07-29 07:02:22 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-07-29 07:02:22 +0100 |
| commit | 3b0f0741eaa6b4b36127a11a8838cb11de94fc8e (patch) | |
| tree | 6caaf4cade7143c60aac6eae1585855f6dc13bab /nixos/modules/services | |
| parent | 232df51ea80e9401010d91502dab0062efa0cec4 (diff) | |
| parent | d28a8cc4af639b5fe86904b0ba1832c3cb8eb803 (diff) | |
| download | nixlib-3b0f0741eaa6b4b36127a11a8838cb11de94fc8e.tar nixlib-3b0f0741eaa6b4b36127a11a8838cb11de94fc8e.tar.gz nixlib-3b0f0741eaa6b4b36127a11a8838cb11de94fc8e.tar.bz2 nixlib-3b0f0741eaa6b4b36127a11a8838cb11de94fc8e.tar.lz nixlib-3b0f0741eaa6b4b36127a11a8838cb11de94fc8e.tar.xz nixlib-3b0f0741eaa6b4b36127a11a8838cb11de94fc8e.tar.zst nixlib-3b0f0741eaa6b4b36127a11a8838cb11de94fc8e.zip | |
Merge pull request #65335 from Baughn/wifi-crda
wifi: Include CRDA regulatory database
Diffstat (limited to 'nixos/modules/services')
4 files changed, 4 insertions, 3 deletions
diff --git a/nixos/modules/services/networking/networkmanager.nix b/nixos/modules/services/networking/networkmanager.nix index ab6065b2008d..551636a33d25 100644 --- a/nixos/modules/services/networking/networkmanager.nix +++ b/nixos/modules/services/networking/networkmanager.nix @@ -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; }; diff --git a/nixos/modules/services/networking/wpa_supplicant.nix b/nixos/modules/services/networking/wpa_supplicant.nix index 0bd9edf4a41c..63e59e7c8fac 100644 --- a/nixos/modules/services/networking/wpa_supplicant.nix +++ b/nixos/modules/services/networking/wpa_supplicant.nix @@ -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 diff --git a/nixos/modules/services/x11/desktop-managers/gnome3.nix b/nixos/modules/services/x11/desktop-managers/gnome3.nix index 4a7a4804e1aa..c4c742ed9d7f 100644 --- a/nixos/modules/services/x11/desktop-managers/gnome3.nix +++ b/nixos/modules/services/x11/desktop-managers/gnome3.nix @@ -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; }; diff --git a/nixos/modules/services/x11/desktop-managers/pantheon.nix b/nixos/modules/services/x11/desktop-managers/pantheon.nix index 41903b33fae9..e27a479adadd 100644 --- a/nixos/modules/services/x11/desktop-managers/pantheon.nix +++ b/nixos/modules/services/x11/desktop-managers/pantheon.nix @@ -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; }; |