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

Merge pull request #77300 from plumelo/rsyslog

Browse Source 
rsyslog: include libmaxminddb
This commit is contained in:
Aaron Andersen 2020-01-24 06:27:19 -05:00 committed by GitHub
commit ddbb15dc79
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/tools/system/rsyslog/default.nix
View File

@ -4,6 +4,7 @@
, libgcrypt ? null, liblognorm ? null, openssl ? null, librelp ? null, libksi ? null , libgcrypt ? null, liblognorm ? null, openssl ? null, librelp ? null, libksi ? null
, liblogging ? null, libnet ? null, hadoop ? null, rdkafka ? null , liblogging ? null, libnet ? null, hadoop ? null, rdkafka ? null
, libmongo-client ? null, czmq ? null, rabbitmq-c ? null, hiredis ? null, mongoc ? null , libmongo-client ? null, czmq ? null, rabbitmq-c ? null, hiredis ? null, mongoc ? null
, libmaxminddb ? null
}: }:
with stdenv.lib; with stdenv.lib;
@ -26,7 +27,7 @@ stdenv.mkDerivation rec {
fastJson libestr json_c zlib pythonPackages.docutils libkrb5 jemalloc fastJson libestr json_c zlib pythonPackages.docutils libkrb5 jemalloc
postgresql libdbi net-snmp libuuid curl gnutls libgcrypt liblognorm openssl postgresql libdbi net-snmp libuuid curl gnutls libgcrypt liblognorm openssl
librelp libksi liblogging libnet hadoop rdkafka libmongo-client czmq librelp libksi liblogging libnet hadoop rdkafka libmongo-client czmq
rabbitmq-c hiredis mongoc rabbitmq-c hiredis mongoc libmaxminddb
] ++ stdenv.lib.optional (libmysqlclient != null) libmysqlclient ] ++ stdenv.lib.optional (libmysqlclient != null) libmysqlclient
++ stdenv.lib.optional stdenv.isLinux systemd; ++ stdenv.lib.optional stdenv.isLinux systemd;
@ -61,6 +62,7 @@ stdenv.mkDerivation rec {
(mkFlag true "rsyslogd") (mkFlag true "rsyslogd")
(mkFlag true "mail") (mkFlag true "mail")
(mkFlag (liblognorm != null) "mmnormalize") (mkFlag (liblognorm != null) "mmnormalize")
(mkFlag (libmaxminddb != null) "mmdblookup")
(mkFlag true "mmjsonparse") (mkFlag true "mmjsonparse")
(mkFlag true "mmaudit") (mkFlag true "mmaudit")
(mkFlag true "mmanon") (mkFlag true "mmanon")

1
pkgs/top-level/all-packages.nix
View File

@ -2133,6 +2133,7 @@ in
czmq = null; czmq = null;
rabbitmq-c = null; rabbitmq-c = null;
hiredis = null; hiredis = null;
libmaxminddb = null;
}; };
mar1d = callPackage ../games/mar1d { } ; mar1d = callPackage ../games/mar1d { } ;