diff options
| author | Robin Gloster <mail@glob.in> | 2016-02-28 16:32:57 +0000 |
|---|---|---|
| committer | Robin Gloster <mail@glob.in> | 2016-02-28 16:32:57 +0000 |
| commit | 3b4765c9e59a34e7f48d2798cd4c4ef14d72e5a4 (patch) | |
| tree | 04c567a4061b3adf6d1e0a898f39b67f27d37aea /pkgs/tools/system | |
| parent | 8615f026a48cbf3f1c37b30e9b70bba6af013a12 (diff) | |
| parent | a9d24cedeb3ba97a4e23ff93fadff32280ff0ab6 (diff) | |
| download | nixlib-3b4765c9e59a34e7f48d2798cd4c4ef14d72e5a4.tar nixlib-3b4765c9e59a34e7f48d2798cd4c4ef14d72e5a4.tar.gz nixlib-3b4765c9e59a34e7f48d2798cd4c4ef14d72e5a4.tar.bz2 nixlib-3b4765c9e59a34e7f48d2798cd4c4ef14d72e5a4.tar.lz nixlib-3b4765c9e59a34e7f48d2798cd4c4ef14d72e5a4.tar.xz nixlib-3b4765c9e59a34e7f48d2798cd4c4ef14d72e5a4.tar.zst nixlib-3b4765c9e59a34e7f48d2798cd4c4ef14d72e5a4.zip | |
Merge remote-tracking branch 'upstream/master' into hardened-stdenv
Diffstat (limited to 'pkgs/tools/system')
| -rw-r--r-- | pkgs/tools/system/collectd/default.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/tools/system/collectd/default.nix b/pkgs/tools/system/collectd/default.nix index ff64b54b9857..a1d676d708df 100644 --- a/pkgs/tools/system/collectd/default.nix +++ b/pkgs/tools/system/collectd/default.nix @@ -19,7 +19,7 @@ , libtool ? null , lm_sensors ? null , lvm2 ? null -, mysql ? null +, libmysql ? null , postgresql ? null , protobufc ? null , python ? null @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { buildInputs = [ pkgconfig curl iptables libatasmart libcredis libdbi libgcrypt libmemcached cyrus_sasl libmodbus libnotify gdk_pixbuf liboping libpcap libsigrok libvirt - lm_sensors libxml2 lvm2 mysql.lib postgresql protobufc rabbitmq-c rrdtool + lm_sensors libxml2 lvm2 libmysql postgresql protobufc rabbitmq-c rrdtool varnish yajl jdk libtool python udev ]; |