diff --git a/pkgs/by-name/st/stalwart-mail/package.nix b/pkgs/by-name/st/stalwart-mail/package.nix index e77b69093b94..bb8a0859230a 100644 --- a/pkgs/by-name/st/stalwart-mail/package.nix +++ b/pkgs/by-name/st/stalwart-mail/package.nix @@ -2,7 +2,6 @@ lib, rustPlatform, fetchFromGitHub, - fetchpatch, pkg-config, protobuf, bzip2, @@ -26,7 +25,7 @@ let # See upstream issue for rocksdb 9.X support # https://github.com/stalwartlabs/mail-server/issues/407 rocksdb = rocksdb_8_11; - version = "0.10.2"; + version = "0.10.3"; in rustPlatform.buildRustPackage { pname = "stalwart-mail"; @@ -36,11 +35,11 @@ rustPlatform.buildRustPackage { owner = "stalwartlabs"; repo = "mail-server"; rev = "refs/tags/v${version}"; - hash = "sha256-wH26uwaYzfqiamiJ/oosVEiTfCOItwVGbHdRh6Ykpgk="; + hash = "sha256-xpNSMZWWiFU6OOooAD7ENzOggqYHdU88baPsXnovpXU="; fetchSubmodules = true; }; - cargoHash = "sha256-1AFDyZpkcvFzWBczMAPfajmhBmVl4ou4JdKnrK2KlQI="; + cargoHash = "sha256-qiKfHrxQ4TSSomDLlPJ2+GOEri/ZuMCvUNdxRVoplgg="; nativeBuildInputs = [ pkg-config @@ -142,6 +141,8 @@ rustPlatform.buildRustPackage { # Failed to read system DNS config: io error: No such file or directory (os error 2) "--skip=smtp::inbound::auth::auth" # Failed to read system DNS config: io error: No such file or directory (os error 2) + "--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" ]; @@ -149,7 +150,7 @@ rustPlatform.buildRustPackage { passthru = { webadmin = callPackage ./webadmin.nix { }; - update-script = nix-update-script { }; + updateScript = nix-update-script { }; tests.stalwart-mail = nixosTests.stalwart-mail; }; diff --git a/pkgs/by-name/st/stalwart-mail/webadmin.nix b/pkgs/by-name/st/stalwart-mail/webadmin.nix index 645af460f681..e11ef03b6534 100644 --- a/pkgs/by-name/st/stalwart-mail/webadmin.nix +++ b/pkgs/by-name/st/stalwart-mail/webadmin.nix @@ -5,6 +5,7 @@ trunk-ng, tailwindcss, fetchNpmDeps, + nix-update-script, nodejs, npmHooks, llvmPackages, @@ -15,13 +16,13 @@ rustPlatform.buildRustPackage rec { pname = "webadmin"; - version = "0.1.15"; + version = "0.1.17"; src = fetchFromGitHub { owner = "stalwartlabs"; repo = "webadmin"; rev = "refs/tags/v${version}"; - hash = "sha256-YglpdxZT5CyFLla6uXTKPtq9EbA9SEQacyR9KNToYT0="; + hash = "sha256-kMfdCb2dwoVd9G1uZw2wcfaAAPt6obFfWQbbXG/MDB4="; }; npmDeps = fetchNpmDeps { @@ -30,7 +31,7 @@ rustPlatform.buildRustPackage rec { hash = "sha256-na1HEueX8w7kuDp8LEtJ0nD1Yv39cyk6sEMpS1zix2s="; }; - cargoHash = "sha256-piZ+oLL8FqS8Ishi7byYfdedkszreGuxI56pTLcYXn4="; + cargoHash = "sha256-0Urr0MsmenFqg25lZAzg7LgJ/NkZHINoOWtPad7G6GE="; postPatch = '' # Using local tailwindcss for compilation @@ -60,6 +61,10 @@ rustPlatform.buildRustPackage rec { zip -r $out/webadmin.zip * ''; + passthru = { + updateScript = nix-update-script { }; + }; + meta = with lib; { description = "Secure & modern all-in-one mail server Stalwart (webadmin module)"; homepage = "https://github.com/stalwartlabs/webadmin";