JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #77324 from worldofpeace/buildbot-eval

Browse Source 
nixos/buildbot: fix eval, and some twin issues
This commit is contained in:
worldofpeace 2020-01-12 15:17:19 -05:00 committed by GitHub
commit d04c6e0c26
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
nixos/modules/services/continuous-integration/buildbot/master.nix
View File

@ -222,7 +222,7 @@ in {
};
config = mkIf cfg.enable {
users.groups = optional (cfg.group == "buildbot") {
users.groups = optionalAttrs (cfg.group == "buildbot") {
buildbot = { };
};

2
nixos/modules/services/continuous-integration/buildbot/worker.nix
View File

@ -136,7 +136,7 @@ in {
config = mkIf cfg.enable {
services.buildbot-worker.workerPassFile = mkDefault (pkgs.writeText "buildbot-worker-password" cfg.workerPass);
users.groups = optional (cfg.group == "bbworker") {
users.groups = optionalAttrs (cfg.group == "bbworker") {
bbworker = { };
};

2
nixos/modules/services/continuous-integration/jenkins/slave.nix
View File

@ -50,7 +50,7 @@ in {
};
config = mkIf (cfg.enable && !masterCfg.enable) {
users.groups = optional (cfg.group == "jenkins") {
users.groups = optionalAttrs (cfg.group == "jenkins") {
jenkins.gid = config.ids.gids.jenkins;
};