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.pwntools: fix build #34537

Merged
merged 1 commit into from Feb 3, 2018
Merged

Conversation

kristoff3r
Copy link
Contributor

@kristoff3r kristoff3r commented Feb 2, 2018

Motivation for this change

pypandoc is broken (it does not work properly with pandoc 2), so we
remove the dependency as it was only used for generating PyPI docs.
The patch will be included upstream in the next version, so it should
be removed next time this package is updated.

I'm not sure what should be done about pypandoc itself. It doesn't look like it will get pandoc 2 support, and it still has another package depending on it. Mark as broken?

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option build-use-sandbox in nix.conf on non-NixOS)
  • 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 nox --run "nox-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Fits CONTRIBUTING.md.

, pyelftools, pypandoc, pyserial, dateutil
, requests, tox, pandoc, unicorn, intervaltree }:
, pyelftools, pyserial, dateutil
, requests, tox, unicorn, intervaltree }:

buildPythonPackage rec {
version = "3.11.0";
Copy link
Member

Choose a reason for hiding this comment

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

Please get rid of the name in the pwntools derivation.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Ok, I thought it was mandatory, apparently not :P


disabled = isPy3k;
doCheck = false; # no setuptools tests for the package

# Can be removed when 3.12.0 is released
patches = [ ./remove-pypandoc.patch ];
Copy link
Member

Choose a reason for hiding this comment

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

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Thanks, I didn't realize it existed.

pypandoc is broken (it does not work properly with pandoc 2), so we
remove the dependency as it was only used for generating PyPI docs.
The patch will be included upstream in the next version, so it should
be removed next time this package is updated.
@dotlambda
Copy link
Member

@GrahamcOfBorg build python2.pkgs.pwntools

@GrahamcOfBorg
Copy link

Success on x86_64-linux (full log)

Partial log (click to expand)

wrapping `/nix/store/iw5c163q16fk7qpzq5b11r2yrzmqpq60-python2.7-pwntools-3.11.0/bin/pwn'...
wrapping `/nix/store/iw5c163q16fk7qpzq5b11r2yrzmqpq60-python2.7-pwntools-3.11.0/bin/elfdiff'...
wrapping `/nix/store/iw5c163q16fk7qpzq5b11r2yrzmqpq60-python2.7-pwntools-3.11.0/bin/common'...
wrapping `/nix/store/iw5c163q16fk7qpzq5b11r2yrzmqpq60-python2.7-pwntools-3.11.0/bin/phd'...
wrapping `/nix/store/iw5c163q16fk7qpzq5b11r2yrzmqpq60-python2.7-pwntools-3.11.0/bin/checksec'...
wrapping `/nix/store/iw5c163q16fk7qpzq5b11r2yrzmqpq60-python2.7-pwntools-3.11.0/bin/debug'...
wrapping `/nix/store/iw5c163q16fk7qpzq5b11r2yrzmqpq60-python2.7-pwntools-3.11.0/bin/main'...
wrapping `/nix/store/iw5c163q16fk7qpzq5b11r2yrzmqpq60-python2.7-pwntools-3.11.0/bin/unhex'...
wrapping `/nix/store/iw5c163q16fk7qpzq5b11r2yrzmqpq60-python2.7-pwntools-3.11.0/bin/pwnstrip'...
wrapping `/nix/store/iw5c163q16fk7qpzq5b11r2yrzmqpq60-python2.7-pwntools-3.11.0/bin/asm'...

@GrahamcOfBorg
Copy link

Success on aarch64-linux (full log)

Partial log (click to expand)

wrapping `/nix/store/196aivvnsmshjriszrsfbprh2y896wss-python2.7-pwntools-3.11.0/bin/hex'...
wrapping `/nix/store/196aivvnsmshjriszrsfbprh2y896wss-python2.7-pwntools-3.11.0/bin/disablenx'...
wrapping `/nix/store/196aivvnsmshjriszrsfbprh2y896wss-python2.7-pwntools-3.11.0/bin/shellcraft'...
wrapping `/nix/store/196aivvnsmshjriszrsfbprh2y896wss-python2.7-pwntools-3.11.0/bin/errno'...
wrapping `/nix/store/196aivvnsmshjriszrsfbprh2y896wss-python2.7-pwntools-3.11.0/bin/cyclic'...
wrapping `/nix/store/196aivvnsmshjriszrsfbprh2y896wss-python2.7-pwntools-3.11.0/bin/template'...
wrapping `/nix/store/196aivvnsmshjriszrsfbprh2y896wss-python2.7-pwntools-3.11.0/bin/constgrep'...
wrapping `/nix/store/196aivvnsmshjriszrsfbprh2y896wss-python2.7-pwntools-3.11.0/bin/elfpatch'...
wrapping `/nix/store/196aivvnsmshjriszrsfbprh2y896wss-python2.7-pwntools-3.11.0/bin/scramble'...
/nix/store/196aivvnsmshjriszrsfbprh2y896wss-python2.7-pwntools-3.11.0

Copy link
Member

@dotlambda dotlambda left a comment

Choose a reason for hiding this comment

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

Regarding pypandoc, I think we should first open an upstream issue or, even better, a PR and see if they are willing to fix this. Maybe @bennofs can do that.

@Mic92 Mic92 merged commit 4f2ba13 into NixOS:master Feb 3, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants