about summary refs log tree commit diff
path: root/pkgs
diff options
context:
space:
mode:
authorJörg Thalheim <joerg@thalheim.io>2018-12-01 11:01:45 +0000
committerJörg Thalheim <joerg@thalheim.io>2018-12-01 14:13:46 +0000
commit5db3428fa3192d6093bbc59c2589087de2cd2fbd (patch)
treedcfa430ab26f8e3e91824f62746cbca719a56352 /pkgs
parent5e9922e800195b482dbdd206cee84c0a8c8654fe (diff)
downloadnixlib-5db3428fa3192d6093bbc59c2589087de2cd2fbd.tar
nixlib-5db3428fa3192d6093bbc59c2589087de2cd2fbd.tar.gz
nixlib-5db3428fa3192d6093bbc59c2589087de2cd2fbd.tar.bz2
nixlib-5db3428fa3192d6093bbc59c2589087de2cd2fbd.tar.lz
nixlib-5db3428fa3192d6093bbc59c2589087de2cd2fbd.tar.xz
nixlib-5db3428fa3192d6093bbc59c2589087de2cd2fbd.tar.zst
nixlib-5db3428fa3192d6093bbc59c2589087de2cd2fbd.zip
pwndbg: switch to python3
Diffstat (limited to 'pkgs')
-rw-r--r--pkgs/development/tools/misc/pwndbg/default.nix19
-rw-r--r--pkgs/top-level/all-packages.nix2
2 files changed, 17 insertions, 4 deletions
diff --git a/pkgs/development/tools/misc/pwndbg/default.nix b/pkgs/development/tools/misc/pwndbg/default.nix
index 257e822edd94..e299a7b0eb82 100644
--- a/pkgs/development/tools/misc/pwndbg/default.nix
+++ b/pkgs/development/tools/misc/pwndbg/default.nix
@@ -1,4 +1,18 @@
-{ stdenv, fetchFromGitHub, pythonPackages, makeWrapper, gdb }:
+{ stdenv
+, fetchFromGitHub
+, makeWrapper
+, gdb
+, future
+, isort
+, psutil
+, pycparser
+, pyelftools
+, python-ptrace
+, ROPGadget
+, six
+, unicorn
+, pygments
+, }:
 
 stdenv.mkDerivation rec {
   name = "pwndbg-${version}";
@@ -13,7 +27,7 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ makeWrapper ];
 
-  propagatedBuildInputs = with pythonPackages; [
+  propagatedBuildInputs = [
     future
     isort
     psutil
@@ -24,7 +38,6 @@ stdenv.mkDerivation rec {
     six
     unicorn
     pygments
-    enum34
   ];
 
   installPhase = ''
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index edd9c330d787..8ebe8bc9f382 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4978,7 +4978,7 @@ with pkgs;
 
   pwnat = callPackage ../tools/networking/pwnat { };
 
-  pwndbg = callPackage ../development/tools/misc/pwndbg { };
+  pwndbg = python3Packages.callPackage ../development/tools/misc/pwndbg { };
 
   pycangjie = pythonPackages.pycangjie;