diff options
| author | Mario Rodas <marsam@users.noreply.github.com> | 2023-04-23 08:11:19 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-04-23 08:11:19 -0500 |
| commit | de8bf15b836629d4d376f8ba175d65ec21e05068 (patch) | |
| tree | 134d92421b1f3fd7730b4e99a78c0cd74d03413e | |
| parent | 141563cfa8ec19280f85ebae0e34c7e67b3ef430 (diff) | |
| parent | c8f2f13fdaef8021db6ca1c834caba6ef141fc0f (diff) | |
Merge pull request #227787 from 06kellyjac/cargo-geiger
cargo-geiger: 0.11.5 -> 0.11.6
| -rw-r--r-- | pkgs/development/tools/rust/cargo-geiger/default.nix | 16 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 4 |
2 files changed, 8 insertions, 12 deletions
diff --git a/pkgs/development/tools/rust/cargo-geiger/default.nix b/pkgs/development/tools/rust/cargo-geiger/default.nix index 03fbd4dd31e21..6d35e4d3ab8a2 100644 --- a/pkgs/development/tools/rust/cargo-geiger/default.nix +++ b/pkgs/development/tools/rust/cargo-geiger/default.nix @@ -5,26 +5,25 @@ , pkg-config , openssl # darwin dependencies -, Security -, CoreFoundation +, darwin , libiconv , curl }: rustPlatform.buildRustPackage rec { pname = "cargo-geiger"; - version = "0.11.5"; + version = "0.11.6"; src = fetchFromGitHub { owner = "rust-secure-code"; repo = pname; rev = "${pname}-${version}"; - sha256 = "sha256-PrrhxY+Hk1XfdV0u4GgIsbo8oNOFnqbCeivY2Ix6g+k="; + sha256 = "sha256-rGZJyCWGk2RUr52ICp4dVER3JMBrnLdOMusRm/GG2PE="; }; - cargoHash = "sha256-D3upXhKFkuZfEVOPJ9mCwoZkbkX9s2MltyTkKcBvb6I="; + cargoHash = "sha256-B6Ka35y2fJEDVd891P60TNppr5HGFnzVjLhhfoFCYUA="; buildInputs = [ openssl ] - ++ lib.optionals stdenv.isDarwin [ CoreFoundation Security libiconv curl ]; + ++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ CoreFoundation Security libiconv curl ]); nativeBuildInputs = [ pkg-config ] # curl-sys wants to run curl-config on darwin ++ lib.optionals stdenv.isDarwin [ curl.dev ]; @@ -37,9 +36,8 @@ rustPlatform.buildRustPackage rec { "--skip serialize_test2_report" "--skip serialize_test3_report" "--skip serialize_test6_report" - "--skip test_package::case_2" - "--skip test_package::case_3" - "--skip test_package::case_6" + # multiple test cases that time-out or cause memory leaks + "--skip test_package" "--skip test_package_update_readme::case_2" "--skip test_package_update_readme::case_3" "--skip test_package_update_readme::case_5" diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8a273fc7368bf..8aca756206a50 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -16148,9 +16148,7 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) Security; }; cargo-fuzz = callPackage ../development/tools/rust/cargo-fuzz { }; - cargo-geiger = callPackage ../development/tools/rust/cargo-geiger { - inherit (darwin.apple_sdk.frameworks) Security CoreFoundation; - }; + cargo-geiger = callPackage ../development/tools/rust/cargo-geiger { }; cargo-hf2 = callPackage ../development/tools/rust/cargo-hf2 { inherit (darwin.apple_sdk.frameworks) AppKit; |