summaryrefslogtreecommitdiffstats
path: root/pkgs/applications/networking/ids
diff options
context:
space:
mode:
authorMario Rodas <marsam@users.noreply.github.com>2023-12-27 04:20:00 +0000
committerMario Rodas <marsam@users.noreply.github.com>2023-12-27 04:20:00 +0000
commit0fcb3dd9d1dcdef43ceefd4a57beb3fdbd4a7840 (patch)
tree4504667ffb491ce877393a210cbfec90e14108c6 /pkgs/applications/networking/ids
parenta247644ab94664d63c2c62a7ccd2b66895ec2246 (diff)
zeek.broker: unstable-2023-02-01 -> 2.7.0
Diffstat (limited to 'pkgs/applications/networking/ids')
-rw-r--r--pkgs/applications/networking/ids/zeek/broker/default.nix16
1 files changed, 10 insertions, 6 deletions
diff --git a/pkgs/applications/networking/ids/zeek/broker/default.nix b/pkgs/applications/networking/ids/zeek/broker/default.nix
index cfb8cc685a10..ef37f4c2ed06 100644
--- a/pkgs/applications/networking/ids/zeek/broker/default.nix
+++ b/pkgs/applications/networking/ids/zeek/broker/default.nix
@@ -14,8 +14,8 @@ let
src-cmake = fetchFromGitHub {
owner = "zeek";
repo = "cmake";
- rev = "b191c36167bc0d6bd9f059b01ad4c99be98488d9";
- hash = "sha256-h6xPCcdTnREeDsGQhWt2w4yJofpr7g4a8xCOB2e0/qQ=";
+ rev = "1be78cc8a889d95db047f473a0f48e0baee49f33";
+ hash = "sha256-zcXWP8CHx0RSDGpRTrYD99lHlqSbvaliXrtFowPfhBk=";
};
src-3rdparty = fetchFromGitHub {
owner = "zeek";
@@ -37,9 +37,9 @@ let
doCheck = false;
});
in
-stdenv.mkDerivation {
+stdenv.mkDerivation rec {
pname = "zeek-broker";
- version = "unstable-2023-02-01";
+ version = "2.7.0";
outputs = [ "out" "py" ];
strictDeps = true;
@@ -47,8 +47,8 @@ stdenv.mkDerivation {
src = fetchFromGitHub {
owner = "zeek";
repo = "broker";
- rev = "3df8d35732d51e3bd41db067260998e79e93f366";
- hash = "sha256-37JIgbG12zd13YhfgVb4egzi80fUcZVj/s+yvsjcP7E=";
+ rev = "v${version}";
+ hash = "sha256-fwLqw7PPYUDm+eJxDpCtY/W6XianqBDPHOhzDQoooYo=";
};
postUnpack = ''
rmdir $sourceRoot/cmake $sourceRoot/3rdparty
@@ -64,6 +64,10 @@ stdenv.mkDerivation {
./0001-Fix-include-path-in-exported-CMake-targets.patch
];
+ postPatch = lib.optionalString stdenv.isDarwin ''
+ substituteInPlace bindings/python/CMakeLists.txt --replace " -u -r" ""
+ '';
+
nativeBuildInputs = [ cmake ];
buildInputs = [ openssl python3.pkgs.pybind11 ];
propagatedBuildInputs = [ caf' ];