diff options
author | Mario Rodas <marsam@users.noreply.github.com> | 2021-03-01 04:20:00 +0000 |
---|---|---|
committer | Mario Rodas <marsam@users.noreply.github.com> | 2021-03-01 04:20:00 +0000 |
commit | a626c5a51c7abc702ec223075e957f3ebbb80d94 (patch) | |
tree | 0e929a3f0cfb88c4b9e936ad660d352a42b724f1 /pkgs/applications/networking/ids | |
parent | 08fc5e317c10f7eb5255fd4394e09a4e18879efe (diff) |
zeek: 3.2.4 -> 4.0.0
https://github.com/zeek/zeek/releases/tag/v4.0.0
Diffstat (limited to 'pkgs/applications/networking/ids')
-rw-r--r-- | pkgs/applications/networking/ids/zeek/default.nix | 22 |
1 files changed, 7 insertions, 15 deletions
diff --git a/pkgs/applications/networking/ids/zeek/default.nix b/pkgs/applications/networking/ids/zeek/default.nix index e5223c35fa35b..12e25fb774e41 100644 --- a/pkgs/applications/networking/ids/zeek/default.nix +++ b/pkgs/applications/networking/ids/zeek/default.nix @@ -11,38 +11,30 @@ , curl , libmaxminddb , gperftools -, python +, python3 , swig , gettext -, fetchpatch , coreutils +, ncurses }: stdenv.mkDerivation rec { pname = "zeek"; - version = "3.2.4"; + version = "4.0.0"; src = fetchurl { url = "https://download.zeek.org/zeek-${version}.tar.gz"; - sha256 = "11dy4w810jms75nrr3n3dy5anrl5ksb5pmnk31z37k60hg9q9afm"; + sha256 = "0m7zy5k2595vf5xr2r4m75rfsdddigrv2hilm1c3zaif4srxmvpj"; }; nativeBuildInputs = [ cmake flex bison file ]; - buildInputs = [ openssl libpcap zlib curl libmaxminddb gperftools python swig ] + buildInputs = [ openssl libpcap zlib curl libmaxminddb gperftools python3 swig ncurses ] ++ lib.optionals stdenv.isDarwin [ gettext ]; - patches = 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 = "17qznp8yavnv84fjsbghv3d59z6k6rx74j49w0izakmgw5a95w84"; - extraPrefix = "auxil/broker/bindings/python/3rdparty/pybind11/"; - stripLen = 1; - }) - ]; + outputs = [ "out" "lib" "py" ]; cmakeFlags = [ - "-DPY_MOD_INSTALL_DIR=${placeholder "out"}/${python.sitePackages}" + "-DZEEK_PYTHON_DIR=${placeholder "py"}/lib/${python3.libPrefix}/site-packages" "-DENABLE_PERFTOOLS=true" "-DINSTALL_AUX_TOOLS=true" ]; |