diff options
author | makefu <github@syntax-fehler.de> | 2016-07-20 18:53:27 +0200 |
---|---|---|
committer | makefu <github@syntax-fehler.de> | 2016-07-20 18:53:27 +0200 |
commit | 5ee80a05eb9ac07b3188a9037a5d153786e4770e (patch) | |
tree | 148471d271ba325e1e1890be6644b0c1b754f5d1 /lass/2configs/buildbot-standalone.nix | |
parent | 18f0221313c75d129fc49ffd402e10102659abd7 (diff) | |
parent | 461637c92851b2f57a5814ff4b2988bcf9a184a5 (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 = { |