diff options
Diffstat (limited to 'pkgs/development/tools/analysis/radare2')
-rw-r--r-- | pkgs/development/tools/analysis/radare2/cutter.nix | 4 | ||||
-rw-r--r-- | pkgs/development/tools/analysis/radare2/default.nix | 38 | ||||
-rwxr-xr-x | pkgs/development/tools/analysis/radare2/update.py | 7 |
3 files changed, 26 insertions, 23 deletions
diff --git a/pkgs/development/tools/analysis/radare2/cutter.nix b/pkgs/development/tools/analysis/radare2/cutter.nix index 659d6a94f5eb..25c6d6d58792 100644 --- a/pkgs/development/tools/analysis/radare2/cutter.nix +++ b/pkgs/development/tools/analysis/radare2/cutter.nix @@ -8,7 +8,7 @@ , python3 }: let - version = "1.7.1"; + version = "1.7.2"; in stdenv.mkDerivation rec { name = "radare2-cutter-${version}"; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { owner = "radareorg"; repo = "cutter"; rev = "v${version}"; - sha256 = "0dfi6f016jnh3swppvks5qkvmk0j2hvggh9sd1f40kg9pg5p08hy"; + sha256 = "09cqfz66r3830jkz1rwyfqw1xl1jfj6xg4pcccd2ml456kddh9dn"; }; postUnpack = "export sourceRoot=$sourceRoot/src"; diff --git a/pkgs/development/tools/analysis/radare2/default.nix b/pkgs/development/tools/analysis/radare2/default.nix index f10b820a73ea..2f0878da8c6f 100644 --- a/pkgs/development/tools/analysis/radare2/default.nix +++ b/pkgs/development/tools/analysis/radare2/default.nix @@ -2,6 +2,7 @@ , callPackage , ninja, meson , pkgconfig , libusb, readline, libewf, perl, zlib, openssl +, libuv , gtk2 ? null, vte ? null, gtkdialog ? null , python ? null , ruby ? null @@ -62,12 +63,15 @@ let "-Dr2_gittip=${gittip}" # 2.8.0 expects this, but later it becomes an option with default=false. "-Dcapstone_in_builddir=true" + + "-Duse_sys_openssl=true" + "-Duse_sys_zlib=true" ]; enableParallelBuilding = true; nativeBuildInputs = [ pkgconfig ninja meson ]; - buildInputs = [ readline libusb libewf perl zlib openssl] + buildInputs = [ readline libusb libewf perl zlib openssl libuv ] ++ optional useX11 [gtkdialog vte gtk2] ++ optional rubyBindings [ruby] ++ optional pythonBindings [python] @@ -86,24 +90,24 @@ in { #<generated> # DO NOT EDIT! Automatically generated by ./update.py radare2 = generic { - version_commit = "19349"; - gittap = "2.9.0"; - gittip = "d5e9539ec8068ca2ab4759dc3b0697781ded4cc8"; - rev = "2.9.0"; - version = "2.9.0"; - sha256 = "0zz6337p9095picfvjrcnqaxdi2a2b68h9my523ilnw8ynwfhdzw"; - cs_tip = "782ea67e17a391ca0d3faafdc365b335a1a8930a"; - cs_sha256 = "1maww4ir78a193pm3f8lr2kdkizi7rywn68ffa65ipyr7j4pl6i4"; + version_commit = "19720"; + gittap = "3.0.0"; + gittip = "13e3ebd2aa6653eb5b6bdd65a93dcddf3550fcfa"; + rev = "3.0.0"; + version = "3.0.0"; + sha256 = "0awbk9v7qjkarscaqzyly310f04dxgndxvxwxbjrsswqlp206b40"; + cs_tip = "e2c1cd46c06744beaceff42dd882de3a90f0a37c"; + cs_sha256 = "1czzqj8zdjgh7h2ixi26ij3mm4bgm4xw2slin6fv73nic8yaw722"; }; r2-for-cutter = generic { - version_commit = "19349"; - gittap = "2.8.0-189-gf82b28982"; - gittip = "f82b289822825e4c7403734f3b95dfd7f5e4f725"; - rev = "f82b289822825e4c7403734f3b95dfd7f5e4f725"; - version = "2018-08-14"; - sha256 = "0zc2a09xmwbxphxd1b0ia0zm8323wfcmxwwx6k239681jj9qwgr1"; - cs_tip = "782ea67e17a391ca0d3faafdc365b335a1a8930a"; - cs_sha256 = "1maww4ir78a193pm3f8lr2kdkizi7rywn68ffa65ipyr7j4pl6i4"; + version_commit = "19720"; + gittap = "2.9.0-310-gcb62c376b"; + gittip = "cb62c376bef6c7427019a7c28910c33c364436dd"; + rev = "cb62c376bef6c7427019a7c28910c33c364436dd"; + version = "2018-10-07"; + sha256 = "0z4nr1d2ca8ibq34441j15pj22wh46brcbr00j5hcqvn8y2lh96l"; + cs_tip = "e2c1cd46c06744beaceff42dd882de3a90f0a37c"; + cs_sha256 = "1czzqj8zdjgh7h2ixi26ij3mm4bgm4xw2slin6fv73nic8yaw722"; }; #</generated> } diff --git a/pkgs/development/tools/analysis/radare2/update.py b/pkgs/development/tools/analysis/radare2/update.py index 45920fd1e4bf..684d70bc0bc4 100755 --- a/pkgs/development/tools/analysis/radare2/update.py +++ b/pkgs/development/tools/analysis/radare2/update.py @@ -38,10 +38,9 @@ def get_radare2_rev() -> str: def get_cutter_version() -> str: version_expr = """ -(with import <nixpkgs> {}; (builtins.parseDrvName (qt5.callPackage ./cutter.nix {}).name).version) +(with import <nixpkgs> {}; (builtins.parseDrvName (qt5.callPackage <radare2/cutter.nix> {}).name).version) """ - with SCRIPT_DIR: - return sh("nix", "eval", "--raw", version_expr.strip()) + return sh("nix", "eval", "--raw", version_expr.strip(), "-I", "radare2={0}".format(SCRIPT_DIR)) def get_r2_cutter_rev() -> str: @@ -109,7 +108,7 @@ def main() -> None: "https://github.com/radare/radare2", ".", ) - nix_file = str(Path(__file__).parent.joinpath("default.nix")) + nix_file = str(SCRIPT_DIR.joinpath("default.nix")) radare2_info = get_repo_info(dirname, radare2_rev) |