diff options
| author | Nikolay Amiantov <ab@fmap.me> | 2016-04-26 15:10:42 +0300 |
|---|---|---|
| committer | Nikolay Amiantov <ab@fmap.me> | 2016-04-26 15:37:42 +0300 |
| commit | dfe608c8a2ecfdf0ab2838a967440207250a0b95 (patch) | |
| tree | 7fd1285495e6dbfda1d318de5ea3aa4976314253 /nixos | |
| parent | ae8a3a14f03cda32340dd55905b4d8c1b18b0446 (diff) | |
| download | nixpkgs-dfe608c8a2ecfdf0ab2838a967440207250a0b95.tar nixpkgs-dfe608c8a2ecfdf0ab2838a967440207250a0b95.tar.gz nixpkgs-dfe608c8a2ecfdf0ab2838a967440207250a0b95.tar.bz2 nixpkgs-dfe608c8a2ecfdf0ab2838a967440207250a0b95.tar.lz nixpkgs-dfe608c8a2ecfdf0ab2838a967440207250a0b95.tar.xz nixpkgs-dfe608c8a2ecfdf0ab2838a967440207250a0b95.tar.zst nixpkgs-dfe608c8a2ecfdf0ab2838a967440207250a0b95.zip | |
symlinkJoin: accept set as an argument with additional options
Diffstat (limited to 'nixos')
| -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 { |