summaryrefslogtreecommitdiffstats
path: root/krebs/3modules/buildbot/master.nix
diff options
context:
space:
mode:
authorlassulus <lassulus@lassul.us>2017-07-23 23:53:10 +0200
committerlassulus <lassulus@lassul.us>2017-07-23 23:53:10 +0200
commit5b980c6a3271d8dac507c2c7d34f99ee0ccf9432 (patch)
tree961800253eb65c0b3742d629f8a2e57d5e1ced97 /krebs/3modules/buildbot/master.nix
parent6fc6456ed930bf53a191bc7d09552b31bb10556d (diff)
parentf5459736cfbf2f3f23d525887184eadd743e6e91 (diff)
Merge remote-tracking branch 'gum/master'
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 6c7af6da5..432b93b05 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 *