diff options
| author | Robert Scott <code@humanleg.org.uk> | 2021-05-29 20:38:07 +0100 |
|---|---|---|
| committer | github-actions[bot] <github-actions[bot]@users.noreply.github.com> | 2021-06-01 14:02:39 +0000 |
| commit | 529b6eee47ea8ed038aa9432179a49b80241aa9b (patch) | |
| tree | f692936c7698134f14d008a23f48f184f6492248 | |
| parent | Merge pull request #124818 from NixOS/backport-124200-to-release-21.05 (diff) | |
| download | nixpkgs-529b6eee47ea8ed038aa9432179a49b80241aa9b.tar.gz | |
yara: 4.0.5 -> 4.1.1
(cherry picked from commit 2d7f554229393ddb0441dd31e37db7ad7b48dab0)
| -rw-r--r-- | pkgs/tools/security/yara/default.nix | 18 |
1 files changed, 2 insertions, 16 deletions
diff --git a/pkgs/tools/security/yara/default.nix b/pkgs/tools/security/yara/default.nix index 506bf0f719d7..3d4411d9087c 100644 --- a/pkgs/tools/security/yara/default.nix +++ b/pkgs/tools/security/yara/default.nix @@ -1,5 +1,4 @@ { lib, stdenv -, fetchpatch , fetchFromGitHub , autoreconfHook , pcre @@ -14,14 +13,14 @@ }: stdenv.mkDerivation rec { - version = "4.0.5"; + version = "4.1.1"; pname = "yara"; src = fetchFromGitHub { owner = "VirusTotal"; repo = "yara"; rev = "v${version}"; - sha256 = "1gkdll2ygdlqy1f27a5b84gw2bq75ss7acsx06yhiss90qwdaalq"; + sha256 = "185j7firn7i5506rcp0va7sxdbminwrm06jsm4c70jf98qxmv522"; }; nativeBuildInputs = [ autoreconfHook pkg-config ]; @@ -34,19 +33,6 @@ stdenv.mkDerivation rec { preConfigure = "./bootstrap.sh"; - # If static builds are disabled, `make all-am` will fail to find libyara.a and - # cause a build failure. It appears that somewhere between yara 4.0.1 and - # 4.0.5, linking the yara binaries dynamically against libyara.so was broken. - # - # This was already fixed in yara master. Backport the patch to yara 4.0.5. - patches = [ - (fetchpatch { - name = "fix-build-with-no-static.patch"; - url = "https://github.com/VirusTotal/yara/commit/52e6866023b9aca26571c78fb8759bc3a51ba6dc.diff"; - sha256 = "074cf99j0rqiyacp60j1hkvjqxia7qwd11xjqgcr8jmfwihb38nr"; - }) - ]; - configureFlags = [ (lib.withFeature withCrypto "crypto") (lib.enableFeature enableCuckoo "cuckoo") |