mirror of
https://github.com/NixOS/nixpkgs.git
synced 2025-06-17 23:19:25 +03:00
667d42c00d
After final improvements to the official formatter implementation,
this commit now performs the first treewide reformat of Nix files using it.
This is part of the implementation of RFC 166.
Only "inactive" files are reformatted, meaning only files that
aren't being touched by any PR with activity in the past 2 months.
This is to avoid conflicts for PRs that might soon be merged.
Later we can do a full treewide reformat to get the rest,
which should not cause as many conflicts.
A CI check has already been running for some time to ensure that new and
already-formatted files are formatted, so the files being reformatted here
should also stay formatted.
This commit was automatically created and can be verified using
nix-build a08b3a4d19.tar.gz \
--argstr baseRev 57b193d8dd
result/bin/apply-formatting $NIXPKGS_PATH
82 lines
2.1 KiB
Nix
82 lines
2.1 KiB
Nix
{
|
|
config,
|
|
lib,
|
|
pkgs,
|
|
...
|
|
}:
|
|
|
|
let
|
|
inherit (lib) mkIf mkOption types;
|
|
cfg = config.services.jenkinsSlave;
|
|
masterCfg = config.services.jenkins;
|
|
in
|
|
{
|
|
options = {
|
|
services.jenkinsSlave = {
|
|
# todo:
|
|
# * assure the profile of the jenkins user has a JRE and any specified packages. This would
|
|
# enable ssh slaves.
|
|
# * Optionally configure the node as a jenkins ad-hoc slave. This would imply configuration
|
|
# properties for the master node.
|
|
enable = mkOption {
|
|
type = types.bool;
|
|
default = false;
|
|
description = ''
|
|
If true the system will be configured to work as a jenkins slave.
|
|
If the system is also configured to work as a jenkins master then this has no effect.
|
|
In progress: Currently only assures the jenkins user is configured.
|
|
'';
|
|
};
|
|
|
|
user = mkOption {
|
|
default = "jenkins";
|
|
type = types.str;
|
|
description = ''
|
|
User the jenkins slave agent should execute under.
|
|
'';
|
|
};
|
|
|
|
group = mkOption {
|
|
default = "jenkins";
|
|
type = types.str;
|
|
description = ''
|
|
If the default slave agent user "jenkins" is configured then this is
|
|
the primary group of that user.
|
|
'';
|
|
};
|
|
|
|
home = mkOption {
|
|
default = "/var/lib/jenkins";
|
|
type = types.path;
|
|
description = ''
|
|
The path to use as JENKINS_HOME. If the default user "jenkins" is configured then
|
|
this is the home of the "jenkins" user.
|
|
'';
|
|
};
|
|
|
|
javaPackage = lib.mkPackageOption pkgs "jdk" { };
|
|
};
|
|
};
|
|
|
|
config = mkIf (cfg.enable && !masterCfg.enable) {
|
|
users.groups = lib.optionalAttrs (cfg.group == "jenkins") {
|
|
jenkins.gid = config.ids.gids.jenkins;
|
|
};
|
|
|
|
users.users = lib.optionalAttrs (cfg.user == "jenkins") {
|
|
jenkins = {
|
|
description = "jenkins user";
|
|
createHome = true;
|
|
home = cfg.home;
|
|
group = cfg.group;
|
|
useDefaultShell = true;
|
|
uid = config.ids.uids.jenkins;
|
|
};
|
|
};
|
|
|
|
programs.java = {
|
|
enable = true;
|
|
package = cfg.javaPackage;
|
|
};
|
|
};
|
|
}
|