about summary refs log tree commit diff
path: root/nixpkgs/nixos/modules
diff options
context:
space:
mode:
authorAlyssa Ross <hi@alyssa.is>2021-04-14 13:32:12 +0000
committerAlyssa Ross <hi@alyssa.is>2021-04-14 17:16:15 +0000
commite952e593cd587c572eb4f7df91423d7587f59f6e (patch)
tree8eb264521c7f285e45ce735bbb79795fb21502a1 /nixpkgs/nixos/modules
parent2a4975aa9a6f1da84d6f3bb4f5848a32a22ed2be (diff)
downloadnixlib-e952e593cd587c572eb4f7df91423d7587f59f6e.tar
nixlib-e952e593cd587c572eb4f7df91423d7587f59f6e.tar.gz
nixlib-e952e593cd587c572eb4f7df91423d7587f59f6e.tar.bz2
nixlib-e952e593cd587c572eb4f7df91423d7587f59f6e.tar.lz
nixlib-e952e593cd587c572eb4f7df91423d7587f59f6e.tar.xz
nixlib-e952e593cd587c572eb4f7df91423d7587f59f6e.tar.zst
nixlib-e952e593cd587c572eb4f7df91423d7587f59f6e.zip
mailman-web: 2019-09-29 -> 2021-04-10
* Make it clearer what code comments apply to
* Fix the state directory (this was changed in the update)
* Add m1cr0man as a maintaner

Co-authored-by: Lucas Savva <lucas@m1cr0man.com>
Co-authored-by: Sandro <sandro.jaeckel@gmail.com>
(cherry picked from commit 912e11a468903d481c91f6413c4eb884cbc09fa4)
Diffstat (limited to 'nixpkgs/nixos/modules')
-rw-r--r--nixpkgs/nixos/modules/services/mail/mailman.nix3
1 files changed, 2 insertions, 1 deletions
diff --git a/nixpkgs/nixos/modules/services/mail/mailman.nix b/nixpkgs/nixos/modules/services/mail/mailman.nix
index a5f5588f90bc..136dff72a34d 100644
--- a/nixpkgs/nixos/modules/services/mail/mailman.nix
+++ b/nixpkgs/nixos/modules/services/mail/mailman.nix
@@ -258,7 +258,8 @@ in {
       # settings_local.json is loaded.
       os.environ["SECRET_KEY"] = ""
 
-      from mailman_web.settings import *
+      from mailman_web.settings.base import *
+      from mailman_web.settings.mailman import *
 
       import json