summaryrefslogtreecommitdiffstats
path: root/krebs/3modules
diff options
context:
space:
mode:
authormakefu <github@syntax-fehler.de>2017-07-24 10:49:31 +0200
committermakefu <github@syntax-fehler.de>2017-07-24 10:49:31 +0200
commit4044ac12863b96b9e1983a95f790b50b5039e287 (patch)
treecbb328038a00c447869fe32f208147217bc8f52e /krebs/3modules
parent0c5fbfde85ea4d3576284206ee67c0e4f7edcad3 (diff)
mv buildbot{-classic,}
Diffstat (limited to 'krebs/3modules')
-rw-r--r--krebs/3modules/buildbot/master.nix2
-rw-r--r--krebs/3modules/buildbot/slave.nix4
2 files changed, 3 insertions, 3 deletions
diff --git a/krebs/3modules/buildbot/master.nix b/krebs/3modules/buildbot/master.nix
index 432b93b05..dce3745dc 100644
--- a/krebs/3modules/buildbot/master.nix
+++ b/krebs/3modules/buildbot/master.nix
@@ -3,7 +3,7 @@
with import <stockholm/lib>;
let
- buildbot = pkgs.buildbot;
+ buildbot = pkgs.buildbot-classic;
buildbot-master-config = pkgs.writeText "buildbot-master.cfg" ''
# -*- python -*-
from buildbot.plugins import *
diff --git a/krebs/3modules/buildbot/slave.nix b/krebs/3modules/buildbot/slave.nix
index e93c190dc..345d4a3ea 100644
--- a/krebs/3modules/buildbot/slave.nix
+++ b/krebs/3modules/buildbot/slave.nix
@@ -2,7 +2,7 @@
with import <stockholm/lib>;
let
-
+ pkg = pkgs.buildbot-classic-slave;
buildbot-slave-init = pkgs.writeText "buildbot-slave.tac" ''
import os
@@ -153,7 +153,7 @@ let
workdir = shell.escape cfg.workDir;
contact = shell.escape cfg.contact;
description = shell.escape cfg.description;
- buildbot = pkgs.buildbot-slave;
+ buildbot = pkg;
# TODO:make this
in {
PermissionsStartOnly = true;