Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

binwalk: add missing dependencies & versionCheckHook #373404

Merged
merged 3 commits into from
Jan 15, 2025

Conversation

KSJ2000
Copy link
Contributor

@KSJ2000 KSJ2000 commented Jan 13, 2025

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.

Add a 👍 reaction to pull requests you find important.

@github-actions github-actions bot added 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin 10.rebuild-linux: 1-10 labels Jan 13, 2025
@nix-owners nix-owners bot requested a review from felbinger January 13, 2025 10:14
Copy link
Member

@felbinger felbinger left a comment

Choose a reason for hiding this comment

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

I didn't cherry-pick to test, but changes look good and reasonable

@KSJ2000
Copy link
Contributor Author

KSJ2000 commented Jan 13, 2025

Still needs srec2bin to be merged and included,
or for the next tag of binwalk to come out which replaces it with srec_cat.

@felbinger felbinger mentioned this pull request Jan 13, 2025
13 tasks
Copy link
Member

@SuperSandro2000 SuperSandro2000 left a comment

Choose a reason for hiding this comment

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

binwalk: use upstream lock file

Technically we just switched to vendoring and we probably copied the lockfile before from upstream but nit picks.

@@ -18,16 +45,42 @@ rustPlatform.buildRustPackage rec {
repo = "binwalk";
tag = "v${version}";
hash = "sha256-em+jOnhCZH5EEJrhXTHmxiwpMcBr5oNU1+5IJ1H/oco=";
fetchSubmodules = true;
Copy link
Member

Choose a reason for hiding this comment

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

The repo contains no .gitmodules file. Why do we need this?

Copy link
Contributor Author

@KSJ2000 KSJ2000 Jan 14, 2025

Choose a reason for hiding this comment

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

Oh, I see. I wasn't sure what modules it fetched, thought it was some rust ones and wanted to get all the optional ones. Gitmodules makes more sense.

@wegank wegank added 12.approvals: 1 This PR was reviewed and approved by one reputable person 12.approved-by: package-maintainer This PR was reviewed and approved by a maintainer listed in the package labels Jan 14, 2025
@KSJ2000
Copy link
Contributor Author

KSJ2000 commented Jan 14, 2025

Technically we just switched to vendoring and we probably copied the lockfile before from upstream but nit picks.

Do we upload the lockfiles into nixpkgs now? since I still saw packages removing them and using useFetchCargoVendor, or I'm not sure I quite understand the sentence correctly.

@wegank wegank removed the 12.approvals: 1 This PR was reviewed and approved by one reputable person label Jan 14, 2025
@felbinger
Copy link
Member

@KSJ2000 srec2bin has been merged, so after a rebase it should be possible to also add this package.

@SuperSandro2000 SuperSandro2000 merged commit 33b6eda into NixOS:master Jan 15, 2025
24 of 27 checks passed
@KSJ2000 KSJ2000 deleted the binwalk branch January 16, 2025 07:18
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin 10.rebuild-linux: 1-10 12.approved-by: package-maintainer This PR was reviewed and approved by a maintainer listed in the package
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants