alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

collectd: 5.4.2 -> 5.5.0

Browse source
This commit is contained in:
Rickard Nilsson 2015-10-22 13:07:45 +02:00
parent a9792367aa
commit d4bebcbd12
1 changed files with 10 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
pkgs/tools/system/collectd/default.nix
View file

@ -3,6 +3,7 @@
, pkgconfig ? null # most of the extra deps need pkgconfig to be found , pkgconfig ? null # most of the extra deps need pkgconfig to be found
, curl ? null , curl ? null
, iptables ? null , iptables ? null
, jdk ? null
, libcredis ? null , libcredis ? null
, libdbi ? null , libdbi ? null
, libgcrypt ? null , libgcrypt ? null
@ -14,34 +15,39 @@
, libsigrok ? null , libsigrok ? null
, libvirt ? null , libvirt ? null
, libxml2 ? null , libxml2 ? null
, libtool ? null
, lm_sensors ? null , lm_sensors ? null
, lvm2 ? null , lvm2 ? null
, mysql ? null , mysql ? null
, postgresql ? null , postgresql ? null
, protobufc ? null , protobufc ? null
, python ? null
, rabbitmq-c ? null , rabbitmq-c ? null
, riemann ? null
, rrdtool ? null , rrdtool ? null
, varnish ? null , varnish ? null
, yajl ? null , yajl ? null
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "collectd-5.4.2"; name = "collectd-5.5.0";
src = fetchurl { src = fetchurl {
url = "http://collectd.org/files/${name}.tar.bz2"; url = "http://collectd.org/files/${name}.tar.bz2";
sha256 = "14z3qkqbmfjvqvcb2v17480f7c8j7wa49myk0zlxpd9qq40fk2cp"; sha256 = "847684cf5c10de1dc34145078af3fcf6e0d168ba98c14f1343b1062a4b569e88";
}; };
buildInputs = [ buildInputs = [
pkgconfig curl iptables libcredis libdbi libgcrypt libmemcached cyrus_sasl pkgconfig curl iptables libcredis libdbi libgcrypt libmemcached cyrus_sasl
libmodbus libnotify gdk_pixbuf liboping libpcap libsigrok libvirt libmodbus libnotify gdk_pixbuf liboping libpcap libsigrok libvirt
lm_sensors libxml2 lvm2 mysql.lib postgresql protobufc rabbitmq-c rrdtool lm_sensors libxml2 lvm2 mysql.lib postgresql protobufc rabbitmq-c rrdtool
varnish yajl varnish yajl jdk libtool python
]; ];
# for some reason libsigrok isn't auto-detected # for some reason libsigrok isn't auto-detected
configureFlags = stdenv.lib.optional (libsigrok != null) "--with-libsigrok"; configureFlags =
stdenv.lib.optional (libsigrok != null) "--with-libsigrok" ++
stdenv.lib.optional (python != null) "--with-python=${python}/bin/python";
NIX_CFLAGS_COMPILE = "-Wno-error=cpp"; NIX_CFLAGS_COMPILE = "-Wno-error=cpp";