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

Jump to bottom

pythonPackages.capstone: 3.0.5.post1 -> 4.0.1, redesign as wrapper package around main capstone package #76913

Merged
merged 2 commits into from Feb 10, 2020
Merged

pythonPackages.capstone: 3.0.5.post1 -> 4.0.1, redesign as wrapper package around main capstone package #76913

merged 2 commits into from Feb 10, 2020

Conversation

risicle
Copy link
Contributor

@risicle risicle commented Jan 4, 2020 •
edited

Motivation for this change

Similar to #76762, this allows us to more easily keep the main package and python bindings in sync.

Again, I've also enabled the main capstone package on darwin and enabled its tests too.

Downstream dependency pwntools fails to build but that's due to tox being broken.

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS linux)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Determined the impact on package closure size (by running nix path-info -S before and after)
  • Ensured that relevant documentation is up to date
  • Fits CONTRIBUTING.md.
Notify maintainers

cc @thoughtpolice @bennofs

@ofborg ofborg bot requested review from bennofs and thoughtpolice January 4, 2020 12:55
thoughtpolice
thoughtpolice approved these changes Jan 4, 2020
View reviewed changes
Copy link
Member

@thoughtpolice thoughtpolice left a comment

Choose a reason for hiding this comment

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

Excellent, thank you for this! Very useful.

@thoughtpolice
Copy link
Member

@GrahamcOfBorg build capstone pythonPackages.capstone

@risicle
Copy link
Contributor Author

risicle commented Jan 5, 2020

Pushed an extra commit fixing the pkg-config output. Turns out it generates capstone.pc during the buildPhase and therefore needs PREFIX to get it right.

@ofborg ofborg bot requested a review from thoughtpolice January 5, 2020 21:33
jonringer
jonringer approved these changes Jan 6, 2020
View reviewed changes
Copy link
Contributor

@jonringer jonringer left a comment

Choose a reason for hiding this comment

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

diff LGTM

16 package built:
boomerang capstone pwndbg python27Packages.ROPGadget python27Packages.capstone python27Packages.pwntools python27Packages.ropper python37Packages.ROPGadget python37Packages.capstone python37Packages.pwntools python37Packages.ropper python38Packages.ROPGadget python38Packages.capstone python38Packages.pwntools python38Packages.ropper wcc

@jonringer
Copy link
Contributor

@GrahamcOfBorg build boomerang capstone pwndbg python27Packages.ROPGadget python27Packages.capstone python27Packages.pwntools python27Packages.ropper python37Packages.ROPGadget python37Packages.capstone python37Packages.pwntools python37Packages.ropper python38Packages.ROPGadget python38Packages.capstone python38Packages.pwntools python38Packages.ropper wcc

jonringer
jonringer reviewed Jan 6, 2020
View reviewed changes
Copy link
Contributor

@jonringer jonringer left a comment

Choose a reason for hiding this comment

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

I think this should be squashed into two commits, one for capstone, one for the python package

@risicle
Copy link
Contributor Author

risicle commented Jan 6, 2020

I can do that I was just trying to give people more points to bisect to if this screws things up - it also allows me to comment things separately...

jonringer
jonringer approved these changes Jan 6, 2020
View reviewed changes
Copy link
Contributor

@jonringer jonringer left a comment

Choose a reason for hiding this comment

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

I can see it either way, personally I view it as "gave darwin some love while bumping the version".

cc @FRidh

@risicle
capstone: enable for darwin, enable tests & fix pkg-config output
0763a85 
turns out capstone.pc is generated during the buildPhase, so needs
PREFIX set here too for it to be correct
@risicle
pythonPackages.capstone: 3.0.5.post1 -> 4.0.1, redesign as wrapper pa…
7b7dcbd 
…ckage around main capstone package

this allows us to keep the two packages in sync and handle overrides more
flexibly
@risicle
Copy link
Contributor Author

risicle commented Jan 6, 2020

Sure, done.

@jonringer
Copy link
Contributor

@GrahamcOfBorg build boomerang capstone pwndbg python27Packages.ROPGadget python27Packages.capstone python27Packages.pwntools python27Packages.ropper python37Packages.ROPGadget python37Packages.capstone python37Packages.pwntools python37Packages.ropper python38Packages.ROPGadget python38Packages.capstone python38Packages.pwntools python38Packages.ropper wcc

@FRidh FRidh merged commit 8817036 into NixOS:master Feb 10, 2020
@abathur abathur mentioned this pull request Mar 7, 2021
Merged
10 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jonringer jonringer jonringer approved these changes

@FRidh FRidh Awaiting requested review from FRidh

@bennofs bennofs Awaiting requested review from bennofs

@thoughtpolice thoughtpolice Awaiting requested review from thoughtpolice

Assignees
No one assigned
Labels
6.topic: python 8.has: package (new) 10.rebuild-darwin: 11-100 10.rebuild-linux: 11-100 11.by: package-maintainer
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
4 participants
@risicle @thoughtpolice @jonringer @FRidh