pyrox.dev / nixpkgs
lol
fork atom

collectd: 5.7.2 -> 5.8.0

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

Closes #32811

authored by volth and committed by Orivej Desh 4026ea9c d3297379

+19 -14
unified split
+7 -4
pkgs/development/libraries/libcollectdclient/default.nix
··· 5 5 name = "libcollectdclient-${collectd.version}"; 6 6 buildInputs = [ ]; 7 7 8 - configureFlags = [ 9 - "--without-daemon" 8 + NIX_CFLAGS_COMPILE = oldAttrs.NIX_CFLAGS_COMPILE ++ [ 9 + "-Wno-error=unused-function" 10 10 ]; 11 11 12 - makeFlags = [ 13 - "-C src/libcollectdclient/" 12 + configureFlags = oldAttrs.configureFlags ++ [ 13 + "--disable-daemon" 14 + "--disable-all-plugins" 14 15 ]; 16 + 17 + postInstall = "rm -rf $out/{bin,etc,sbin,share}"; 15 18 16 19 }) // { 17 20 meta = with stdenv.lib; {
+12 -10
pkgs/tools/system/collectd/default.nix
··· 25 25 , protobufc ? null 26 26 , python ? null 27 27 , rabbitmq-c ? null 28 - , riemann ? null 28 + , riemann_c_client ? null 29 29 , rrdtool ? null 30 30 , udev ? null 31 31 , varnish ? null ··· 33 33 , net_snmp ? null 34 34 , hiredis ? null 35 35 , libmnl ? null 36 + , mosquitto ? null 37 + , rdkafka ? null 38 + , mongoc ? null 36 39 }: 37 40 stdenv.mkDerivation rec { 38 - version = "5.7.2"; 41 + version = "5.8.0"; 39 42 name = "collectd-${version}"; 40 43 41 44 src = fetchurl { 42 45 url = "http://collectd.org/files/${name}.tar.bz2"; 43 - sha256 = "14p5cc3ys3qfg71xzxfvmxdmz5l4brpbhlmw1fwdda392lia084x"; 46 + sha256 = "1j8mxgfq8039js2bscphd6cnriy35hk4jrxfjz5k6mghpdvg8vxh"; 44 47 }; 45 48 46 - # on 5.7.2: lvm2app.h:21:2: error: #warning "liblvm2app is deprecated, use D-Bus API instead." [-Werror=cpp] 47 - NIX_CFLAGS_COMPILE = "-Wno-error=cpp"; 49 + # on 5.8.0: lvm2app.h:21:2: error: #warning "liblvm2app is deprecated, use D-Bus API instead." [-Werror=cpp] 50 + NIX_CFLAGS_COMPILE = [ "-Wno-error=cpp" ]; 48 51 49 52 nativeBuildInputs = [ pkgconfig ]; 50 53 buildInputs = [ ··· 52 55 cyrus_sasl libnotify gdk_pixbuf liboping libpcap libvirt 53 56 libxml2 libmysql postgresql protobufc rrdtool 54 57 varnish yajl jdk libtool python hiredis libmicrohttpd 58 + riemann_c_client mosquitto rdkafka mongoc 55 59 ] ++ stdenv.lib.optionals stdenv.isLinux [ 56 60 iptables libatasmart libcredis libmodbus libsigrok 57 61 lm_sensors lvm2 rabbitmq-c udev net_snmp libmnl ··· 60 64 darwin.apple_sdk.frameworks.ApplicationServices 61 65 ]; 62 66 63 - # for some reason libsigrok isn't auto-detected 64 - configureFlags = 65 - [ "--localstatedir=/var" ] ++ 66 - stdenv.lib.optional (stdenv.isLinux && libsigrok != null) "--with-libsigrok" ++ 67 - stdenv.lib.optional (python != null) "--with-python=${python}/bin/python"; 67 + configureFlags = [ "--localstatedir=/var" ]; 68 68 69 69 # do not create directories in /var during installPhase 70 70 postConfigure = '' ··· 76 76 mv $out/share/collectd/java $out/share/ 77 77 fi 78 78 ''; 79 + 80 + enableParallelBuilding = true; 79 81 80 82 meta = with stdenv.lib; { 81 83 description = "Daemon which collects system performance statistics periodically";