diff options
author | Kristoffer Søholm <k.soeholm@gmail.com> | 2018-02-02 19:16:39 +0100 |
---|---|---|
committer | Kristoffer Søholm <k.soeholm@gmail.com> | 2018-02-02 20:02:19 +0100 |
commit | d834ae3cbbda522d7e7fe2975262ecc8068e738a (patch) | |
tree | 5325b91780d4fde73d4da5be765964ad6a9967b3 | |
parent | 2e4aded366914d625a2f31208e8ac8548cb43a7e (diff) | |
download | nixlib-d834ae3cbbda522d7e7fe2975262ecc8068e738a.tar nixlib-d834ae3cbbda522d7e7fe2975262ecc8068e738a.tar.gz nixlib-d834ae3cbbda522d7e7fe2975262ecc8068e738a.tar.bz2 nixlib-d834ae3cbbda522d7e7fe2975262ecc8068e738a.tar.lz nixlib-d834ae3cbbda522d7e7fe2975262ecc8068e738a.tar.xz nixlib-d834ae3cbbda522d7e7fe2975262ecc8068e738a.tar.zst nixlib-d834ae3cbbda522d7e7fe2975262ecc8068e738a.zip |
pythonPackages.pwntools: fix build
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.
-rw-r--r-- | pkgs/development/python-modules/pwntools/default.nix | 16 | ||||
-rw-r--r-- | pkgs/development/python-modules/pypandoc/default.nix | 2 |
2 files changed, 13 insertions, 5 deletions
diff --git a/pkgs/development/python-modules/pwntools/default.nix b/pkgs/development/python-modules/pwntools/default.nix index b98930dfe594..0ed51d7acecf 100644 --- a/pkgs/development/python-modules/pwntools/default.nix +++ b/pkgs/development/python-modules/pwntools/default.nix @@ -1,24 +1,32 @@ { stdenv, buildPythonPackage, fetchPypi, isPy3k , Mako, packaging, pysocks, pygments, ROPGadget , capstone, paramiko, pip, psutil -, pyelftools, pypandoc, pyserial, dateutil -, requests, tox, pandoc, unicorn, intervaltree }: +, pyelftools, pyserial, dateutil +, requests, tox, unicorn, intervaltree, fetchpatch }: buildPythonPackage rec { version = "3.11.0"; pname = "pwntools"; - name = pname + "-" + version; src = fetchPypi { inherit pname version; sha256 = "609b3f0ba47c975f4dbedd3da2af4c5ca1b3a2aa13fb99240531b6a68edb87be"; }; - propagatedBuildInputs = [ Mako packaging pysocks pygments ROPGadget capstone paramiko pip psutil pyelftools pypandoc pyserial dateutil requests tox pandoc unicorn intervaltree ]; + propagatedBuildInputs = [ Mako packaging pysocks pygments ROPGadget capstone paramiko pip psutil pyelftools pyserial dateutil requests tox unicorn intervaltree ]; disabled = isPy3k; doCheck = false; # no setuptools tests for the package + # Can be removed when 3.12.0 is released + patches = [ + (fetchpatch { + url = "https://github.com/Gallopsled/pwntools/pull/1098.patch"; + sha256 = "0p0h87npn1mwsd8ciab7lg74bk3ahlk5r0mjbvx4jhihl2gjc3z2"; + }) + ]; + + meta = with stdenv.lib; { homepage = "http://pwntools.com"; description = "CTF framework and exploit development library"; diff --git a/pkgs/development/python-modules/pypandoc/default.nix b/pkgs/development/python-modules/pypandoc/default.nix index 4c694319563e..ba05da884d8b 100644 --- a/pkgs/development/python-modules/pypandoc/default.nix +++ b/pkgs/development/python-modules/pypandoc/default.nix @@ -27,6 +27,6 @@ buildPythonPackage rec { description = "Thin wrapper for pandoc"; homepage = https://github.com/bebraw/pypandoc; license = licenses.mit; - maintainers = with maintainers; [ bennofs kristoff3r ]; + maintainers = with maintainers; [ bennofs ]; }; } |