diff options
| author | Wael Nasreddine <wael.nasreddine@gmail.com> | 2021-08-20 09:15:30 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-08-20 09:15:30 -0700 |
| commit | 46bb19ea0feaa8c653cc8ff9f7d4eacbb8f387b5 (patch) | |
| tree | f5e73e9ea9c004268a4ed215aabe8b40977668e8 | |
| parent | Merge pull request #134799 from NixOS/backport-132475-to-release-21.05 (diff) | |
| parent | onlykey-cli: update 1.2.2 -> 1.2.5 (diff) | |
| download | nixpkgs-46bb19ea0feaa8c653cc8ff9f7d4eacbb8f387b5.tar.gz | |
Merge pull request #134859 from kalbasit/update-onlykey-cli
[Backport release-21.05] onlykey-cli: 1.2.2 -> 1.2.5
| -rw-r--r-- | pkgs/development/python-modules/onlykey-solo-python/default.nix | 35 | ||||
| -rw-r--r-- | pkgs/tools/security/onlykey-cli/default.nix | 18 | ||||
| -rw-r--r-- | pkgs/top-level/python-packages.nix | 2 |
3 files changed, 51 insertions, 4 deletions
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 000000000000..91f36b01dd4d --- /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/tools/security/onlykey-cli/default.nix b/pkgs/tools/security/onlykey-cli/default.nix index b342f203b44c..3919a5726c01 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"; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 181837dc9968..e9e9d9de9458 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 { }; |