From 24ce88615e32f1bea04c74c748a0fd14f59b0726 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Tue, 4 Sep 2018 22:51:01 +0100 Subject: [PATCH 1/3] radare2: 2.8.0 -> 2.9.0 --- pkgs/development/tools/analysis/radare2/default.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/development/tools/analysis/radare2/default.nix b/pkgs/development/tools/analysis/radare2/default.nix index 85559269f27..76df2d4fd64 100644 --- a/pkgs/development/tools/analysis/radare2/default.nix +++ b/pkgs/development/tools/analysis/radare2/default.nix @@ -86,12 +86,12 @@ in { # # DO NOT EDIT! Automatically generated by ./update.py radare2 = generic { - version_commit = "19251"; - gittap = "2.8.0"; - gittip = "a76b965410aba07b4ef8b96d90b25b271c2003dd"; - rev = "2.8.0"; - version = "2.8.0"; - sha256 = "1d9rkzc3vychy2h1bnywwx4why83rr18r0lvvl1cqx87ad5awcjk"; + 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"; }; From 63b7bc847cfdfe6c5d43eac69802c2b1cb7c0912 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Tue, 4 Sep 2018 23:08:39 +0100 Subject: [PATCH 2/3] radare2-cutter: add mic92 as maintainer --- pkgs/development/tools/analysis/radare2/cutter.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/tools/analysis/radare2/cutter.nix b/pkgs/development/tools/analysis/radare2/cutter.nix index 4269661a4ff..95b456fd2b7 100644 --- a/pkgs/development/tools/analysis/radare2/cutter.nix +++ b/pkgs/development/tools/analysis/radare2/cutter.nix @@ -49,6 +49,6 @@ stdenv.mkDerivation rec { description = "A Qt and C++ GUI for radare2 reverse engineering framework"; homepage = src.meta.homepage; license = licenses.gpl3; - maintainers = with maintainers; [ dtzWill ]; + maintainers = with maintainers; [ mic92 dtzWill ]; }; } From a56fd17938917fcdb461c67c24b3bec8f7d7c033 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Tue, 4 Sep 2018 22:51:35 +0100 Subject: [PATCH 3/3] radare2-cutter: 1.7 -> 1.7.1 --- pkgs/development/tools/analysis/radare2/cutter.nix | 4 ++-- pkgs/development/tools/analysis/radare2/default.nix | 12 ++++++------ pkgs/development/tools/analysis/radare2/update.py | 13 ++++++++++++- 3 files changed, 20 insertions(+), 9 deletions(-) diff --git a/pkgs/development/tools/analysis/radare2/cutter.nix b/pkgs/development/tools/analysis/radare2/cutter.nix index 95b456fd2b7..659d6a94f5e 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"; + version = "1.7.1"; in stdenv.mkDerivation rec { name = "radare2-cutter-${version}"; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { owner = "radareorg"; repo = "cutter"; rev = "v${version}"; - sha256 = "0z9wzxd5hw0ivakrg3xiv4zx1rjj032hlmizq0pxj22xjrj1gg9n"; + sha256 = "0dfi6f016jnh3swppvks5qkvmk0j2hvggh9sd1f40kg9pg5p08hy"; }; postUnpack = "export sourceRoot=$sourceRoot/src"; diff --git a/pkgs/development/tools/analysis/radare2/default.nix b/pkgs/development/tools/analysis/radare2/default.nix index 76df2d4fd64..f10b820a73e 100644 --- a/pkgs/development/tools/analysis/radare2/default.nix +++ b/pkgs/development/tools/analysis/radare2/default.nix @@ -96,12 +96,12 @@ in { cs_sha256 = "1maww4ir78a193pm3f8lr2kdkizi7rywn68ffa65ipyr7j4pl6i4"; }; r2-for-cutter = generic { - version_commit = "19251"; - gittap = "2.8.0-118-gb0547831f"; - gittip = "b0547831f127b7357e3c93bc43933482a4d6213b"; - rev = "b0547831f127b7357e3c93bc43933482a4d6213b"; - version = "2018-08-07"; - sha256 = "1ix42kipd1aayb494ajbxawzc1cwikm9fxk343d1kchxx4a30a1m"; + 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"; }; diff --git a/pkgs/development/tools/analysis/radare2/update.py b/pkgs/development/tools/analysis/radare2/update.py index fae6a52a392..45920fd1e4b 100755 --- a/pkgs/development/tools/analysis/radare2/update.py +++ b/pkgs/development/tools/analysis/radare2/update.py @@ -13,6 +13,8 @@ from datetime import datetime from pathlib import Path from typing import Dict +SCRIPT_DIR = Path(__file__).parent.resolve() + def sh(*args: str) -> str: out = subprocess.check_output(list(args)) @@ -34,8 +36,17 @@ def get_radare2_rev() -> str: return release["tag_name"] +def get_cutter_version() -> str: + version_expr = """ +(with import {}; (builtins.parseDrvName (qt5.callPackage ./cutter.nix {}).name).version) +""" + with SCRIPT_DIR: + return sh("nix", "eval", "--raw", version_expr.strip()) + + def get_r2_cutter_rev() -> str: - url = "https://api.github.com/repos/radareorg/cutter/contents/" + version = get_cutter_version() + url = f"https://api.github.com/repos/radareorg/cutter/contents?ref=v{version}" with urllib.request.urlopen(url) as response: data = json.load(response) # type: ignore for entry in data: