From 36e8d9eb9628a7d92cf54cce06b044ee9fbc25ca Mon Sep 17 00:00:00 2001 From: Alexander Sieg Date: Tue, 28 Jan 2025 11:46:16 +0100 Subject: [PATCH] stalwart-cli: reuse cargoDeps from stalwart-mail --- pkgs/by-name/st/stalwart-cli/package.nix | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/pkgs/by-name/st/stalwart-cli/package.nix b/pkgs/by-name/st/stalwart-cli/package.nix index 46be3abb2f37..4ae1fa96e587 100644 --- a/pkgs/by-name/st/stalwart-cli/package.nix +++ b/pkgs/by-name/st/stalwart-cli/package.nix @@ -5,24 +5,26 @@ stalwart-mail, }: -rustPlatform.buildRustPackage rec { +rustPlatform.buildRustPackage { + inherit (stalwart-mail) src version cargoDeps; pname = "stalwart-cli"; - version = stalwart-mail.version; - src = stalwart-mail.src; - buildAndTestSubdir = "crates/cli"; - useFetchCargoVendor = true; - cargoHash = "sha256-k0pNNLwFRLI7eHjVwHGjgrnX4moWOwoWvMiyPfGMgCo="; + cargoBuildFlags = [ + "--package" + "stalwart-cli" + ]; + cargoTestFlags = [ + "--package" + "stalwart-cli" + ]; doInstallCheck = true; nativeInstallCheckInputs = [ versionCheckHook ]; versionCheckProgramArg = [ "--version" ]; meta = { + inherit (stalwart-mail.meta) license homepage changelog; description = "Stalwart Mail Server CLI"; - homepage = "https://github.com/stalwartlabs/mail-server"; - changelog = "https://github.com/stalwartlabs/mail-server/blob/v${version}/CHANGELOG.md"; - license = lib.licenses.agpl3Only; mainProgram = "stalwart-cli"; maintainers = with lib.maintainers; [ giomf