stalwart-mail: 0.11.8 -> 0.12.2 (#409178)

This commit is contained in:
Yt 2025-06-01 16:58:38 -04:00 committed by GitHub
commit d699cfc3b4
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 18 additions and 9 deletions

View file

@ -158,7 +158,7 @@ in
serviceConfig = { serviceConfig = {
ExecStart = [ ExecStart = [
"" ""
"${cfg.package}/bin/stalwart-mail --config=${configFile}" "${lib.getExe cfg.package} --config=${configFile}"
]; ];
LoadCredential = lib.mapAttrsToList (key: value: "${key}:${value}") cfg.credentials; LoadCredential = lib.mapAttrsToList (key: value: "${key}:${value}") cfg.credentials;
@ -171,6 +171,10 @@ in
CacheDirectory = "stalwart-mail"; CacheDirectory = "stalwart-mail";
StateDirectory = "stalwart-mail"; StateDirectory = "stalwart-mail";
# Upstream uses "stalwart" as the username since 0.12.0
User = "stalwart-mail";
Group = "stalwart-mail";
# Bind standard privileged ports # Bind standard privileged ports
AmbientCapabilities = [ "CAP_NET_BIND_SERVICE" ]; AmbientCapabilities = [ "CAP_NET_BIND_SERVICE" ];
CapabilityBoundingSet = [ "CAP_NET_BIND_SERVICE" ]; CapabilityBoundingSet = [ "CAP_NET_BIND_SERVICE" ];

View file

@ -24,13 +24,13 @@ let
in in
rustPlatform.buildRustPackage (finalAttrs: { rustPlatform.buildRustPackage (finalAttrs: {
pname = "stalwart-mail" + (lib.optionalString stalwartEnterprise "-enterprise"); pname = "stalwart-mail" + (lib.optionalString stalwartEnterprise "-enterprise");
version = "0.11.8"; version = "0.12.2";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "stalwartlabs"; owner = "stalwartlabs";
repo = "mail-server"; repo = "stalwart";
tag = "v${finalAttrs.version}"; tag = "v${finalAttrs.version}";
hash = "sha256-VqGosbSQxNeOS+kGtvXAmz6vyz5mJlXvKZM57B1Xue4="; hash = "sha256-P19jeEzFE8Gu6hqHZJiPoJ70r+zOmzOpEwfFqPQczZY=";
}; };
# rocksdb does not properly distinguish between pointers it has allocated itself # rocksdb does not properly distinguish between pointers it has allocated itself
@ -45,7 +45,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
''; '';
useFetchCargoVendor = true; useFetchCargoVendor = true;
cargoHash = "sha256-iheURWxO0cOvO+FV01l2Vmo0B+S2mXzue6mx3gapftQ="; cargoHash = "sha256-WVvDapCA9pTgOtPpbsK78u2AC2hUfo3sOejZ6pJSlQk=";
nativeBuildInputs = [ nativeBuildInputs = [
pkg-config pkg-config
@ -62,7 +62,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
rocksdbJemalloc rocksdbJemalloc
] ++ lib.optionals (stdenv.hostPlatform.isLinux && withFoundationdb) [ foundationdb ]; ] ++ lib.optionals (stdenv.hostPlatform.isLinux && withFoundationdb) [ foundationdb ];
# Issue: https://github.com/stalwartlabs/mail-server/issues/1104 # Issue: https://github.com/stalwartlabs/stalwart/issues/1104
buildNoDefaultFeatures = true; buildNoDefaultFeatures = true;
buildFeatures = buildFeatures =
[ [
@ -133,6 +133,10 @@ rustPlatform.buildRustPackage (finalAttrs: {
"--skip=smtp::queue::retry::queue_retry" "--skip=smtp::queue::retry::queue_retry"
# Missing store type. Try running `STORE=<store_type> cargo test`: NotPresent # Missing store type. Try running `STORE=<store_type> cargo test`: NotPresent
"--skip=store::store_tests" "--skip=store::store_tests"
# Missing store type. Try running `STORE=<store_type> cargo test`: NotPresent
"--skip=cluster::cluster_tests"
# Missing store type. Try running `STORE=<store_type> cargo test`: NotPresent
"--skip=webdav::webdav_tests"
# thread 'config::parser::tests::toml_parse' panicked at crates/utils/src/config/parser.rs:463:58: # thread 'config::parser::tests::toml_parse' panicked at crates/utils/src/config/parser.rs:463:58:
# called `Result::unwrap()` on an `Err` value: "Expected ['\\n'] but found '!' in value at line 70." # called `Result::unwrap()` on an `Err` value: "Expected ['\\n'] but found '!' in value at line 70."
"--skip=config::parser::tests::toml_parse" "--skip=config::parser::tests::toml_parse"
@ -189,6 +193,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
} }
]; ];
mainProgram = "stalwart";
maintainers = with lib.maintainers; [ maintainers = with lib.maintainers; [
happysalada happysalada
onny onny

View file

@ -16,13 +16,13 @@
rustPlatform.buildRustPackage rec { rustPlatform.buildRustPackage rec {
pname = "webadmin"; pname = "webadmin";
version = "0.1.25"; version = "0.1.26";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "stalwartlabs"; owner = "stalwartlabs";
repo = "webadmin"; repo = "webadmin";
tag = "v${version}"; tag = "v${version}";
hash = "sha256-Hv7FojY/SZgbzS8XGVj0uRfynZCZPEbPiSHRuBtt/Jc="; hash = "sha256-TWzXSBXLZd4b02cfiERZqNaXcfxx1pH7OFUcdEugH7k=";
}; };
npmDeps = fetchNpmDeps { npmDeps = fetchNpmDeps {
@ -32,7 +32,7 @@ rustPlatform.buildRustPackage rec {
}; };
useFetchCargoVendor = true; useFetchCargoVendor = true;
cargoHash = "sha256-/BoGeAF4GbM8ddWCnxAueJQYgQZvAL0pQ0pDUW0mXI0="; cargoHash = "sha256-Eh5wu3RHNPWIPDZPUlh8L6OvghkfmMp0eAOTbk9Fs+0=";
postPatch = '' postPatch = ''
# Using local tailwindcss for compilation # Using local tailwindcss for compilation