summaryrefslogtreecommitdiffstats
path: root/krebs
diff options
context:
space:
mode:
authorlassulus <lass@aidsballs.de>2016-08-05 17:53:16 +0200
committerlassulus <lass@aidsballs.de>2016-08-05 17:53:16 +0200
commit252bac92e877e0f14dbdd83a9c54ba02fe937069 (patch)
treed8960c4b99aefcf8f192f758b7e0b9a57da8493a /krebs
parentf0925c5c44780a623137d82a1f923de628b2f868 (diff)
k 3 buildbot: remove override (upstream fix)
Diffstat (limited to 'krebs')
-rw-r--r--krebs/3modules/buildbot/master.nix11
1 files changed, 2 insertions, 9 deletions
diff --git a/krebs/3modules/buildbot/master.nix b/krebs/3modules/buildbot/master.nix
index bd17c3765..5dde50ea4 100644
--- a/krebs/3modules/buildbot/master.nix
+++ b/krebs/3modules/buildbot/master.nix
@@ -3,15 +3,8 @@
with config.krebs.lib;
let
- # https://github.com/NixOS/nixpkgs/issues/14026
- nixpkgs-fix = import (pkgs.fetchgit {
- url = https://github.com/nixos/nixpkgs;
- rev = "e026b5c243ea39810826e68362718f5d703fb5d0";
- sha256 = "87e0724910a6df0371f883f99a8cf42e366fb4119f676f6f74ffb404beca2632";
- }) {};
-
- buildbot = nixpkgs-fix.buildbot;
- buildbot-master-config = pkgs.writeText "buildbot-master.cfg" ''
+ buildbot = pkgs.buildbot;
+ buildbot-master-config = pkgs.writePython2 "buildbot-master.cfg" ''
# -*- python -*-
from buildbot.plugins import *
import re