Merge pull request #221656 from frogamic/pynitrokey-0.4.34

SPSDK fix and Pynitrokey 0.4.31 -> 0.4.34

pkgs/development/python-modules/spsdk/default.nix

@@ -27,6 +27,7 @@
 , pyserial
 , ruamel-yaml
 , sly
+, typing-extensions
 , pytestCheckHook
 , voluptuous
 }:
@@ -52,8 +53,10 @@ buildPythonPackage rec {
     "cmsis-pack-manager"
     "deepmerge"
     "jinja2"
+    "pycryptodome"
     "pylink-square"
     "pyocd"
+    "typing-extensions"
   ];
 
   pythonRemoveDeps = [
@@ -85,6 +88,7 @@ buildPythonPackage rec {
     pyserial
     ruamel-yaml
     sly
+    typing-extensions
   ];
 
   nativeCheckInputs = [

pkgs/tools/security/pynitrokey/default.nix

@@ -1,36 +1,36 @@
-{ python3Packages, lib, nrfutil  }:
+{ python3Packages, lib, nrfutil, libnitrokey }:
 
 with python3Packages;
 
 buildPythonApplication rec {
   pname = "pynitrokey";
-  version = "0.4.31";
+  version = "0.4.34";
   format = "flit";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "sha256-nqw5wUzQxKCBzYBRhqB6v7WWrF1Ojf8z6Kf1YUA9+wU=";
+    hash = "sha256-lMXoDkNiAmGb6e4u/vZMcmXUclwW402YUGihLjWIr+U=";
   };
 
   propagatedBuildInputs = [
+    certifi
+    cffi
     click
     cryptography
     ecdsa
+    frozendict
     fido2
     intelhex
+    nkdfu
     nrfutil
-    pyserial
+    python-dateutil
     pyusb
     requests
-    pygments
-    python-dateutil
     spsdk
+    tqdm
     urllib3
-    cffi
-    cbor
-    nkdfu
-    fido2
     tlv8
+    typing-extensions
   ];
 
   nativeBuildInputs = [
@@ -39,7 +39,15 @@ buildPythonApplication rec {
 
   pythonRelaxDeps = [
     "cryptography"
+    "python-dateutil"
     "spsdk"
+    "typing_extensions"
+  ];
+
+  # libnitrokey is not propagated to users of pynitrokey
+  # It is only usable from the wrapped bin/nitropy
+  makeWrapperArgs = [
+    "--set LIBNK_PATH ${lib.makeLibraryPath [ libnitrokey ]}"
   ];
 
   # no tests