diff options
author | Frederik Rietdijk <fridh@fridh.nl> | 2017-12-30 17:04:54 +0100 |
---|---|---|
committer | Frederik Rietdijk <fridh@fridh.nl> | 2017-12-30 17:04:54 +0100 |
commit | 2d0bead714eb5f99a08c54a3b25cd84379c251c2 (patch) | |
tree | d1a3616057aa65e89422a1663174300d9cf2661f /pkgs/tools/system/collectd/default.nix | |
parent | d2b02d662ef78d70c16ac564dfe2454522e9a424 (diff) | |
parent | 9d4de1eac81e58f45727a069811bc7fb9b07177d (diff) | |
download | nixlib-2d0bead714eb5f99a08c54a3b25cd84379c251c2.tar nixlib-2d0bead714eb5f99a08c54a3b25cd84379c251c2.tar.gz nixlib-2d0bead714eb5f99a08c54a3b25cd84379c251c2.tar.bz2 nixlib-2d0bead714eb5f99a08c54a3b25cd84379c251c2.tar.lz nixlib-2d0bead714eb5f99a08c54a3b25cd84379c251c2.tar.xz nixlib-2d0bead714eb5f99a08c54a3b25cd84379c251c2.tar.zst nixlib-2d0bead714eb5f99a08c54a3b25cd84379c251c2.zip |
Merge remote-tracking branch 'upstream/master' into HEAD
Diffstat (limited to 'pkgs/tools/system/collectd/default.nix')
-rw-r--r-- | pkgs/tools/system/collectd/default.nix | 26 |
1 files changed, 14 insertions, 12 deletions
diff --git a/pkgs/tools/system/collectd/default.nix b/pkgs/tools/system/collectd/default.nix index 4c9ebc460819..e9ce2913a6cb 100644 --- a/pkgs/tools/system/collectd/default.nix +++ b/pkgs/tools/system/collectd/default.nix @@ -25,7 +25,7 @@ , protobufc ? null , python ? null , rabbitmq-c ? null -, riemann ? null +, riemann_c_client ? null , rrdtool ? null , udev ? null , varnish ? null @@ -33,18 +33,21 @@ , net_snmp ? null , hiredis ? null , libmnl ? null +, mosquitto ? null +, rdkafka ? null +, mongoc ? null }: stdenv.mkDerivation rec { - version = "5.7.2"; + version = "5.8.0"; name = "collectd-${version}"; src = fetchurl { url = "http://collectd.org/files/${name}.tar.bz2"; - sha256 = "14p5cc3ys3qfg71xzxfvmxdmz5l4brpbhlmw1fwdda392lia084x"; + sha256 = "1j8mxgfq8039js2bscphd6cnriy35hk4jrxfjz5k6mghpdvg8vxh"; }; - # on 5.7.2: lvm2app.h:21:2: error: #warning "liblvm2app is deprecated, use D-Bus API instead." [-Werror=cpp] - NIX_CFLAGS_COMPILE = "-Wno-error=cpp"; + # on 5.8.0: lvm2app.h:21:2: error: #warning "liblvm2app is deprecated, use D-Bus API instead." [-Werror=cpp] + NIX_CFLAGS_COMPILE = [ "-Wno-error=cpp" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ @@ -52,8 +55,9 @@ stdenv.mkDerivation rec { cyrus_sasl libnotify gdk_pixbuf liboping libpcap libvirt libxml2 postgresql protobufc rrdtool varnish yajl jdk libtool python hiredis libmicrohttpd - ] ++ stdenv.lib.optional (mysql != null) mysql.connector-c - ++ stdenv.lib.optionals stdenv.isLinux [ + riemann_c_client mosquitto rdkafka mongoc + ] ++ stdenv.lib.optionals (mysql != null) [ mysql.connector-c + ] ++ stdenv.lib.optionals stdenv.isLinux [ iptables libatasmart libcredis libmodbus libsigrok lm_sensors lvm2 rabbitmq-c udev net_snmp libmnl ] ++ stdenv.lib.optionals stdenv.isDarwin [ @@ -61,11 +65,7 @@ stdenv.mkDerivation rec { darwin.apple_sdk.frameworks.ApplicationServices ]; - # for some reason libsigrok isn't auto-detected - configureFlags = - [ "--localstatedir=/var" ] ++ - stdenv.lib.optional (stdenv.isLinux && libsigrok != null) "--with-libsigrok" ++ - stdenv.lib.optional (python != null) "--with-python=${python}/bin/python"; + configureFlags = [ "--localstatedir=/var" ]; # do not create directories in /var during installPhase postConfigure = '' @@ -78,6 +78,8 @@ stdenv.mkDerivation rec { fi ''; + enableParallelBuilding = true; + meta = with stdenv.lib; { description = "Daemon which collects system performance statistics periodically"; homepage = https://collectd.org; |