Mic92/stockholm
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

s 2 base: use current unstable

Browse Source
This commit is contained in:
makefu 2016-01-18 16:59:44 +01:00 committed by makefu
parent fbe826ba2a
commit 64a69bd153
2 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
shared/2configs/base.nix
View File

@ -18,7 +18,7 @@ with lib;
krebs.build.source = { krebs.build.source = {
git.nixpkgs = { git.nixpkgs = {
url = https://github.com/NixOS/nixpkgs; url = https://github.com/NixOS/nixpkgs;
rev = "6d31e9b81dcd4ab927bb3dc91b612dd5abfa2f80"; rev = "d0e3cca";
target-path = "/var/src/nixpkgs"; target-path = "/var/src/nixpkgs";
}; };
dir.secrets = { dir.secrets = {

9
shared/2configs/buildbot-standalone.nix
View File

@ -1,11 +1,6 @@
{ lib, config, pkgs, ... }: { 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 ]; networking.firewall.allowedTCPPorts = [ 8010 9989 ];
krebs.buildbot.master = { krebs.buildbot.master = {
secrets = [ "retiolum-ci.rsa_key.priv" "cac.json" ]; secrets = [ "retiolum-ci.rsa_key.priv" "cac.json" ];