summaryrefslogtreecommitdiffstats
path: root/makefu
diff options
context:
space:
mode:
authormakefu <github@syntax-fehler.de>2015-10-27 18:12:05 +0100
committermakefu <github@syntax-fehler.de>2015-10-27 18:12:05 +0100
commitfe4f5b98b91f6bacb036d57b5322fb4e09c22f14 (patch)
treedbc5392e5cf9c77f5aa73509ec58bcbcc6201658 /makefu
parent3708839857669e3c7fc9899e324350ff55a34586 (diff)
m 12 collectd: wry uses cherry-picked collectd to enable python support
Diffstat (limited to 'makefu')
-rw-r--r--makefu/1systems/wry.nix3
-rw-r--r--makefu/2configs/unstable-sources.nix2
2 files changed, 4 insertions, 1 deletions
diff --git a/makefu/1systems/wry.nix b/makefu/1systems/wry.nix
index 6627d87b5..fc98179e4 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 f2d28dcaf..5cb4e8016 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 = {