summaryrefslogtreecommitdiffstats
path: root/shared/2configs
diff options
context:
space:
mode:
authortv <tv@krebsco.de>2016-02-04 01:31:21 +0100
committertv <tv@krebsco.de>2016-02-04 01:31:21 +0100
commite2a922dd7d2ab1f3e24a5d54c641c9ce6f51865d (patch)
tree361d2db5f8226a5b9d6aea80e9b7e55a7a845bed /shared/2configs
parent48381bd8dd9607d54a936c644964ab5bac90e4a9 (diff)
parentb38a821c31de84af6567073bd65ac76c5fc02b5d (diff)
Merge remote-tracking branch 'gum/master'
Diffstat (limited to 'shared/2configs')
-rw-r--r--shared/2configs/base.nix2
-rw-r--r--shared/2configs/buildbot-standalone.nix11
2 files changed, 5 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..c614bd3c1 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" ];
@@ -89,6 +84,7 @@ in {
nix-instantiate --eval -A \
users.shared.test-all-krebs-modules.system \
-I stockholm=. \
+ --show-trace \
-I secrets=. '<stockholm>' \
--argstr current-date lol \
--argstr current-user-name shared \
@@ -101,6 +97,7 @@ in {
users.shared.test-minimal-deploy.system \
-I stockholm=. \
-I secrets=. '<stockholm>' \
+ --show-trace \
--argstr current-date lol \
--argstr current-user-name shared \
--argstr current-host-name lol \