Skip to content

binwalk: migrate to fork, 2.4.1#326295

Merged
superherointj merged 2 commits intoNixOS:masterfrom
jchw-forks:fix/binwalk
Jul 11, 2024
Merged

binwalk: migrate to fork, 2.4.1#326295
superherointj merged 2 commits intoNixOS:masterfrom
jchw-forks:fix/binwalk

Conversation

@jchv
Copy link
Contributor

@jchv jchv commented Jul 11, 2024

Description of changes

Binwalk has gone unmaintained for some time, unfortunately. Thankfully our friends at Gentoo have been maintaining a fork. It is currently used by both Gentoo and Alpine.

This PR moves to the fork and updates the derivation accordingly. It also migrates to the PEP517 builder.

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 Jul 11, 2024
@jchv
Copy link
Contributor Author

jchv commented Jul 11, 2024

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

12 packages built:
  • binwalk (python312Packages.binwalk)
  • binwalk.dist (python312Packages.binwalk.dist)
  • diffoscope
  • diffoscope.dist
  • diffoscope.man
  • ghidra-extensions.ghidraninja-ghidra-scripts
  • python311Packages.binwalk
  • python311Packages.binwalk-full
  • python311Packages.binwalk-full.dist
  • python311Packages.binwalk.dist
  • python312Packages.binwalk-full
  • python312Packages.binwalk-full.dist

@ofborg ofborg bot added 8.has: package (new) This PR adds a new package 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 11, 2024
Copy link
Member

@emilazy emilazy left a comment

Choose a reason for hiding this comment

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

Arch, Void, Exherbo, and MSYS2 all use this fork too. At a glance, the new upstream seems reputable, development looks reasonably active, and they seem to understand what a licence is…

Do you know how this might affect the weird test behaviour in #325623?

Result of nixpkgs-review pr 326295 run on aarch64-darwin 1

1 package marked as broken and skipped:
  • ghidra-extensions.ghidraninja-ghidra-scripts
11 packages built:
  • binwalk (python312Packages.binwalk)
  • binwalk.dist (python312Packages.binwalk.dist)
  • diffoscope
  • diffoscope.dist
  • diffoscope.man
  • python311Packages.binwalk
  • python311Packages.binwalk-full
  • python311Packages.binwalk-full.dist
  • python311Packages.binwalk.dist
  • python312Packages.binwalk-full
  • python312Packages.binwalk-full.dist

@jchv
Copy link
Contributor Author

jchv commented Jul 11, 2024

Result of nixpkgs-review pr 326295 run on aarch64-darwin 1

1 package marked as broken and skipped:
  • ghidra-extensions.ghidraninja-ghidra-scripts
11 packages built:
  • binwalk (python312Packages.binwalk)
  • binwalk.dist (python312Packages.binwalk.dist)
  • diffoscope
  • diffoscope.dist
  • diffoscope.man
  • python311Packages.binwalk
  • python311Packages.binwalk-full
  • python311Packages.binwalk-full.dist
  • python311Packages.binwalk.dist
  • python312Packages.binwalk-full
  • python312Packages.binwalk-full.dist

@jchv
Copy link
Contributor Author

jchv commented Jul 11, 2024

Good question. I'm actually wondering the same thing myself.

How should it manifest, as a test failure in diffoscope? I guess I'm not seeing that if so. Maybe we can find evidence in the 77 or so commits that this fork has on top of the original repository.

@emilazy
Copy link
Member

emilazy commented Jul 11, 2024

Yeah, I guess this fork is fine but the other patch wasn’t, somehow…? Or skipping the checks on 3.12 somehow broke it in the other PR? But hey, it built fine…

cc @philiptaron

@superherointj
Copy link
Contributor

Result of nixpkgs-review pr 326295 run on aarch64-darwin 1

1 package marked as broken and skipped:
  • ghidra-extensions.ghidraninja-ghidra-scripts
11 packages built:
  • binwalk (python312Packages.binwalk)
  • binwalk.dist (python312Packages.binwalk.dist)
  • diffoscope
  • diffoscope.dist
  • diffoscope.man
  • python311Packages.binwalk
  • python311Packages.binwalk-full
  • python311Packages.binwalk-full.dist
  • python311Packages.binwalk.dist
  • python312Packages.binwalk-full
  • python312Packages.binwalk-full.dist

@github-actions
Copy link
Contributor

Backport failed for release-24.05, because it was unable to cherry-pick the commit(s).

Please cherry-pick the changes locally and resolve any conflicts.

git fetch origin release-24.05
git worktree add -d .worktree/backport-326295-to-release-24.05 origin/release-24.05
cd .worktree/backport-326295-to-release-24.05
git switch --create backport-326295-to-release-24.05
git cherry-pick -x c9998d08693c680857e567d034c2bf0de661c10b c734673fef56864c7d0d2a70e66b344472f3456e

@emilazy
Copy link
Member

emilazy commented Jul 11, 2024

I don’t think the 3.12 switch is on 24.05…?

@jchv jchv deleted the fix/binwalk branch July 13, 2024 00:01
Copy link
Contributor

@philiptaron philiptaron left a comment

Choose a reason for hiding this comment

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

Thanks. I'll close #325623.

midischwarz12 pushed a commit to midischwarz12/nixpkgs that referenced this pull request Jul 28, 2024
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. 8.has: package (new) This PR adds a new package 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.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants