public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'staging-next'

Browse Source 
There are several security fixes - again, as it consists mainly of the
previously reverted staging-next merge.
This commit is contained in:
Vladimír Čunát
2019-09-28 07:43:04 +02:00
parent 15f9bdb648 217cf982c7
commit fda4a08d4a
91 changed files with 437 additions and 378 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/tools/system/collectd/default.nix
View File

@@ -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

6
pkgs/tools/system/rsyslog/default.nix
View File

@@ -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")