diff options
| author | makefu <github@syntax-fehler.de> | 2016-08-21 12:12:13 +0200 |
|---|---|---|
| committer | makefu <github@syntax-fehler.de> | 2016-08-21 12:12:13 +0200 |
| commit | 054475b6230ec357523b9eed143667a11db92966 (patch) | |
| tree | dd60906a6b0f6a5d2252536a50044d42e6098915 /krebs/3modules/buildbot | |
| parent | 54ccd367175e33c0aab67e8ef46d4d73bcf8183c (diff) | |
| parent | 1d9f7b4f2d1a444bb7b19f18efa3bee63c8d3770 (diff) | |
Merge remote-tracking branch 'prism/master'
Diffstat (limited to 'krebs/3modules/buildbot')
| -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 |