diff options
| author | Nikolay Amiantov <ab@fmap.me> | 2016-04-26 16:47:43 +0400 |
|---|---|---|
| committer | Nikolay Amiantov <ab@fmap.me> | 2016-04-26 16:47:43 +0400 |
| commit | f6eb6862221bff46a143fb10b1c16a5ce1f32027 (patch) | |
| tree | 22b68eb6bb5227a362b0987a3e722315d0ba15eb /nixos/modules/services | |
| parent | 07cad5411ef18fa2de2e500d1a78e12a2b3fda6b (diff) | |
| parent | 8415fa35c79214fc2093882ed688f98f9abf7048 (diff) | |
| download | nixpkgs-f6eb6862221bff46a143fb10b1c16a5ce1f32027.tar nixpkgs-f6eb6862221bff46a143fb10b1c16a5ce1f32027.tar.gz nixpkgs-f6eb6862221bff46a143fb10b1c16a5ce1f32027.tar.bz2 nixpkgs-f6eb6862221bff46a143fb10b1c16a5ce1f32027.tar.lz nixpkgs-f6eb6862221bff46a143fb10b1c16a5ce1f32027.tar.xz nixpkgs-f6eb6862221bff46a143fb10b1c16a5ce1f32027.tar.zst nixpkgs-f6eb6862221bff46a143fb10b1c16a5ce1f32027.zip | |
Merge pull request #15002 from abbradar/symlink-join-wrappers
Use symlinkJoin for wrappers
Diffstat (limited to 'nixos/modules/services')
| -rw-r--r-- | nixos/modules/services/logging/logcheck.nix | 5 | ||||
| -rw-r--r-- | nixos/modules/services/mail/dovecot.nix | 6 |
2 files changed, 8 insertions, 3 deletions
diff --git a/nixos/modules/services/logging/logcheck.nix b/nixos/modules/services/logging/logcheck.nix index 6069262b470..3a85fa60fe7 100644 --- a/nixos/modules/services/logging/logcheck.nix +++ b/nixos/modules/services/logging/logcheck.nix @@ -11,7 +11,10 @@ let rm $out/logcheck.* ''; - rulesDir = pkgs.symlinkJoin "logcheck-rules-dir" ([ defaultRules ] ++ cfg.extraRulesDirs); + rulesDir = pkgs.symlinkJoin + { name = "logcheck-rules-dir"; + paths = ([ defaultRules ] ++ cfg.extraRulesDirs); + }; configFile = pkgs.writeText "logcheck.conf" cfg.config; diff --git a/nixos/modules/services/mail/dovecot.nix b/nixos/modules/services/mail/dovecot.nix index 127c3da69d1..47e374d8edc 100644 --- a/nixos/modules/services/mail/dovecot.nix +++ b/nixos/modules/services/mail/dovecot.nix @@ -63,8 +63,10 @@ let cfg.extraConfig ]; - modulesDir = pkgs.symlinkJoin "dovecot-modules" - (map (pkg: "${pkg}/lib/dovecot") ([ dovecotPkg ] ++ map (module: module.override { dovecot = dovecotPkg; }) cfg.modules)); + modulesDir = pkgs.symlinkJoin { + name = "dovecot-modules"; + paths = map (pkg: "${pkg}/lib/dovecot") ([ dovecotPkg ] ++ map (module: module.override { dovecot = dovecotPkg; }) cfg.modules); + }; in { |