about summary refs log tree commit diff
path: root/pkgs/development/tools/misc
diff options
context:
space:
mode:
authorFrederik Rietdijk <fridh@fridh.nl>2018-04-08 10:54:17 +0200
committerFrederik Rietdijk <fridh@fridh.nl>2018-04-08 10:54:17 +0200
commit595a72589f038e4512ca12232009c97a47fba044 (patch)
tree079cdeab0e7722d19292fb7532adc42d77533d1f /pkgs/development/tools/misc
parentf9e17ca3f68b040bd0cf68c26104e4a5c9bc7b4f (diff)
parent62dc989963c67fe5564b30a2b4bf21ba49446eee (diff)
downloadnixlib-595a72589f038e4512ca12232009c97a47fba044.tar
nixlib-595a72589f038e4512ca12232009c97a47fba044.tar.gz
nixlib-595a72589f038e4512ca12232009c97a47fba044.tar.bz2
nixlib-595a72589f038e4512ca12232009c97a47fba044.tar.lz
nixlib-595a72589f038e4512ca12232009c97a47fba044.tar.xz
nixlib-595a72589f038e4512ca12232009c97a47fba044.tar.zst
nixlib-595a72589f038e4512ca12232009c97a47fba044.zip
Merge master into staging
Diffstat (limited to 'pkgs/development/tools/misc')
-rw-r--r--pkgs/development/tools/misc/pwndbg/default.nix48
-rw-r--r--pkgs/development/tools/misc/sysbench/default.nix6
2 files changed, 51 insertions, 3 deletions
diff --git a/pkgs/development/tools/misc/pwndbg/default.nix b/pkgs/development/tools/misc/pwndbg/default.nix
new file mode 100644
index 000000000000..df4b91a79b09
--- /dev/null
+++ b/pkgs/development/tools/misc/pwndbg/default.nix
@@ -0,0 +1,48 @@
+{ stdenv, fetchFromGitHub, pythonPackages, makeWrapper, gdb }:
+
+stdenv.mkDerivation rec {
+  name = "pwndbg-2018-04-06";
+
+  src = fetchFromGitHub {
+    owner = "pwndbg";
+    repo = "pwndbg";
+    rev = "e225ba9f647ab8f7f4871075529c0ec239f43300";
+    sha256 = "1s6m93qi3baclgqqii4fnmzjmg0c6ipkscg7xiljaj5z4bs371j4";
+  };
+
+  nativeBuildInputs = [ makeWrapper ];
+
+  propagatedBuildInputs = with pythonPackages; [
+    future
+    isort
+    psutil
+    pycparser
+    pyelftools
+    python-ptrace
+    ROPGadget
+    six
+    unicorn
+    pygments
+    enum34
+  ];
+
+  installPhase = ''
+    mkdir -p $out/share/pwndbg
+    cp -r *.py pwndbg $out/share/pwndbg
+    makeWrapper ${gdb}/bin/gdb $out/bin/pwndbg \
+      --add-flags "-q -x $out/share/pwndbg/gdbinit.py"
+  '';
+
+  preFixup = ''
+    sed -i "/import sys/a import sys; sys.path[0:0] = '$PYTHONPATH'.split(':')" \
+      $out/share/pwndbg/gdbinit.py
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Exploit Development and Reverse Engineering with GDB Made Easy";
+    homepage = http://pwndbg.com;
+    license = licenses.mit;
+    platforms = platforms.linux;
+    maintainers = with maintainers; [ mic92 ];
+  };
+}
diff --git a/pkgs/development/tools/misc/sysbench/default.nix b/pkgs/development/tools/misc/sysbench/default.nix
index d72fc86d7ee5..dbd036d03fdf 100644
--- a/pkgs/development/tools/misc/sysbench/default.nix
+++ b/pkgs/development/tools/misc/sysbench/default.nix
@@ -2,7 +2,7 @@
 , libaio }:
 
 stdenv.mkDerivation rec {
-  name = "sysbench-1.0.13";
+  name = "sysbench-1.0.14";
 
   nativeBuildInputs = [ autoreconfHook pkgconfig ];
   buildInputs = [ vim mysql.connector-c libaio ];
@@ -10,8 +10,8 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "akopytov";
     repo = "sysbench";
-    rev = "1.0.13";
-    sha256 = "1inxyjpcyv2ag3k5riwlaq91362y16yks75vs2crmhjxlxdspy8c";
+    rev = "1.0.14";
+    sha256 = "0mp1wqdm87zqyn55z23qf1izqz7ijgcbsysdwqndd98w6m5d86rp";
   };
 
   meta = {