colin/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #284749 from 2xsaiko/outgoing/dovecot-fix-1

Browse Source
This commit is contained in:
Franz Pletz 2024-01-30 00:17:12 +01:00 committed by GitHub
commit da226d14bf
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
nixos/modules/services/mail/dovecot.nix
View File

@ -1,8 +1,8 @@
{ options, config, lib, pkgs, ... }: { config, lib, pkgs, ... }:
let let
inherit (lib) any attrValues concatMapStringsSep concatStrings inherit (lib) attrValues concatMapStringsSep concatStrings
concatStringsSep flatten imap1 isList literalExpression mapAttrsToList concatStringsSep flatten imap1 literalExpression mapAttrsToList
mkEnableOption mkIf mkOption mkRemovedOptionModule optional optionalAttrs mkEnableOption mkIf mkOption mkRemovedOptionModule optional optionalAttrs
optionalString singleton types mkRenamedOptionModule nameValuePair optionalString singleton types mkRenamedOptionModule nameValuePair
mapAttrs' listToAttrs filter; mapAttrs' listToAttrs filter;
@ -14,7 +14,7 @@ let
baseDir = "/run/dovecot2"; baseDir = "/run/dovecot2";
stateDir = "/var/lib/dovecot"; stateDir = "/var/lib/dovecot";
sieveScriptSettings = mapAttrs' (to: from: nameValuePair "sieve_${to}" "${stateDir}/sieve/${from}") cfg.sieve.scripts; sieveScriptSettings = mapAttrs' (to: _: nameValuePair "sieve_${to}" "${stateDir}/sieve/${to}") cfg.sieve.scripts;
imapSieveMailboxSettings = listToAttrs (flatten (imap1 (idx: el: imapSieveMailboxSettings = listToAttrs (flatten (imap1 (idx: el:
singleton { singleton {
name = "imapsieve_mailbox${toString idx}_name"; name = "imapsieve_mailbox${toString idx}_name";