From f4388ee36cb7ce7af8d4a28aae7023ce65da953b Mon Sep 17 00:00:00 2001 From: Benedikt Peetz Date: Sat, 7 Jun 2025 16:50:57 +0200 Subject: pkgs/stalwart-mail-patched: Use different native-ca-roots patch My patch was no longer working, as it was written against an older version of stalwart. This patch is now sourced directly from a GitHub pr, that was closed at the 21st of may. Upstream says, that they will support that in a future version, but I am honestly just waiting for the rug pull at this point. They are no longer accepting PRs, focusing more and more on new features, whilst the actual software is still very difficult to debug. But, with all this said, their current source code is available under the AGPL, so even if they rug pull (which might be difficult, due to fact, that their CLA is from the FSFE), a base for forking still persists. --- pkgs/by-name/st/stalwart-mail-patched/package.nix | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) (limited to 'pkgs/by-name/st/stalwart-mail-patched/package.nix') diff --git a/pkgs/by-name/st/stalwart-mail-patched/package.nix b/pkgs/by-name/st/stalwart-mail-patched/package.nix index 5b1c409..9058f2c 100644 --- a/pkgs/by-name/st/stalwart-mail-patched/package.nix +++ b/pkgs/by-name/st/stalwart-mail-patched/package.nix @@ -4,8 +4,6 @@ nixLib, }: let spamfilter = callPackage ./spam-filter.nix {}; - - mail-send = callPackage ./mail-send.nix {}; in stalwart-mail.overrideAttrs (final: prev: { pname = "stalwart-mail-patched"; @@ -28,21 +26,15 @@ in # "elastic" # "s3" "redis" + "tls-native-roots" ]; - postUnpack = - (prev.postUnpack or "") - + '' - cp --recursive "${mail-send}" ./source/crates/mail-send - chmod --recursive +w "./source/crates/mail-send" - ''; - cargoPatches = (prev.cargoPatches or []) ++ [ # `stalwart-mail` uses their bundled store, which makes it impossible to use our # own CA certificate (e.g., for tests). Thus use a native version. - ./patches/crates-Use-the-platform-CA-bundle-instead-of-the-bun.patch + ./patches/use-platform-ca-roots.patch ]; # Check that the enterprise feature is really disabled. -- cgit 1.4.1