Merge pull request #204811 from figsoda/cargo-about

cargo-about: 0.5.1 -> 0.5.2

authored by

figsoda and committed by
GitHub
7452c40b 082ccd0a

+14 -13
+3 -3
pkgs/development/tools/rust/cargo-about/default.nix
··· 9 10 rustPlatform.buildRustPackage rec { 11 pname = "cargo-about"; 12 - version = "0.5.1"; 13 14 src = fetchFromGitHub { 15 owner = "EmbarkStudios"; 16 repo = "cargo-about"; 17 rev = version; 18 - sha256 = "sha256-T8Hhody0jMmZb6/xMkSvKCv4STZPbcrf/UB3APspYDM="; 19 }; 20 21 cargoPatches = [ ··· 26 ./zstd-pkg-config.patch 27 ]; 28 29 - cargoSha256 = "sha256-2Reqj+WP6OoaB/3Z5llZP4c5ToVmMNX0Fe0IqDwcg2E="; 30 31 nativeBuildInputs = [ pkg-config ]; 32
··· 9 10 rustPlatform.buildRustPackage rec { 11 pname = "cargo-about"; 12 + version = "0.5.2"; 13 14 src = fetchFromGitHub { 15 owner = "EmbarkStudios"; 16 repo = "cargo-about"; 17 rev = version; 18 + sha256 = "sha256-8476jJK1oiXVX9G09NSL+xvXZdZ+h7grCHC6R0XXewo="; 19 }; 20 21 cargoPatches = [ ··· 26 ./zstd-pkg-config.patch 27 ]; 28 29 + cargoSha256 = "sha256-EFpkBWQSWYyMrUa9Dh+n9kDNmXL/2yuEmFN3DcPeE7U="; 30 31 nativeBuildInputs = [ pkg-config ]; 32
+11 -10
pkgs/development/tools/rust/cargo-about/zstd-pkg-config.patch
··· 1 --- a/Cargo.lock 2 +++ b/Cargo.lock 3 - @@ -183,6 +183,7 @@ dependencies = [ 4 "toml_edit", 5 "twox-hash", 6 "url", ··· 8 ] 9 10 [[package]] 11 - @@ -1039,6 +1040,12 @@ version = "0.1.0" 12 source = "registry+https://github.com/rust-lang/crates.io-index" 13 checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" 14 15 +[[package]] 16 +name = "pkg-config" 17 - +version = "0.3.22" 18 +source = "registry+https://github.com/rust-lang/crates.io-index" 19 - +checksum = "12295df4f294471248581bc09bef3c38a5e46f1e36d6a37353621a0c6c357e1f" 20 + 21 [[package]] 22 name = "ppv-lite86" 23 - version = "0.2.15" 24 - @@ -1902,4 +1909,5 @@ checksum = "2141bed8922b427761470e6bbfeff255da94fa20b0bbeab0d9297fcaf71e3aa7" 25 dependencies = [ 26 "cc", 27 "libc", 28 + "pkg-config", 29 ] 30 - diff --git a/Cargo.toml b/Cargo.toml 31 - index bf2a896..35cbf7c 100644 32 --- a/Cargo.toml 33 +++ b/Cargo.toml 34 - @@ -80,3 +80,5 @@ toml_edit = "0.9" 35 twox-hash = "1.6" 36 # Url parsing 37 url = "2.2" 38 - + 39 +zstd = { version = "*", features = ["pkg-config"] }
··· 1 --- a/Cargo.lock 2 +++ b/Cargo.lock 3 + @@ -207,6 +207,7 @@ dependencies = [ 4 "toml_edit", 5 "twox-hash", 6 "url", ··· 8 ] 9 10 [[package]] 11 + @@ -1093,6 +1094,12 @@ version = "0.1.0" 12 source = "registry+https://github.com/rust-lang/crates.io-index" 13 checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" 14 15 +[[package]] 16 +name = "pkg-config" 17 + +version = "0.3.26" 18 +source = "registry+https://github.com/rust-lang/crates.io-index" 19 + +checksum = "6ac9a59f73473f1b8d852421e59e64809f025994837ef743615c6d0c5b305160" 20 + 21 [[package]] 22 name = "ppv-lite86" 23 + version = "0.2.16" 24 + @@ -2045,4 +2052,5 @@ checksum = "2141bed8922b427761470e6bbfeff255da94fa20b0bbeab0d9297fcaf71e3aa7" 25 dependencies = [ 26 "cc", 27 "libc", 28 + "pkg-config", 29 ] 30 --- a/Cargo.toml 31 +++ b/Cargo.toml 32 + @@ -80,6 +80,8 @@ toml_edit = "0.15" 33 twox-hash = "1.6" 34 # Url parsing 35 url = "2.2" 36 + +# Use pkg-config feature of zstd 37 +zstd = { version = "*", features = ["pkg-config"] } 38 + 39 + [dev-dependencies] 40 + # Filesystems - Filesystem fixtures and assertions for testing