diff options
| author | Vladimír Čunát <v@cunat.cz> | 2019-09-28 07:43:04 +0200 |
|---|---|---|
| committer | Vladimír Čunát <v@cunat.cz> | 2019-09-28 07:43:04 +0200 |
| commit | fda4a08d4a1dd1509bb4c3ab110fb8665f47cc00 (patch) | |
| tree | dba7ec5e6a0757a413e8cb9dfb01bb14abc469f4 /pkgs/tools/system | |
| parent | 15f9bdb6489e7e55a861958a9388bf5ad3b2d2cd (diff) | |
| parent | 217cf982c754f1e8506e180551c73f57c04aed7f (diff) | |
| download | nixlib-fda4a08d4a1dd1509bb4c3ab110fb8665f47cc00.tar nixlib-fda4a08d4a1dd1509bb4c3ab110fb8665f47cc00.tar.gz nixlib-fda4a08d4a1dd1509bb4c3ab110fb8665f47cc00.tar.bz2 nixlib-fda4a08d4a1dd1509bb4c3ab110fb8665f47cc00.tar.lz nixlib-fda4a08d4a1dd1509bb4c3ab110fb8665f47cc00.tar.xz nixlib-fda4a08d4a1dd1509bb4c3ab110fb8665f47cc00.tar.zst nixlib-fda4a08d4a1dd1509bb4c3ab110fb8665f47cc00.zip | |
Merge branch 'staging-next'
There are several security fixes - again, as it consists mainly of the previously reverted staging-next merge.
Diffstat (limited to 'pkgs/tools/system')
| -rw-r--r-- | pkgs/tools/system/collectd/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/tools/system/rsyslog/default.nix | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/pkgs/tools/system/collectd/default.nix b/pkgs/tools/system/collectd/default.nix index 1df73e08d1e3..3e7e4e5969ab 100644 --- a/pkgs/tools/system/collectd/default.nix +++ b/pkgs/tools/system/collectd/default.nix @@ -22,7 +22,7 @@ , libtool , lm_sensors , lvm2 -, mysql +, libmysqlclient , numactl , postgresql , protobufc @@ -63,7 +63,7 @@ stdenv.mkDerivation rec { libxml2 postgresql protobufc rrdtool varnish yajl jdk libtool python hiredis libmicrohttpd riemann_c_client mosquitto rdkafka mongoc - ] ++ stdenv.lib.optionals (mysql != null) [ mysql.connector-c + ] ++ stdenv.lib.optionals (libmysqlclient != null) [ libmysqlclient ] ++ stdenv.lib.optionals stdenv.isLinux [ iptables libatasmart libcredis libmodbus libsigrok lm_sensors lvm2 rabbitmq-c udev net_snmp libmnl diff --git a/pkgs/tools/system/rsyslog/default.nix b/pkgs/tools/system/rsyslog/default.nix index 2899837f3f88..34b7b7d908a8 100644 --- a/pkgs/tools/system/rsyslog/default.nix +++ b/pkgs/tools/system/rsyslog/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pkgconfig, autoreconfHook, libestr, json_c, zlib, pythonPackages, fastJson -, libkrb5 ? null, systemd ? null, jemalloc ? null, mysql ? null, postgresql ? null +, libkrb5 ? null, systemd ? null, jemalloc ? null, libmysqlclient ? null, postgresql ? null , 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 @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { postgresql libdbi net_snmp libuuid curl gnutls libgcrypt liblognorm openssl librelp libgt libksi liblogging libnet hadoop rdkafka libmongo-client czmq rabbitmq-c hiredis mongoc - ] ++ stdenv.lib.optional (mysql != null) mysql.connector-c + ] ++ stdenv.lib.optional (libmysqlclient != null) libmysqlclient ++ stdenv.lib.optional stdenv.isLinux systemd; hardeningDisable = [ "format" ]; @@ -50,7 +50,7 @@ stdenv.mkDerivation rec { (mkFlag false "valgrind") (mkFlag false "diagtools") (mkFlag true "usertools") - (mkFlag (mysql != null) "mysql") + (mkFlag (libmysqlclient != null) "mysql") (mkFlag (postgresql != null) "pgsql") (mkFlag (libdbi != null) "libdbi") (mkFlag (net_snmp != null) "snmp") |