From 178bc95341c6fdfc3a08ffb5633757d1eb3166d1 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 4 Jun 2024 03:36:11 +0000
Subject: [PATCH] openpgp-card-tools: 0.10.1 -> 0.11.0

---
 .../op/openpgp-card-tools/package.nix}            | 15 +++++++++------
 pkgs/top-level/all-packages.nix                   |  4 ----
 2 files changed, 9 insertions(+), 10 deletions(-)
 rename pkgs/{tools/security/openpgp-card-tools/default.nix => by-name/op/openpgp-card-tools/package.nix} (71%)

diff --git a/pkgs/tools/security/openpgp-card-tools/default.nix b/pkgs/by-name/op/openpgp-card-tools/package.nix
similarity index 71%
rename from pkgs/tools/security/openpgp-card-tools/default.nix
rename to pkgs/by-name/op/openpgp-card-tools/package.nix
index 009807058661d..74ac946cdc517 100644
--- a/pkgs/tools/security/openpgp-card-tools/default.nix
+++ b/pkgs/by-name/op/openpgp-card-tools/package.nix
@@ -4,28 +4,31 @@
 , fetchFromGitea
 , pkg-config
 , pcsclite
-, nettle
-, PCSC
 , testers
 , openpgp-card-tools
+, darwin
 }:
 
 rustPlatform.buildRustPackage rec {
   pname = "openpgp-card-tools";
-  version = "0.10.1";
+  version = "0.11.0";
 
   src = fetchFromGitea {
     domain = "codeberg.org";
     owner = "openpgp-card";
     repo = "openpgp-card-tools";
     rev = "v${version}";
-    hash = "sha256-fasu2XElGk6TB2VNFg43rpa3ZafgGZga9WojyUiXj0k=";
+    hash = "sha256-GKBli6ybMDqB105POFEocU2X/xvd56V87k6Y6BsNt18=";
   };
 
-  cargoHash = "sha256-7OauQRG8DhIoANfel45QBm3igGjmtNw9KNAwt1TL5xg=";
+  cargoHash = "sha256-mLZErQhgRWDMdDC5tWjG9NCvLaSdF4A3uCdN8+QMWjU=";
 
   nativeBuildInputs = [ pkg-config rustPlatform.bindgenHook ];
-  buildInputs = [ pcsclite nettle ] ++ lib.optionals stdenv.isDarwin [ PCSC ];
+
+  buildInputs = [ pcsclite ] ++ lib.optionals stdenv.isDarwin [
+    darwin.apple_sdk.frameworks.PCSC
+    darwin.apple_sdk.frameworks.Security
+  ];
 
   passthru = {
     tests.version = testers.testVersion {
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 84826faa30c96..c148061f6ea00 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -23650,10 +23650,6 @@ with pkgs;
 
   openpa = callPackage ../development/libraries/openpa { };
 
-  openpgp-card-tools = callPackage ../tools/security/openpgp-card-tools {
-    inherit (darwin.apple_sdk.frameworks) PCSC;
-  };
-
   opensaml-cpp = callPackage ../development/libraries/opensaml-cpp { };
 
   openscenegraph = callPackage ../development/libraries/openscenegraph {