summaryrefslogtreecommitdiffstats
path: root/shared
diff options
context:
space:
mode:
authormakefu <github@syntax-fehler.de>2016-01-18 17:23:54 +0100
committermakefu <github@syntax-fehler.de>2016-01-18 17:23:54 +0100
commit043047d7e651dba88a6b355df7f931bcc89047ec (patch)
tree4cffb5322abbae410f507ba7131d52b349cfbb31 /shared
parent7cf54a1d791fff716968a145feb55f28b84aef76 (diff)
parenta3d2a86e38c4c9cf710be041e94791f046493f01 (diff)
Merge remote-tracking branch 'gum/fix-cert' into fix-cert
Diffstat (limited to 'shared')
-rw-r--r--shared/2configs/base.nix2
-rw-r--r--shared/2configs/buildbot-standalone.nix9
2 files changed, 3 insertions, 8 deletions
diff --git a/shared/2configs/base.nix b/shared/2configs/base.nix
index 4d509d7a6..5e6072661 100644
--- a/shared/2configs/base.nix
+++ b/shared/2configs/base.nix
@@ -18,7 +18,7 @@ with lib;
krebs.build.source = {
git.nixpkgs = {
url = https://github.com/NixOS/nixpkgs;
- rev = "6d31e9b81dcd4ab927bb3dc91b612dd5abfa2f80";
+ rev = "d0e3cca";
target-path = "/var/src/nixpkgs";
};
dir.secrets = {
diff --git a/shared/2configs/buildbot-standalone.nix b/shared/2configs/buildbot-standalone.nix
index 3275189a5..2ea19e8aa 100644
--- a/shared/2configs/buildbot-standalone.nix
+++ b/shared/2configs/buildbot-standalone.nix
@@ -1,11 +1,6 @@
{ lib, config, pkgs, ... }:
-let
- pkgs-unst = import (fetchTarball https://github.com/NixOS/nixpkgs-channels/archive/nixos-unstable.tar.gz) {};
-in {
- nixpkgs.config.packageOverrides = pkgs: {
- buildbot = pkgs-unst.buildbot;
- buildbot-slave = pkgs-unst.buildbot-slave;
- };
+
+{
networking.firewall.allowedTCPPorts = [ 8010 9989 ];
krebs.buildbot.master = {
secrets = [ "retiolum-ci.rsa_key.priv" "cac.json" ];