diff options
| author | Tuomas Tynkkynen <tuomas@tuxera.com> | 2018-02-28 20:52:49 +0200 |
|---|---|---|
| committer | Tuomas Tynkkynen <tuomas@tuxera.com> | 2018-02-28 20:52:49 +0200 |
| commit | 34f95d92a2ca033fa25ae7ddcc7f5cb4b9e1f852 (patch) | |
| tree | d3e3546a41a812d151d1980cb8ee6808a8b8c7c6 /pkgs/development/python-modules/pwntools/default.nix | |
| parent | ad17db3562766979371f0ae9cc0d2428f44a9d58 (diff) | |
| parent | f1dd205c4e5ac28931ae8cdcde9d3c9a8ed2a0f5 (diff) | |
| download | nixlib-34f95d92a2ca033fa25ae7ddcc7f5cb4b9e1f852.tar nixlib-34f95d92a2ca033fa25ae7ddcc7f5cb4b9e1f852.tar.gz nixlib-34f95d92a2ca033fa25ae7ddcc7f5cb4b9e1f852.tar.bz2 nixlib-34f95d92a2ca033fa25ae7ddcc7f5cb4b9e1f852.tar.lz nixlib-34f95d92a2ca033fa25ae7ddcc7f5cb4b9e1f852.tar.xz nixlib-34f95d92a2ca033fa25ae7ddcc7f5cb4b9e1f852.tar.zst nixlib-34f95d92a2ca033fa25ae7ddcc7f5cb4b9e1f852.zip | |
Merge remote-tracking branch 'upstream/master' into staging
Conflicts: pkgs/applications/misc/pytrainer/default.nix pkgs/development/tools/pew/default.nix pkgs/tools/misc/you-get/default.nix
Diffstat (limited to 'pkgs/development/python-modules/pwntools/default.nix')
| -rw-r--r-- | pkgs/development/python-modules/pwntools/default.nix | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/pkgs/development/python-modules/pwntools/default.nix b/pkgs/development/python-modules/pwntools/default.nix index 0ed51d7acecf..da7ddbc7dcb7 100644 --- a/pkgs/development/python-modules/pwntools/default.nix +++ b/pkgs/development/python-modules/pwntools/default.nix @@ -5,12 +5,12 @@ , requests, tox, unicorn, intervaltree, fetchpatch }: buildPythonPackage rec { - version = "3.11.0"; + version = "3.12.0"; pname = "pwntools"; src = fetchPypi { inherit pname version; - sha256 = "609b3f0ba47c975f4dbedd3da2af4c5ca1b3a2aa13fb99240531b6a68edb87be"; + sha256 = "09a7yhsyqxb4xf2r6mbn3p5zx1wp89lxq7lj34y4zbin6ns5929s"; }; propagatedBuildInputs = [ Mako packaging pysocks pygments ROPGadget capstone paramiko pip psutil pyelftools pyserial dateutil requests tox unicorn intervaltree ]; @@ -18,10 +18,10 @@ buildPythonPackage rec { disabled = isPy3k; doCheck = false; # no setuptools tests for the package - # Can be removed when 3.12.0 is released + # Can be removed when 3.13.0 is released patches = [ (fetchpatch { - url = "https://github.com/Gallopsled/pwntools/pull/1098.patch"; + url = "https://github.com/Gallopsled/pwntools/commit/9859f54a21404174dd17efee02f91521a2dd09c5.patch"; sha256 = "0p0h87npn1mwsd8ciab7lg74bk3ahlk5r0mjbvx4jhihl2gjc3z2"; }) ]; |