From c8f2f13fdaef8021db6ca1c834caba6ef141fc0f Mon Sep 17 00:00:00 2001
From: 06kellyjac <dev@j-k.io>
Date: Sun, 23 Apr 2023 12:52:55 +0100
Subject: [PATCH] cargo-geiger: 0.11.5 -> 0.11.6

Diff: https://github.com/rust-secure-code/cargo-geiger/compare/cargo-geiger-0.11.5...cargo-geiger-0.11.6

Changelog: https://github.com/rust-secure-code/cargo-geiger/blob/cargo-geiger-0.11.6/CHANGELOG.md
---
 .../tools/rust/cargo-geiger/default.nix          | 16 +++++++---------
 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 03fbd4dd31e2..6d35e4d3ab8a 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 e296abe63928..714021489365 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;