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

collectd: 5.5.2 -> 5.6.0

This commit is contained in:
Franz Pletz 2016-09-24 06:12:16 +02:00
parent 7d5546af42
commit 63052c1126
No known key found for this signature in database
GPG Key ID: 846FDED7792617B4
2 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -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 ];
};
}

1
pkgs/top-level/all-packages.nix
View File

@ -1111,7 +1111,6 @@ in
convertlit = callPackage ../tools/text/convertlit { };
collectd = callPackage ../tools/system/collectd {
rabbitmq-c = rabbitmq-c_0_4;
libmysql = mysql.lib;
libsigrok = libsigrok-0-3-0; # not compatible with >= 0.4.0 yet
};