diff options
| author | lassulus <lass@aidsballs.de> | 2016-10-13 21:20:33 +0200 |
|---|---|---|
| committer | lassulus <lass@aidsballs.de> | 2016-10-13 21:20:33 +0200 |
| commit | 08c98a00ed75a49a34b1f0079954cd65ce2e1e1c (patch) | |
| tree | ee6600625e40c9a0f0490560916483bf7833a84f /krebs/3modules/buildbot | |
| parent | 8458ffd7a00a3e4c734755de7d72f95458d1bb52 (diff) | |
Revert "k 3 buildbot: remove override (upstream fix)"
This reverts commit 252bac92e877e0f14dbdd83a9c54ba02fe937069.
because buildbot is broken again
Diffstat (limited to 'krebs/3modules/buildbot')
| -rw-r--r-- | krebs/3modules/buildbot/master.nix | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/krebs/3modules/buildbot/master.nix b/krebs/3modules/buildbot/master.nix index 5dde50ea4..bd17c3765 100644 --- a/krebs/3modules/buildbot/master.nix +++ b/krebs/3modules/buildbot/master.nix @@ -3,8 +3,15 @@ with config.krebs.lib; let - buildbot = pkgs.buildbot; - buildbot-master-config = pkgs.writePython2 "buildbot-master.cfg" '' + # 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" '' # -*- python -*- from buildbot.plugins import * import re |