summaryrefslogtreecommitdiffstats
path: root/krebs/3modules/buildbot/master.nix
diff options
context:
space:
mode:
authormakefu <github@syntax-fehler.de>2017-07-23 23:05:25 +0200
committermakefu <github@syntax-fehler.de>2017-07-23 23:05:25 +0200
commit6d7dfa388e34e3ea43ebaaaa273d008a141ee503 (patch)
treec1c11333a68e48c880a3be53137952f530005c77 /krebs/3modules/buildbot/master.nix
parent01314f4b6639be3caf1f0b685a41e22794fd7ed8 (diff)
buildbot: cherry-pick working buildbot-classic definition from nixpkgs
Diffstat (limited to 'krebs/3modules/buildbot/master.nix')
-rw-r--r--krebs/3modules/buildbot/master.nix9
1 files changed, 1 insertions, 8 deletions
diff --git a/krebs/3modules/buildbot/master.nix b/krebs/3modules/buildbot/master.nix
index 6c7af6da..432b93b0 100644
--- a/krebs/3modules/buildbot/master.nix
+++ b/krebs/3modules/buildbot/master.nix
@@ -3,14 +3,7 @@
with import <stockholm/lib>;
let
- # https://github.com/NixOS/nixpkgs/issues/14026
- nixpkgs-fix = import (pkgs.fetchgit {
- url = https://github.com/nixos/nixpkgs;
- rev = "e026b5c243ea39810826e68362718f5d703fb5d0";
- sha256 = "11lqd480bi6xbi7xbh4krrxmbp6a6iafv1d0q3sj461al0x0has8";
- }) {};
-
- buildbot = nixpkgs-fix.buildbot;
+ buildbot = pkgs.buildbot;
buildbot-master-config = pkgs.writeText "buildbot-master.cfg" ''
# -*- python -*-
from buildbot.plugins import *