swendel/nixpkgs
1
0
Fork 0
mirror of https://github.com/SebastianWendel/nixpkgs.git synced 2024-09-21 12:59:04 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #219857 from tobim/pkgs/zeek-5.2.0

Browse source 
zeek: 5.1.2 -> 5.2.0

Closes #215368
This commit is contained in:
Mario Rodas 2023-03-07 00:33:45 -05:00 committed by GitHub
parent 9110e8cba8 186e71a9ab
commit ded734aee8
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
pkgs/applications/networking/ids/zeek/broker/default.nix
View file

@ -14,8 +14,8 @@ let
src-cmake = fetchFromGitHub { src-cmake = fetchFromGitHub {
owner = "zeek"; owner = "zeek";
repo = "cmake"; repo = "cmake";
rev = "0b7a543554622600bc0a42b57a22f291a4fbd86c"; rev = "9f05362a5c33ed11dab37d2dedf74206d59d8f6d";
hash = "sha256-kaBOBTpfR3XyuF4PW5NQKca/UhXXxJJcXVsErFU1VYY="; hash = "sha256-UfPPbwLJcI6+8EYLKRcBhxashEkCTJ2Gj1JOtFayot8=";
}; };
src-3rdparty = fetchFromGitHub { src-3rdparty = fetchFromGitHub {
owner = "zeek"; owner = "zeek";
@ -41,9 +41,9 @@ let
''; '';
}); });
in in
stdenv.mkDerivation rec { stdenv.mkDerivation {
pname = "zeek-broker"; pname = "zeek-broker";
version = "2.4.2"; version = "unstable-2023-02-01";
outputs = [ "out" "py" ]; outputs = [ "out" "py" ];
strictDeps = true; strictDeps = true;
@ -51,8 +51,8 @@ stdenv.mkDerivation rec {
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "zeek"; owner = "zeek";
repo = "broker"; repo = "broker";
rev = "v${version}"; rev = "bc0205ce1fc06ddb91abb6744cb79c7eb846c23e";
hash = "sha256-y07fJEVPDGPv5VThE45SwM342VS6LnEtMvazZHadM/k="; hash = "sha256-bmyitJg3kRyIXm09IupLwZXbiGZfikkHcRcIexkS4/g=";
}; };
postUnpack = '' postUnpack = ''
rmdir $sourceRoot/cmake $sourceRoot/3rdparty rmdir $sourceRoot/cmake $sourceRoot/3rdparty

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 = "5.1.2"; version = "5.2.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-1DvXUcTbLBm9UjJXuk8DjGEj+lED+s9D+SNnSqA3bwU="; sha256 = "sha256-URBHQA3UU5F3VCyEpegNfpetc9KpmG/81s2FtMxxH78=";
}; };
strictDeps = true; strictDeps = true;

4
pkgs/development/tools/parsing/spicy/default.nix
View file

@ -11,7 +11,7 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "spicy"; pname = "spicy";
version = "1.5.3"; version = "1.7.0";
strictDeps = true; strictDeps = true;
@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
owner = "zeek"; owner = "zeek";
repo = "spicy"; repo = "spicy";
rev = "v${version}"; rev = "v${version}";
hash = "sha256-eCF914QEBBqg3LfM3N22c7W0TMOhuHqLxncpAG+8FjU="; hash = "sha256-axeBD1wjMc5HZy+0Oi5wltr7M6zrQI/NzU6717vUpg0=";
fetchSubmodules = true; fetchSubmodules = true;
}; };