From 50d1f373a381fe2ca027074023a08363f3622d90 Mon Sep 17 00:00:00 2001
From: "Wael M. Nasreddine" <wael.nasreddine@gmail.com>
Date: Wed, 18 Aug 2021 19:54:37 -0700
Subject: [PATCH 1/2] python3Packages.onlykey-solo-python: init at 0.0.28

(cherry picked from commit d136766caa50ddca210491230884365bf485457a)
---
 .../onlykey-solo-python/default.nix           | 35 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 ++
 2 files changed, 37 insertions(+)
 create mode 100644 pkgs/development/python-modules/onlykey-solo-python/default.nix

diff --git a/pkgs/development/python-modules/onlykey-solo-python/default.nix b/pkgs/development/python-modules/onlykey-solo-python/default.nix
new file mode 100644
index 00000000000..91f36b01dd4
--- /dev/null
+++ b/pkgs/development/python-modules/onlykey-solo-python/default.nix
@@ -0,0 +1,35 @@
+{ buildPythonPackage
+, click
+, ecdsa
+, fetchPypi
+, fido2
+, intelhex
+, lib
+, pyserial
+, pyusb
+, requests
+}:
+
+buildPythonPackage rec {
+  pname = "onlykey-solo-python";
+  version = "0.0.28";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "sha256-Mbi5So2OgeXjg4Fzg7v2gAJuh1Y7ZCYu8Lrha/7PQfY=";
+  };
+
+  propagatedBuildInputs = [ click ecdsa fido2 intelhex pyserial pyusb requests ];
+
+  # no tests
+  doCheck = false;
+  pythonImportsCheck = [ "solo" ];
+
+  meta = with lib; {
+    homepage = "https://github.com/trustcrypto/onlykey-solo-python";
+    description = "Python library for OnlyKey with Solo FIDO2";
+    maintainers = with maintainers; [ kalbasit ];
+    license = licenses.asl20;
+  };
+}
+
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 181837dc996..e9e9d9de945 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -4728,6 +4728,8 @@ in {
 
   onkyo-eiscp = callPackage ../development/python-modules/onkyo-eiscp { };
 
+  onlykey-solo-python = callPackage ../development/python-modules/onlykey-solo-python { };
+
   onnx = callPackage ../development/python-modules/onnx { };
 
   openant = callPackage ../development/python-modules/openant { };

From b64d6f2d3cfb0f598c51f93874fbf2b8de5e46db Mon Sep 17 00:00:00 2001
From: "Wael M. Nasreddine" <wael.nasreddine@gmail.com>
Date: Wed, 18 Aug 2021 19:54:50 -0700
Subject: [PATCH 2/2] onlykey-cli: update 1.2.2 -> 1.2.5

(cherry picked from commit 98f344f0da6fd9fab5dda98bb0269af8f2b61f7f)
---
 pkgs/tools/security/onlykey-cli/default.nix | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

diff --git a/pkgs/tools/security/onlykey-cli/default.nix b/pkgs/tools/security/onlykey-cli/default.nix
index b342f203b44..3919a5726c0 100644
--- a/pkgs/tools/security/onlykey-cli/default.nix
+++ b/pkgs/tools/security/onlykey-cli/default.nix
@@ -2,18 +2,28 @@
 
 python3Packages.buildPythonApplication rec {
   pname = "onlykey-cli";
-  version = "1.2.2";
+  version = "1.2.5";
 
   src = python3Packages.fetchPypi {
     inherit version;
     pname = "onlykey";
-    sha256 = "1qkbgab5xlg7bd0jfzf8k5ppb1zhib76r050fiaqi5wibrqrfwdi";
+    sha256 = "sha256-7Pr1gXaPF5mctGxDciKKj0YDDQVFFi1+t6QztoKqpAA=";
   };
 
+  propagatedBuildInputs = with python3Packages; [
+    aenum
+    cython
+    ecdsa
+    hidapi
+    onlykey-solo-python
+    prompt_toolkit
+    pynacl
+    six
+  ];
+
   # Requires having the physical onlykey (a usb security key)
   doCheck = false;
-  propagatedBuildInputs =
-    with python3Packages; [ hidapi aenum six prompt_toolkit pynacl ecdsa cython ];
+  pythonImportsCheck = [ "onlykey.cli" ];
 
   meta = with lib; {
     description = "OnlyKey client and command-line tool";