jolheiser/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #114836 from marsam/update-zeek

Browse Source 
zeek: 3.2.4 -> 4.0.0
This commit is contained in:
Mario Rodas 2021-03-02 21:14:18 -05:00 committed by GitHub
commit cb47d44717
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
pkgs/applications/networking/ids/zeek/default.nix
View File

@ -11,38 +11,30 @@
, curl , curl
, libmaxminddb , libmaxminddb
, gperftools , gperftools
, python , python3
, swig , swig
, gettext , gettext
, fetchpatch
, coreutils , coreutils
, ncurses
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "zeek"; pname = "zeek";
version = "3.2.4"; version = "4.0.0";
src = fetchurl { src = fetchurl {
url = "https://download.zeek.org/zeek-${version}.tar.gz"; url = "https://download.zeek.org/zeek-${version}.tar.gz";
sha256 = "11dy4w810jms75nrr3n3dy5anrl5ksb5pmnk31z37k60hg9q9afm"; sha256 = "0m7zy5k2595vf5xr2r4m75rfsdddigrv2hilm1c3zaif4srxmvpj";
}; };
nativeBuildInputs = [ cmake flex bison file ]; nativeBuildInputs = [ cmake flex bison file ];
buildInputs = [ openssl libpcap zlib curl libmaxminddb gperftools python swig ] buildInputs = [ openssl libpcap zlib curl libmaxminddb gperftools python3 swig ncurses ]
++ lib.optionals stdenv.isDarwin [ gettext ]; ++ lib.optionals stdenv.isDarwin [ gettext ];
patches = lib.optionals stdenv.cc.isClang [ outputs = [ "out" "lib" "py" ];
# Fix pybind c++17 build with Clang. See: https://github.com/pybind/pybind11/issues/1604
(fetchpatch {
url = "https://github.com/pybind/pybind11/commit/759221f5c56939f59d8f342a41f8e2d2cacbc8cf.patch";
sha256 = "17qznp8yavnv84fjsbghv3d59z6k6rx74j49w0izakmgw5a95w84";
extraPrefix = "auxil/broker/bindings/python/3rdparty/pybind11/";
stripLen = 1;
})
];
cmakeFlags = [ cmakeFlags = [
"-DPY_MOD_INSTALL_DIR=${placeholder "out"}/${python.sitePackages}" "-DZEEK_PYTHON_DIR=${placeholder "py"}/lib/${python3.libPrefix}/site-packages"
"-DENABLE_PERFTOOLS=true" "-DENABLE_PERFTOOLS=true"
"-DINSTALL_AUX_TOOLS=true" "-DINSTALL_AUX_TOOLS=true"
]; ];

4
pkgs/top-level/python-packages.nix
View File

@ -8661,6 +8661,10 @@ in {
zdaemon = callPackage ../development/python-modules/zdaemon { }; zdaemon = callPackage ../development/python-modules/zdaemon { };
zeek = disabledIf (!isPy3k) (toPythonModule (pkgs.zeek.override {
python3 = python;
})).py;
zeep = callPackage ../development/python-modules/zeep { }; zeep = callPackage ../development/python-modules/zeep { };
zeitgeist = (toPythonModule (pkgs.zeitgeist.override { python3 = python; })).py; zeitgeist = (toPythonModule (pkgs.zeitgeist.override { python3 = python; })).py;