m 3 buildbot.slave: add extra packages and environ to configuration
This commit is contained in:
parent
b0ffa54288
commit
ad3178e7e6
|
@ -38,7 +38,7 @@ let
|
||||||
allow_shutdown=allow_shutdown)
|
allow_shutdown=allow_shutdown)
|
||||||
s.setServiceParent(application)
|
s.setServiceParent(application)
|
||||||
'';
|
'';
|
||||||
|
default-packages = [ pkgs.git pkgs.bash ];
|
||||||
cfg = config.makefu.buildbot.slave;
|
cfg = config.makefu.buildbot.slave;
|
||||||
|
|
||||||
api = {
|
api = {
|
||||||
|
@ -91,6 +91,26 @@ let
|
||||||
'';
|
'';
|
||||||
};
|
};
|
||||||
|
|
||||||
|
packages = mkOption {
|
||||||
|
default = [ pkgs.git ];
|
||||||
|
type = with types; listOf package;
|
||||||
|
description = ''
|
||||||
|
packages which should be in path for buildslave
|
||||||
|
'';
|
||||||
|
};
|
||||||
|
|
||||||
|
extraEnviron = mkOption {
|
||||||
|
default = {};
|
||||||
|
example = {
|
||||||
|
NIX_PATH = "nixpkgs=/path/to/my/nixpkgs";
|
||||||
|
};
|
||||||
|
type = types.attrsOf types.str;
|
||||||
|
description = ''
|
||||||
|
extra environment variables to be provided to the buildslave service
|
||||||
|
if you need nixpkgs, e.g. for running nix-shell you can set NIX_PATH here.
|
||||||
|
'';
|
||||||
|
};
|
||||||
|
|
||||||
extraConfig = mkOption {
|
extraConfig = mkOption {
|
||||||
default = "";
|
default = "";
|
||||||
type = types.lines;
|
type = types.lines;
|
||||||
|
@ -121,6 +141,12 @@ let
|
||||||
description = "Buildbot Slave for ${cfg.username}@${cfg.masterhost}";
|
description = "Buildbot Slave for ${cfg.username}@${cfg.masterhost}";
|
||||||
after = [ "network.target" ];
|
after = [ "network.target" ];
|
||||||
wantedBy = [ "multi-user.target" ];
|
wantedBy = [ "multi-user.target" ];
|
||||||
|
path = default-packages ++ cfg.packages;
|
||||||
|
|
||||||
|
environment = {
|
||||||
|
NIX_REMOTE="daemon";
|
||||||
|
} // cfg.extraEnviron;
|
||||||
|
|
||||||
serviceConfig = let
|
serviceConfig = let
|
||||||
workdir = "${lib.shell.escape cfg.workDir}";
|
workdir = "${lib.shell.escape cfg.workDir}";
|
||||||
contact = "${lib.shell.escape cfg.contact}";
|
contact = "${lib.shell.escape cfg.contact}";
|
||||||
|
|
Loading…
Reference in a new issue