From 5db3428fa3192d6093bbc59c2589087de2cd2fbd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Sat, 1 Dec 2018 11:01:45 +0000 Subject: [PATCH] pwndbg: switch to python3 --- .../development/tools/misc/pwndbg/default.nix | 19 ++++++++++++++++--- pkgs/top-level/all-packages.nix | 2 +- 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 257e822edd9..e299a7b0eb8 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 edd9c330d78..8ebe8bc9f38 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;