Unverified Commit ded734ae authored by Mario Rodas's avatar Mario Rodas Committed by GitHub
Browse files

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

zeek: 5.1.2 -> 5.2.0

Closes #215368
parents 9110e8cb 186e71a9

pkgs/applications/networking/ids/zeek/broker/default.nix

+6 −6
Original line number Diff line number Diff line
@@ -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

pkgs/applications/networking/ids/zeek/default.nix

+2 −2
Original line number Diff line number Diff line
@@ -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;

pkgs/development/tools/parsing/spicy/default.nix

+2 −2
Original line number Diff line number Diff line
@@ -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;

  };