mailman: make archivers configurable

Also, mailman looks in /etc/mailman.cfg by default, so setting
MAILMAN_CONFIG_FILE isn't required either.

1 files changed, 4 insertions, 17 deletions

diff --git a/nixpkgs/nixos/modules/services/mail/mailman.nix b/nixpkgs/nixos/modules/services/mail/mailman.nix
index 25c1541a44f6..69a3a5447390 100644
--- a/nixpkgs/nixos/modules/services/mail/mailman.nix
+++ b/nixpkgs/nixos/modules/services/mail/mailman.nix
@@ -6,19 +6,6 @@ let
 
   cfg = config.services.mailman;
 
-  mailmanPyEnv = pkgs.python3.withPackages (ps: with ps; [mailman mailman-hyperkitty]);
-
-  mailmanExe = with pkgs; stdenv.mkDerivation {
-    name = "mailman-" + python3Packages.mailman.version;
-    buildInputs = [makeWrapper];
-    unpackPhase = ":";
-    installPhase = ''
-      mkdir -p $out/bin
-      makeWrapper ${mailmanPyEnv}/bin/mailman $out/bin/mailman \
-        --set MAILMAN_CONFIG_FILE /etc/mailman.cfg
-   '';
-  };
-
   mailmanWeb = pkgs.python3Packages.mailman-web.override {
     serverEMail = cfg.siteOwner;
     archiverKey = cfg.hyperkittyApiKey;
@@ -184,7 +171,7 @@ in {
     users.users.mailman = { description = "GNU Mailman"; isSystemUser = true; };
 
     environment = {
-      systemPackages = [ mailmanExe mailmanWebExe pkgs.sassc ];
+      systemPackages = [ pkgs.mailman mailmanWebExe pkgs.sassc ];
       etc."mailman.cfg".text = mailmanCfg;
     };
 
@@ -200,8 +187,8 @@ in {
       after = [ "network.target" ];
       wantedBy = [ "multi-user.target" ];
       serviceConfig = {
-        ExecStart = "${mailmanExe}/bin/mailman start";
-        ExecStop = "${mailmanExe}/bin/mailman stop";
+        ExecStart = "${pkgs.mailman}/bin/mailman start";
+        ExecStop = "${pkgs.mailman}/bin/mailman stop";
         User = "mailman";
         Type = "forking";
         RuntimeDirectory = "mailman";
@@ -266,7 +253,7 @@ in {
       description = "Trigger daily Mailman events";
       startAt = "daily";
       serviceConfig = {
-        ExecStart = "${mailmanExe}/bin/mailman digests --send";
+        ExecStart = "${pkgs.mailman}/bin/mailman digests --send";
         User = "mailman";
       };
     };