public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #34537 from kristoff3r/fix-pwntools

Browse Source 
pythonPackages.pwntools: fix build
This commit is contained in:
Jörg Thalheim
2018-02-03 10:23:11 +00:00
committed by GitHub
parent e493bf64cf d834ae3cbb
commit 4f2ba1354f
2 changed files with 13 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/development/python-modules/pwntools/default.nix
+12 -4
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";
pkgs/development/python-modules/pypandoc/default.nix
+1 -1
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 ];
}; };
} }