Update rspamd

lib/modules.nix

@@ -647,7 +647,17 @@ rec {
      result of the change function
   */
   mkChangedOptionModule = from: to: changeFn:
-    mkMergedOptionModule [ from ] to changeFn;
+    { config, options, ... }:
+    { options = setAttrByPath from (mkOption {
+        visible = false;
+      });
+      config =
+        let opt = getAttrFromPath from options; in {
+          warnings =
+            optional opt.isDefined
+              "The option `${showOption from}' defined in ${showFiles opt.files} has been changed to `${showOption to}' that has a different type. Please read `${showOption to}' documentation and update your configuration accordingly.";
+        } // setAttrByPath to (mkIf opt.isDefined (changeFn config));
+    };
 
   /* Like ‘mkRenamedOptionModule’, but doesn't show a warning. */
   mkAliasOptionModule = from: to: doRename {

nixos/doc/manual/release-notes/rl-1809.xml

@@ -233,6 +233,14 @@ $ nix-instantiate -E '(import <nixpkgsunstable> {}).gitFull'
      <literal>networking.networkmanager.dns</literal> instead.
     </para>
    </listitem>
+   <listitem>
+    <para>
+     <literal>services.rmilter</literal> has been deprecated and corresponding package removed.
+     rspamd now listens on a UNIX socket by default. Use <literal>services.rspamd.postfix.enable</literal>
+     instead of <literal>services.rmilter.postfix.enable</literal> for quick Postfix integration.
+    </para>
+   </listitem>
+
   </itemizedlist>
  </section>
 </section>

nixos/modules/module-list.nix

@@ -298,7 +298,6 @@
   ./services/mail/postgrey.nix
   ./services/mail/spamassassin.nix
   ./services/mail/rspamd.nix
-  ./services/mail/rmilter.nix
   ./services/mail/nullmailer.nix
   ./services/misc/airsonic.nix
   ./services/misc/apache-kafka.nix

nixos/modules/rename.nix

@@ -49,9 +49,6 @@ with lib;
     (mkRemovedOptionModule [ "security" "setuidOwners" ] "Use security.wrappers instead")
     (mkRemovedOptionModule [ "security" "setuidPrograms" ] "Use security.wrappers instead")
 
-    (mkRemovedOptionModule [ "services" "rmilter" "bindInetSockets" ] "Use services.rmilter.bindSocket.* instead")
-    (mkRemovedOptionModule [ "services" "rmilter" "bindUnixSockets" ] "Use services.rmilter.bindSocket.* instead")
-
     # Xsession script
     (mkRenamedOptionModule [ "services" "xserver" "displayManager" "job" "logsXsession" ] [ "services" "xserver" "displayManager" "job" "logToFile" ])
     (mkRenamedOptionModule [ "services" "xserver" "displayManager" "logToJournal" ] [ "services" "xserver" "displayManager" "job" "logToJournal" ])
@@ -250,6 +247,9 @@ with lib;
     (mkRenamedOptionModule [ "programs" "info" "enable" ] [ "documentation" "info" "enable" ])
     (mkRenamedOptionModule [ "programs" "man"  "enable" ] [ "documentation" "man"  "enable" ])
 
+    # rmilter
+    (mkRemovedOptionModule [ "services" "rmilter" ] "Use services.rspamd directly instead")
+
   ] ++ (flip map [ "blackboxExporter" "collectdExporter" "fritzboxExporter"
                    "jsonExporter" "minioExporter" "nginxExporter" "nodeExporter"
                    "snmpExporter" "unifiExporter" "varnishExporter" ]