diff options
| author | Will Dietz <w@wdtz.org> | 2018-11-16 08:36:42 -0600 |
|---|---|---|
| committer | Will Dietz <w@wdtz.org> | 2018-11-16 08:39:40 -0600 |
| commit | aceb11047ab77d6645a1ae641af1204c5f1e39ab (patch) | |
| tree | 8e88cd1ad857d419ad56b1963119d876e9af5838 /pkgs/development/tools/analysis/retdec | |
| parent | d53c0a71ab877bc72ed5aa403b15c8fbb3450a34 (diff) | |
| download | nixlib-aceb11047ab77d6645a1ae641af1204c5f1e39ab.tar nixlib-aceb11047ab77d6645a1ae641af1204c5f1e39ab.tar.gz nixlib-aceb11047ab77d6645a1ae641af1204c5f1e39ab.tar.bz2 nixlib-aceb11047ab77d6645a1ae641af1204c5f1e39ab.tar.lz nixlib-aceb11047ab77d6645a1ae641af1204c5f1e39ab.tar.xz nixlib-aceb11047ab77d6645a1ae641af1204c5f1e39ab.tar.zst nixlib-aceb11047ab77d6645a1ae641af1204c5f1e39ab.zip | |
retdec: bump yaramod dep to fix 2/bison 3.2+
Diffstat (limited to 'pkgs/development/tools/analysis/retdec')
| -rw-r--r-- | pkgs/development/tools/analysis/retdec/default.nix | 19 |
1 files changed, 17 insertions, 2 deletions
diff --git a/pkgs/development/tools/analysis/retdec/default.nix b/pkgs/development/tools/analysis/retdec/default.nix index 428ca259f496..3e64e91d1300 100644 --- a/pkgs/development/tools/analysis/retdec/default.nix +++ b/pkgs/development/tools/analysis/retdec/default.nix @@ -1,5 +1,6 @@ { stdenv , fetchFromGitHub +, fetchpatch , fetchzip , lib , callPackage @@ -70,8 +71,8 @@ let yaramod = fetchFromGitHub { owner = "avast-tl"; repo = "yaramod"; - rev = "v2.1.2"; - sha256 = "1rpyqzkrqvk721hf75wb7aasw5mzp9wz4j89p0x1l9p5x1b3maz3"; + rev = "v2.2.2"; + sha256 = "0cq9h4h686q9ybamisbl797g6xjy211s3cq83nixkwkigmz48ccp"; }; jsoncpp = fetchFromGitHub { owner = "open-source-parsers"; @@ -181,6 +182,20 @@ in stdenv.mkDerivation rec { (yaramod // { dep_name = "yaramod"; }) ]; + # Use newer yaramod to fix w/bison 3.2+ + patches = [ + # 2.1.2 -> 2.2.1 + (fetchpatch { + url = https://github.com/avast-tl/retdec/commit/c9d23da1c6e23c149ed684c6becd3f3828fb4a55.patch; + sha256 = "0hdq634f72fihdy10nx2ajbps561w03dfdsy5r35afv9fapla6mv"; + }) + # 2.2.1 -> 2.2.2 + (fetchpatch { + url = https://github.com/avast-tl/retdec/commit/fb85f00754b5d13b781385651db557741679721e.patch; + sha256 = "0a8mwmwb39pr5ag3q11nv81ncdk51shndqrkm92shqrmdq14va52"; + }) + ]; + postPatch = (lib.concatMapStrings patchDep external_deps) + '' # install retdec-support echo "Checking version of retdec-support" |