Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

rsyslog: include libmaxminddb #77300

Merged
merged 2 commits into from Jan 24, 2020
Merged

rsyslog: include libmaxminddb #77300

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
da5bb02
rsyslog: include libmaxminddb
basilgood Jan 8, 2020
be692c4
rsyslog-light: remove libmaxminddb
megheaiulian Jan 23, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 3 additions & 1 deletion pkgs/tools/system/rsyslog/default.nix
View file
Open in desktop
Expand Up @@ -4,6 +4,7 @@
, libgcrypt ? null, liblognorm ? null, openssl ? null, librelp ? null, libksi ? null
, liblogging ? null, libnet ? null, hadoop ? null, rdkafka ? null
, libmongo-client ? null, czmq ? null, rabbitmq-c ? null, hiredis ? null, mongoc ? null
, libmaxminddb ? null
}:

with stdenv.lib;
Expand All @@ -26,7 +27,7 @@ stdenv.mkDerivation rec {
fastJson libestr json_c zlib pythonPackages.docutils libkrb5 jemalloc
postgresql libdbi net-snmp libuuid curl gnutls libgcrypt liblognorm openssl
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 stdenv.isLinux systemd;

Expand Down Expand Up @@ -61,6 +62,7 @@ stdenv.mkDerivation rec {
(mkFlag true "rsyslogd")
(mkFlag true "mail")
(mkFlag (liblognorm != null) "mmnormalize")
(mkFlag (libmaxminddb != null) "mmdblookup")
(mkFlag true "mmjsonparse")
(mkFlag true "mmaudit")
(mkFlag true "mmanon")
Expand Down
3 changes: 2 additions & 1 deletion pkgs/top-level/all-packages.nix
View file
Open in desktop
Expand Up @@ -2133,6 +2133,7 @@ in
czmq = null;
rabbitmq-c = null;
hiredis = null;
libmaxminddb = null;
};

mar1d = callPackage ../games/mar1d { } ;
Expand Down Expand Up @@ -7591,7 +7592,7 @@ in
zpaqd = callPackage ../tools/archivers/zpaq/zpaqd.nix { };

zsh-autoenv = callPackage ../tools/misc/zsh-autoenv { };

zsh-bd = callPackage ../shells/zsh/zsh-bd { };

zsh-git-prompt = callPackage ../shells/zsh/zsh-git-prompt { };
Expand Down