diff --git a/pkgs/by-name/rs/rsyslog-light/package.nix b/pkgs/by-name/rs/rsyslog-light/package.nix index 1a0aab3a1036..5f259f18f168 100644 --- a/pkgs/by-name/rs/rsyslog-light/package.nix +++ b/pkgs/by-name/rs/rsyslog-light/package.nix @@ -3,6 +3,7 @@ }: rsyslog.override { + withLibyaml = false; withKrb5 = false; withSystemd = false; withJemalloc = false; diff --git a/pkgs/by-name/rs/rsyslog/package.nix b/pkgs/by-name/rs/rsyslog/package.nix index 7019ed63e8e2..dccac3ae60ff 100644 --- a/pkgs/by-name/rs/rsyslog/package.nix +++ b/pkgs/by-name/rs/rsyslog/package.nix @@ -4,11 +4,14 @@ fetchurl, pkg-config, autoreconfHook, + autoconf-archive, libestr, json_c, zlib, docutils, libfastjson, + withLibyaml ? true, + libyaml, withKrb5 ? true, libkrb5, withSystemd ? lib.meta.availableOn stdenv.hostPlatform systemd, @@ -62,16 +65,17 @@ stdenv.mkDerivation (finalAttrs: { pname = "rsyslog"; - version = "8.2512.0"; + version = "8.2606.0"; src = fetchurl { url = "https://www.rsyslog.com/files/download/rsyslog/rsyslog-${finalAttrs.version}.tar.gz"; - hash = "sha256-k8UAJdkLbHlfo1DVaj2DK/zkUEPqm9aCQNnCqTlLxik="; + hash = "sha256-JXSz8waOaVXrlO9WQ+K2pbhYXMjqp3IJ/1y8Hi5fceU="; }; nativeBuildInputs = [ pkg-config autoreconfHook + autoconf-archive docutils ]; @@ -81,6 +85,7 @@ stdenv.mkDerivation (finalAttrs: { json_c zlib ] + ++ lib.optional withLibyaml libyaml ++ lib.optional withKrb5 libkrb5 ++ lib.optional withJemalloc jemalloc ++ lib.optional withPostgres libpq @@ -112,6 +117,7 @@ stdenv.mkDerivation (finalAttrs: { "--with-systemdsystemunitdir=\${out}/etc/systemd/system" (lib.enableFeature true "largefile") (lib.enableFeature true "regexp") + (lib.enableFeature withLibyaml "libyaml") (lib.enableFeature withKrb5 "gssapi-krb5") (lib.enableFeature true "klog") (lib.enableFeature true "kmsg") @@ -157,6 +163,7 @@ stdenv.mkDerivation (finalAttrs: { (lib.enableFeature false "imsolaris") (lib.enableFeature true "imptcp") (lib.enableFeature true "impstats") + (lib.enableFeature false "impstats-push") (lib.enableFeature true "omprog") (lib.enableFeature withNet "omudpspoof") (lib.enableFeature true "omstdout")