From 1e4065d90a1594746c313965f77d2d464470e0c1 Mon Sep 17 00:00:00 2001
From: Reno Reckling <exi@wthack.de>
Date: Fri, 19 Jan 2024 01:21:07 +0100
Subject: [PATCH 1/2] Do not include sieve_extensions and
 sieve_global_extensions if they are the default value

Setting them to empty string will disable the default behaviour, leading to missing extensions.
---
 nixos/modules/services/mail/dovecot.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/nixos/modules/services/mail/dovecot.nix b/nixos/modules/services/mail/dovecot.nix
index 25c7017a1d25..58303565c53b 100644
--- a/nixos/modules/services/mail/dovecot.nix
+++ b/nixos/modules/services/mail/dovecot.nix
@@ -119,9 +119,10 @@ 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 = ${concatStringsSep " " (map (el: "+${el}") cfg.sieve.extensions)}'')
+    (optionalString (cfg.sieve.globalExtensions != []) ''sieve_global_extensions = ${concatStringsSep " " (map (el: "+${el}") cfg.sieve.globalExtensions)}'')
+
     (optionalString (cfg.imapsieve.mailbox != []) ''
       ${
         concatStringsSep "\n" (flatten (imap1 (

From 33ede4cc7c7061c90788fe94f98ee9652fb39e1e Mon Sep 17 00:00:00 2001
From: Reno Reckling <exi@wthack.de>
Date: Fri, 19 Jan 2024 07:14:59 +0100
Subject: [PATCH 2/2] use concatMapStringsSep in dovecot config

Co-authored-by: h7x4 <h7x4@nani.wtf>
---
 nixos/modules/services/mail/dovecot.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/nixos/modules/services/mail/dovecot.nix b/nixos/modules/services/mail/dovecot.nix
index 58303565c53b..79c8fec75252 100644
--- a/nixos/modules/services/mail/dovecot.nix
+++ b/nixos/modules/services/mail/dovecot.nix
@@ -120,8 +120,8 @@ let
       plugin {
         sieve_plugins = ${concatStringsSep " " cfg.sieve.plugins}
     ''
-    (optionalString (cfg.sieve.extensions != []) ''sieve_extensions = ${concatStringsSep " " (map (el: "+${el}") cfg.sieve.extensions)}'')
-    (optionalString (cfg.sieve.globalExtensions != []) ''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 != []) ''
       ${