diff --git a/pkgs/development/tools/rust/cargo-about/default.nix b/pkgs/development/tools/rust/cargo-about/default.nix index 88b99889f1ba..98e8f1038bea 100644 --- a/pkgs/development/tools/rust/cargo-about/default.nix +++ b/pkgs/development/tools/rust/cargo-about/default.nix @@ -9,24 +9,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-about"; - version = "0.5.2"; + version = "0.5.3"; src = fetchFromGitHub { owner = "EmbarkStudios"; repo = "cargo-about"; rev = version; - sha256 = "sha256-8476jJK1oiXVX9G09NSL+xvXZdZ+h7grCHC6R0XXewo="; + sha256 = "sha256-THyVFvotR7ttGB3YyK0XPG5m4mbgHJqu1gnZFmyFDOA="; }; - cargoPatches = [ - # update mimalloc to fix build with older apple sdks - ./update-mimalloc.patch - - # enable pkg-config feature of zstd - ./zstd-pkg-config.patch - ]; - - cargoSha256 = "sha256-EFpkBWQSWYyMrUa9Dh+n9kDNmXL/2yuEmFN3DcPeE7U="; + cargoSha256 = "sha256-o9NMhkKtdlTqmOO5mVWxcuEu4U7GkTO0B3XoMrBwiwI="; nativeBuildInputs = [ pkg-config ]; @@ -34,6 +26,8 @@ rustPlatform.buildRustPackage rec { darwin.apple_sdk.frameworks.Security ]; + ZSTD_SYS_USE_PKG_CONFIG = true; + meta = with lib; { description = "Cargo plugin to generate list of all licenses for a crate"; homepage = "https://github.com/EmbarkStudios/cargo-about"; diff --git a/pkgs/development/tools/rust/cargo-about/update-mimalloc.patch b/pkgs/development/tools/rust/cargo-about/update-mimalloc.patch deleted file mode 100644 index 2d467fb811c2..000000000000 --- a/pkgs/development/tools/rust/cargo-about/update-mimalloc.patch +++ /dev/null @@ -1,26 +0,0 @@ ---- a/Cargo.lock -+++ b/Cargo.lock -@@ -829,9 +829,9 @@ checksum = "efaa7b300f3b5fe8eb6bf21ce3895e1751d9665086af2d64b42f19701015ff4f" - - [[package]] - name = "libmimalloc-sys" --version = "0.1.24" -+version = "0.1.26" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "7705fc40f6ed493f73584abbb324e74f96b358ff60dfe5659a0f8fc12c590a69" -+checksum = "8fc093ab289b0bfda3aa1bdfab9c9542be29c7ef385cfcbe77f8c9813588eb48" - dependencies = [ - "cc", - ] -@@ -884,9 +884,9 @@ dependencies = [ - - [[package]] - name = "mimalloc" --version = "0.1.28" -+version = "0.1.30" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "b0dfa131390c2f6bdb3242f65ff271fcdaca5ff7b6c08f28398be7f2280e3926" -+checksum = "76ce6a4b40d3bff9eb3ce9881ca0737a85072f9f975886082640cd46a75cdb35" - dependencies = [ - "libmimalloc-sys", - ] diff --git a/pkgs/development/tools/rust/cargo-about/zstd-pkg-config.patch b/pkgs/development/tools/rust/cargo-about/zstd-pkg-config.patch deleted file mode 100644 index ea8b67085fd2..000000000000 --- a/pkgs/development/tools/rust/cargo-about/zstd-pkg-config.patch +++ /dev/null @@ -1,40 +0,0 @@ ---- a/Cargo.lock -+++ b/Cargo.lock -@@ -207,6 +207,7 @@ dependencies = [ - "toml_edit", - "twox-hash", - "url", -+ "zstd", - ] - - [[package]] -@@ -1093,6 +1094,12 @@ version = "0.1.0" - source = "registry+https://github.com/rust-lang/crates.io-index" - checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" - -+[[package]] -+name = "pkg-config" -+version = "0.3.26" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "6ac9a59f73473f1b8d852421e59e64809f025994837ef743615c6d0c5b305160" -+ - [[package]] - name = "ppv-lite86" - version = "0.2.16" -@@ -2045,4 +2052,5 @@ checksum = "2141bed8922b427761470e6bbfeff255da94fa20b0bbeab0d9297fcaf71e3aa7" - dependencies = [ - "cc", - "libc", -+ "pkg-config", - ] ---- a/Cargo.toml -+++ b/Cargo.toml -@@ -80,6 +80,8 @@ toml_edit = "0.15" - twox-hash = "1.6" - # Url parsing - url = "2.2" -+# Use pkg-config feature of zstd -+zstd = { version = "*", features = ["pkg-config"] } - - [dev-dependencies] - # Filesystems - Filesystem fixtures and assertions for testing