diff options
| author | worldofpeace <worldofpeace@protonmail.ch> | 2020-01-12 15:17:19 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-01-12 15:17:19 -0500 |
| commit | d04c6e0c26d90fe1ee3ca34d10e8d05bba897bee (patch) | |
| tree | 3818d2761f200273c240b7fabb03b0d778720c03 /nixos/modules | |
| parent | 315329fec4f0208dd903b966bd40036964766cb9 (diff) | |
| parent | 2af959e57912b4fb16bb53975690a20b3e9d2697 (diff) | |
| download | nixpkgs-d04c6e0c26d90fe1ee3ca34d10e8d05bba897bee.tar nixpkgs-d04c6e0c26d90fe1ee3ca34d10e8d05bba897bee.tar.gz nixpkgs-d04c6e0c26d90fe1ee3ca34d10e8d05bba897bee.tar.bz2 nixpkgs-d04c6e0c26d90fe1ee3ca34d10e8d05bba897bee.tar.lz nixpkgs-d04c6e0c26d90fe1ee3ca34d10e8d05bba897bee.tar.xz nixpkgs-d04c6e0c26d90fe1ee3ca34d10e8d05bba897bee.tar.zst nixpkgs-d04c6e0c26d90fe1ee3ca34d10e8d05bba897bee.zip | |
Merge pull request #77324 from worldofpeace/buildbot-eval
nixos/buildbot: fix eval, and some twin issues
Diffstat (limited to 'nixos/modules')
3 files changed, 3 insertions, 3 deletions
diff --git a/nixos/modules/services/continuous-integration/buildbot/master.nix b/nixos/modules/services/continuous-integration/buildbot/master.nix index 326d2cbd82c..e3da3092d45 100644 --- a/nixos/modules/services/continuous-integration/buildbot/master.nix +++ b/nixos/modules/services/continuous-integration/buildbot/master.nix @@ -222,7 +222,7 @@ in { }; config = mkIf cfg.enable { - users.groups = optional (cfg.group == "buildbot") { + users.groups = optionalAttrs (cfg.group == "buildbot") { buildbot = { }; }; diff --git a/nixos/modules/services/continuous-integration/buildbot/worker.nix b/nixos/modules/services/continuous-integration/buildbot/worker.nix index 7613692f0a3..52f24b8cee3 100644 --- a/nixos/modules/services/continuous-integration/buildbot/worker.nix +++ b/nixos/modules/services/continuous-integration/buildbot/worker.nix @@ -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 = { }; }; diff --git a/nixos/modules/services/continuous-integration/jenkins/slave.nix b/nixos/modules/services/continuous-integration/jenkins/slave.nix index 26368cb94e4..3c0e6f78e74 100644 --- a/nixos/modules/services/continuous-integration/jenkins/slave.nix +++ b/nixos/modules/services/continuous-integration/jenkins/slave.nix @@ -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; }; |