summary refs log tree commit diff
path: root/pkgs/development/python-modules/pwntools
diff options
context:
space:
mode:
authorKristoffer Søholm <k.soeholm@gmail.com>2019-11-06 10:41:32 +0100
committerJon <jonringer@users.noreply.github.com>2019-11-13 13:15:12 -0800
commitf74aafc9e6a974f5d9329b4068337b839d297af8 (patch)
tree18b004d9ce4e07f3715d93839dc75cc0d34d3148 /pkgs/development/python-modules/pwntools
parent20394a368e8a03c32f49966a96e0198407f0ddac (diff)
downloadnixpkgs-f74aafc9e6a974f5d9329b4068337b839d297af8.tar
nixpkgs-f74aafc9e6a974f5d9329b4068337b839d297af8.tar.gz
nixpkgs-f74aafc9e6a974f5d9329b4068337b839d297af8.tar.bz2
nixpkgs-f74aafc9e6a974f5d9329b4068337b839d297af8.tar.lz
nixpkgs-f74aafc9e6a974f5d9329b4068337b839d297af8.tar.xz
nixpkgs-f74aafc9e6a974f5d9329b4068337b839d297af8.tar.zst
nixpkgs-f74aafc9e6a974f5d9329b4068337b839d297af8.zip
pythonPackages.pwntools: 3.12 -> 4.0b0
Fixes the broken build. I chose to go directly to 4.0 beta because
stable is pretty old, and because 4.0 has python3 support.
Diffstat (limited to 'pkgs/development/python-modules/pwntools')
-rw-r--r--pkgs/development/python-modules/pwntools/default.nix14
1 files changed, 2 insertions, 12 deletions
diff --git a/pkgs/development/python-modules/pwntools/default.nix b/pkgs/development/python-modules/pwntools/default.nix
index da7ddbc7dcb..72ab1b5c405 100644
--- a/pkgs/development/python-modules/pwntools/default.nix
+++ b/pkgs/development/python-modules/pwntools/default.nix
@@ -5,28 +5,18 @@
 , requests, tox, unicorn, intervaltree, fetchpatch }:
 
 buildPythonPackage rec {
-  version = "3.12.0";
+  version = "4.0.0b0";
   pname = "pwntools";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "09a7yhsyqxb4xf2r6mbn3p5zx1wp89lxq7lj34y4zbin6ns5929s";
+    sha256 = "11f7x7rjad1nawn3r524lzxgz3nk89c6s3xycrscn3n86hh0zgid";
   };
 
   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.13.0 is released
-  patches = [
-    (fetchpatch {
-      url = "https://github.com/Gallopsled/pwntools/commit/9859f54a21404174dd17efee02f91521a2dd09c5.patch";
-      sha256 = "0p0h87npn1mwsd8ciab7lg74bk3ahlk5r0mjbvx4jhihl2gjc3z2";
-    })
-  ];
-
-
   meta = with stdenv.lib; {
     homepage = "http://pwntools.com";
     description = "CTF framework and exploit development library";