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

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

Conversation

@risicle
Copy link
Contributor

@risicle risicle commented Jan 4, 2020

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

@risicle risicle requested review from FRidh and jonringer as code owners Jan 4, 2020
@ofborg ofborg bot added the 6.topic: python label Jan 4, 2020
Copy link
Member

@thoughtpolice thoughtpolice left a comment

Excellent, thank you for this! Very useful.

@thoughtpolice
Copy link
Member

@thoughtpolice thoughtpolice commented Jan 4, 2020

@GrahamcOfBorg build capstone pythonPackages.capstone

@risicle risicle force-pushed the risicle:ris-capstone-python-unify branch from 0bd6a8f to 7b63c9b Jan 5, 2020
@risicle
Copy link
Contributor Author

@risicle 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 Jan 5, 2020
Copy link
Contributor

@jonringer jonringer left a comment

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

@jonringer jonringer commented Jan 6, 2020

@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

Copy link
Contributor

@jonringer jonringer left a comment

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

@risicle
Copy link
Contributor Author

@risicle 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...

Copy link
Contributor

@jonringer jonringer left a comment

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

cc @FRidh

risicle added 2 commits Jan 3, 2020
turns out capstone.pc is generated during the buildPhase, so needs
PREFIX set here too for it to be correct
…ckage around main capstone package

this allows us to keep the two packages in sync and handle overrides more
flexibly
@risicle risicle force-pushed the risicle:ris-capstone-python-unify branch from 7b63c9b to 7b7dcbd Jan 6, 2020
@risicle
Copy link
Contributor Author

@risicle risicle commented Jan 6, 2020

Sure, done.

@jonringer
Copy link
Contributor

@jonringer jonringer commented Jan 6, 2020

@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
18 checks passed
18 checks passed
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 on aarch64-linux Failure
Details
Evaluation Performance Report Evaluator Performance Report
Details
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 on x86_64-darwin Success
Details
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 on x86_64-linux Success
Details
capstone on aarch64-linux Success
Details
capstone on x86_64-linux Success
Details
grahamcofborg-eval ^.^!
Details
grahamcofborg-eval-check-maintainers matching changed paths to changed attrs...
Details
grahamcofborg-eval-check-meta config.nix: checkMeta = true
Details
grahamcofborg-eval-darwin nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./pkgs/top-level/release.nix -A darwin-tested
Details
grahamcofborg-eval-nixos nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./nixos/release-combined.nix -A tested
Details
grahamcofborg-eval-nixos-manual nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./nixos/release.nix -A manual
Details
grahamcofborg-eval-nixos-options nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./nixos/release.nix -A options
Details
grahamcofborg-eval-nixpkgs-manual nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./pkgs/top-level/release.nix -A manual
Details
grahamcofborg-eval-nixpkgs-tarball nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./pkgs/top-level/release.nix -A tarball
Details
grahamcofborg-eval-nixpkgs-unstable-jobset nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./pkgs/top-level/release.nix -A unstable
Details
grahamcofborg-eval-package-list nix-env -qa --json --file .
Details
grahamcofborg-eval-package-list-no-aliases nix-env -qa --json --file . --arg config { allowAliases = false; }
Details
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

None yet

4 participants
You can’t perform that action at this time.