Merge branch 'staging-next' into staging

This commit is contained in:
WORLDofPEACE
2020-09-20 18:41:15 -04:00
394 changed files with 17279 additions and 6702 deletions
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
"--enable-control-socket"
"--with-daq-includes=${daq}/includes"
"--with-daq-libraries=${daq}/lib"
];
];
postInstall = ''
wrapProgram $out/bin/snort --add-flags "--daq-dir ${daq}/lib/daq --dynamic-preprocessor-lib-dir $out/lib/snort_dynamicpreprocessor/ --dynamic-engine-lib-dir $out/lib/snort_dynamicengine"
@@ -20,11 +20,11 @@ let
in
stdenv.mkDerivation rec {
pname = "zeek";
version = "3.2.0";
version = "3.2.1";
src = fetchurl {
url = "https://download.zeek.org/zeek-${version}.tar.gz";
sha256 = "0ky4485z0gpaj1z75y7jr5bn9wr8x8w3v637aqq4v9a0a5iyagmg";
sha256 = "0rybs79h0sq12vsayah8dixqac404z84rlvqynvzf3dh2lwcgg0y";
};
nativeBuildInputs = [ cmake flex bison file ];