From 81b1905c864b3feb61b3ea042c726d313919cd6b Mon Sep 17 00:00:00 2001 From: Jörg Thalheim Date: Thu, 22 Apr 2021 07:47:20 +0200 Subject: radare2: 5.2.0 -> 5.2.1 Also get rid of update script: Since we no longer bundle capstone it just adds a bunch of metadata. Now we can easier auto-update radare2. --- .../development/tools/analysis/radare2/default.nix | 39 +++++----------------- 1 file changed, 9 insertions(+), 30 deletions(-) (limited to 'pkgs/development/tools/analysis/radare2/default.nix') diff --git a/pkgs/development/tools/analysis/radare2/default.nix b/pkgs/development/tools/analysis/radare2/default.nix index cdade7c273c..e59c48f91d3 100644 --- a/pkgs/development/tools/analysis/radare2/default.nix +++ b/pkgs/development/tools/analysis/radare2/default.nix @@ -1,5 +1,4 @@ { lib -, fetchpatch , stdenv , fetchFromGitHub , buildPackages @@ -27,44 +26,24 @@ , luaBindings ? false }: -let - inherit (lib) optional; - - # - # DO NOT EDIT! Automatically generated by ./update.py - gittap = "5.2.0"; - gittip = "cf3db945083fb4dab951874e5ec1283128deab11"; - rev = "5.2.0"; - version = "5.2.0"; - sha256 = "08azxfk6mw2vr0x4zbz0612rk7pj4mfz8shrzc9ima77wb52b8sm"; - # -in -stdenv.mkDerivation { +stdenv.mkDerivation rec { pname = "radare2"; - inherit version; + version = "5.2.1"; src = fetchFromGitHub { owner = "radare"; repo = "radare2"; - inherit rev sha256; + rev = version; + sha256 = "0n3k190qjhdlj10fjqijx6ismz0g7fk28i83j0480cxdqgmmlbxc"; }; - patches = [ - # fix build against openssl, included in next release - (fetchpatch { - url = "https://github.com/radareorg/radare2/commit/e5e7469b6450c374e0884d35d44824e1a4eb46b4.patch"; - sha256 = "sha256-xTmMHvUdW7d2QG7d4hlvMgEcegND7pGU745TWGqzY44="; - }) - ]; - postInstall = '' install -D -m755 $src/binr/r2pm/r2pm $out/bin/r2pm ''; WITHOUT_PULL = "1"; makeFlags = [ - "GITTAP=${gittap}" - "GITTIP=${gittip}" + "GITTAP=${version}" "RANLIB=${stdenv.cc.bintools.bintools}/bin/${stdenv.cc.bintools.targetPrefix}ranlib" ]; configureFlags = [ @@ -89,10 +68,10 @@ stdenv.mkDerivation { zlib openssl libuv - ] ++ optional useX11 [ gtkdialog vte gtk2 ] - ++ optional rubyBindings [ ruby ] - ++ optional pythonBindings [ python3 ] - ++ optional luaBindings [ lua ]; + ] ++ lib.optional useX11 [ gtkdialog vte gtk2 ] + ++ lib.optional rubyBindings [ ruby ] + ++ lib.optional pythonBindings [ python3 ] + ++ lib.optional luaBindings [ lua ]; propagatedBuildInputs = [ # radare2 exposes r_lib which depends on these libraries -- cgit 1.4.1