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

Merge pull request #77669 from basvandijk/hydra-sync-buildMachinesFiles-with-upstream 

hydra: only set buildMachinesFiles when nix.buildMachines is defined
This commit is contained in:
Bas van Dijk 2020-01-15 09:39:25 +01:00 committed by GitHub
parent b517409c6b ad554b3e4e
commit b0b37569a7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
nixos/modules/services/continuous-integration/hydra/default.nix
View File

@ -167,7 +167,7 @@ in
buildMachinesFiles = mkOption { buildMachinesFiles = mkOption {
type = types.listOf types.path; type = types.listOf types.path;
default = [ "/etc/nix/machines" ]; default = optional (config.nix.buildMachines != []) "/etc/nix/machines";
example = [ "/etc/nix/machines" "/var/lib/hydra/provisioner/machines" ]; example = [ "/etc/nix/machines" "/var/lib/hydra/provisioner/machines" ];
description = "List of files containing build machines."; description = "List of files containing build machines.";
}; };