From 31fa96e09eda434c3ef39f0fcc4e21d370e7d762 Mon Sep 17 00:00:00 2001 From: Damien Cassou Date: Mon, 11 Sep 2023 21:01:27 +0200 Subject: [PATCH 1/4] python3Packages.spsdk: remove unused binding --- pkgs/development/python-modules/spsdk/default.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/development/python-modules/spsdk/default.nix b/pkgs/development/python-modules/spsdk/default.nix index 4aafc2e6c131..1a02ecdc6588 100644 --- a/pkgs/development/python-modules/spsdk/default.nix +++ b/pkgs/development/python-modules/spsdk/default.nix @@ -1,7 +1,6 @@ { lib , buildPythonPackage , fetchFromGitHub -, dos2unix , pythonRelaxDepsHook , asn1crypto , astunparse From e250509945196183b0637a88df70ffdcb80e21dc Mon Sep 17 00:00:00 2001 From: Damien Cassou Date: Mon, 11 Sep 2023 21:01:46 +0200 Subject: [PATCH 2/4] python3Packages.spsdk: fix dependency toward importlib-metadata The dependency is needed at runtime by plugins.py. --- pkgs/development/python-modules/spsdk/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/spsdk/default.nix b/pkgs/development/python-modules/spsdk/default.nix index 1a02ecdc6588..b8598f3a8846 100644 --- a/pkgs/development/python-modules/spsdk/default.nix +++ b/pkgs/development/python-modules/spsdk/default.nix @@ -79,6 +79,7 @@ buildPythonPackage rec { deepmerge fastjsonschema hexdump + importlib-metadata jinja2 libusbsio oscrypto @@ -93,7 +94,6 @@ buildPythonPackage rec { ]; nativeCheckInputs = [ - importlib-metadata pyftdi pytestCheckHook voluptuous From 2f216e2afcd7361443866157f74f0ecf6fe45ff2 Mon Sep 17 00:00:00 2001 From: Damien Cassou Date: Mon, 11 Sep 2023 21:16:47 +0200 Subject: [PATCH 3/4] python3Packages.spsdk: Add meta.mainProgram --- pkgs/development/python-modules/spsdk/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/python-modules/spsdk/default.nix b/pkgs/development/python-modules/spsdk/default.nix index b8598f3a8846..668dc0eea8fc 100644 --- a/pkgs/development/python-modules/spsdk/default.nix +++ b/pkgs/development/python-modules/spsdk/default.nix @@ -107,5 +107,6 @@ buildPythonPackage rec { homepage = "https://github.com/nxp-mcuxpresso/spsdk"; license = licenses.bsd3; maintainers = with maintainers; [ frogamic sbruder ]; + mainProgram = "spsdk"; }; } From 09ffed3fd459a441396e2cdfa8de1851d27654a7 Mon Sep 17 00:00:00 2001 From: Damien Cassou Date: Mon, 11 Sep 2023 21:17:10 +0200 Subject: [PATCH 4/4] python3Packages.spsdk: Add passthru.tests.version --- pkgs/development/python-modules/spsdk/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/development/python-modules/spsdk/default.nix b/pkgs/development/python-modules/spsdk/default.nix index 668dc0eea8fc..d8e6b0ab45ef 100644 --- a/pkgs/development/python-modules/spsdk/default.nix +++ b/pkgs/development/python-modules/spsdk/default.nix @@ -28,6 +28,8 @@ , pyserial , ruamel-yaml , sly +, spsdk +, testers , typing-extensions , pytestCheckHook , voluptuous @@ -101,6 +103,8 @@ buildPythonPackage rec { pythonImportsCheck = [ "spsdk" ]; + passthru.tests.version = testers.testVersion { package = spsdk; }; + meta = with lib; { changelog = "https://github.com/nxp-mcuxpresso/spsdk/blob/${src.rev}/docs/release_notes.rst"; description = "NXP Secure Provisioning SDK";