diff options
author | Rickard Nilsson <rickynils@gmail.com> | 2015-10-22 13:07:45 +0200 |
---|---|---|
committer | Rickard Nilsson <rickynils@gmail.com> | 2015-10-22 13:07:56 +0200 |
commit | d4bebcbd1201dc6ebd615fb1beea8ddbe7f2e0f9 (patch) | |
tree | 097559116acf2fca1ac37c697caa2dfc65aaa856 /pkgs/tools/system/collectd | |
parent | a9792367aaccd2566bfc726676388183a3eed4a1 (diff) | |
download | nixpkgs-d4bebcbd1201dc6ebd615fb1beea8ddbe7f2e0f9.tar nixpkgs-d4bebcbd1201dc6ebd615fb1beea8ddbe7f2e0f9.tar.gz nixpkgs-d4bebcbd1201dc6ebd615fb1beea8ddbe7f2e0f9.tar.bz2 nixpkgs-d4bebcbd1201dc6ebd615fb1beea8ddbe7f2e0f9.tar.lz nixpkgs-d4bebcbd1201dc6ebd615fb1beea8ddbe7f2e0f9.tar.xz nixpkgs-d4bebcbd1201dc6ebd615fb1beea8ddbe7f2e0f9.tar.zst nixpkgs-d4bebcbd1201dc6ebd615fb1beea8ddbe7f2e0f9.zip |
collectd: 5.4.2 -> 5.5.0
Diffstat (limited to 'pkgs/tools/system/collectd')
-rw-r--r-- | pkgs/tools/system/collectd/default.nix | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/pkgs/tools/system/collectd/default.nix b/pkgs/tools/system/collectd/default.nix index 80d9d2d98ef..d1214d3c163 100644 --- a/pkgs/tools/system/collectd/default.nix +++ b/pkgs/tools/system/collectd/default.nix @@ -3,6 +3,7 @@ , pkgconfig ? null # most of the extra deps need pkgconfig to be found , curl ? null , iptables ? null +, jdk ? null , libcredis ? null , libdbi ? null , libgcrypt ? null @@ -14,34 +15,39 @@ , libsigrok ? null , libvirt ? null , libxml2 ? null +, libtool ? null , lm_sensors ? null , lvm2 ? null , mysql ? null , postgresql ? null , protobufc ? null +, python ? null , rabbitmq-c ? null +, riemann ? null , rrdtool ? null , varnish ? null , yajl ? null }: stdenv.mkDerivation rec { - name = "collectd-5.4.2"; + name = "collectd-5.5.0"; src = fetchurl { url = "http://collectd.org/files/${name}.tar.bz2"; - sha256 = "14z3qkqbmfjvqvcb2v17480f7c8j7wa49myk0zlxpd9qq40fk2cp"; + sha256 = "847684cf5c10de1dc34145078af3fcf6e0d168ba98c14f1343b1062a4b569e88"; }; buildInputs = [ pkgconfig curl iptables 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 - varnish yajl + varnish yajl jdk libtool python ]; # 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"; |