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.

Sign up for GitHub

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

Pwntools + unicorn update #93927

Merged
merged 2 commits into from Jul 30, 2020
Merged

Pwntools + unicorn update #93927

merged 2 commits into from Jul 30, 2020

Conversation

kristoff3r
Copy link
Contributor

Motivation for this change

Currently pwntools is broken because of incompatible package bounds. To fix it I updated unicorn-emulator, and since it is a pretty big update (even though they only bump patch/rc version numbers) I also added tests to make me more confident that it works.

I haven't tested that unicorn still works on macOS, and I'm unsure if we want doCheck to default to true, I couldn't find any consensus on that when searching.

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.

@ofborg ofborg bot requested review from bennofs and thoughtpolice July 26, 2020 16:25
@prusnak prusnak mentioned this pull request Jul 26, 2020
Closed
@prusnak
Copy link
Member

prusnak commented Jul 26, 2020

Fixes #93925

@FRidh
Copy link
Member

FRidh commented Jul 26, 2020

@GrahamcOfBorg eval

@veprbl veprbl linked an issue Jul 26, 2020 that may be closed by this pull request
building python37Packages.pwntools fails #93925
Closed
@FRidh
Copy link
Member

FRidh commented Jul 27, 2020

@GrahamcOfBorg build python2.pkgs.pwntools python3.pkgs.pwntools

@kristoff3r
Copy link
Contributor Author

kristoff3r commented Jul 27, 2020 •
edited

Hmm, it looks like the tests tries to use gobjcopy when on macOS. I can't figure out if objcopy is already in scope on macOS, or if the binutils in nixpkgs prefixes stuff with 'g' since that is apparently customary. In any case, it should be enough to add a wrapper for it. Or we could disable tests on macOS.

@kristoff3r kristoff3r force-pushed the pwntools-update branch 2 times, most recently from bcc8fcc to 21e5603 Compare July 27, 2020 21:27
@kristoff3r
Copy link
Contributor Author

@GrahamcOfBorg build unicorn-emu

@kristoff3r
Copy link
Contributor Author

@GrahamcOfBorg build python3.pkgs.pwntools

@kristoff3r kristoff3r force-pushed the pwntools-update branch 2 times, most recently from bf3c4db to 1d5f8db Compare July 28, 2020 11:37
@kristoff3r
Copy link
Contributor Author

@GrahamcOfBorg eval

@kristoff3r
Copy link
Contributor Author

Based on local testing I did (patch the makefile on linux to use gobjcopy and give it the shellscript) it should work, but I don't know how to get the bot to test it on darwin for me.

@jonringer
Copy link
Contributor

@GrahamcOfBorg build pwntools

@jonringer
Copy link
Contributor

@GrahamcOfBorg buildpython3Packages.pwntools

@kristoff3r
Copy link
Contributor Author

Oh well, I'll disable tests for darwin and then we can merge.

@kristoff3r
unicorn-emulator: 1.0.1 -> 1.0.2-rc4
8b633d8 
Also adds tests
@kristoff3r
python: pwntools: 4.1.1 -> 4.2.1
edfcd37 
The previous update broke the build, this updates fixes it
@jonringer
Copy link
Contributor

@GrahamcOfBorg buildpython3Packages.pwntools

@kristoff3r
Copy link
Contributor Author

Should be ready to merge

@Mic92 Mic92 merged commit 16a63d0 into NixOS:master Jul 30, 2020
@kristoff3r kristoff3r deleted the pwntools-update branch July 30, 2020 08:11
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@FRidh FRidh FRidh requested changes

@jonringer jonringer Awaiting requested review from jonringer

@bennofs bennofs Awaiting requested review from bennofs

@thoughtpolice thoughtpolice Awaiting requested review from thoughtpolice

Assignees
No one assigned
Labels
6.topic: python 10.rebuild-darwin: 1-10 10.rebuild-linux: 1-10
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

building python37Packages.pwntools fails
5 participants
@kristoff3r @prusnak @FRidh @jonringer @Mic92