diff options
| author | tv <tv@krebsco.de> | 2016-10-20 20:22:29 +0200 |
|---|---|---|
| committer | tv <tv@krebsco.de> | 2016-10-20 20:22:29 +0200 |
| commit | 9329c1e47ddda0653d7e9824a01632ce3766e8f0 (patch) | |
| tree | 2bfb70737a757d0bd61ca0aa895c77d740b21e73 /krebs/3modules/buildbot/master.nix | |
| parent | 844d347ce7cf0b7646e9ecba3fbdc0b90e608501 (diff) | |
| parent | 0f2a9778315c3126794c0f1ad63710d38e7a67f7 (diff) | |
Merge remote-tracking branch 'prism/master'
Diffstat (limited to 'krebs/3modules/buildbot/master.nix')
| -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 |