diff options
| author | Mario Rodas <marsam@users.noreply.github.com> | 2023-12-17 20:03:44 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-12-17 20:03:44 -0500 |
| commit | 21470204523b352e62458185980bdf9db91c18eb (patch) | |
| tree | 69c65726c8d4ce8145d36f7a76400fc19df537b3 /pkgs/top-level | |
| parent | a5873fa6d8a40d211ca51242b2023e66bc0f68a4 (diff) | |
| parent | 848b539f97a91650bed4c07f28c25aa56bd68dc6 (diff) | |
Merge pull request #272745 from anthonyroussel/updates/pcsctools
pcsc-tools: 1.6.2 -> 1.7.0
Diffstat (limited to 'pkgs/top-level')
| -rw-r--r-- | pkgs/top-level/aliases.nix | 1 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 7 |
2 files changed, 6 insertions, 2 deletions
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 1c79b8a74a954..5e3695a2eef3c 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -703,6 +703,7 @@ mapAliases ({ paper-note = throw "paper-note has been removed: abandoned by upstream"; # Added 2023-05-03 parity = openethereum; # Added 2020-08-01 pash = throw "'pash' has been removed: abandoned by upstream. Use 'powershell' instead"; # Added 2023-09-16 + pcsctools = pcsc-tools; # Added 2023-12-07 pdf2xml = throw "'pdf2xml' was removed: abandoned for years."; # Added 2023-10-22 peach = asouldocs; # Added 2022-08-28 pentablet-driver = xp-pen-g430-driver; # Added 2022-06-23 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 812331b375e8a..e27b5c511b9b6 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11977,13 +11977,16 @@ with pkgs; polkitSupport = true; }; - pcsctools = callPackage ../tools/security/pcsctools { }; - pcsc-cyberjack = callPackage ../tools/security/pcsc-cyberjack { }; pcsc-safenet = callPackage ../tools/security/pcsc-safenet { }; pcsc-scm-scl011 = callPackage ../tools/security/pcsc-scm-scl011 { }; + + pcsc-tools = callPackage ../tools/security/pcsc-tools { + inherit (pkgs.darwin.apple_sdk.frameworks) PCSC; + }; + ifdnfc = callPackage ../tools/security/ifdnfc { }; pdd = python3Packages.callPackage ../tools/misc/pdd { }; |