From 7d973a56d0a38b8b0bb7e1e715ca3e3ebcdb2ac3 Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Sat, 26 Dec 2015 01:09:00 +0000
Subject: [PATCH] wpa_supplicant module: remove obsolete option

networking.WLANInterface has been obsolete for years
---
 .../services/networking/wpa_supplicant.nix      | 17 +++--------------
 1 file changed, 3 insertions(+), 14 deletions(-)

diff --git a/nixos/modules/services/networking/wpa_supplicant.nix b/nixos/modules/services/networking/wpa_supplicant.nix
index 9e04bd40190..bef4b2bc0b9 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" ];