diff options
| author | tv <tv@krebsco.de> | 2016-07-07 23:05:06 +0200 |
|---|---|---|
| committer | tv <tv@krebsco.de> | 2016-07-07 23:05:06 +0200 |
| commit | f7d966043d04d73df719cbe6c13e4c1aa16bb7f7 (patch) | |
| tree | 2bf4f994e8bcb15fe2ce16a1fe2d8f742234ab63 /krebs/3modules | |
| parent | f18ababed59c21615d6659881a01597e18e706d3 (diff) | |
| parent | 6eab08eef60d634324056b58c98a1b2a4fa1ed1f (diff) | |
Merge remote-tracking branch 'prism/master'
Diffstat (limited to 'krebs/3modules')
| -rw-r--r-- | krebs/3modules/buildbot/master.nix | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/krebs/3modules/buildbot/master.nix b/krebs/3modules/buildbot/master.nix index f23981f44..bd17c3765 100644 --- a/krebs/3modules/buildbot/master.nix +++ b/krebs/3modules/buildbot/master.nix @@ -3,13 +3,14 @@ with config.krebs.lib; let - nixpkgs-1509 = import (pkgs.fetchFromGitHub { - owner = "NixOS"; repo = "nixpkgs-channels"; - rev = "91371c2bb6e20fc0df7a812332d99c38b21a2bda"; - sha256 = "1as1i0j9d2n3iap9b471y4x01561r2s3vmjc5281qinirlr4al73"; + # https://github.com/NixOS/nixpkgs/issues/14026 + nixpkgs-fix = import (pkgs.fetchgit { + url = https://github.com/nixos/nixpkgs; + rev = "e026b5c243ea39810826e68362718f5d703fb5d0"; + sha256 = "87e0724910a6df0371f883f99a8cf42e366fb4119f676f6f74ffb404beca2632"; }) {}; - buildbot = nixpkgs-1509.buildbot; + buildbot = nixpkgs-fix.buildbot; buildbot-master-config = pkgs.writeText "buildbot-master.cfg" '' # -*- python -*- from buildbot.plugins import * |