diff options
author | Franz Pletz <fpletz@fnordicwalking.de> | 2016-09-24 06:12:16 +0200 |
---|---|---|
committer | Franz Pletz <fpletz@fnordicwalking.de> | 2016-09-24 15:33:31 +0200 |
commit | 63052c11261290b8db2f0a9bf024207d3e3354de (patch) | |
tree | 355a44d24e05f675444b240789c63af2dd188823 /pkgs/tools/system/collectd | |
parent | 7d5546af4217a3fc61e73d4679782d06bba16471 (diff) | |
download | nixpkgs-63052c11261290b8db2f0a9bf024207d3e3354de.tar nixpkgs-63052c11261290b8db2f0a9bf024207d3e3354de.tar.gz nixpkgs-63052c11261290b8db2f0a9bf024207d3e3354de.tar.bz2 nixpkgs-63052c11261290b8db2f0a9bf024207d3e3354de.tar.lz nixpkgs-63052c11261290b8db2f0a9bf024207d3e3354de.tar.xz nixpkgs-63052c11261290b8db2f0a9bf024207d3e3354de.tar.zst nixpkgs-63052c11261290b8db2f0a9bf024207d3e3354de.zip |
collectd: 5.5.2 -> 5.6.0
Diffstat (limited to 'pkgs/tools/system/collectd')
-rw-r--r-- | pkgs/tools/system/collectd/default.nix | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/pkgs/tools/system/collectd/default.nix b/pkgs/tools/system/collectd/default.nix index b0c6b073029..2aa5f9fb4c4 100644 --- a/pkgs/tools/system/collectd/default.nix +++ b/pkgs/tools/system/collectd/default.nix @@ -30,21 +30,23 @@ , varnish ? null , yajl ? null , net_snmp ? null +, hiredis ? null +, libmnl ? null }: stdenv.mkDerivation rec { - version = "5.5.2"; + version = "5.6.0"; name = "collectd-${version}"; src = fetchurl { url = "http://collectd.org/files/${name}.tar.bz2"; - sha256 = "03w2pawbshl2wrl4cmyw8alsi0pvamb6ibxni96mjzhqc903lzq1"; + sha256 = "08w6fjzczi2psk7va0xkjh9pigpar6sbjx2a6ayq4dmc3zcvpzzh"; }; buildInputs = [ pkgconfig curl iptables libatasmart libcredis libdbi libgcrypt libmemcached cyrus_sasl libmodbus libnotify gdk_pixbuf liboping libpcap libsigrok libvirt lm_sensors libxml2 lvm2 libmysql postgresql protobufc rabbitmq-c rrdtool - varnish yajl jdk libtool python udev net_snmp + varnish yajl jdk libtool python udev net_snmp hiredis libmnl ]; # for some reason libsigrok isn't auto-detected @@ -52,14 +54,11 @@ stdenv.mkDerivation rec { stdenv.lib.optional (libsigrok != null) "--with-libsigrok" ++ stdenv.lib.optional (python != null) "--with-python=${python}/bin/python"; - # Fix build on Glibc 2.24. - NIX_CFLAGS_COMPILE = "-Wno-error=cpp -Wno-error=deprecated-declarations"; - meta = with stdenv.lib; { description = "Daemon which collects system performance statistics periodically"; homepage = http://collectd.org; license = licenses.gpl2; platforms = platforms.linux; - maintainers = [ maintainers.bjornfor ]; + maintainers = with maintainers; [ bjornfor fpletz ]; }; } |