aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIsmaël Bouya <ismael.bouya@normalesup.org>2025-03-14 00:42:05 +0100
committerIsmaël Bouya <ismael.bouya@normalesup.org>2025-03-14 01:09:12 +0100
commit644631197f0d913ab9c06e203a5fcefe82df5279 (patch)
tree87239fd982a897fcee6e0866353eb348eae0664b
parent178f5058c8d1cafb6fd091c0b12df7985735c756 (diff)
downloadNix-644631197f0d913ab9c06e203a5fcefe82df5279.tar.gz
Nix-644631197f0d913ab9c06e203a5fcefe82df5279.tar.zst
Nix-644631197f0d913ab9c06e203a5fcefe82df5279.zip
Fix crash for sympa
-rw-r--r--deploy/flake.lock4
-rw-r--r--flake.lock4
-rw-r--r--flakes/flake.lock2
-rw-r--r--systems/eldiron/mail/sympa.nix11
4 files changed, 16 insertions, 5 deletions
diff --git a/deploy/flake.lock b/deploy/flake.lock
index e0fff48..1d37ba6 100644
--- a/deploy/flake.lock
+++ b/deploy/flake.lock
@@ -2848,7 +2848,7 @@
2848 }, 2848 },
2849 "locked": { 2849 "locked": {
2850 "lastModified": 1, 2850 "lastModified": 1,
2851 "narHash": "sha256-9LREn+Bx62kTYJ9qFlHM3REWanuhAjqMzuW2EIfYlQw=", 2851 "narHash": "sha256-nOUijP8PCY6y2kPKHb/e36a1SvAdQoiviKaZX+tlPAY=",
2852 "path": "../flakes", 2852 "path": "../flakes",
2853 "type": "path" 2853 "type": "path"
2854 }, 2854 },
@@ -3970,7 +3970,7 @@
3970 }, 3970 },
3971 "locked": { 3971 "locked": {
3972 "lastModified": 1, 3972 "lastModified": 1,
3973 "narHash": "sha256-EaYcBPNpaP5rgiDFY1hfqpg4hMeLZEMQhFcCTP5VSso=", 3973 "narHash": "sha256-RfVz/T1ZGq//oGdyFAHTGYnquMGQ2Z1iVGdJIhi2iMo=",
3974 "path": "../systems/eldiron", 3974 "path": "../systems/eldiron",
3975 "type": "path" 3975 "type": "path"
3976 }, 3976 },
diff --git a/flake.lock b/flake.lock
index 412de94..e02cdf9 100644
--- a/flake.lock
+++ b/flake.lock
@@ -2729,7 +2729,7 @@
2729 }, 2729 },
2730 "locked": { 2730 "locked": {
2731 "lastModified": 1, 2731 "lastModified": 1,
2732 "narHash": "sha256-9LREn+Bx62kTYJ9qFlHM3REWanuhAjqMzuW2EIfYlQw=", 2732 "narHash": "sha256-nOUijP8PCY6y2kPKHb/e36a1SvAdQoiviKaZX+tlPAY=",
2733 "path": "./flakes", 2733 "path": "./flakes",
2734 "type": "path" 2734 "type": "path"
2735 }, 2735 },
@@ -3986,7 +3986,7 @@
3986 }, 3986 },
3987 "locked": { 3987 "locked": {
3988 "lastModified": 1, 3988 "lastModified": 1,
3989 "narHash": "sha256-EaYcBPNpaP5rgiDFY1hfqpg4hMeLZEMQhFcCTP5VSso=", 3989 "narHash": "sha256-RfVz/T1ZGq//oGdyFAHTGYnquMGQ2Z1iVGdJIhi2iMo=",
3990 "path": "../systems/eldiron", 3990 "path": "../systems/eldiron",
3991 "type": "path" 3991 "type": "path"
3992 }, 3992 },
diff --git a/flakes/flake.lock b/flakes/flake.lock
index 644fb56..483b962 100644
--- a/flakes/flake.lock
+++ b/flakes/flake.lock
@@ -3890,7 +3890,7 @@
3890 }, 3890 },
3891 "locked": { 3891 "locked": {
3892 "lastModified": 1, 3892 "lastModified": 1,
3893 "narHash": "sha256-EaYcBPNpaP5rgiDFY1hfqpg4hMeLZEMQhFcCTP5VSso=", 3893 "narHash": "sha256-RfVz/T1ZGq//oGdyFAHTGYnquMGQ2Z1iVGdJIhi2iMo=",
3894 "path": "../systems/eldiron", 3894 "path": "../systems/eldiron",
3895 "type": "path" 3895 "type": "path"
3896 }, 3896 },
diff --git a/systems/eldiron/mail/sympa.nix b/systems/eldiron/mail/sympa.nix
index 9f57f0a..a1fb2f4 100644
--- a/systems/eldiron/mail/sympa.nix
+++ b/systems/eldiron/mail/sympa.nix
@@ -5,6 +5,17 @@ let
5in 5in
6{ 6{
7 config = lib.mkIf config.myServices.mail.enable { 7 config = lib.mkIf config.myServices.mail.enable {
8 nixpkgs.overlays = [
9 (self: super: {
10 sympa = super.sympa.overrideAttrs(old: {
11 # When clicking on link in the e-mail, we cannot select a
12 # template. This patch avoids a crash in this case
13 patchPhase = old.patchPhase or "" + ''
14 sed -i -e "s/\(message_template.*\), #FIXME/\1 || 'reject_default',/" src/cgi/wwsympa.fcgi.in
15 '';
16 });
17 })
18 ];
8 services.borgBackup.profiles.global.includedPaths = [ 19 services.borgBackup.profiles.global.includedPaths = [
9 "sympa/spool/auth" 20 "sympa/spool/auth"
10 "sympa/spool/automatic" 21 "sympa/spool/automatic"