diff --git a/pkgs/by-name/st/stalwart-mail/package.nix b/pkgs/by-name/st/stalwart-mail/package.nix index 3e1ccb9d5293..775491f40319 100644 --- a/pkgs/by-name/st/stalwart-mail/package.nix +++ b/pkgs/by-name/st/stalwart-mail/package.nix @@ -13,34 +13,24 @@ darwin, nix-update-script, nixosTests, - rocksdb_8_11, + rocksdb, callPackage, }: -let - # Stalwart depends on rocksdb crate: - # https://github.com/stalwartlabs/mail-server/blob/v0.8.0/crates/store/Cargo.toml#L10 - # which expects a specific rocksdb versions: - # https://github.com/rust-rocksdb/rust-rocksdb/blob/v0.22.0/librocksdb-sys/Cargo.toml#L3 - # See upstream issue for rocksdb 9.X support - # https://github.com/stalwartlabs/mail-server/issues/407 - rocksdb = rocksdb_8_11; - version = "0.10.7"; -in -rustPlatform.buildRustPackage { +rustPlatform.buildRustPackage rec { pname = "stalwart-mail"; - inherit version; + version = "0.11.6"; src = fetchFromGitHub { owner = "stalwartlabs"; repo = "mail-server"; tag = "v${version}"; - hash = "sha256-BATkLgfkz94u2M+Xy6PYQi+7EIxBe86VLYTnBI8PzzY="; + hash = "sha256-8xRmAPqIVanGyWoUWb4DyRkhl5djPJD+ie03B3FyZ4w="; fetchSubmodules = true; }; useFetchCargoVendor = true; - cargoHash = "sha256-k0pNNLwFRLI7eHjVwHGjgrnX4moWOwoWvMiyPfGMgCo="; + cargoHash = "sha256-PHr73GQ/6d5ulJzntSHIilGzdF4Y8Np9jSFa6F2Nwao="; nativeBuildInputs = [ pkg-config @@ -83,8 +73,6 @@ rustPlatform.buildRustPackage { postInstall = '' mkdir -p $out/etc/stalwart - cp resources/config/spamfilter.toml $out/etc/stalwart/spamfilter.toml - cp -r resources/config/spamfilter $out/etc/stalwart/ mkdir -p $out/lib/systemd/system @@ -98,8 +86,10 @@ rustPlatform.buildRustPackage { "--skip=directory::internal::internal_directory" "--skip=directory::ldap::ldap_directory" "--skip=directory::sql::sql_directory" + "--skip=directory::oidc::oidc_directory" "--skip=store::blob::blob_tests" "--skip=store::lookup::lookup_tests" + "--skip=smtp::lookup::sql::lookup_sql" # thread 'directory::smtp::lmtp_directory' panicked at tests/src/store/mod.rs:122:44: # called `Result::unwrap()` on an `Err` value: Os { code: 2, kind: NotFound, message: "No such file or directory" } "--skip=directory::smtp::lmtp_directory"