diff --git a/pkgs/tools/system/rsyslog/default.nix b/pkgs/tools/system/rsyslog/default.nix index 81e929382b2da0..1367871ded410d 100644 --- a/pkgs/tools/system/rsyslog/default.nix +++ b/pkgs/tools/system/rsyslog/default.nix @@ -3,7 +3,7 @@ , libdbi ? null, net_snmp ? null, libuuid ? null, curl ? null, gnutls ? null , libgcrypt ? null, liblognorm ? null, openssl ? null, librelp ? null, libksi ? null , libgt ? null, liblogging ? null, libnet ? null, hadoop ? null, rdkafka ? null -, libmongo-client ? null, czmq ? null, rabbitmq-c ? null, hiredis ? null +, libmongo-client ? null, czmq ? null, rabbitmq-c ? null, hiredis ? null, mongoc ? null }: with stdenv.lib; @@ -11,21 +11,21 @@ let mkFlag = cond: name: if cond then "--enable-${name}" else "--disable-${name}"; in stdenv.mkDerivation rec { - name = "rsyslog-8.21.0"; + name = "rsyslog-8.37.0"; src = fetchurl { url = "https://www.rsyslog.com/files/download/rsyslog/${name}.tar.gz"; - sha256 = "1arrhc9fw79sp7dxkf7gyfwibyr2i1000pfds5c7n43mgglgvcdx"; + sha256 = "1rs7y7xgjm82j4mp0897x2myv73kkcj86np37y7qzgca9jdjhp19"; }; #patches = [ ./fix-gnutls-detection.patch ]; nativeBuildInputs = [ pkgconfig autoreconfHook ]; buildInputs = [ - 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 librelp libgt libksi liblogging libnet hadoop rdkafka libmongo-client czmq - rabbitmq-c hiredis + rabbitmq-c hiredis mongoc ] ++ stdenv.lib.optional (mysql != null) mysql.connector-c ++ stdenv.lib.optional stdenv.isLinux systemd; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 254d9ac85d042c..1340020d5b9c19 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1502,7 +1502,6 @@ with pkgs; libdbi = null; net_snmp = null; libuuid = null; - curl = null; gnutls = null; libgcrypt = null; liblognorm = null;