@@ -1,55 +1,56 @@
1−{ lib, stdenv
1+{ lib
2+, stdenv
23, fetchFromGitHub
34, pkg-config
45, autoreconfHook
56, libtool
67, libpcap
7−
8+, libcdada
89# Optional Dependencies
9−, zlib ? null
10−, withJansson ? true, jansson ? null
11−, withNflog ? true, libnetfilter_log ? null
12−, withSQLite ? true, sqlite ? null
13−, withPgSQL ? true, postgresql ? null
14−, withMysql ? true, libmysqlclient ? null }:
15−
16−assert withJansson -> jansson != null;
17−assert withNflog -> libnetfilter_log != null;
18−assert withSQLite -> sqlite != null;
19−assert withPgSQL -> postgresql != null;
20−assert withMysql -> libmysqlclient != null;
21−
22−let inherit (lib) getDev optional optionalString; in
10+, withJansson ? true, jansson
11+, withNflog ? true, libnetfilter_log
12+, withSQLite ? true, sqlite
13+, withPgSQL ? true, postgresql
14+, withMysql ? true, libmysqlclient, zlib
15+, gnutlsSupport ? false, gnutls
16+}:
2317
2418stdenv.mkDerivation rec {
25− version = "1.7.5";
19+ version = "1.7.6";
2620 pname = "pmacct";
2721
2822 src = fetchFromGitHub {
2923 owner = "pmacct";
30− repo = pname;
24+ repo = "pmacct";
3125 rev = "v${version}";
32− sha256 = "17p5isrq5w58hvmzhc6akbd37ins3c95g0rvhhdm0v33khzxmran";
26+ sha256 = "0x1i75hwz44siqvn4i58jgji0zwrqgn6ayv89s9m9nh3b423nsiv";
3327 };
3428
35− nativeBuildInputs = [ autoreconfHook pkg-config libtool ];
36− buildInputs = [ libpcap ]
37− ++ optional withJansson jansson
38− ++ optional withNflog libnetfilter_log
39− ++ optional withSQLite sqlite
40− ++ optional withPgSQL postgresql
41− ++ optional withMysql [ libmysqlclient zlib ];
29+ nativeBuildInputs = [
30+ autoreconfHook
31+ pkg-config
32+ libtool
33+ ];
34+ buildInputs = [
35+ libcdada
36+ libpcap
37+ ] ++ lib.optional withJansson jansson
38+ ++ lib.optional withNflog libnetfilter_log
39+ ++ lib.optional withSQLite sqlite
40+ ++ lib.optional withPgSQL postgresql
41+ ++ lib.optionals withMysql [ libmysqlclient zlib ]
42+ ++ lib.optional gnutlsSupport gnutls;
4243
43− MYSQL_CONFIG =
44− optionalString withMysql "${getDev libmysqlclient}/bin/mysql_config";
44+ MYSQL_CONFIG = lib.optionalString withMysql "${lib.getDev libmysqlclient}/bin/mysql_config";
4545
4646 configureFlags = [
4747 "--with-pcap-includes=${libpcap}/include"
48− ] ++ optional withJansson "--enable-jansson"
49− ++ optional withNflog "--enable-nflog"
50− ++ optional withSQLite "--enable-sqlite3"
51− ++ optional withPgSQL "--enable-pgsql"
52− ++ optional withMysql "--enable-mysql";
48+ ] ++ lib.optional withJansson "--enable-jansson"
49+ ++ lib.optional withNflog "--enable-nflog"
50+ ++ lib.optional withSQLite "--enable-sqlite3"
51+ ++ lib.optional withPgSQL "--enable-pgsql"
52+ ++ lib.optional withMysql "--enable-mysql"
53+ ++ lib.optional gnutlsSupport "--enable-gnutls";
5354
5455 meta = with lib; {
5556 description = "A small set of multi-purpose passive network monitoring tools";