diff options
| author | tv <tv@krebsco.de> | 2016-08-07 09:54:10 +0200 |
|---|---|---|
| committer | tv <tv@krebsco.de> | 2016-08-07 09:54:10 +0200 |
| commit | 3288d6848f774e00a5fbc2ba060f2df695af8e55 (patch) | |
| tree | 971a8ae4fd7b64d2c5b9374d6707d7dc2bb79beb /krebs/3modules | |
| parent | 3a760096f6b3b49d4bf32465c860ccfd23d174fa (diff) | |
| parent | cbf66556afed7220bc95d1716f06cede5a7a8b09 (diff) | |
Merge remote-tracking branch 'prism/master'
Diffstat (limited to 'krebs/3modules')
| -rw-r--r-- | krebs/3modules/buildbot/master.nix | 11 |
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 |