From d7c29a31447582c462374035f41ed693aeb5496b Mon Sep 17 00:00:00 2001 From: Alexander Sieg Date: Sun, 27 Apr 2025 14:43:13 +0200 Subject: [PATCH 1/2] stalwart-mail: cleaup unneeded darwin frameworks --- pkgs/by-name/st/stalwart-mail/package.nix | 19 ++++++------------- 1 file changed, 6 insertions(+), 13 deletions(-) diff --git a/pkgs/by-name/st/stalwart-mail/package.nix b/pkgs/by-name/st/stalwart-mail/package.nix index 2b1820dcd7cd..2519b43e8e0b 100644 --- a/pkgs/by-name/st/stalwart-mail/package.nix +++ b/pkgs/by-name/st/stalwart-mail/package.nix @@ -38,19 +38,12 @@ rustPlatform.buildRustPackage rec { rustPlatform.bindgenHook ]; - buildInputs = - [ - bzip2 - openssl - sqlite - zstd - ] - ++ lib.optionals (stdenv.hostPlatform.isLinux && withFoundationdb) [ foundationdb ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.CoreFoundation - darwin.apple_sdk.frameworks.Security - darwin.apple_sdk.frameworks.SystemConfiguration - ]; + buildInputs = [ + bzip2 + openssl + sqlite + zstd + ] ++ lib.optionals (stdenv.hostPlatform.isLinux && withFoundationdb) [ foundationdb ]; # Issue: https://github.com/stalwartlabs/mail-server/issues/1104 buildNoDefaultFeatures = true; From a02812faafd0a5219ab6d70c12083e5c79ed06a7 Mon Sep 17 00:00:00 2001 From: Alexander Sieg Date: Sun, 27 Apr 2025 15:34:53 +0200 Subject: [PATCH 2/2] stalwart-mail: skip unreliable test --- pkgs/by-name/st/stalwart-mail/package.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/by-name/st/stalwart-mail/package.nix b/pkgs/by-name/st/stalwart-mail/package.nix index 2519b43e8e0b..7c442b483ad0 100644 --- a/pkgs/by-name/st/stalwart-mail/package.nix +++ b/pkgs/by-name/st/stalwart-mail/package.nix @@ -136,6 +136,10 @@ rustPlatform.buildRustPackage rec { "--skip=smtp::inbound::antispam::antispam" # Failed to read system DNS config: io error: No such file or directory (os error 2) "--skip=smtp::inbound::vrfy::vrfy_expn" + # thread 'smtp::management::queue::manage_queue' panicked at tests/src/smtp/inbound/mod.rs:45:23: + # No queue event received. + # NOTE: Test unreliable on high load systems + "--skip=smtp::management::queue::manage_queue" ]; doCheck = !(stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64);