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

collectd: 5.8.1 -> 5.10.0

Browse Source
This commit is contained in:
Martin Milata 2020-03-10 15:58:43 +01:00 committed by Bjørn Forsman
parent 91c98f407e
commit 970ce2863f
2 changed files with 7 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -8,21 +8,14 @@ let
plugins = callPackage ./plugins.nix args; plugins = callPackage ./plugins.nix args;
in in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
version = "5.8.1"; version = "5.10.0";
pname = "collectd"; pname = "collectd";
src = fetchurl { src = fetchurl {
url = "https://collectd.org/files/${pname}-${version}.tar.bz2"; url = "https://collectd.org/files/${pname}-${version}.tar.bz2";
sha256 = "1njk8hh56gb755xafsh7ahmqr9k2d4lam4ddj7s7fqz0gjigv5p7"; sha256 = "0nrpq09q6vbbv0hjc1vfa36z8j5802500hy75m678gh2cgsmjcx0";
}; };
patches = [
(fetchpatch {
url = "https://github.com/rpv-tomsk/collectd/commit/d5a3c020d33cc33ee8049f54c7b4dffcd123bf83.patch";
sha256 = "1n65zw4d2k2bxapayaaw51ym7hy72a0cwi2abd8jgxcw3d0m5g15";
})
];
nativeBuildInputs = [ pkgconfig autoreconfHook ]; nativeBuildInputs = [ pkgconfig autoreconfHook ];
buildInputs = [ buildInputs = [
libtool libtool
@ -50,7 +43,7 @@ stdenv.mkDerivation rec {
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";
license = licenses.gpl2; license = licenses.gpl2;
platforms = platforms.unix; platforms = platforms.unix;
maintainers = with maintainers; [ bjornfor fpletz ]; maintainers = with maintainers; [ bjornfor fpletz ];

5
pkgs/tools/system/collectd/plugins.nix
View File

@ -25,6 +25,7 @@
, mongoc , mongoc
, mosquitto , mosquitto
, net-snmp , net-snmp
, perl
, postgresql , postgresql
, protobufc , protobufc
, python , python
@ -205,7 +206,9 @@ let
ovs_stats = { ovs_stats = {
buildInputs = [ yajl ]; buildInputs = [ yajl ];
}; };
perl = {}; perl = {
buildInputs = [ perl ];
};
pf = {}; pf = {};
pinba = { pinba = {
buildInputs = [ protobufc ]; buildInputs = [ protobufc ];