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/services/system | |
| 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/services/system')
| -rw-r--r-- | nixos/modules/services/system/kerberos.nix | 6 | ||||
| -rw-r--r-- | nixos/modules/services/system/nscd.nix | 2 | ||||
| -rw-r--r-- | nixos/modules/services/system/uptimed.nix | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/nixos/modules/services/system/kerberos.nix b/nixos/modules/services/system/kerberos.nix index 8fb5debd20e4..3a0171ca1b9b 100644 --- a/nixos/modules/services/system/kerberos.nix +++ b/nixos/modules/services/system/kerberos.nix @@ -1,8 +1,8 @@ -{pkgs, config, ...}: +{pkgs, config, lib, ...}: let - inherit (pkgs.lib) mkOption mkIf singleton; + inherit (lib) mkOption mkIf singleton; inherit (pkgs) heimdal; @@ -36,7 +36,7 @@ in environment.systemPackages = [ heimdal ]; services.xinetd.enable = true; - services.xinetd.services = pkgs.lib.singleton + services.xinetd.services = lib.singleton { name = "kerberos-adm"; flags = "REUSE NAMEINARGS"; protocol = "tcp"; diff --git a/nixos/modules/services/system/nscd.nix b/nixos/modules/services/system/nscd.nix index 1ac82064a1f7..5460e962ea2c 100644 --- a/nixos/modules/services/system/nscd.nix +++ b/nixos/modules/services/system/nscd.nix @@ -7,7 +7,7 @@ let nssModulesPath = config.system.nssModules.path; cfg = config.services.nscd; - inherit (pkgs.lib) singleton; + inherit (lib) singleton; cfgFile = pkgs.writeText "nscd.conf" cfg.config; diff --git a/nixos/modules/services/system/uptimed.nix b/nixos/modules/services/system/uptimed.nix index 61eecd5c9ba8..ab46c508914d 100644 --- a/nixos/modules/services/system/uptimed.nix +++ b/nixos/modules/services/system/uptimed.nix @@ -1,8 +1,8 @@ -{pkgs, config, ...}: +{pkgs, config, lib, ...}: let - inherit (pkgs.lib) mkOption mkIf singleton; + inherit (lib) mkOption mkIf singleton; inherit (pkgs) uptimed; |