From 5ad30374e90299040265eefcd1ae3db9ab9ff1ab Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Tue, 5 Dec 2017 09:07:31 -0600
Subject: radare2: 2.0.1 -> 2.1.0

* drop patch, now included
* drop r2-docker/r2-indent fixups, no longer installed
  (see https://github.com/radare/radare2/commit/a09d6dae925ab381ed9eeb9d11ad595b1a83e4c5)
---
 pkgs/development/tools/analysis/radare2/default.nix | 19 ++-----------------
 1 file changed, 2 insertions(+), 17 deletions(-)

(limited to 'pkgs/development')

diff --git a/pkgs/development/tools/analysis/radare2/default.nix b/pkgs/development/tools/analysis/radare2/default.nix
index 9468842f0c4d..c7338212bdb9 100644
--- a/pkgs/development/tools/analysis/radare2/default.nix
+++ b/pkgs/development/tools/analysis/radare2/default.nix
@@ -13,24 +13,16 @@ let
   inherit (stdenv.lib) optional;
 in
 stdenv.mkDerivation rec {
-  version = "2.0.1";
+  version = "2.1.0";
   name = "radare2-${version}";
 
   src = fetchFromGitHub {
     owner = "radare";
     repo = "radare2";
     rev = version;
-    sha256 = "031ndvinsypagpkdszxjq0hj91ijq9zx4dzk53sz7il7s3zn65c7";
+    sha256 = "1mny0iw2dgszvvx0yb0z5vlygz4f3jblzi9byybczm8wdqs1vhb1";
   };
 
-  patches = [
-    (fetchpatch {
-      name = "CVE-2017-15385.patch";
-      url = https://github.com/radare/radare2/commit/21a6f570ba33fa9f52f1bba87f07acc4e8c178f4.patch;
-      sha256 = "19qg5j9yr5r62nrq2b6mscxsz0wyyfah2z5jz8dvj9kqxq186d43";
-    })
-  ];
-
   postPatch = let
     cs_ver = "3.0.4"; # version from $sourceRoot/shlr/Makefile
     capstone = fetchurl {
@@ -51,13 +43,6 @@ stdenv.mkDerivation rec {
     ++ optional pythonBindings [python]
     ++ optional luaBindings [lua];
 
-  postInstall = ''
-    # replace symlinks pointing into the build directory with the files they point to
-    rm $out/bin/{r2-docker,r2-indent}
-    cp sys/r2-docker.sh $out/bin/r2-docker
-    cp sys/indent.sh    $out/bin/r2-indent
-  '';
-
   meta = {
     description = "unix-like reverse engineering framework and commandline tools";
     homepage = http://radare.org/;
-- 
cgit 1.4.1