pynitrokey: 0.4.9 -> 0.4.26 #183099

sbruder · 2022-07-27T13:12:45Z

Description of changes

This updates pynitrokey as part of the Summer of Nix.
It introduces a few new packages that are new dependencies of pynitrokey.

A few notes on how this is packaged:

It depends on Update nrfutil and dependencies. #180075, which fixes the nrfutil package, a new dependency of pynitrokey. This PR’s branch includes the commits from that PR to make it build self-contained, but it should not be merged before the other PR is merged.
It does not fully use pypemicro, which is an optional dependency of some projects. Where it is a hard dependency, it is patched out. The reason is that it packages prebuilt shared libraries for which no source code is available: Source code for shared libraries? nxp-mcuxpresso/pypemicro#10
Since I can’t guarantee that I will be able to maintain this after Summer of Nix, I also added @frogamic as a maintainer to each package, I hope this is okay for you.
I don’t own a Nitrokey device and couldn’t test this with real hardware. All (well, most, cf. spsdk) tests for the dependencies pass and the CLI looks functional, so I think it should work. @devhell @frogamic, you were involved in initially adding the package, could you please test if this works with a Nitrokey?
I also ran into Missing binutils dependency #176917, which I addressed by adding binutils.bintools to the downstream packages and wrapping the binaries with a LD_LIBRARY_PATH including OpenSSL. I don’t know if this is the preferred way to do this.

Things done

risicle · 2022-07-27T21:52:54Z

pkgs/development/libraries/pc-ble-driver/default.nix

+  patches = [
+     # Fix build with GCC 11
+    (fetchpatch {
+      url = "https://github.com/NordicSemiconductor/pc-ble-driver/commit/37258e65bdbcd0b4369ae448faf650dd181816ec.patch";


Suggested change

url = "https://github.com/NordicSemiconductor/pc-ble-driver/commit/37258e65bdbcd0b4369ae448faf650dd181816ec.patch";

name = "gcc11-fix.patch";

url = "https://github.com/NordicSemiconductor/pc-ble-driver/commit/37258e65bdbcd0b4369ae448faf650dd181816ec.patch";

This is directly taken from #180075, so you would need to review this there.

pkgs/development/libraries/libusbsio/default.nix

pkgs/development/embedded/pyocd/default.nix

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

pkgs/development/embedded/pyocd/default.nix

pkgs/development/python-modules/cmsis-pack-manager/default.nix

risicle · 2022-07-27T23:40:26Z

Looking good. I'd suggest adding pythonImportsCheck to all the python packages, even those with tests enabled, as it can sometimes catch problems the tests miss.

sbruder · 2022-07-28T07:30:42Z

Thank you for the review! I implemented your suggestions (except for the one from the depending PR). It should now also work on Darwin, though I have no system to test this with. I left the comments to the patches there in addition to the patch names, because I think they add valuable information, though I’m open to removing them.

pkgs/development/libraries/libusbsio/default.nix

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

DamienCassou · 2022-08-03T14:25:39Z

I rebased the PR on top of latest master and will merge it in the coming days if nobody says otherwise (or merges before me).

DamienCassou · 2022-08-03T18:07:54Z

Works fine with my Nitrokey start.

pkgs/development/libraries/libusbsio/default.nix

SuperSandro2000 · 2022-08-03T21:27:15Z

pkgs/development/libraries/libusbsio/default.nix

+
+  installPhase = ''
+    runHook preInstall
+    install -D bin/${binDirPrefix}$(uname -m)/libusbsio.${libSuffix} $out/lib/libusbsio.${libSuffix}


I don't think we want to use uname -m here. Can't we get that from a nix variable or use a wildcard?

The makefile uses uname -m to determine the directory, so I think it should be used to get the same path that the build uses. Or is there a nixpkgs function/constant that returns this?

I don't know but I would suspect that it could be a source for impurity.

I replaced it with stdenv.targetPlatform.parsed.cpu.name.

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

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

SuperSandro2000 · 2022-08-03T21:34:38Z

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

+    asn1crypto
+    astunparse
+    bincopy
+    binutils.bintools # required for ctypes to find libcrypto (https://github.com/dbt-labs/dbt-core/issues/3366#issuecomment-849764321)


Can we patch the code instead?

That would probably require patching the python interpreter (see #176917)

thats strange

binutils (objdump) is indeed one of the methods for ctypes to find dependencies.

Still, in Nixpkgs we patch out ctypes calls in the calling code. This is not for the interpreter.

I patched the calls in the oscrypto library, from where they originate. This should also fix #176917.

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

pkgs/top-level/python-packages.nix

DamienCassou · 2022-08-10T15:31:32Z

Can this be merged now @SuperSandro2000?

pkgs/development/libraries/libusbsio/default.nix

Many thanks to David Runge (dvzrv), who made an effort to get this available under a free license earlier this year: nxp-mcuxpresso/spsdk#36

Its version is synced with libusbsio.

The ctypes call did not work, because it requires binutils.bintools to be available in every downstream dependency. Fixes NixOS#176917.

sbruder · 2022-08-17T11:13:46Z

I rebased it onto latest master and fixed an issue with cross-compilation (libusbsio used targetPlatform instead of hostPlatform for determining the library architecture).

sbruder requested review from FRidh and jonringer as code owners July 27, 2022 13:12

github-actions bot added the 6.topic: python label Jul 27, 2022

ofborg bot added the 8.has: package (new) This PR adds a new package label Jul 27, 2022

ofborg bot requested review from jonas-schievink and gebner July 27, 2022 13:21

ofborg bot added 10.rebuild-darwin: 11-100 10.rebuild-linux: 11-100 labels Jul 27, 2022

risicle reviewed Jul 27, 2022

View reviewed changes

pkgs/development/libraries/libusbsio/default.nix Show resolved Hide resolved

risicle reviewed Jul 27, 2022

View reviewed changes

pkgs/development/embedded/pyocd/default.nix Show resolved Hide resolved

risicle reviewed Jul 27, 2022

View reviewed changes

pkgs/development/python-modules/spsdk/default.nix Show resolved Hide resolved

risicle reviewed Jul 27, 2022

View reviewed changes

pkgs/development/embedded/pyocd/default.nix Show resolved Hide resolved

risicle reviewed Jul 27, 2022

View reviewed changes

pkgs/development/python-modules/cmsis-pack-manager/default.nix Show resolved Hide resolved

sbruder force-pushed the update-pynitrokey branch from 23ac66e to f06024c Compare July 28, 2022 07:25

sbruder force-pushed the update-pynitrokey branch from f06024c to 1b72377 Compare July 29, 2022 06:51

gytis-ivaskevicius approved these changes Jul 29, 2022

View reviewed changes

pkgs/development/libraries/libusbsio/default.nix Outdated Show resolved Hide resolved

pkgs/development/python-modules/spsdk/default.nix Outdated Show resolved Hide resolved

sbruder force-pushed the update-pynitrokey branch from 1b72377 to bebebf6 Compare July 29, 2022 13:59

DamienCassou force-pushed the update-pynitrokey branch from bebebf6 to 1af5041 Compare August 3, 2022 14:22

DamienCassou requested a review from risicle August 3, 2022 14:22

SuperSandro2000 reviewed Aug 3, 2022

View reviewed changes

pkgs/development/libraries/libusbsio/default.nix Outdated Show resolved Hide resolved

SuperSandro2000 reviewed Aug 3, 2022

View reviewed changes

sbruder force-pushed the update-pynitrokey branch 4 times, most recently from 461e03b to 05d5a88 Compare August 4, 2022 15:19

SuperSandro2000 requested changes Aug 11, 2022

View reviewed changes

pkgs/development/libraries/libusbsio/default.nix Outdated Show resolved Hide resolved

pkgs/development/libraries/libusbsio/default.nix Outdated Show resolved Hide resolved

sbruder force-pushed the update-pynitrokey branch from 05d5a88 to de4cbc3 Compare August 12, 2022 09:48

sbruder requested review from SuperSandro2000 and removed request for jonas-schievink August 12, 2022 09:48

SuperSandro2000 approved these changes Aug 15, 2022

View reviewed changes

bobby285271 added the 12.approvals: 2 This PR was reviewed and approved by two reputable people label Aug 16, 2022

sbruder added 11 commits August 17, 2022 13:00

python3Packages.argparse_addons: init at 0.8.0

a285900

python3Packages.bincopy: init at 17.10.2

af149e5

libusbsio: init at 2.1.11

1a941b4

Many thanks to David Runge (dvzrv), who made an effort to get this available under a free license earlier this year: nxp-mcuxpresso/spsdk#36

python3Packages.libusbsio: init

45206b2

Its version is synced with libusbsio.

python3Packages.cmsis-pack-manager: init at 0.4.0

7a7f1ae

python3Packages.hexdump: init at 3.3

beeffa2

pyocd: init at 0.34.1

2e61922

python3Packages.pypemicro: init at 0.1.9

3820a02

python3Packages.oscrypto: patch ctypes call

c400724

The ctypes call did not work, because it requires binutils.bintools to be available in every downstream dependency. Fixes NixOS#176917.

python3Packages.spsdk: init at 1.6.3

f06e9ce

pynitrokey: 0.4.9 -> 0.4.26

d6bbf7d

sbruder force-pushed the update-pynitrokey branch from de4cbc3 to d6bbf7d Compare August 17, 2022 11:13

sbruder mentioned this pull request Aug 17, 2022

polkit does not work as nativeBuildInput for embedded cross-compiling #187109

Closed

SuperSandro2000 merged commit 2908c21 into NixOS:master Aug 17, 2022

abathur mentioned this pull request Aug 27, 2023

Init pypemicro and pyocd-pemicro #150586

Closed

13 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

pynitrokey: 0.4.9 -> 0.4.26 #183099

pynitrokey: 0.4.9 -> 0.4.26 #183099

sbruder commented Jul 27, 2022 •

edited

Loading

risicle Jul 27, 2022

sbruder Jul 28, 2022

risicle commented Jul 27, 2022

sbruder commented Jul 28, 2022

DamienCassou commented Aug 3, 2022

DamienCassou commented Aug 3, 2022

SuperSandro2000 Aug 3, 2022

sbruder Aug 4, 2022 •

edited

Loading

SuperSandro2000 Aug 4, 2022

sbruder Aug 4, 2022

SuperSandro2000 Aug 3, 2022

sbruder Aug 4, 2022

SuperSandro2000 Aug 4, 2022

FRidh Aug 4, 2022 •

edited

Loading

sbruder Aug 4, 2022

DamienCassou commented Aug 10, 2022

sbruder commented Aug 17, 2022

	url = "https://github.com/NordicSemiconductor/pc-ble-driver/commit/37258e65bdbcd0b4369ae448faf650dd181816ec.patch";
	name = "gcc11-fix.patch";
	url = "https://github.com/NordicSemiconductor/pc-ble-driver/commit/37258e65bdbcd0b4369ae448faf650dd181816ec.patch";

pynitrokey: 0.4.9 -> 0.4.26 #183099

pynitrokey: 0.4.9 -> 0.4.26 #183099

Conversation

sbruder commented Jul 27, 2022 • edited Loading

Description of changes

Things done

Choose a reason for hiding this comment

Choose a reason for hiding this comment

risicle commented Jul 27, 2022

sbruder commented Jul 28, 2022

DamienCassou commented Aug 3, 2022

DamienCassou commented Aug 3, 2022

Choose a reason for hiding this comment

sbruder Aug 4, 2022 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

FRidh Aug 4, 2022 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

DamienCassou commented Aug 10, 2022

sbruder commented Aug 17, 2022

sbruder commented Jul 27, 2022 •

edited

Loading

sbruder Aug 4, 2022 •

edited

Loading

FRidh Aug 4, 2022 •

edited

Loading