diff options
| author | Mario Rodas <marsam@users.noreply.github.com> | 2023-03-07 00:33:45 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-03-07 00:33:45 -0500 |
| commit | ded734aee806018df56e0fd0a4b47fe6b180724d (patch) | |
| tree | 36cc601628c605b95d0a0e8e12089bc3a0e5d9d6 | |
| parent | 9110e8cba872767ed85c0be008676b0d33e454b9 (diff) | |
| parent | 186e71a9aba60e6f0b5dc4193231ce6bc5c407a2 (diff) | |
Merge pull request #219857 from tobim/pkgs/zeek-5.2.0
zeek: 5.1.2 -> 5.2.0
Closes #215368
| -rw-r--r-- | pkgs/applications/networking/ids/zeek/broker/default.nix | 12 | ||||
| -rw-r--r-- | pkgs/applications/networking/ids/zeek/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/development/tools/parsing/spicy/default.nix | 4 |
3 files changed, 10 insertions, 10 deletions
diff --git a/pkgs/applications/networking/ids/zeek/broker/default.nix b/pkgs/applications/networking/ids/zeek/broker/default.nix index cb10e43933aa..082607e4d023 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 = "0b7a543554622600bc0a42b57a22f291a4fbd86c"; - hash = "sha256-kaBOBTpfR3XyuF4PW5NQKca/UhXXxJJcXVsErFU1VYY="; + rev = "9f05362a5c33ed11dab37d2dedf74206d59d8f6d"; + hash = "sha256-UfPPbwLJcI6+8EYLKRcBhxashEkCTJ2Gj1JOtFayot8="; }; src-3rdparty = fetchFromGitHub { owner = "zeek"; @@ -41,9 +41,9 @@ let ''; }); in -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "zeek-broker"; - version = "2.4.2"; + version = "unstable-2023-02-01"; outputs = [ "out" "py" ]; strictDeps = true; @@ -51,8 +51,8 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "zeek"; repo = "broker"; - rev = "v${version}"; - hash = "sha256-y07fJEVPDGPv5VThE45SwM342VS6LnEtMvazZHadM/k="; + rev = "bc0205ce1fc06ddb91abb6744cb79c7eb846c23e"; + hash = "sha256-bmyitJg3kRyIXm09IupLwZXbiGZfikkHcRcIexkS4/g="; }; postUnpack = '' rmdir $sourceRoot/cmake $sourceRoot/3rdparty diff --git a/pkgs/applications/networking/ids/zeek/default.nix b/pkgs/applications/networking/ids/zeek/default.nix index 0bacf8ce03c4..645bbad3ed96 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.1.2"; + version = "5.2.0"; src = fetchurl { url = "https://download.zeek.org/zeek-${version}.tar.gz"; - sha256 = "sha256-1DvXUcTbLBm9UjJXuk8DjGEj+lED+s9D+SNnSqA3bwU="; + sha256 = "sha256-URBHQA3UU5F3VCyEpegNfpetc9KpmG/81s2FtMxxH78="; }; strictDeps = true; diff --git a/pkgs/development/tools/parsing/spicy/default.nix b/pkgs/development/tools/parsing/spicy/default.nix index f379a1ed0517..9ed70fbf885e 100644 --- a/pkgs/development/tools/parsing/spicy/default.nix +++ b/pkgs/development/tools/parsing/spicy/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { pname = "spicy"; - version = "1.5.3"; + version = "1.7.0"; strictDeps = true; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { owner = "zeek"; repo = "spicy"; rev = "v${version}"; - hash = "sha256-eCF914QEBBqg3LfM3N22c7W0TMOhuHqLxncpAG+8FjU="; + hash = "sha256-axeBD1wjMc5HZy+0Oi5wltr7M6zrQI/NzU6717vUpg0="; fetchSubmodules = true; }; |