Skip to content

Conversation

@frogamic
Copy link
Contributor

@frogamic frogamic commented Jun 20, 2024

Description of changes

  • Update spsdk python module to 2.2.0
    • Changes
    • Add/remove dependencies accordingly
    • Remove dependency pyocd-pemicro which is non-free due to non-licensed binary files being included. It is still in requirements.txt but doesn't seem to be used other than a pyinstaller spec file which afaik is not used in the nix build.
  • Update libusbsio python wrapper to 2.1.12
    • Version is no longer in sync with the python wrapper bundled with the binary library, so fetch source from pypi instead.
  • Disable a test in pyocd that is broken in python 3.12 (upstream fix at Fix test failure pyocd/pyOCD#1710)

Things done

  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandboxing enabled in nix.conf? (See Nix manual)
    • sandbox = relaxed
    • sandbox = true
  • Tested, as applicable:
  • Tested compilation of all packages that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage
  • Tested basic functionality of all binary files (usually in ./result/bin/)
  • 24.11 Release Notes (or backporting 23.11 and 24.05 Release notes)
    • (Package updates) Added a release notes entry if the change is major or breaking
    • (Module updates) Added a release notes entry if the change is significant
    • (Module addition) Added a release notes entry if adding a new NixOS module
  • Fits CONTRIBUTING.md.

Add a 👍 reaction to pull requests you find important.

@github-actions github-actions bot added the 6.topic: python Python is a high-level, general-purpose programming language. label Jun 20, 2024
@frogamic frogamic requested a review from sbruder June 20, 2024 04:47
@ofborg ofborg bot added 11.by: package-maintainer This PR was created by a maintainer of all the package it changes. 10.rebuild-darwin: 1-10 This PR causes between 1 and 10 packages to rebuild on Darwin. 10.rebuild-linux: 1-10 This PR causes between 1 and 10 packages to rebuild on Linux. labels Jun 20, 2024
@frogamic frogamic force-pushed the spsdk-update branch 2 times, most recently from 65da539 to d6a4cfe Compare June 20, 2024 07:45
@frogamic
Copy link
Contributor Author

Result of nixpkgs-review pr 321158 run on x86_64-linux 1

4 packages marked as broken and skipped:
  • python312Packages.pynitrokey
  • python312Packages.pynitrokey.dist
  • python312Packages.spsdk
  • python312Packages.spsdk.dist
10 packages built:
  • nitrokey-app2
  • nitrokey-app2.dist
  • pynitrokey (python311Packages.pynitrokey)
  • pynitrokey.dist (python311Packages.pynitrokey.dist)
  • python311Packages.libusbsio
  • python311Packages.libusbsio.dist
  • python311Packages.spsdk
  • python311Packages.spsdk.dist
  • python312Packages.libusbsio
  • python312Packages.libusbsio.dist

Copy link
Contributor

@mjoerg mjoerg left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Removing disabledTests altogether also seems to work for me.

@frogamic frogamic requested a review from mjoerg June 20, 2024 13:39
Copy link
Contributor

@mjoerg mjoerg left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Result of nixpkgs-review pr 321158 run on x86_64-linux 1

4 packages marked as broken and skipped:
  • python312Packages.pynitrokey
  • python312Packages.pynitrokey.dist
  • python312Packages.spsdk
  • python312Packages.spsdk.dist
10 packages built:
  • nitrokey-app2
  • nitrokey-app2.dist
  • pynitrokey (python311Packages.pynitrokey)
  • pynitrokey.dist (python311Packages.pynitrokey.dist)
  • python311Packages.libusbsio
  • python311Packages.libusbsio.dist
  • python311Packages.spsdk
  • python311Packages.spsdk.dist
  • python312Packages.libusbsio
  • python312Packages.libusbsio.dist

@wegank wegank added the 12.approvals: 1 This PR was reviewed and approved by one person. label Jun 21, 2024
@frogamic frogamic removed the request for review from sbruder July 3, 2024 01:30
@wegank wegank added the 2.status: merge conflict This PR has merge conflicts with the target branch label Jul 6, 2024
@frogamic frogamic force-pushed the spsdk-update branch 2 times, most recently from d08d62c to 38ea415 Compare July 8, 2024 05:25
@ofborg ofborg bot removed the 2.status: merge conflict This PR has merge conflicts with the target branch label Jul 8, 2024
@frogamic frogamic force-pushed the spsdk-update branch 2 times, most recently from 893e390 to 8f16385 Compare July 8, 2024 06:08
@ofborg ofborg bot requested a review from sbruder July 8, 2024 06:38
Copy link
Contributor

@mjoerg mjoerg left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Referencing pythonRelaxDepsHook is no longer needed since #319573.

@wegank wegank removed the 12.approvals: 1 This PR was reviewed and approved by one person. label Jul 8, 2024
@frogamic frogamic force-pushed the spsdk-update branch 2 times, most recently from 95f74ad to 8999909 Compare July 9, 2024 03:20
@jollheef
Copy link
Member

jollheef commented Jul 9, 2024

Result of nixpkgs-review pr 321158 run on aarch64-linux 1

8 packages marked as broken and skipped:
  • nitrokey-app2
  • nitrokey-app2.dist
  • pynitrokey
  • pynitrokey.dist
  • python312Packages.pynitrokey
  • python312Packages.pynitrokey.dist
  • python312Packages.spsdk
  • python312Packages.spsdk.dist
8 packages built:
  • python311Packages.libusbsio
  • python311Packages.libusbsio.dist
  • python311Packages.pynitrokey
  • python311Packages.pynitrokey.dist
  • python311Packages.spsdk
  • python311Packages.spsdk.dist
  • python312Packages.libusbsio
  • python312Packages.libusbsio.dist

@frogamic frogamic force-pushed the spsdk-update branch 2 times, most recently from 25d590b to 59e8125 Compare July 12, 2024 01:51
@frogamic
Copy link
Contributor Author

@sbruder are you still around on GitHub to review this?

frogamic added 3 commits July 15, 2024 14:24
Its version is no longer in sync with libusbsio
Patch out pyocd_pemicro, unused and unfree dependency
@ofborg ofborg bot added 10.rebuild-darwin: 11-100 This PR causes between 11 and 100 packages to rebuild on Darwin. 10.rebuild-linux: 11-100 This PR causes between 11 and 100 packages to rebuild on Linux. and removed 10.rebuild-darwin: 1-10 This PR causes between 1 and 10 packages to rebuild on Darwin. 10.rebuild-linux: 1-10 This PR causes between 1 and 10 packages to rebuild on Linux. labels Jul 15, 2024
@frogamic
Copy link
Contributor Author

Result of nixpkgs-review pr 321158 run on x86_64-linux 1

22 packages built:
  • nitrokey-app2
  • nitrokey-app2.dist
  • pynitrokey (python312Packages.pynitrokey)
  • pynitrokey.dist (python312Packages.pynitrokey.dist)
  • pyocd (python312Packages.pyocd)
  • pyocd.dist (python312Packages.pyocd.dist)
  • python311Packages.libusbsio
  • python311Packages.libusbsio.dist
  • python311Packages.pynitrokey
  • python311Packages.pynitrokey.dist
  • python311Packages.pyocd
  • python311Packages.pyocd-pemicro
  • python311Packages.pyocd-pemicro.dist
  • python311Packages.pyocd.dist
  • python311Packages.spsdk
  • python311Packages.spsdk.dist
  • python312Packages.libusbsio
  • python312Packages.libusbsio.dist
  • python312Packages.pyocd-pemicro
  • python312Packages.pyocd-pemicro.dist
  • python312Packages.spsdk
  • python312Packages.spsdk.dist

Copy link
Contributor

@panicgh panicgh left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Result of nixpkgs-review pr 321158 run on x86_64-linux 1

22 packages built:
  • nitrokey-app2
  • nitrokey-app2.dist
  • pynitrokey (python312Packages.pynitrokey)
  • pynitrokey.dist (python312Packages.pynitrokey.dist)
  • pyocd (python312Packages.pyocd)
  • pyocd.dist (python312Packages.pyocd.dist)
  • python311Packages.libusbsio
  • python311Packages.libusbsio.dist
  • python311Packages.pynitrokey
  • python311Packages.pynitrokey.dist
  • python311Packages.pyocd
  • python311Packages.pyocd-pemicro
  • python311Packages.pyocd-pemicro.dist
  • python311Packages.pyocd.dist
  • python311Packages.spsdk
  • python311Packages.spsdk.dist
  • python312Packages.libusbsio
  • python312Packages.libusbsio.dist
  • python312Packages.pyocd-pemicro
  • python312Packages.pyocd-pemicro.dist
  • python312Packages.spsdk
  • python312Packages.spsdk.dist

@jollheef
Copy link
Member

Result of nixpkgs-review pr 321158 run on aarch64-linux 1

22 packages built:
  • nitrokey-app2
  • nitrokey-app2.dist
  • pynitrokey (python312Packages.pynitrokey)
  • pynitrokey.dist (python312Packages.pynitrokey.dist)
  • pyocd (python312Packages.pyocd)
  • pyocd.dist (python312Packages.pyocd.dist)
  • python311Packages.libusbsio
  • python311Packages.libusbsio.dist
  • python311Packages.pynitrokey
  • python311Packages.pynitrokey.dist
  • python311Packages.pyocd
  • python311Packages.pyocd-pemicro
  • python311Packages.pyocd-pemicro.dist
  • python311Packages.pyocd.dist
  • python311Packages.spsdk
  • python311Packages.spsdk.dist
  • python312Packages.libusbsio
  • python312Packages.libusbsio.dist
  • python312Packages.pyocd-pemicro
  • python312Packages.pyocd-pemicro.dist
  • python312Packages.spsdk
  • python312Packages.spsdk.dist

@frogamic
Copy link
Contributor Author

@NixOS/nixpkgs-merge-bot merge

@nixpkgs-merge-bot
Copy link
Contributor

@frogamic merge not permitted (#305350):
pkgs/development/python-modules/libusbsio/default.nix is not in pkgs/by-name/
pkgs/development/python-modules/pyocd/default.nix is not in pkgs/by-name/
pkgs/development/python-modules/spsdk/default.nix is not in pkgs/by-name/

@Lassulus Lassulus merged commit 8b2a796 into NixOS:master Jul 18, 2024
@frogamic frogamic deleted the spsdk-update branch July 18, 2024 11:53
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

6.topic: python Python is a high-level, general-purpose programming language. 10.rebuild-darwin: 11-100 This PR causes between 11 and 100 packages to rebuild on Darwin. 10.rebuild-linux: 11-100 This PR causes between 11 and 100 packages to rebuild on Linux. 11.by: package-maintainer This PR was created by a maintainer of all the package it changes.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

6 participants