Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: e7ca19f7cb07
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: bba28099b268
Choose a head ref
  • 2 commits
  • 1 file changed
  • 1 contributor

Commits on Apr 10, 2020

  1. zeek: 3.0.3 -> 3.1.1

    @marsam
    marsam committed Apr 10, 2020
    Copy the full SHA
    a37e2f2 View commit details

Commits on Apr 12, 2020

  1. Merge pull request #84942 from marsam/update-zeek 

    zeek: 3.0.3 -> 3.1.1
    @marsam
    marsam authored Apr 12, 2020
    Copy the full SHA
    bba2809 View commit details
Showing with 15 additions and 5 deletions.
  1. +15 −5 pkgs/applications/networking/ids/zeek/default.nix
20 changes: 15 additions & 5 deletions pkgs/applications/networking/ids/zeek/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,25 +1,35 @@
{stdenv, fetchurl, cmake, flex, bison, openssl, libpcap, zlib, file, curl
, libmaxminddb, gperftools, python, swig, rocksdb }:
, libmaxminddb, gperftools, python, swig, fetchpatch }:
let
preConfigure = (import ./script.nix);
in
stdenv.mkDerivation rec {
pname = "zeek";
version = "3.0.3";
version = "3.1.1";

src = fetchurl {
url = "https://old.zeek.org/downloads/zeek-${version}.tar.gz";
sha256 = "0xlw5v83qbgy23wdcddmvan2pid28mw745g4fc1z5r18kp67i8a2";
sha256 = "0siybzdp8w62jqk5vdi5fxwvj6cn4r6c2d4z2axd4rj5vhv5zvx2";
};

nativeBuildInputs = [ cmake flex bison file ];
buildInputs = [ openssl libpcap zlib curl libmaxminddb gperftools python swig rocksdb ];
buildInputs = [ openssl libpcap zlib curl libmaxminddb gperftools python swig ];

#see issue https://github.com/zeek/zeek/issues/804 to modify hardlinking duplicate files.
inherit preConfigure;

enableParallelBuilding = true;

patches = stdenv.lib.optionals stdenv.cc.isClang [
# 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 = "0l8z7d7chq1awd8dnfarj4c40wx36hkhcan0702p5l89x73wqk54";
extraPrefix = "aux/broker/bindings/python/3rdparty/pybind11/";
stripLen = 1;
})
];

cmakeFlags = [
"-DPY_MOD_INSTALL_DIR=${placeholder "out"}/${python.sitePackages}"
"-DENABLE_PERFTOOLS=true"