Skip to content

jefferson: relax cstruct dependency#380735

Merged
SuperSandro2000 merged 1 commit intoNixOS:masterfrom
secshellnet:fix-jefferson
Feb 10, 2025
Merged

jefferson: relax cstruct dependency#380735
SuperSandro2000 merged 1 commit intoNixOS:masterfrom
secshellnet:fix-jefferson

Conversation

@felbinger
Copy link
Member

@felbinger felbinger commented Feb 9, 2025

fix python import check, by relaxing cstruct dependency.

I've got the following error, when trying to build binwalk:

   > Checking runtime dependencies for jefferson-0.4.5-py3-none-any.whl
   >   - cstruct<6.0,>=5.2 not satisfied by version 6.0

broken by: 311264f / #375144

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/)
  • 25.05 Release Notes (or backporting 24.11 and 25.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.

@tnias @vlaci


Add a 👍 reaction to pull requests you find important.

@github-actions github-actions bot added 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 Feb 9, 2025
@nix-owners nix-owners bot requested a review from vlaci February 9, 2025 22:01
@felbinger
Copy link
Member Author

felbinger commented Feb 9, 2025

nixpkgs-review result

Generated using nixpkgs-review-gha

Command: nixpkgs-review pr 380735

Logs: https://github.com/felbinger/nixpkgs-review-gha/actions/runs/13229941204


x86_64-linux

❌ 4 packages failed to build:
  • diffoscope
  • diffoscope.dist
  • diffoscope.man
  • garble
✅ 6 packages built:
  • binwalk
  • ghidra-extensions.ghidraninja-ghidra-scripts
  • jefferson
  • jefferson.dist
  • unblob
  • unblob.dist

aarch64-linux

✅ 6 packages built:
  • binwalk
  • ghidra-extensions.ghidraninja-ghidra-scripts
  • jefferson
  • jefferson.dist
  • unblob
  • unblob.dist

x86_64-darwin

✅ 6 packages built:
  • binwalk
  • ghidra-extensions.ghidraninja-ghidra-scripts
  • jefferson
  • jefferson.dist
  • unblob
  • unblob.dist

aarch64-darwin

✅ 6 packages built:
  • binwalk
  • ghidra-extensions.ghidraninja-ghidra-scripts
  • jefferson
  • jefferson.dist
  • unblob
  • unblob.dist

Not sure why and how to fix, I'm going to continue working on this tomorrow evening.

@tnias tnias mentioned this pull request Feb 9, 2025
3 tasks
@tnias
Copy link
Contributor

tnias commented Feb 9, 2025

Looks good to me. I successfully tested basic functionality of jefferson and unblob by extracting an example image.

The diffoscope build failure seems to be related to changed import paths between androguard v3.4.0a1 and v4.1.2.
https://github.com/androguard/androguard/blob/v3.4.0a1/androguard/core/bytecodes/apk.py
https://github.com/androguard/androguard/blob/v4.1.2/androguard/core/apk/__init__.py

Androguard was also recently updated in 47c6362 / #375144 (same PR you mentioned above)

Copy link
Contributor

@al3xtjames al3xtjames left a comment

Choose a reason for hiding this comment

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

LGTM! BTW, I reported this upstream: onekey-sec/jefferson#20

@tnias tnias mentioned this pull request Feb 10, 2025
13 tasks
@wegank wegank added 12.approved-by: package-maintainer This PR was reviewed and approved by a maintainer listed in any of the changed packages. 12.approvals: 3+ This PR was reviewed and approved by three or more persons. labels Feb 10, 2025
@felbinger
Copy link
Member Author

felbinger commented Feb 10, 2025

LGTM! BTW, I reported this upstream: onekey-sec/jefferson#20

Merged but no new release yet, so I guess we should continue working with the relaxed dependency.

Mentioned diffoscope update pr above fixes diffoscope, which is currently broken on master, depends on this change.

How to proceed with this? Can we simply merge this pr, because the marked as broken packages are broken anyway right now?

@SuperSandro2000 SuperSandro2000 merged commit b7cde80 into NixOS:master Feb 10, 2025
45 checks passed
@SuperSandro2000
Copy link
Member

Can we simply merge this pr, because the marked as broken packages are broken anyway right now?

yep

@felbinger felbinger deleted the fix-jefferson branch February 10, 2025 17:42
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

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. 12.approvals: 3+ This PR was reviewed and approved by three or more persons. 12.approved-by: package-maintainer This PR was reviewed and approved by a maintainer listed in any of the changed packages.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

6 participants