From daa8d8b42ca676df16783d263bac3e3045869975 Mon Sep 17 00:00:00 2001 From: Pavol Rusnak Date: Wed, 29 Jun 2022 21:44:48 +0200 Subject: [PATCH] rsyslog: replace mkFlag with lib.enableFeature --- pkgs/tools/system/rsyslog/default.nix | 135 +++++++++++++------------- 1 file changed, 66 insertions(+), 69 deletions(-) diff --git a/pkgs/tools/system/rsyslog/default.nix b/pkgs/tools/system/rsyslog/default.nix index c0894f31a012..6876d441c52e 100644 --- a/pkgs/tools/system/rsyslog/default.nix +++ b/pkgs/tools/system/rsyslog/default.nix @@ -9,9 +9,6 @@ }: with lib; -let - mkFlag = cond: name: if cond then "--enable-${name}" else "--disable-${name}"; -in stdenv.mkDerivation rec { pname = "rsyslog"; version = "8.2204.1"; @@ -36,72 +33,72 @@ stdenv.mkDerivation rec { "--sysconfdir=/etc" "--localstatedir=/var" "--with-systemdsystemunitdir=\${out}/etc/systemd/system" - (mkFlag true "largefile") - (mkFlag true "regexp") - (mkFlag (libkrb5 != null) "gssapi-krb5") - (mkFlag true "klog") - (mkFlag true "kmsg") - (mkFlag (systemd != null) "imjournal") - (mkFlag true "inet") - (mkFlag (jemalloc != null) "jemalloc") - (mkFlag true "unlimited-select") - (mkFlag false "debug") - (mkFlag false "debug-symbols") - (mkFlag true "debugless") - (mkFlag false "valgrind") - (mkFlag false "diagtools") - (mkFlag true "usertools") - (mkFlag (libmysqlclient != null) "mysql") - (mkFlag (postgresql != null) "pgsql") - (mkFlag (libdbi != null) "libdbi") - (mkFlag (net-snmp != null) "snmp") - (mkFlag (libuuid != null) "uuid") - (mkFlag (curl != null) "elasticsearch") - (mkFlag (gnutls != null) "gnutls") - (mkFlag (libgcrypt != null) "libgcrypt") - (mkFlag true "rsyslogrt") - (mkFlag true "rsyslogd") - (mkFlag true "mail") - (mkFlag (liblognorm != null) "mmnormalize") - (mkFlag (libmaxminddb != null) "mmdblookup") - (mkFlag true "mmjsonparse") - (mkFlag true "mmaudit") - (mkFlag true "mmanon") - (mkFlag true "mmutf8fix") - (mkFlag true "mmcount") - (mkFlag true "mmsequence") - (mkFlag true "mmfields") - (mkFlag true "mmpstrucdata") - (mkFlag (openssl != null) "mmrfc5424addhmac") - (mkFlag (librelp != null) "relp") - (mkFlag (libksi != null) "ksi-ls12") - (mkFlag (liblogging != null) "liblogging-stdlog") - (mkFlag (liblogging != null) "rfc3195") - (mkFlag true "imfile") - (mkFlag false "imsolaris") - (mkFlag true "imptcp") - (mkFlag true "impstats") - (mkFlag true "omprog") - (mkFlag (libnet != null) "omudpspoof") - (mkFlag true "omstdout") - (mkFlag (systemd != null) "omjournal") - (mkFlag true "pmlastmsg") - (mkFlag true "pmcisconames") - (mkFlag true "pmciscoios") - (mkFlag true "pmaixforwardedfrom") - (mkFlag true "pmsnare") - (mkFlag true "omruleset") - (mkFlag true "omuxsock") - (mkFlag true "mmsnmptrapd") - (mkFlag (hadoop != null) "omhdfs") - (mkFlag (rdkafka != null) "omkafka") - (mkFlag (libmongo-client != null) "ommongodb") - (mkFlag (czmq != null) "imczmq") - (mkFlag (czmq != null) "omczmq") - (mkFlag (rabbitmq-c != null) "omrabbitmq") - (mkFlag (hiredis != null) "omhiredis") - (mkFlag (curl != null) "omhttpfs") - (mkFlag true "generate-man-pages") + (enableFeature true "largefile") + (enableFeature true "regexp") + (enableFeature (libkrb5 != null) "gssapi-krb5") + (enableFeature true "klog") + (enableFeature true "kmsg") + (enableFeature (systemd != null) "imjournal") + (enableFeature true "inet") + (enableFeature (jemalloc != null) "jemalloc") + (enableFeature true "unlimited-select") + (enableFeature false "debug") + (enableFeature false "debug-symbols") + (enableFeature true "debugless") + (enableFeature false "valgrind") + (enableFeature false "diagtools") + (enableFeature true "usertools") + (enableFeature (libmysqlclient != null) "mysql") + (enableFeature (postgresql != null) "pgsql") + (enableFeature (libdbi != null) "libdbi") + (enableFeature (net-snmp != null) "snmp") + (enableFeature (libuuid != null) "uuid") + (enableFeature (curl != null) "elasticsearch") + (enableFeature (gnutls != null) "gnutls") + (enableFeature (libgcrypt != null) "libgcrypt") + (enableFeature true "rsyslogrt") + (enableFeature true "rsyslogd") + (enableFeature true "mail") + (enableFeature (liblognorm != null) "mmnormalize") + (enableFeature (libmaxminddb != null) "mmdblookup") + (enableFeature true "mmjsonparse") + (enableFeature true "mmaudit") + (enableFeature true "mmanon") + (enableFeature true "mmutf8fix") + (enableFeature true "mmcount") + (enableFeature true "mmsequence") + (enableFeature true "mmfields") + (enableFeature true "mmpstrucdata") + (enableFeature (openssl != null) "mmrfc5424addhmac") + (enableFeature (librelp != null) "relp") + (enableFeature (libksi != null) "ksi-ls12") + (enableFeature (liblogging != null) "liblogging-stdlog") + (enableFeature (liblogging != null) "rfc3195") + (enableFeature true "imfile") + (enableFeature false "imsolaris") + (enableFeature true "imptcp") + (enableFeature true "impstats") + (enableFeature true "omprog") + (enableFeature (libnet != null) "omudpspoof") + (enableFeature true "omstdout") + (enableFeature (systemd != null) "omjournal") + (enableFeature true "pmlastmsg") + (enableFeature true "pmcisconames") + (enableFeature true "pmciscoios") + (enableFeature true "pmaixforwardedfrom") + (enableFeature true "pmsnare") + (enableFeature true "omruleset") + (enableFeature true "omuxsock") + (enableFeature true "mmsnmptrapd") + (enableFeature (hadoop != null) "omhdfs") + (enableFeature (rdkafka != null) "omkafka") + (enableFeature (libmongo-client != null) "ommongodb") + (enableFeature (czmq != null) "imczmq") + (enableFeature (czmq != null) "omczmq") + (enableFeature (rabbitmq-c != null) "omrabbitmq") + (enableFeature (hiredis != null) "omhiredis") + (enableFeature (curl != null) "omhttpfs") + (enableFeature true "generate-man-pages") ]; passthru.tests = {