diff options
| author | Mario Rodas <marsam@users.noreply.github.com> | 2023-12-27 04:20:00 +0000 |
|---|---|---|
| committer | Mario Rodas <marsam@users.noreply.github.com> | 2023-12-27 04:20:00 +0000 |
| commit | adf4824946131ed9c1d67f6ec1ec243fdfe1c2f2 (patch) | |
| tree | 99a95c6d0a4d43c7a4bb0c27ea0b07c1255ca246 /pkgs/applications/networking/ids | |
| parent | 0fcb3dd9d1dcdef43ceefd4a57beb3fdbd4a7840 (diff) | |
zeek: 6.0.2 -> 6.1.0
Changelog: https://github.com/zeek/zeek/releases/tag/v6.1.0
Diffstat (limited to 'pkgs/applications/networking/ids')
| -rw-r--r-- | pkgs/applications/networking/ids/zeek/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/applications/networking/ids/zeek/fix-installation.patch | 10 |
2 files changed, 7 insertions, 7 deletions
diff --git a/pkgs/applications/networking/ids/zeek/default.nix b/pkgs/applications/networking/ids/zeek/default.nix index 3922b95fbac2c..7970a090407c4 100644 --- a/pkgs/applications/networking/ids/zeek/default.nix +++ b/pkgs/applications/networking/ids/zeek/default.nix @@ -26,11 +26,11 @@ let in stdenv.mkDerivation rec { pname = "zeek"; - version = "6.0.2"; + version = "6.1.0"; src = fetchurl { url = "https://download.zeek.org/zeek-${version}.tar.gz"; - sha256 = "sha256-JCGYmtzuain0io9ycvcZ7b6VTWbC6G46Uuecrhd/iHw="; + sha256 = "sha256-+3VvS5eAl1W13sOJJ8SUd/8GqmR9/NK4gCWxvhtqNY4="; }; strictDeps = true; diff --git a/pkgs/applications/networking/ids/zeek/fix-installation.patch b/pkgs/applications/networking/ids/zeek/fix-installation.patch index 63c213e3a69e4..135e8c3146780 100644 --- a/pkgs/applications/networking/ids/zeek/fix-installation.patch +++ b/pkgs/applications/networking/ids/zeek/fix-installation.patch @@ -2,7 +2,7 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt index 4d3da0c90..d37931c1b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -503,11 +503,6 @@ if (NOT MSVC) +@@ -508,11 +508,6 @@ if (NOT MSVC) set(HAVE_SUPERVISOR true) endif () @@ -11,11 +11,11 @@ index 4d3da0c90..d37931c1b 100644 -install(DIRECTORY DESTINATION ${ZEEK_SPOOL_DIR}) -install(DIRECTORY DESTINATION ${ZEEK_LOG_DIR}) - - configure_file(zeek-path-dev.in ${CMAKE_CURRENT_BINARY_DIR}/zeek-path-dev) + configure_file(cmake_templates/zeek-path-dev.in ${CMAKE_CURRENT_BINARY_DIR}/zeek-path-dev) file( -@@ -1198,7 +1193,7 @@ if (INSTALL_ZKG) - @ONLY) +@@ -1201,7 +1201,7 @@ if (INSTALL_ZKG) + ${CMAKE_CURRENT_BINARY_DIR}/zkg-config @ONLY) install(DIRECTORY DESTINATION var/lib/zkg) - install(FILES ${CMAKE_CURRENT_BINARY_DIR}/zkg-config DESTINATION ${ZEEK_ZKG_CONFIG_DIR} @@ -37,7 +37,7 @@ index 1ebe7c2..1435509 100644 ######################################################################## ## Dependency Configuration -@@ -200,38 +200,9 @@ else () +@@ -186,38 +186,9 @@ else () set(LOGS ${VAR}/logs) endif () |