diff options
author | Aaron Andersen <aaron@fosslib.net> | 2020-01-24 06:27:19 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-01-24 06:27:19 -0500 |
commit | ddbb15dc7951af2bf72421bf6793b241b4c28757 (patch) | |
tree | 8b54a65adcda5cf8e843a31a16d341c76e772c49 /pkgs | |
parent | 40e51d2092f1011c110c895e2818636cc25d4f09 (diff) | |
parent | be692c4c29b29d4ae9d2e139be1ec9f906e5d963 (diff) | |
download | nixpkgs-ddbb15dc7951af2bf72421bf6793b241b4c28757.tar nixpkgs-ddbb15dc7951af2bf72421bf6793b241b4c28757.tar.gz nixpkgs-ddbb15dc7951af2bf72421bf6793b241b4c28757.tar.bz2 nixpkgs-ddbb15dc7951af2bf72421bf6793b241b4c28757.tar.lz nixpkgs-ddbb15dc7951af2bf72421bf6793b241b4c28757.tar.xz nixpkgs-ddbb15dc7951af2bf72421bf6793b241b4c28757.tar.zst nixpkgs-ddbb15dc7951af2bf72421bf6793b241b4c28757.zip |
Merge pull request #77300 from plumelo/rsyslog
rsyslog: include libmaxminddb
Diffstat (limited to 'pkgs')
-rw-r--r-- | pkgs/tools/system/rsyslog/default.nix | 4 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 3 |
2 files changed, 5 insertions, 2 deletions
diff --git a/pkgs/tools/system/rsyslog/default.nix b/pkgs/tools/system/rsyslog/default.nix index 7c5b9a18966..9d3cbbf79eb 100644 --- a/pkgs/tools/system/rsyslog/default.nix +++ b/pkgs/tools/system/rsyslog/default.nix @@ -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; @@ -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; @@ -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") diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index fed4a37a88f..870723e5afb 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2133,6 +2133,7 @@ in czmq = null; rabbitmq-c = null; hiredis = null; + libmaxminddb = null; }; mar1d = callPackage ../games/mar1d { } ; @@ -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 { }; |