diff options
| author | makefu <github@syntax-fehler.de> | 2016-01-23 00:29:55 +0100 |
|---|---|---|
| committer | makefu <github@syntax-fehler.de> | 2016-01-23 00:29:55 +0100 |
| commit | e91ee6132671d874c817d5569a618472b5a710ca (patch) | |
| tree | 60422048d6d8a532a1c30cbeba3ebd6c35367ee8 /shared | |
| parent | 7cf54a1d791fff716968a145feb55f28b84aef76 (diff) | |
| parent | ed4e0241d5aba830f31a7271435c93c7299b884b (diff) | |
Merge branch 'master' of gum:stockholm
Diffstat (limited to 'shared')
| -rw-r--r-- | shared/2configs/base.nix | 2 | ||||
| -rw-r--r-- | shared/2configs/buildbot-standalone.nix | 11 |
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 \ |