summary refs log tree commit diff
diff options
context:
space:
mode:
authorRobert Scott <code@humanleg.org.uk>2021-05-29 20:38:07 +0100
committerRobert Scott <code@humanleg.org.uk>2021-05-30 11:59:04 +0100
commit2d7f554229393ddb0441dd31e37db7ad7b48dab0 (patch)
treed6acb226c02a3e5b44515d2e47bda29ccf0c2587
parent0d698e61863a9920fa92eb5fe6fa10cab4e415e0 (diff)
downloadnixpkgs-2d7f554229393ddb0441dd31e37db7ad7b48dab0.tar
nixpkgs-2d7f554229393ddb0441dd31e37db7ad7b48dab0.tar.gz
nixpkgs-2d7f554229393ddb0441dd31e37db7ad7b48dab0.tar.bz2
nixpkgs-2d7f554229393ddb0441dd31e37db7ad7b48dab0.tar.lz
nixpkgs-2d7f554229393ddb0441dd31e37db7ad7b48dab0.tar.xz
nixpkgs-2d7f554229393ddb0441dd31e37db7ad7b48dab0.tar.zst
nixpkgs-2d7f554229393ddb0441dd31e37db7ad7b48dab0.zip
yara: 4.0.5 -> 4.1.1
-rw-r--r--pkgs/tools/security/yara/default.nix18
1 files changed, 2 insertions, 16 deletions
diff --git a/pkgs/tools/security/yara/default.nix b/pkgs/tools/security/yara/default.nix
index 506bf0f719d..3d4411d9087 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")