diff options
| author | Bas van Dijk <v.dijk.bas@gmail.com> | 2020-01-15 09:39:25 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-01-15 09:39:25 +0100 |
| commit | b0b37569a74112cb7d3cadc3705819e65f2f298c (patch) | |
| tree | 746c9699e8119b8166ae83738e082c40d0ab4ae0 /nixos/modules/services/continuous-integration/hydra/default.nix | |
| parent | b517409c6b07d99f172b0e79872c5f235a8e2355 (diff) | |
| parent | ad554b3e4e0a61f3aeae27e37093ebb0d5a80606 (diff) | |
| download | nixpkgs-b0b37569a74112cb7d3cadc3705819e65f2f298c.tar nixpkgs-b0b37569a74112cb7d3cadc3705819e65f2f298c.tar.gz nixpkgs-b0b37569a74112cb7d3cadc3705819e65f2f298c.tar.bz2 nixpkgs-b0b37569a74112cb7d3cadc3705819e65f2f298c.tar.lz nixpkgs-b0b37569a74112cb7d3cadc3705819e65f2f298c.tar.xz nixpkgs-b0b37569a74112cb7d3cadc3705819e65f2f298c.tar.zst nixpkgs-b0b37569a74112cb7d3cadc3705819e65f2f298c.zip | |
Merge pull request #77669 from basvandijk/hydra-sync-buildMachinesFiles-with-upstream
hydra: only set buildMachinesFiles when nix.buildMachines is defined
Diffstat (limited to 'nixos/modules/services/continuous-integration/hydra/default.nix')
| -rw-r--r-- | nixos/modules/services/continuous-integration/hydra/default.nix | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/nixos/modules/services/continuous-integration/hydra/default.nix b/nixos/modules/services/continuous-integration/hydra/default.nix index ed9876842a0..8b56207590a 100644 --- a/nixos/modules/services/continuous-integration/hydra/default.nix +++ b/nixos/modules/services/continuous-integration/hydra/default.nix @@ -167,7 +167,7 @@ in buildMachinesFiles = mkOption { 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" ]; description = "List of files containing build machines."; }; |