Merge remote-tracking branch 'upstream/master' into HEAD

2017-11-25 11:38:13 +01:00
parent d087463b48 88eea6947f
commit 0cd857bffd
22 changed files with 695 additions and 64 deletions
@@ -3,14 +3,14 @@
 }:

 stdenv.mkDerivation rec {
-  version = "2.0.33";
+  version = "2.0.34";
  name = "munin-${version}";

  src = fetchFromGitHub {
    owner = "munin-monitoring";
    repo = "munin";
    rev = version;
-    sha256 = "0rs05b7926mjd58sdry33i91m1h3v3svl0wg2gmhljl8wqidac5w";
+    sha256 = "0mb5m0nc3nr9781d3s99sjdssmvkv37gxyplzr6d73i4hi31m7fr";
  };

  buildInputs = [ 
@@ -67,6 +67,9 @@ stdenv.mkDerivation rec {

    # https://github.com/munin-monitoring/munin/pull/134
    ./adding_servicedir_munin-node.patch
+
+    ./adding_sconfdir_munin-node.patch
+    ./preserve_environment.patch
  ];

  preBuild = ''