diff options
| author | Martin Milata <martin@martinmilata.cz> | 2020-03-10 15:58:43 +0100 |
|---|---|---|
| committer | Bjørn Forsman <bjorn.forsman@gmail.com> | 2020-03-10 18:05:59 +0100 |
| commit | 970ce2863fd6366e2fba25bb80d149191074cc2f (patch) | |
| tree | c19f2d84df9e2381c5cd4d8b9706e7f14cd7fd7c /pkgs/tools/system | |
| parent | 91c98f407e01c422640096c9fbdeb50c674254e0 (diff) | |
| download | nixlib-970ce2863fd6366e2fba25bb80d149191074cc2f.tar nixlib-970ce2863fd6366e2fba25bb80d149191074cc2f.tar.gz nixlib-970ce2863fd6366e2fba25bb80d149191074cc2f.tar.bz2 nixlib-970ce2863fd6366e2fba25bb80d149191074cc2f.tar.lz nixlib-970ce2863fd6366e2fba25bb80d149191074cc2f.tar.xz nixlib-970ce2863fd6366e2fba25bb80d149191074cc2f.tar.zst nixlib-970ce2863fd6366e2fba25bb80d149191074cc2f.zip | |
collectd: 5.8.1 -> 5.10.0
Diffstat (limited to 'pkgs/tools/system')
| -rw-r--r-- | pkgs/tools/system/collectd/default.nix | 13 | ||||
| -rw-r--r-- | pkgs/tools/system/collectd/plugins.nix | 5 |
2 files changed, 7 insertions, 11 deletions
diff --git a/pkgs/tools/system/collectd/default.nix b/pkgs/tools/system/collectd/default.nix index 517d0afb95f2..9118fc55ea96 100644 --- a/pkgs/tools/system/collectd/default.nix +++ b/pkgs/tools/system/collectd/default.nix @@ -8,21 +8,14 @@ let plugins = callPackage ./plugins.nix args; in stdenv.mkDerivation rec { - version = "5.8.1"; + version = "5.10.0"; pname = "collectd"; src = fetchurl { 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 ]; buildInputs = [ libtool @@ -50,7 +43,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Daemon which collects system performance statistics periodically"; - homepage = https://collectd.org; + homepage = "https://collectd.org"; license = licenses.gpl2; platforms = platforms.unix; maintainers = with maintainers; [ bjornfor fpletz ]; diff --git a/pkgs/tools/system/collectd/plugins.nix b/pkgs/tools/system/collectd/plugins.nix index f1a87847a5ce..defeed4c8928 100644 --- a/pkgs/tools/system/collectd/plugins.nix +++ b/pkgs/tools/system/collectd/plugins.nix @@ -25,6 +25,7 @@ , mongoc , mosquitto , net-snmp +, perl , postgresql , protobufc , python @@ -205,7 +206,9 @@ let ovs_stats = { buildInputs = [ yajl ]; }; - perl = {}; + perl = { + buildInputs = [ perl ]; + }; pf = {}; pinba = { buildInputs = [ protobufc ]; |