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.
This commit is contained in:
Kristoffer Søholm 2018-02-02 19:16:39 +01:00
parent 2e4aded366
commit d834ae3cbb
2 changed files with 13 additions and 5 deletions

View File

@ -1,24 +1,32 @@
{ stdenv, buildPythonPackage, fetchPypi, isPy3k { stdenv, buildPythonPackage, fetchPypi, isPy3k
, Mako, packaging, pysocks, pygments, ROPGadget , Mako, packaging, pysocks, pygments, ROPGadget
, capstone, paramiko, pip, psutil , capstone, paramiko, pip, psutil
, pyelftools, pypandoc, pyserial, dateutil , pyelftools, pyserial, dateutil
, requests, tox, pandoc, unicorn, intervaltree }: , requests, tox, unicorn, intervaltree, fetchpatch }:
buildPythonPackage rec { buildPythonPackage rec {
version = "3.11.0"; version = "3.11.0";
pname = "pwntools"; pname = "pwntools";
name = pname + "-" + version;
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "609b3f0ba47c975f4dbedd3da2af4c5ca1b3a2aa13fb99240531b6a68edb87be"; 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; disabled = isPy3k;
doCheck = false; # no setuptools tests for the package 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; { meta = with stdenv.lib; {
homepage = "http://pwntools.com"; homepage = "http://pwntools.com";
description = "CTF framework and exploit development library"; description = "CTF framework and exploit development library";

View File

@ -27,6 +27,6 @@ buildPythonPackage rec {
description = "Thin wrapper for pandoc"; description = "Thin wrapper for pandoc";
homepage = https://github.com/bebraw/pypandoc; homepage = https://github.com/bebraw/pypandoc;
license = licenses.mit; license = licenses.mit;
maintainers = with maintainers; [ bennofs kristoff3r ]; maintainers = with maintainers; [ bennofs ];
}; };
} }