diff options
author | tv <tv@krebsco.de> | 2016-07-22 13:22:13 +0200 |
---|---|---|
committer | tv <tv@krebsco.de> | 2016-07-22 13:22:13 +0200 |
commit | 45c62ec4d3ec61ba593657676f5a09d47622564e (patch) | |
tree | 7937fbefaddc5e0168e44ab1d6e355c42192d7e8 /lass/2configs/buildbot-standalone.nix | |
parent | 8b58e6e6e25e38586f3cc8879aa0444d4fdf6f0d (diff) | |
parent | 0bd78c3b0de0fa79322e9031f45dcc62abd094d1 (diff) |
Merge remote-tracking branch 'prism/master'
Diffstat (limited to 'lass/2configs/buildbot-standalone.nix')
-rw-r--r-- | lass/2configs/buildbot-standalone.nix | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/lass/2configs/buildbot-standalone.nix b/lass/2configs/buildbot-standalone.nix index 4c63d857c..5afb23687 100644 --- a/lass/2configs/buildbot-standalone.nix +++ b/lass/2configs/buildbot-standalone.nix @@ -86,17 +86,17 @@ in { ["make \ test \ ssh=${sshWrapper} \ - target=build@localhost:${config.users.users.build.home}/testbuild \ + target=build@localhost${config.users.users.build.home}/testbuild \ method=build \ system={}".format(i)]) - for i in [ "pornocauster", "wry" ]: + for i in [ "pornocauster", "wry", "vbob", "wbob", "shoney" ]: addShell(f,name="build-{}".format(i),env=env_makefu, command=nixshell + \ ["make \ test \ ssh=${sshWrapper} \ - target=build@localhost:${config.users.users.build.home}/testbuild \ + target=build@localhost${config.users.users.build.home}/testbuild \ method=build \ system={}".format(i)]) @@ -147,7 +147,7 @@ in { password = "lasspass"; packages = with pkgs; [ gnumake jq nix populate ]; extraEnviron = { - NIX_PATH="nixpkgs=/var/src/nixpkgs"; + NIX_PATH="/var/src"; }; }; config.krebs.iptables = { |