about summary refs log tree commit diff
path: root/nixpkgs/nixos
diff options
context:
space:
mode:
authorPeter Simons <simons@cryp.to>2019-09-11 14:48:51 +0200
committerAlyssa Ross <hi@alyssa.is>2019-09-16 22:13:57 +0000
commit597266d1a316eb8b2d01c44f03770d0a7df6fa9c (patch)
tree28e434096c70e7c4770cc6d2fd8da2f426d0fa45 /nixpkgs/nixos
parent60152067cac65a9e9df52782649dc8fecab3c33b (diff)
downloadnixlib-597266d1a316eb8b2d01c44f03770d0a7df6fa9c.tar
nixlib-597266d1a316eb8b2d01c44f03770d0a7df6fa9c.tar.gz
nixlib-597266d1a316eb8b2d01c44f03770d0a7df6fa9c.tar.bz2
nixlib-597266d1a316eb8b2d01c44f03770d0a7df6fa9c.tar.lz
nixlib-597266d1a316eb8b2d01c44f03770d0a7df6fa9c.tar.xz
nixlib-597266d1a316eb8b2d01c44f03770d0a7df6fa9c.tar.zst
nixlib-597266d1a316eb8b2d01c44f03770d0a7df6fa9c.zip
python-mailman-web: turn these Djando configuration files into a make-shift Python library
Suggested in https://github.com/NixOS/nixpkgs/pull/67951#issuecomment-530309702.

(cherry picked from commit 86f8895abbfdb3ce118e0ca971f56c7f72871e29)
Diffstat (limited to 'nixpkgs/nixos')
-rw-r--r--nixpkgs/nixos/modules/services/mail/mailman.nix11
1 files changed, 7 insertions, 4 deletions
diff --git a/nixpkgs/nixos/modules/services/mail/mailman.nix b/nixpkgs/nixos/modules/services/mail/mailman.nix
index 93f4d8899553..a3c007a55c94 100644
--- a/nixpkgs/nixos/modules/services/mail/mailman.nix
+++ b/nixpkgs/nixos/modules/services/mail/mailman.nix
@@ -62,6 +62,12 @@ let
     installPhase = "install -D ${djangoPyEnv}/bin/django-admin $out/bin/mailman-django-admin";
   };
 
+  mailmanWeb = pkgs.python3Packages.mailman-web.override {
+    serverEMail = cfg.siteOwner;
+    archiverKey = cfg.hyperkittyApiKey;
+    allowedHosts = cfg.webHosts;
+  };
+
 in {
 
   ###### interface
@@ -88,10 +94,7 @@ in {
 
       webRoot = mkOption {
         type = types.path;
-        default = pkgs.python3Packages.mailman-web.override { serverEMail = cfg.siteOwner;
-                                                              archiverKey = cfg.hyperkittyApiKey;
-                                                              allowedHosts = cfg.webHosts;
-                                                            };
+        default = "${mailmanWeb}/${pkgs.python3.sitePackages}";
         defaultText = "pkgs.python3Packages.mailman-web";
         description = ''
           The web root for the Hyperkity + Postorius apps provided by Mailman.