diff options
author | Shea Levy <shea@shealevy.com> | 2014-05-05 14:58:51 -0400 |
---|---|---|
committer | Shea Levy <shea@shealevy.com> | 2014-07-02 12:28:18 -0400 |
commit | b3cfb9084b3860852581be235aea90540a5302d4 (patch) | |
tree | 06cf1333ae7d60f25bd23866dbaec17b148a15dd /nixos/modules/services/networking | |
parent | 80709b141ca82d5afe3874f50b822db3409bed4e (diff) | |
download | nixlib-b3cfb9084b3860852581be235aea90540a5302d4.tar nixlib-b3cfb9084b3860852581be235aea90540a5302d4.tar.gz nixlib-b3cfb9084b3860852581be235aea90540a5302d4.tar.bz2 nixlib-b3cfb9084b3860852581be235aea90540a5302d4.tar.lz nixlib-b3cfb9084b3860852581be235aea90540a5302d4.tar.xz nixlib-b3cfb9084b3860852581be235aea90540a5302d4.tar.zst nixlib-b3cfb9084b3860852581be235aea90540a5302d4.zip |
Get all lib functions from lib, not pkgs.lib, in modules
Diffstat (limited to 'nixos/modules/services/networking')
-rw-r--r-- | nixos/modules/services/networking/connman.nix | 2 | ||||
-rw-r--r-- | nixos/modules/services/networking/ddclient.nix | 4 | ||||
-rw-r--r-- | nixos/modules/services/networking/dhcpd.nix | 2 | ||||
-rw-r--r-- | nixos/modules/services/networking/gvpe.nix | 4 | ||||
-rw-r--r-- | nixos/modules/services/networking/networkmanager.nix | 4 | ||||
-rw-r--r-- | nixos/modules/services/networking/notbit.nix | 2 | ||||
-rw-r--r-- | nixos/modules/services/networking/nsd.nix | 4 | ||||
-rw-r--r-- | nixos/modules/services/networking/teamspeak3.nix | 4 |
8 files changed, 13 insertions, 13 deletions
diff --git a/nixos/modules/services/networking/connman.nix b/nixos/modules/services/networking/connman.nix index 7ed1e4805d8f..482b61997ae1 100644 --- a/nixos/modules/services/networking/connman.nix +++ b/nixos/modules/services/networking/connman.nix @@ -1,7 +1,7 @@ { config, lib, pkgs, ... }: -with lib; with pkgs; +with lib; let cfg = config.networking.connman; diff --git a/nixos/modules/services/networking/ddclient.nix b/nixos/modules/services/networking/ddclient.nix index c53cb68fb75f..bb94a8dacfa2 100644 --- a/nixos/modules/services/networking/ddclient.nix +++ b/nixos/modules/services/networking/ddclient.nix @@ -1,8 +1,8 @@ -{ config, pkgs, ... }: +{ config, pkgs, lib, ... }: let - inherit (pkgs.lib) mkOption mkIf singleton; + inherit (lib) mkOption mkIf singleton; inherit (pkgs) ddclient; diff --git a/nixos/modules/services/networking/dhcpd.nix b/nixos/modules/services/networking/dhcpd.nix index 89f686c28703..e5e1c103c686 100644 --- a/nixos/modules/services/networking/dhcpd.nix +++ b/nixos/modules/services/networking/dhcpd.nix @@ -18,7 +18,7 @@ let ${cfg.extraConfig} - ${pkgs.lib.concatMapStrings + ${lib.concatMapStrings (machine: '' host ${machine.hostName} { hardware ethernet ${machine.ethernetAddress}; diff --git a/nixos/modules/services/networking/gvpe.nix b/nixos/modules/services/networking/gvpe.nix index 594a2e80f345..c633ffedef49 100644 --- a/nixos/modules/services/networking/gvpe.nix +++ b/nixos/modules/services/networking/gvpe.nix @@ -1,9 +1,9 @@ # GNU Virtual Private Ethernet -{config, pkgs, ...}: +{config, pkgs, lib, ...}: let - inherit (pkgs.lib) mkOption mkIf; + inherit (lib) mkOption mkIf; cfg = config.services.gvpe; diff --git a/nixos/modules/services/networking/networkmanager.nix b/nixos/modules/services/networking/networkmanager.nix index 54bdf19373d5..bc1c95d3fd36 100644 --- a/nixos/modules/services/networking/networkmanager.nix +++ b/nixos/modules/services/networking/networkmanager.nix @@ -1,7 +1,7 @@ { config, lib, pkgs, ... }: -with lib; with pkgs; +with lib; let cfg = config.networking.networkmanager; @@ -151,7 +151,7 @@ in { { source = "${networkmanager_pptp}/etc/NetworkManager/VPN/nm-pptp-service.name"; target = "NetworkManager/VPN/nm-pptp-service.name"; } - ] ++ pkgs.lib.optional (cfg.appendNameservers == [] || cfg.insertNameservers == []) + ] ++ optional (cfg.appendNameservers == [] || cfg.insertNameservers == []) { source = overrideNameserversScript; target = "NetworkManager/dispatcher.d/02overridedns"; }; diff --git a/nixos/modules/services/networking/notbit.nix b/nixos/modules/services/networking/notbit.nix index 3e8c956f191e..2e1412ff7c83 100644 --- a/nixos/modules/services/networking/notbit.nix +++ b/nixos/modules/services/networking/notbit.nix @@ -1,6 +1,6 @@ { config, lib, pkgs, ... }: -with pkgs.lib; +with lib; let cfg = config.services.notbit; varDir = "/var/lib/notbit"; diff --git a/nixos/modules/services/networking/nsd.nix b/nixos/modules/services/networking/nsd.nix index adfee1caec58..db8cb1228719 100644 --- a/nixos/modules/services/networking/nsd.nix +++ b/nixos/modules/services/networking/nsd.nix @@ -1,6 +1,6 @@ -{ config, pkgs, ... }: +{ config, pkgs, lib, ... }: -with pkgs.lib; +with lib; let cfg = config.services.nsd; diff --git a/nixos/modules/services/networking/teamspeak3.nix b/nixos/modules/services/networking/teamspeak3.nix index 2d3478d52f83..b3656d73dec0 100644 --- a/nixos/modules/services/networking/teamspeak3.nix +++ b/nixos/modules/services/networking/teamspeak3.nix @@ -1,6 +1,6 @@ -{ config, pkgs, ... }: +{ config, lib, pkgs, ... }: -with pkgs.lib; +with lib; let ts3 = pkgs.teamspeak_server; |