From 970ce2863fd6366e2fba25bb80d149191074cc2f Mon Sep 17 00:00:00 2001
From: Martin Milata <martin@martinmilata.cz>
Date: Tue, 10 Mar 2020 15:58:43 +0100
Subject: collectd: 5.8.1 -> 5.10.0

---
 pkgs/tools/system/collectd/default.nix | 13 +++----------
 pkgs/tools/system/collectd/plugins.nix |  5 ++++-
 2 files changed, 7 insertions(+), 11 deletions(-)

(limited to 'pkgs/tools/system')

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 ];
-- 
cgit 1.4.1