From fe4f5b98b91f6bacb036d57b5322fb4e09c22f14 Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Tue, 27 Oct 2015 18:12:05 +0100
Subject: m 12 collectd: wry uses cherry-picked collectd to enable python
 support

---
 makefu/1systems/wry.nix              | 3 +++
 makefu/2configs/unstable-sources.nix | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

(limited to 'makefu')

diff --git a/makefu/1systems/wry.nix b/makefu/1systems/wry.nix
index 6627d87b..fc98179e 100644
--- a/makefu/1systems/wry.nix
+++ b/makefu/1systems/wry.nix
@@ -19,6 +19,9 @@ in {
 
       # Reaktor
       ../2configs/Reaktor/simpleExtend.nix
+
+      # collectd
+      ../2configs/collectd/collectd-base.nix
   ];
 
   krebs.build = {
diff --git a/makefu/2configs/unstable-sources.nix b/makefu/2configs/unstable-sources.nix
index f2d28dca..5cb4e801 100644
--- a/makefu/2configs/unstable-sources.nix
+++ b/makefu/2configs/unstable-sources.nix
@@ -4,7 +4,7 @@
   krebs.build.source = {
     git.nixpkgs = {
       url = https://github.com/makefu/nixpkgs;
-      rev = "984d33884d63d404ff2da76920b8bc8b15471552";
+      rev = "15b5bbfbd1c8a55e7d9e05dd9058dc102fac04fe"; # cherry-picked collectd
     };
 
     dir.secrets = {
-- 
cgit v1.2.3