summary refs log tree commit diff
path: root/modules/services/networking/wpa_supplicant.nix
diff options
context:
space:
mode:
authorEelco Dolstra <eelco.dolstra@logicblox.com>2009-10-12 17:27:57 +0000
committerEelco Dolstra <eelco.dolstra@logicblox.com>2009-10-12 17:27:57 +0000
commitd982f23f2052cca8e03cb21e3f0c7ff639d369d0 (patch)
tree10cb3b88ae23d068d6975a031b1839eadee2a207 /modules/services/networking/wpa_supplicant.nix
parent9943e0762e1589e37c3653c3812967f303225277 (diff)
downloadnixpkgs-d982f23f2052cca8e03cb21e3f0c7ff639d369d0.tar
nixpkgs-d982f23f2052cca8e03cb21e3f0c7ff639d369d0.tar.gz
nixpkgs-d982f23f2052cca8e03cb21e3f0c7ff639d369d0.tar.bz2
nixpkgs-d982f23f2052cca8e03cb21e3f0c7ff639d369d0.tar.lz
nixpkgs-d982f23f2052cca8e03cb21e3f0c7ff639d369d0.tar.xz
nixpkgs-d982f23f2052cca8e03cb21e3f0c7ff639d369d0.tar.zst
nixpkgs-d982f23f2052cca8e03cb21e3f0c7ff639d369d0.zip
* Convert the remaining jobs to jobAttrs style.
svn path=/nixos/trunk/; revision=17764
Diffstat (limited to 'modules/services/networking/wpa_supplicant.nix')
-rw-r--r--modules/services/networking/wpa_supplicant.nix14
1 files changed, 7 insertions, 7 deletions
diff --git a/modules/services/networking/wpa_supplicant.nix b/modules/services/networking/wpa_supplicant.nix
index 309305481ee..c566452f9f7 100644
--- a/modules/services/networking/wpa_supplicant.nix
+++ b/modules/services/networking/wpa_supplicant.nix
@@ -1,4 +1,6 @@
-{pkgs, config, ...}:
+{ config, pkgs, ... }:
+
+with pkgs.lib;
 
 let
 
@@ -12,7 +14,7 @@ in
 
   options = {
   
-    networking.enableWLAN = pkgs.lib.mkOption {
+    networking.enableWLAN = mkOption {
       default = false;
       description = ''
         Whether to start <command>wpa_supplicant</command> to scan for
@@ -31,14 +33,12 @@ in
 
   ###### implementation
   
-  config = pkgs.lib.mkIf config.networking.enableWLAN {
+  config = mkIf config.networking.enableWLAN {
 
     environment.systemPackages = [pkgs.wpa_supplicant];
 
-    jobs = pkgs.lib.singleton
-      { name = "wpa_supplicant";
-
-        startOn = "network-interfaces/started";
+    jobAttrs.wpa_supplicant = 
+      { startOn = "network-interfaces/started";
         stopOn = "network-interfaces/stop";
 
         preStart =