diff options
author | figsoda <figsoda@pm.me> | 2021-12-06 08:39:08 -0500 |
---|---|---|
committer | figsoda <figsoda@pm.me> | 2021-12-06 09:36:36 -0500 |
commit | 31701970986d5d6f3f61332ac5e14a0b3fc3381e (patch) | |
tree | 1621838bc9a364759a025cb3dc15c49c267370d6 | |
parent | 54fcdaa6b983f86389bd057e99e6cca920985a46 (diff) | |
download | nixpkgs-31701970986d5d6f3f61332ac5e14a0b3fc3381e.tar nixpkgs-31701970986d5d6f3f61332ac5e14a0b3fc3381e.tar.gz nixpkgs-31701970986d5d6f3f61332ac5e14a0b3fc3381e.tar.bz2 nixpkgs-31701970986d5d6f3f61332ac5e14a0b3fc3381e.tar.lz nixpkgs-31701970986d5d6f3f61332ac5e14a0b3fc3381e.tar.xz nixpkgs-31701970986d5d6f3f61332ac5e14a0b3fc3381e.tar.zst nixpkgs-31701970986d5d6f3f61332ac5e14a0b3fc3381e.zip |
cargo-about: 0.4.2 -> 0.4.3, mark broken on darwin
-rw-r--r-- | pkgs/tools/package-management/cargo-about/default.nix | 16 | ||||
-rw-r--r-- | pkgs/tools/package-management/cargo-about/zstd-pkg-config.patch | 39 |
2 files changed, 51 insertions, 4 deletions
diff --git a/pkgs/tools/package-management/cargo-about/default.nix b/pkgs/tools/package-management/cargo-about/default.nix index ac9249b3a9b..8e8cc710b5d 100644 --- a/pkgs/tools/package-management/cargo-about/default.nix +++ b/pkgs/tools/package-management/cargo-about/default.nix @@ -1,17 +1,24 @@ -{ lib, rustPlatform, fetchFromGitHub }: +{ lib, rustPlatform, fetchFromGitHub, pkg-config, zstd, stdenv }: rustPlatform.buildRustPackage rec { pname = "cargo-about"; - version = "0.4.2"; + version = "0.4.3"; src = fetchFromGitHub { owner = "EmbarkStudios"; repo = "cargo-about"; rev = version; - sha256 = "sha256-QLPqvlMwCdMfUGCVibCGQdI7UkHV1WBfpBi2Kwi3b1Q="; + sha256 = "sha256-nNMpCv7pokWK+rCV/jEvTpJNwTtZO5t2+etMRg3XJiQ="; }; - cargoSha256 = "sha256-x9hx9wJlcrGo1zuugPYY4G4Os5x8tIOICKnKq8TuevI="; + # enable pkg-config feature of zstd + cargoPatches = [ ./zstd-pkg-config.patch ]; + + cargoSha256 = "sha256-LC4vY/jyIPGY2UpB4LOKCCR/gv8EUfB4nH8h0O9c6iw="; + + nativeBuildInputs = [ pkg-config ]; + + buildInputs = [ zstd ]; meta = with lib; { description = "Cargo plugin to generate list of all licenses for a crate"; @@ -19,5 +26,6 @@ rustPlatform.buildRustPackage rec { changelog = "https://github.com/EmbarkStudios/cargo-about/blob/${version}/CHANGELOG.md"; license = with licenses; [ mit /* or */ asl20 ]; maintainers = with maintainers; [ evanjs figsoda ]; + broken = stdenv.isDarwin; }; } diff --git a/pkgs/tools/package-management/cargo-about/zstd-pkg-config.patch b/pkgs/tools/package-management/cargo-about/zstd-pkg-config.patch new file mode 100644 index 00000000000..e084538ca92 --- /dev/null +++ b/pkgs/tools/package-management/cargo-about/zstd-pkg-config.patch @@ -0,0 +1,39 @@ +--- a/Cargo.lock ++++ b/Cargo.lock +@@ -183,6 +183,7 @@ dependencies = [ + "toml_edit", + "twox-hash", + "url", ++ "zstd", + ] + + [[package]] +@@ -1039,6 +1040,12 @@ version = "0.1.0" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" + ++[[package]] ++name = "pkg-config" ++version = "0.3.22" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "12295df4f294471248581bc09bef3c38a5e46f1e36d6a37353621a0c6c357e1f" ++ + [[package]] + name = "ppv-lite86" + version = "0.2.15" +@@ -1902,4 +1909,5 @@ checksum = "2141bed8922b427761470e6bbfeff255da94fa20b0bbeab0d9297fcaf71e3aa7" + dependencies = [ + "cc", + "libc", ++ "pkg-config", + ] +diff --git a/Cargo.toml b/Cargo.toml +index bf2a896..35cbf7c 100644 +--- a/Cargo.toml ++++ b/Cargo.toml +@@ -80,3 +80,5 @@ toml_edit = "0.9" + twox-hash = "1.6" + # Url parsing + url = "2.2" ++ ++zstd = { version = "*", features = ["pkg-config"] } |