cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

zeek: 6.0.2 -> 6.1.0

Browse source 
Changelog: https://github.com/zeek/zeek/releases/tag/v6.1.0
This commit is contained in:
Mario Rodas 2023-12-27 04:20:00 +00:00
parent 0fcb3dd9d1
commit adf4824946
2 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
pkgs/applications/networking/ids/zeek/default.nix
View file

@ -26,11 +26,11 @@ let
in in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "zeek"; pname = "zeek";
version = "6.0.2"; version = "6.1.0";
src = fetchurl { src = fetchurl {
url = "https://download.zeek.org/zeek-${version}.tar.gz"; url = "https://download.zeek.org/zeek-${version}.tar.gz";
sha256 = "sha256-JCGYmtzuain0io9ycvcZ7b6VTWbC6G46Uuecrhd/iHw="; sha256 = "sha256-+3VvS5eAl1W13sOJJ8SUd/8GqmR9/NK4gCWxvhtqNY4=";
}; };
strictDeps = true; strictDeps = true;

10
pkgs/applications/networking/ids/zeek/fix-installation.patch
View file

@ -2,7 +2,7 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt
index 4d3da0c90..d37931c1b 100644 index 4d3da0c90..d37931c1b 100644
--- a/CMakeLists.txt --- a/CMakeLists.txt
+++ b/CMakeLists.txt +++ b/CMakeLists.txt
@@ -503,11 +503,6 @@ if (NOT MSVC) @@ -508,11 +508,6 @@ if (NOT MSVC)
set(HAVE_SUPERVISOR true) set(HAVE_SUPERVISOR true)
endif () endif ()
@ -11,11 +11,11 @@ index 4d3da0c90..d37931c1b 100644
-install(DIRECTORY DESTINATION ${ZEEK_SPOOL_DIR}) -install(DIRECTORY DESTINATION ${ZEEK_SPOOL_DIR})
-install(DIRECTORY DESTINATION ${ZEEK_LOG_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( file(
@@ -1198,7 +1193,7 @@ if (INSTALL_ZKG) @@ -1201,7 +1201,7 @@ if (INSTALL_ZKG)
@ONLY) ${CMAKE_CURRENT_BINARY_DIR}/zkg-config @ONLY)
install(DIRECTORY DESTINATION var/lib/zkg) install(DIRECTORY DESTINATION var/lib/zkg)
- install(FILES ${CMAKE_CURRENT_BINARY_DIR}/zkg-config DESTINATION ${ZEEK_ZKG_CONFIG_DIR} - install(FILES ${CMAKE_CURRENT_BINARY_DIR}/zkg-config DESTINATION ${ZEEK_ZKG_CONFIG_DIR}
@ -37,7 +37,7 @@ index 1ebe7c2..1435509 100644
######################################################################## ########################################################################
## Dependency Configuration ## Dependency Configuration
@@ -200,38 +200,9 @@ else () @@ -186,38 +186,9 @@ else ()
set(LOGS ${VAR}/logs) set(LOGS ${VAR}/logs)
endif () endif ()