public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #48581 from dtzWill/update/radare2-3.0.0 

radare2: 2.9.0 -> 3.0.0, fix to use deps we provide
This commit is contained in:
Jörg Thalheim 2018-10-17 09:17:34 +01:00 committed by GitHub
parent 9aa43737f0 26dfc0c533
commit 35c037c2f5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 16 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
pkgs/development/tools/analysis/radare2/default.nix
View File

@ -2,6 +2,7 @@
, callPackage , callPackage
, ninja, meson , pkgconfig , ninja, meson , pkgconfig
, libusb, readline, libewf, perl, zlib, openssl , libusb, readline, libewf, perl, zlib, openssl
, libuv
, gtk2 ? null, vte ? null, gtkdialog ? null , gtk2 ? null, vte ? null, gtkdialog ? null
, python ? null , python ? null
, ruby ? null , ruby ? null
@ -62,12 +63,15 @@ let
"-Dr2_gittip=${gittip}" "-Dr2_gittip=${gittip}"
# 2.8.0 expects this, but later it becomes an option with default=false. # 2.8.0 expects this, but later it becomes an option with default=false.
"-Dcapstone_in_builddir=true" "-Dcapstone_in_builddir=true"
"-Duse_sys_openssl=true"
"-Duse_sys_zlib=true"
]; ];
enableParallelBuilding = true; enableParallelBuilding = true;
nativeBuildInputs = [ pkgconfig ninja meson ]; 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 useX11 [gtkdialog vte gtk2]
++ optional rubyBindings [ruby] ++ optional rubyBindings [ruby]
++ optional pythonBindings [python] ++ optional pythonBindings [python]
@ -86,14 +90,14 @@ in {
#<generated> #<generated>
# DO NOT EDIT! Automatically generated by ./update.py # DO NOT EDIT! Automatically generated by ./update.py
radare2 = generic { radare2 = generic {
version_commit = "19349"; version_commit = "19720";
gittap = "2.9.0"; gittap = "3.0.0";
gittip = "d5e9539ec8068ca2ab4759dc3b0697781ded4cc8"; gittip = "13e3ebd2aa6653eb5b6bdd65a93dcddf3550fcfa";
rev = "2.9.0"; rev = "3.0.0";
version = "2.9.0"; version = "3.0.0";
sha256 = "0zz6337p9095picfvjrcnqaxdi2a2b68h9my523ilnw8ynwfhdzw"; sha256 = "0awbk9v7qjkarscaqzyly310f04dxgndxvxwxbjrsswqlp206b40";
cs_tip = "782ea67e17a391ca0d3faafdc365b335a1a8930a"; cs_tip = "e2c1cd46c06744beaceff42dd882de3a90f0a37c";
cs_sha256 = "1maww4ir78a193pm3f8lr2kdkizi7rywn68ffa65ipyr7j4pl6i4"; cs_sha256 = "1czzqj8zdjgh7h2ixi26ij3mm4bgm4xw2slin6fv73nic8yaw722";
}; };
r2-for-cutter = generic { r2-for-cutter = generic {
version_commit = "19349"; version_commit = "19349";

7
pkgs/development/tools/analysis/radare2/update.py
View File

@ -38,10 +38,9 @@ def get_radare2_rev() -> str:
def get_cutter_version() -> str: def get_cutter_version() -> str:
version_expr = """ 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(), "-I", "radare2={0}".format(SCRIPT_DIR))
return sh("nix", "eval", "--raw", version_expr.strip())
def get_r2_cutter_rev() -> str: def get_r2_cutter_rev() -> str:
@ -109,7 +108,7 @@ def main() -> None:
"https://github.com/radare/radare2", "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) radare2_info = get_repo_info(dirname, radare2_rev)