From ac50d8e7096fccad543940c4871f44af2729109e Mon Sep 17 00:00:00 2001 From: Svein Ove Aas Date: Sun, 28 Jul 2019 22:08:43 +0100 Subject: [PATCH 1/4] nixos/wpa_supplicant: Include CRDA regulatory database --- nixos/modules/services/networking/wpa_supplicant.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/modules/services/networking/wpa_supplicant.nix b/nixos/modules/services/networking/wpa_supplicant.nix index 0bd9edf4a41..63e59e7c8fa 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 From 7ee6226bdd25442cf56265d33d31a715742b45bc Mon Sep 17 00:00:00 2001 From: Svein Ove Aas Date: Sun, 28 Jul 2019 22:08:30 +0100 Subject: [PATCH 2/4] nixos/networkmanager: Include CRDA regulatory database --- nixos/modules/services/networking/networkmanager.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/networking/networkmanager.nix b/nixos/modules/services/networking/networkmanager.nix index ab6065b2008..551636a33d2 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; }; From 186dd1ce58387dd753dd9f7924cccf1034013297 Mon Sep 17 00:00:00 2001 From: Svein Ove Aas Date: Sun, 28 Jul 2019 22:17:10 +0100 Subject: [PATCH 3/4] nixos/gnome3: Include CRDA regulatory database --- nixos/modules/services/x11/desktop-managers/gnome3.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/x11/desktop-managers/gnome3.nix b/nixos/modules/services/x11/desktop-managers/gnome3.nix index 4a7a4804e1a..c4c742ed9d7 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; }; From d28a8cc4af639b5fe86904b0ba1832c3cb8eb803 Mon Sep 17 00:00:00 2001 From: Svein Ove Aas Date: Sun, 28 Jul 2019 22:17:19 +0100 Subject: [PATCH 4/4] nixos/pantheon: Include CRDA regulatory database --- nixos/modules/services/x11/desktop-managers/pantheon.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/x11/desktop-managers/pantheon.nix b/nixos/modules/services/x11/desktop-managers/pantheon.nix index 41903b33fae..e27a479adad 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; };