mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-17 19:21:04 +00:00
nixos/buildbot-master: allow merging extraConfig and extraImports (#322469)
This commit is contained in:
commit
0f73a33f7e
|
@ -93,13 +93,13 @@ in {
|
||||||
};
|
};
|
||||||
|
|
||||||
extraConfig = lib.mkOption {
|
extraConfig = lib.mkOption {
|
||||||
type = lib.types.str;
|
type = lib.types.lines;
|
||||||
description = "Extra configuration to append to master.cfg";
|
description = "Extra configuration to append to master.cfg";
|
||||||
default = "c['buildbotNetUsageData'] = None";
|
default = "c['buildbotNetUsageData'] = None";
|
||||||
};
|
};
|
||||||
|
|
||||||
extraImports = lib.mkOption {
|
extraImports = lib.mkOption {
|
||||||
type = lib.types.str;
|
type = lib.types.lines;
|
||||||
description = "Extra python imports to prepend to master.cfg";
|
description = "Extra python imports to prepend to master.cfg";
|
||||||
default = "";
|
default = "";
|
||||||
example = "from buildbot.process.project import Project";
|
example = "from buildbot.process.project import Project";
|
||||||
|
|
Loading…
Reference in a new issue