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: 40e51d2092f1
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: ddbb15dc7951
Choose a head ref
  • 3 commits
  • 2 files changed
  • 3 contributors

Commits on Jan 23, 2020

  1. rsyslog: include libmaxminddb

    @basilgood @megheaiulian
    basilgood authored and megheaiulian committed Jan 23, 2020
    Copy the full SHA
    da5bb02 View commit details

  2. rsyslog-light: remove libmaxminddb

    @megheaiulian
    megheaiulian committed Jan 23, 2020
    Copy the full SHA
    be692c4 View commit details

Commits on Jan 24, 2020

  1. Merge pull request #77300 from plumelo/rsyslog 

    rsyslog: include libmaxminddb
    @aanderse
    aanderse authored Jan 24, 2020
    Copy the full SHA
    ddbb15d View commit details
Showing with 5 additions and 2 deletions.
  1. +3 −1 pkgs/tools/system/rsyslog/default.nix
  2. +2 −1 pkgs/top-level/all-packages.nix
4 changes: 3 additions & 1 deletion pkgs/tools/system/rsyslog/default.nix
View file
Original file line number Diff line number Diff line change
@@ -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")
3 changes: 2 additions & 1 deletion pkgs/top-level/all-packages.nix
View file
Original file line number Diff line number Diff line change
@@ -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 { };