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

collectd: 5.7.2 -> 5.8.0

Browse Source 
This is https://github.com/NixOS/nixpkgs/pull/32811 without refactoring parts.

Closes #32811
This commit is contained in:
volth 2017-12-20 22:37:37 +00:00 committed by Orivej Desh
parent d3297379ad
commit 4026ea9c8a
2 changed files with 19 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
pkgs/development/libraries/libcollectdclient/default.nix
View File

@ -5,14 +5,17 @@ overrideDerivation collectd (oldAttrs: {
name = "libcollectdclient-${collectd.version}"; name = "libcollectdclient-${collectd.version}";
buildInputs = [ ]; buildInputs = [ ];
configureFlags = [ NIX_CFLAGS_COMPILE = oldAttrs.NIX_CFLAGS_COMPILE ++ [
"--without-daemon" "-Wno-error=unused-function"
]; ];
makeFlags = [ configureFlags = oldAttrs.configureFlags ++ [
"-C src/libcollectdclient/" "--disable-daemon"
"--disable-all-plugins"
]; ];
postInstall = "rm -rf $out/{bin,etc,sbin,share}";
}) // { }) // {
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "C Library for collectd, a daemon which collects system performance statistics periodically"; description = "C Library for collectd, a daemon which collects system performance statistics periodically";

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

@ -25,7 +25,7 @@
, protobufc ? null , protobufc ? null
, python ? null , python ? null
, rabbitmq-c ? null , rabbitmq-c ? null
, riemann ? null , riemann_c_client ? null
, rrdtool ? null , rrdtool ? null
, udev ? null , udev ? null
, varnish ? null , varnish ? null
@ -33,18 +33,21 @@
, net_snmp ? null , net_snmp ? null
, hiredis ? null , hiredis ? null
, libmnl ? null , libmnl ? null
, mosquitto ? null
, rdkafka ? null
, mongoc ? null
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
version = "5.7.2"; version = "5.8.0";
name = "collectd-${version}"; name = "collectd-${version}";
src = fetchurl { src = fetchurl {
url = "http://collectd.org/files/${name}.tar.bz2"; 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] # 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"; NIX_CFLAGS_COMPILE = [ "-Wno-error=cpp" ];
nativeBuildInputs = [ pkgconfig ]; nativeBuildInputs = [ pkgconfig ];
buildInputs = [ buildInputs = [
@ -52,6 +55,7 @@ stdenv.mkDerivation rec {
cyrus_sasl libnotify gdk_pixbuf liboping libpcap libvirt cyrus_sasl libnotify gdk_pixbuf liboping libpcap libvirt
libxml2 libmysql postgresql protobufc rrdtool libxml2 libmysql postgresql protobufc rrdtool
varnish yajl jdk libtool python hiredis libmicrohttpd varnish yajl jdk libtool python hiredis libmicrohttpd
riemann_c_client mosquitto rdkafka mongoc
] ++ stdenv.lib.optionals stdenv.isLinux [ ] ++ stdenv.lib.optionals stdenv.isLinux [
iptables libatasmart libcredis libmodbus libsigrok iptables libatasmart libcredis libmodbus libsigrok
lm_sensors lvm2 rabbitmq-c udev net_snmp libmnl lm_sensors lvm2 rabbitmq-c udev net_snmp libmnl
@ -60,11 +64,7 @@ stdenv.mkDerivation rec {
darwin.apple_sdk.frameworks.ApplicationServices darwin.apple_sdk.frameworks.ApplicationServices
]; ];
# for some reason libsigrok isn't auto-detected configureFlags = [ "--localstatedir=/var" ];
configureFlags =
[ "--localstatedir=/var" ] ++
stdenv.lib.optional (stdenv.isLinux && libsigrok != null) "--with-libsigrok" ++
stdenv.lib.optional (python != null) "--with-python=${python}/bin/python";
# do not create directories in /var during installPhase # do not create directories in /var during installPhase
postConfigure = '' postConfigure = ''
@ -77,6 +77,8 @@ stdenv.mkDerivation rec {
fi fi
''; '';
enableParallelBuilding = true;
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "Daemon which collects system performance statistics periodically"; description = "Daemon which collects system performance statistics periodically";
homepage = https://collectd.org; homepage = https://collectd.org;