summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormakefu <github@syntax-fehler.de>2015-12-15 21:18:29 +0100
committermakefu <github@syntax-fehler.de>2015-12-15 21:18:29 +0100
commitcf5a1ba6bcf657396bc6b8c2fbc32143d27849d0 (patch)
treee31056f11fd32b3e0606d922c5ba437a17cbd1e8
parent36b34fdebe5de5a705df78d5cf0221101bc3d610 (diff)
m 1 pornocauster: use latest buildbot for stable build
-rw-r--r--makefu/1systems/pornocauster.nix13
1 files changed, 10 insertions, 3 deletions
diff --git a/makefu/1systems/pornocauster.nix b/makefu/1systems/pornocauster.nix
index 977289470..6f176b7fa 100644
--- a/makefu/1systems/pornocauster.nix
+++ b/makefu/1systems/pornocauster.nix
@@ -36,11 +36,17 @@
# ../2configs/mediawiki.nix
#../2configs/wordpress.nix
];
- nixpkgs.config.packageOverrides = pkgs: { tinc = pkgs.tinc_pre; };
+ nixpkgs.config.packageOverrides = pkgs: {
+ tinc = pkgs.tinc_pre;
+ buildbot = let
+ pkgs1509 = import (fetchTarball https://github.com/NixOS/nixpkgs-channels/archive/nixos-unstable.tar.gz) {};
+ in pkgs1509.buildbot;
+ };
+ makefu.buildbot.master.enable = true;
+
#krebs.Reaktor.enable = true;
#krebs.Reaktor.nickname = "makefu|r";
-
- krebs.build.host = config.krebs.hosts.pornocauster;
+ # nix.binaryCaches = [ "http://acng.shack/nixos" "https://cache.nixos.org" ];
environment.systemPackages = with pkgs;[
get
@@ -58,4 +64,5 @@
25
];
+ krebs.build.host = config.krebs.hosts.pornocauster;
}