fix build errors on 25.05

modules/mail/dovecot2.nix

@@ -19,6 +19,10 @@ in
     993 # IMAPS
     4190 # Managesieve
   ];
+    environment.systemPackages = [
+    pkgs.dovecot_pigeonhole
+  ];
+
   sops.secrets."dovecot_ldap_search".owner = config.services.dovecot2.user;
   services.dovecot2 = {
     enable = true;
@@ -65,9 +69,6 @@ in
         specialUse = "Archive";
       };
     };
-    modules = [
-      pkgs.dovecot_pigeonhole
-    ];
     # set to satisfy the sieveScripts check, will be overridden by userdb lookups anyways
     mailUser = "vmail";
     mailGroup = "vmail";

modules/mail/rspamd.nix

@@ -197,6 +197,7 @@ in
             extraConfig = ''
               allow 141.30.0.0/16;
               allow 141.76.0.0/16;
+              allow 2a13:dd80::/29;
               deny all;
             '';
           };

modules/matrix/mautrix-telegram.nix

@@ -17,22 +17,11 @@ in
 
   sops.secrets.mautrix-telegram_env = { };
 
-  services.matrix-synapse.settings.app_service_config_files = [
-    # The registration file is automatically generated after starting the
-    # appservice for the first time.
-    registrationFileSynapse
-  ];
-
-  systemd.tmpfiles.rules = [
-    # copy registration file over to synapse
-    "C ${registrationFileSynapse} - - - - ${registrationFileMautrix}"
-    "Z /var/lib/matrix-synapse/ - matrix-synapse matrix-synapse - -"
-  ];
-
   services.mautrix-telegram = {
     enable = true;
 
     environmentFile = config.sops.secrets.mautrix-telegram_env.path;
+    registerToSynapse = true;
 
     settings = {
       homeserver = {
@@ -57,14 +46,4 @@ in
       };
     };
   };
-
-  # If we don't explicitly set {a,h}s_token, mautrix-telegram will try to read them from the registrationFile
-  # and write them to the settingsFile in /nix/store, which obviously fails.
-  systemd.services.mautrix-telegram.serviceConfig.ExecStart =
-    lib.mkForce (pkgs.writeShellScript "start" ''
-      export MAUTRIX_TELEGRAM_APPSERVICE_AS_TOKEN=$(grep as_token ${registrationFileMautrix} | cut -d' ' -f2-)
-      export MAUTRIX_TELEGRAM_APPSERVICE_HS_TOKEN=$(grep hs_token ${registrationFileMautrix} | cut -d' ' -f2-)
-
-      ${pkgs.mautrix-telegram}/bin/mautrix-telegram --config='${settingsFile}'
-    '');
 }