diff options
Diffstat (limited to 'pkgs/applications/networking/ids/zeek/default.nix')
-rw-r--r-- | pkgs/applications/networking/ids/zeek/default.nix | 16 |
1 files changed, 5 insertions, 11 deletions
diff --git a/pkgs/applications/networking/ids/zeek/default.nix b/pkgs/applications/networking/ids/zeek/default.nix index eb8799e76636..5b9ca68df1f7 100644 --- a/pkgs/applications/networking/ids/zeek/default.nix +++ b/pkgs/applications/networking/ids/zeek/default.nix @@ -5,7 +5,6 @@ , cmake , flex , bison -, spicy-parser-generator , openssl , libkqueue , libpcap @@ -26,18 +25,16 @@ let in stdenv.mkDerivation rec { pname = "zeek"; - version = "5.2.2"; + version = "6.0.1"; src = fetchurl { url = "https://download.zeek.org/zeek-${version}.tar.gz"; - sha256 = "sha256-4MJBV8yWpy5LvkyyipOZdDjU6FV7F8INc/zWddRGFcY="; + sha256 = "sha256-z8MpoXBDkZXXBw7FOH2Vzdp+trhqyF7HB7ntDp1Xaik="; }; strictDeps = true; patches = [ - ./avoid-broken-tests.patch - ./debug-runtime-undef-fortify-source.patch ./fix-installation.patch ]; @@ -51,7 +48,6 @@ stdenv.mkDerivation rec { buildInputs = [ broker - spicy-parser-generator curl gperftools libmaxminddb @@ -67,21 +63,19 @@ stdenv.mkDerivation rec { ]; postPatch = '' - patchShebangs ./auxil/spicy/spicy/scripts - - substituteInPlace auxil/spicy/CMakeLists.txt --replace "hilti-toolchain-tests" "" - substituteInPlace auxil/spicy/spicy/hilti/CMakeLists.txt --replace "hilti-toolchain-tests" "" + patchShebangs ./ci/collect-repo-info.py + patchShebangs ./auxil/spicy/scripts ''; cmakeFlags = [ "-DBroker_ROOT=${broker}" - "-DSPICY_ROOT_DIR=${spicy-parser-generator}" "-DENABLE_PERFTOOLS=true" "-DINSTALL_AUX_TOOLS=true" "-DZEEK_ETC_INSTALL_DIR=/etc/zeek" "-DZEEK_LOG_DIR=/var/log/zeek" "-DZEEK_STATE_DIR=/var/lib/zeek" "-DZEEK_SPOOL_DIR=/var/spool/zeek" + "-DDISABLE_JAVASCRIPT=ON" ] ++ lib.optionals stdenv.isLinux [ "-DLIBKQUEUE_ROOT_DIR=${libkqueue}" ]; |