From 7bdef9ba9940f67dfb2627f3a092c51a969d28ce Mon Sep 17 00:00:00 2001 From: Dominic Shelton Date: Sun, 23 Jan 2022 16:57:30 +1100 Subject: [PATCH 1/2] nkdfu: init at 0.1 --- .../python-modules/nkdfu/default.nix | 31 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 33 insertions(+) create mode 100644 pkgs/development/python-modules/nkdfu/default.nix diff --git a/pkgs/development/python-modules/nkdfu/default.nix b/pkgs/development/python-modules/nkdfu/default.nix new file mode 100644 index 000000000000..fa094404b8b1 --- /dev/null +++ b/pkgs/development/python-modules/nkdfu/default.nix @@ -0,0 +1,31 @@ +{ lib, buildPythonPackage, fetchPypi, fire, tqdm, intelhex, libusb1 }: + +buildPythonPackage rec { + pname = "nkdfu"; + version = "0.1"; + format = "flit"; + + src = fetchPypi { + inherit pname version; + sha256 = "sha256-Y8GonfCBi3BNMhZ99SN6/SDSa0+dbfPIMPoVzALwH5A="; + }; + + propagatedBuildInputs = [ + fire + tqdm + intelhex + libusb1 + ]; + + # no tests + doCheck = false; + + pythonImportsCheck = [ "nkdfu" ]; + + meta = with lib; { + description = "Python tool for Nitrokeys' firmware update"; + homepage = "https://github.com/Nitrokey/nkdfu"; + license = with licenses; [ gpl2Only ]; + maintainers = with maintainers; [ frogamic ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 24a0dcb52fc3..ea8279dd37ae 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -5370,6 +5370,8 @@ in { nix-prefetch-github = callPackage ../development/python-modules/nix-prefetch-github { }; + nkdfu = callPackage ../development/python-modules/nkdfu { }; + nltk = callPackage ../development/python-modules/nltk { }; nmapthon2 = callPackage ../development/python-modules/nmapthon2 { }; From b80ea23c7b3848d98a99a2fdb958cc351d8e6c4d Mon Sep 17 00:00:00 2001 From: Dominic Shelton Date: Wed, 12 Jan 2022 20:08:14 +1100 Subject: [PATCH 2/2] pynitrokey: init at 0.4.9 --- pkgs/tools/security/pynitrokey/default.nix | 44 ++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 46 insertions(+) create mode 100644 pkgs/tools/security/pynitrokey/default.nix diff --git a/pkgs/tools/security/pynitrokey/default.nix b/pkgs/tools/security/pynitrokey/default.nix new file mode 100644 index 000000000000..b50550e74368 --- /dev/null +++ b/pkgs/tools/security/pynitrokey/default.nix @@ -0,0 +1,44 @@ +{ python3Packages, lib }: + +with python3Packages; + +buildPythonApplication rec { + pname = "pynitrokey"; + version = "0.4.9"; + format = "flit"; + + src = fetchPypi { + inherit pname version; + sha256 = "sha256-mhH6mVgLRX87PSGTFkj1TE75jU1lwcaRZWbC67T+vWo="; + }; + + propagatedBuildInputs = [ + click + cryptography + ecdsa + fido2 + intelhex + pyserial + pyusb + requests + pygments + python-dateutil + urllib3 + cffi + cbor + nkdfu + ]; + + # no tests + doCheck = false; + + pythonImportsCheck = [ "pynitrokey" ]; + + meta = with lib; { + description = "Python client for Nitrokey devices"; + homepage = "https://github.com/Nitrokey/pynitrokey"; + license = with licenses; [ asl20 mit ]; + maintainers = with maintainers; [ frogamic ]; + mainProgram = "nitropy"; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9a5b526c6d33..451c05043c38 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -34032,6 +34032,8 @@ with pkgs; xrq = callPackage ../applications/misc/xrq { }; + pynitrokey = callPackage ../tools/security/pynitrokey { }; + nitrokey-app = libsForQt5.callPackage ../tools/security/nitrokey-app { }; nitrokey-udev-rules = callPackage ../tools/security/nitrokey-app/udev-rules.nix { };