Merge pull request #282965 from NixOS/revert-281915-patch-1

Revert "Dovecot: Do not include empty sieve_extensions and sieve_global_extensions"
This commit is contained in:
Robert Schütz 2024-01-22 10:25:44 -08:00 committed by GitHub
commit 95bfc3d275
No known key found for this signature in database
GPG key ID: B5690EEEBB952194

View file

@ -119,10 +119,9 @@ let
''
plugin {
sieve_plugins = ${concatStringsSep " " cfg.sieve.plugins}
sieve_extensions = ${concatStringsSep " " (map (el: "+${el}") cfg.sieve.extensions)}
sieve_global_extensions = ${concatStringsSep " " (map (el: "+${el}") cfg.sieve.globalExtensions)}
''
(optionalString (cfg.sieve.extensions != []) ''sieve_extensions = ${concatMapStringsSep " " (el: "+${el}") cfg.sieve.extensions}'')
(optionalString (cfg.sieve.globalExtensions != []) ''sieve_global_extensions = ${concatMapStringsSep " " (el: "+${el}") cfg.sieve.globalExtensions}'')
(optionalString (cfg.imapsieve.mailbox != []) ''
${
concatStringsSep "\n" (flatten (imap1 (