diff options
author | Robin Gloster <mail@glob.in> | 2015-12-26 01:09:00 +0000 |
---|---|---|
committer | Robin Gloster <mail@glob.in> | 2016-01-06 03:58:39 +0000 |
commit | 7d973a56d0a38b8b0bb7e1e715ca3e3ebcdb2ac3 (patch) | |
tree | 23f4b6bb170a576d0a29616d806167a691acf664 /nixos/modules/services/networking/wpa_supplicant.nix | |
parent | 2ee6396bf78f4a6cf8c4fb76f9b438b5d3d02186 (diff) | |
download | nixlib-7d973a56d0a38b8b0bb7e1e715ca3e3ebcdb2ac3.tar nixlib-7d973a56d0a38b8b0bb7e1e715ca3e3ebcdb2ac3.tar.gz nixlib-7d973a56d0a38b8b0bb7e1e715ca3e3ebcdb2ac3.tar.bz2 nixlib-7d973a56d0a38b8b0bb7e1e715ca3e3ebcdb2ac3.tar.lz nixlib-7d973a56d0a38b8b0bb7e1e715ca3e3ebcdb2ac3.tar.xz nixlib-7d973a56d0a38b8b0bb7e1e715ca3e3ebcdb2ac3.tar.zst nixlib-7d973a56d0a38b8b0bb7e1e715ca3e3ebcdb2ac3.zip |
wpa_supplicant module: remove obsolete option
networking.WLANInterface has been obsolete for years
Diffstat (limited to 'nixos/modules/services/networking/wpa_supplicant.nix')
-rw-r--r-- | nixos/modules/services/networking/wpa_supplicant.nix | 17 |
1 files changed, 3 insertions, 14 deletions
diff --git a/nixos/modules/services/networking/wpa_supplicant.nix b/nixos/modules/services/networking/wpa_supplicant.nix index 9e04bd401906..bef4b2bc0b99 100644 --- a/nixos/modules/services/networking/wpa_supplicant.nix +++ b/nixos/modules/services/networking/wpa_supplicant.nix @@ -3,14 +3,8 @@ with lib; let - cfg = config.networking.wireless; configFile = "/etc/wpa_supplicant.conf"; - - ifaces = - cfg.interfaces ++ - optional (config.networking.WLANInterface != "") config.networking.WLANInterface; - in { @@ -18,12 +12,6 @@ in ###### interface options = { - - networking.WLANInterface = mkOption { - default = ""; - description = "Obsolete. Use <option>networking.wireless.interfaces</option> instead."; - }; - networking.wireless = { enable = mkOption { type = types.bool; @@ -95,8 +83,9 @@ in services.dbus.packages = [ pkgs.wpa_supplicant ]; # FIXME: start a separate wpa_supplicant instance per interface. - jobs.wpa_supplicant = - { description = "WPA Supplicant"; + jobs.wpa_supplicant = let + ifaces = cfg.interfaces; + in { description = "WPA Supplicant"; wantedBy = [ "network.target" ]; |