diff options
author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2014-07-07 13:16:26 +0200 |
---|---|---|
committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2014-07-07 13:16:26 +0200 |
commit | 95b828de42adaa2f825e5588d1cccb0d6398b20a (patch) | |
tree | abfa4798c91b9932173212e7fbc6e5f7bd85f5d6 /nixos/modules/config | |
parent | 421ce6439c2e685065fe9c256b751225de51e0b3 (diff) | |
parent | 1ecae5c2c123c0ca615d011b9ce32f501198e7c4 (diff) | |
download | nixlib-95b828de42adaa2f825e5588d1cccb0d6398b20a.tar nixlib-95b828de42adaa2f825e5588d1cccb0d6398b20a.tar.gz nixlib-95b828de42adaa2f825e5588d1cccb0d6398b20a.tar.bz2 nixlib-95b828de42adaa2f825e5588d1cccb0d6398b20a.tar.lz nixlib-95b828de42adaa2f825e5588d1cccb0d6398b20a.tar.xz nixlib-95b828de42adaa2f825e5588d1cccb0d6398b20a.tar.zst nixlib-95b828de42adaa2f825e5588d1cccb0d6398b20a.zip |
Merge remote-tracking branch 'origin/master' into staging
Diffstat (limited to 'nixos/modules/config')
-rw-r--r-- | nixos/modules/config/ldap.nix | 2 | ||||
-rw-r--r-- | nixos/modules/config/networking.nix | 4 | ||||
-rw-r--r-- | nixos/modules/config/pulseaudio.nix | 2 | ||||
-rw-r--r-- | nixos/modules/config/swap.nix | 2 | ||||
-rw-r--r-- | nixos/modules/config/unix-odbc-drivers.nix | 2 |
5 files changed, 6 insertions, 6 deletions
diff --git a/nixos/modules/config/ldap.nix b/nixos/modules/config/ldap.nix index 8171f460385b..7fcb1aaf63dd 100644 --- a/nixos/modules/config/ldap.nix +++ b/nixos/modules/config/ldap.nix @@ -1,7 +1,7 @@ { config, lib, pkgs, ... }: -with lib; with pkgs; +with lib; let diff --git a/nixos/modules/config/networking.nix b/nixos/modules/config/networking.nix index 43717697ebd3..fd1e55f673ae 100644 --- a/nixos/modules/config/networking.nix +++ b/nixos/modules/config/networking.nix @@ -14,7 +14,7 @@ in options = { - networking.extraHosts = pkgs.lib.mkOption { + networking.extraHosts = lib.mkOption { type = types.lines; default = ""; example = "192.168.0.1 lanlocalhost"; @@ -23,7 +23,7 @@ in ''; }; - networking.dnsSingleRequest = pkgs.lib.mkOption { + networking.dnsSingleRequest = lib.mkOption { type = types.bool; default = false; description = '' diff --git a/nixos/modules/config/pulseaudio.nix b/nixos/modules/config/pulseaudio.nix index 9802b898a5d8..67e536f4fd93 100644 --- a/nixos/modules/config/pulseaudio.nix +++ b/nixos/modules/config/pulseaudio.nix @@ -1,7 +1,7 @@ { config, lib, pkgs, ... }: -with lib; with pkgs; +with lib; let diff --git a/nixos/modules/config/swap.nix b/nixos/modules/config/swap.nix index ac1c32387c5e..1dc7ebb96aff 100644 --- a/nixos/modules/config/swap.nix +++ b/nixos/modules/config/swap.nix @@ -1,7 +1,7 @@ { config, lib, pkgs, utils, ... }: -with lib; with utils; +with lib; { diff --git a/nixos/modules/config/unix-odbc-drivers.nix b/nixos/modules/config/unix-odbc-drivers.nix index b725e6cae732..98929392acec 100644 --- a/nixos/modules/config/unix-odbc-drivers.nix +++ b/nixos/modules/config/unix-odbc-drivers.nix @@ -27,7 +27,7 @@ with lib; environment.etc."odbcinst.ini".text = let inis = config.environment.unixODBCDrivers; - in pkgs.lib.concatStringsSep "\n" inis; + in lib.concatStringsSep "\n" inis; }; |