summaryrefslogtreecommitdiffstats
path: root/krebs/3modules
diff options
context:
space:
mode:
authortv <tv@krebsco.de>2016-07-07 23:02:41 +0200
committertv <tv@krebsco.de>2016-07-07 23:02:41 +0200
commitf18ababed59c21615d6659881a01597e18e706d3 (patch)
treee379f438eb190ed76d8d4d4c28ee1adbd8ce2bb7 /krebs/3modules
parent0c72da81cc58dcb68ae079901fae464249e5cec3 (diff)
parent8b829fdfa1e90635b1681ec9f466fcdc5d6e8f7e (diff)
Merge remote-tracking branch 'prism/lassulus'
Diffstat (limited to 'krebs/3modules')
-rw-r--r--krebs/3modules/buildbot/master.nix9
1 files changed, 8 insertions, 1 deletions
diff --git a/krebs/3modules/buildbot/master.nix b/krebs/3modules/buildbot/master.nix
index c365798f3..f23981f44 100644
--- a/krebs/3modules/buildbot/master.nix
+++ b/krebs/3modules/buildbot/master.nix
@@ -2,7 +2,14 @@
with config.krebs.lib;
let
- buildbot = pkgs.buildbot;
+
+ nixpkgs-1509 = import (pkgs.fetchFromGitHub {
+ owner = "NixOS"; repo = "nixpkgs-channels";
+ rev = "91371c2bb6e20fc0df7a812332d99c38b21a2bda";
+ sha256 = "1as1i0j9d2n3iap9b471y4x01561r2s3vmjc5281qinirlr4al73";
+ }) {};
+
+ buildbot = nixpkgs-1509.buildbot;
buildbot-master-config = pkgs.writeText "buildbot-master.cfg" ''
# -*- python -*-
from buildbot.plugins import *