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

zeek: 3.0.3 -> 3.1.1

This commit is contained in:
Mario Rodas 2020-04-10 04:20:00 -05:00
parent 9ddfde8977
commit a37e2f2f1d
No known key found for this signature in database
GPG Key ID: 325649BCA6D53027
1 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
pkgs/applications/networking/ids/zeek/default.nix
View File

@ -1,25 +1,35 @@
{stdenv, fetchurl, cmake, flex, bison, openssl, libpcap, zlib, file, curl {stdenv, fetchurl, cmake, flex, bison, openssl, libpcap, zlib, file, curl
, libmaxminddb, gperftools, python, swig, rocksdb }: , libmaxminddb, gperftools, python, swig, fetchpatch }:
let let
preConfigure = (import ./script.nix); preConfigure = (import ./script.nix);
in in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "zeek"; pname = "zeek";
version = "3.0.3"; version = "3.1.1";
src = fetchurl { src = fetchurl {
url = "https://old.zeek.org/downloads/zeek-${version}.tar.gz"; url = "https://old.zeek.org/downloads/zeek-${version}.tar.gz";
sha256 = "0xlw5v83qbgy23wdcddmvan2pid28mw745g4fc1z5r18kp67i8a2"; sha256 = "0siybzdp8w62jqk5vdi5fxwvj6cn4r6c2d4z2axd4rj5vhv5zvx2";
}; };
nativeBuildInputs = [ cmake flex bison file ]; nativeBuildInputs = [ cmake flex bison file ];
buildInputs = [ openssl libpcap zlib curl libmaxminddb gperftools python swig rocksdb ]; buildInputs = [ openssl libpcap zlib curl libmaxminddb gperftools python swig ];
#see issue https://github.com/zeek/zeek/issues/804 to modify hardlinking duplicate files. #see issue https://github.com/zeek/zeek/issues/804 to modify hardlinking duplicate files.
inherit preConfigure; inherit preConfigure;
enableParallelBuilding = true; enableParallelBuilding = true;
patches = stdenv.lib.optionals stdenv.cc.isClang [
# Fix pybind c++17 build with Clang. See: https://github.com/pybind/pybind11/issues/1604
(fetchpatch {
url = "https://github.com/pybind/pybind11/commit/759221f5c56939f59d8f342a41f8e2d2cacbc8cf.patch";
sha256 = "0l8z7d7chq1awd8dnfarj4c40wx36hkhcan0702p5l89x73wqk54";
extraPrefix = "aux/broker/bindings/python/3rdparty/pybind11/";
stripLen = 1;
})
];
cmakeFlags = [ cmakeFlags = [
"-DPY_MOD_INSTALL_DIR=${placeholder "out"}/${python.sitePackages}" "-DPY_MOD_INSTALL_DIR=${placeholder "out"}/${python.sitePackages}"
"-DENABLE_PERFTOOLS=true" "-DENABLE_PERFTOOLS=true"