From 358cfcdfbe6ca137983c6629e174a98c306209cd Mon Sep 17 00:00:00 2001
From: Matt Votava <mvnetbiz@gmail.com>
Date: Sun, 13 Sep 2020 07:58:26 -0700
Subject: [PATCH] Declare default dovecot2 mailboxes as attrset for 20.09+

---
 default.nix | 46 +++++++++++++++++++++-------------------------
 1 file changed, 21 insertions(+), 25 deletions(-)

diff --git a/default.nix b/default.nix
index bfddc3e..6b96acd 100644
--- a/default.nix
+++ b/default.nix
@@ -307,31 +307,27 @@ in
         The mailboxes for dovecot.
         Depending on the mail client used it might be necessary to change some mailbox's name.
       '';
-      default = [
-        {
-          name = "Trash";
-          auto = "no";
-          specialUse = "Trash";
-        }
-
-        {
-          name = "Junk";
-          auto = "subscribe";
-          specialUse = "Junk";
-        }
-
-        {
-          name = "Drafts";
-          auto = "subscribe";
-          specialUse = "Drafts";
-        }
-
-        {
-          name = "Sent";
-          auto = "subscribe";
-          specialUse = "Sent";
-        }
-      ];
+      default = let
+        defMailBoxes = {
+          Trash = {
+            auto = "no";
+            specialUse = "Trash";
+          };
+          Junk = {
+            auto = "subscribe";
+            specialUse = "Junk";
+          };
+          Drafts = {
+            auto = "subscribe";
+            specialUse = "Drafts";
+          };
+          Sent = {
+            auto = "subscribe";
+            specialUse = "Sent";
+          };
+        };
+      in if (versionAtLeast version "20.09pre") then defMailBoxes
+      else (flip mapAttrsToList defMailBoxes (name: options: { inherit name; } // options));
     };
 
     certificateScheme = mkOption {