From 8ec463eba8ccbef12b26b441ef1728e824cd3c30 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 15 May 2023 05:22:12 +0000
Subject: zeek: 5.2.0 -> 5.2.1

---
 pkgs/applications/networking/ids/zeek/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'pkgs/applications/networking')

diff --git a/pkgs/applications/networking/ids/zeek/default.nix b/pkgs/applications/networking/ids/zeek/default.nix
index 645bbad3ed96b..d0fef55da9657 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 = "5.2.0";
+  version = "5.2.1";
 
   src = fetchurl {
     url = "https://download.zeek.org/zeek-${version}.tar.gz";
-    sha256 = "sha256-URBHQA3UU5F3VCyEpegNfpetc9KpmG/81s2FtMxxH78=";
+    sha256 = "sha256-cWTJ/NkQzzOfoh0WoYpwHg4TCbjtSJomtQarhsSFg48=";
   };
 
   strictDeps = true;
-- 
cgit 1.4.1


From eca6dd10b9e6474eb1e954700a2705fa8eb960f4 Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Sat, 20 May 2023 04:20:00 +0000
Subject: zeek: 5.2.1 -> 5.2.2

https://github.com/zeek/zeek/releases/tag/v5.2.2
---
 pkgs/applications/networking/ids/zeek/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'pkgs/applications/networking')

diff --git a/pkgs/applications/networking/ids/zeek/default.nix b/pkgs/applications/networking/ids/zeek/default.nix
index d0fef55da9657..7530b5730b2f6 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 = "5.2.1";
+  version = "5.2.2";
 
   src = fetchurl {
     url = "https://download.zeek.org/zeek-${version}.tar.gz";
-    sha256 = "sha256-cWTJ/NkQzzOfoh0WoYpwHg4TCbjtSJomtQarhsSFg48=";
+    sha256 = "sha256-4MJBV8yWpy5LvkyyipOZdDjU6FV7F8INc/zWddRGFcY=";
   };
 
   strictDeps = true;
-- 
cgit 1.4.1


From fda63c16e2e6f45c42038b61ce6d2d4d38ed7ea2 Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Sat, 20 May 2023 04:20:00 +0000
Subject: zeek: only build with libkqueue on Linux

---
 pkgs/applications/networking/ids/zeek/default.nix | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'pkgs/applications/networking')

diff --git a/pkgs/applications/networking/ids/zeek/default.nix b/pkgs/applications/networking/ids/zeek/default.nix
index 7530b5730b2f6..eb8799e766363 100644
--- a/pkgs/applications/networking/ids/zeek/default.nix
+++ b/pkgs/applications/networking/ids/zeek/default.nix
@@ -54,13 +54,14 @@ stdenv.mkDerivation rec {
     spicy-parser-generator
     curl
     gperftools
-    libkqueue
     libmaxminddb
     libpcap
     ncurses
     openssl
     swig
     zlib
+  ] ++ lib.optionals stdenv.isLinux [
+    libkqueue
   ] ++ lib.optionals stdenv.isDarwin [
     gettext
   ];
@@ -75,13 +76,14 @@ stdenv.mkDerivation rec {
   cmakeFlags = [
     "-DBroker_ROOT=${broker}"
     "-DSPICY_ROOT_DIR=${spicy-parser-generator}"
-    "-DLIBKQUEUE_ROOT_DIR=${libkqueue}"
     "-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"
+  ] ++ lib.optionals stdenv.isLinux [
+    "-DLIBKQUEUE_ROOT_DIR=${libkqueue}"
   ];
 
   postInstall = ''
-- 
cgit 1.4.1