summaryrefslogtreecommitdiffstats
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
parent0c5fbfde85ea4d3576284206ee67c0e4f7edcad3 (diff)
mv buildbot{-classic,}
-rw-r--r--krebs/3modules/buildbot/master.nix2
-rw-r--r--krebs/3modules/buildbot/slave.nix4
-rw-r--r--krebs/5pkgs/simple/buildbot-classic/default.nix (renamed from krebs/5pkgs/simple/buildbot/default.nix)0
-rw-r--r--krebs/5pkgs/simple/buildbot-slave-classic/default.nix (renamed from krebs/5pkgs/simple/buildbot-slave/default.nix)9
4 files changed, 5 insertions, 10 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;
diff --git a/krebs/5pkgs/simple/buildbot/default.nix b/krebs/5pkgs/simple/buildbot-classic/default.nix
index 5f1081278..5f1081278 100644
--- a/krebs/5pkgs/simple/buildbot/default.nix
+++ b/krebs/5pkgs/simple/buildbot-classic/default.nix
diff --git a/krebs/5pkgs/simple/buildbot-slave/default.nix b/krebs/5pkgs/simple/buildbot-slave-classic/default.nix
index db61d7c3f..83da05c3f 100644
--- a/krebs/5pkgs/simple/buildbot-slave/default.nix
+++ b/krebs/5pkgs/simple/buildbot-slave-classic/default.nix
@@ -1,14 +1,9 @@
-{ stdenv, python2Packages, fetchFromGitHub, coreutils }:
+{ stdenv, pkgs, python2Packages, fetchFromGitHub, coreutils }:
python2Packages.buildPythonApplication (rec {
name = "buildbot-slave-classic-2017-07-23";
- src = fetchFromGitHub {
- owner = "krebscode";
- repo = "buildbot-classic";
- rev = "5b4f5f6f1";
- sha256 = "1j3xn1gjzvsf90jvfmyln71fzlhjx642ivrqf47zfxpkacljja93";
- };
+ src = pkgs.buildbot-classic.src;
postUnpack = "sourceRoot=\${sourceRoot}/slave";