summaryrefslogtreecommitdiffstats
path: root/krebs/3modules/buildbot
diff options
context:
space:
mode:
authormakefu <github@syntax-fehler.de>2017-07-25 15:04:16 +0200
committermakefu <github@syntax-fehler.de>2017-07-25 15:04:16 +0200
commit80d72a7243408cfd1e31011f1f67a03fd4f27cc8 (patch)
tree2ee3614f1d8c06268ead11931295ff4bdf25dcd7 /krebs/3modules/buildbot
parent17d99bea38bc72f599a157b0e52e954042bb32e2 (diff)
buildbot: override sources instead of repackage
Diffstat (limited to 'krebs/3modules/buildbot')
-rw-r--r--krebs/3modules/buildbot/master.nix16
-rw-r--r--krebs/3modules/buildbot/slave.nix15
2 files changed, 29 insertions, 2 deletions
diff --git a/krebs/3modules/buildbot/master.nix b/krebs/3modules/buildbot/master.nix
index dce3745dc..12c685b82 100644
--- a/krebs/3modules/buildbot/master.nix
+++ b/krebs/3modules/buildbot/master.nix
@@ -2,8 +2,22 @@
with import <stockholm/lib>;
let
+ # https://github.com/NixOS/nixpkgs/issues/14026
+ nixpkgs-fix = import (pkgs.fetchgit {
+ url = https://github.com/nixos/nixpkgs;
+ rev = "e026b5c243ea39810826e68362718f5d703fb5d0";
+ sha256 = "11lqd480bi6xbi7xbh4krrxmbp6a6iafv1d0q3sj461al0x0has8";
+ }) {};
+
+ buildbot = nixpkgs-fix.buildbot.overrideDerivation (old: {
+ postUnpack = "sourceRoot=\${sourceRoot}/master";
+ patches = [];
+ src = pkgs.fetchFromGitHub {
+ owner = "krebscode";
+ repo = "buildbot-classic";
+ rev = "5b4f5f6f1";
+ sha256 = "1j3xn1gjzvsf90jvfmyln71fzlhjx642ivrqf47zfxpkacljja93"; };});
- buildbot = pkgs.buildbot-classic;
buildbot-master-config = pkgs.writeText "buildbot-master.cfg" ''
# -*- python -*-
from buildbot.plugins import *
diff --git a/krebs/3modules/buildbot/slave.nix b/krebs/3modules/buildbot/slave.nix
index 345d4a3ea..698bf3bcd 100644
--- a/krebs/3modules/buildbot/slave.nix
+++ b/krebs/3modules/buildbot/slave.nix
@@ -2,7 +2,20 @@
with import <stockholm/lib>;
let
- pkg = pkgs.buildbot-classic-slave;
+ # https://github.com/NixOS/nixpkgs/issues/14026
+ nixpkgs-fix = import (pkgs.fetchgit {
+ url = https://github.com/nixos/nixpkgs;
+ rev = "e026b5c243ea39810826e68362718f5d703fb5d0";
+ sha256 = "11lqd480bi6xbi7xbh4krrxmbp6a6iafv1d0q3sj461al0x0has8";
+ }) {};
+ pkg = nixpkgs-fix.buildbot-slave.overrideDerivation (old: {
+ postUnpack = "sourceRoot=\${sourceRoot}/slave";
+ patches = [];
+ src = pkgs.fetchFromGitHub {
+ owner = "krebscode";
+ repo = "buildbot-classic";
+ rev = "5b4f5f6f1";
+ sha256 = "1j3xn1gjzvsf90jvfmyln71fzlhjx642ivrqf47zfxpkacljja93"; };});
buildbot-slave-init = pkgs.writeText "buildbot-slave.tac" ''
import os