diff options
| author | Bas van Dijk <v.dijk.bas@gmail.com> | 2020-01-14 12:32:40 +0100 |
|---|---|---|
| committer | Bas van Dijk <v.dijk.bas@gmail.com> | 2020-01-14 12:32:40 +0100 |
| commit | ad554b3e4e0a61f3aeae27e37093ebb0d5a80606 (patch) | |
| tree | 3dfe04c60dde1f1e830466fb3943f3ce0867851a /nixos/modules/services/continuous-integration | |
| parent | e306ee4a56eeb60eb38e97a33e65a769b0e99ad1 (diff) | |
| download | nixpkgs-ad554b3e4e0a61f3aeae27e37093ebb0d5a80606.tar nixpkgs-ad554b3e4e0a61f3aeae27e37093ebb0d5a80606.tar.gz nixpkgs-ad554b3e4e0a61f3aeae27e37093ebb0d5a80606.tar.bz2 nixpkgs-ad554b3e4e0a61f3aeae27e37093ebb0d5a80606.tar.lz nixpkgs-ad554b3e4e0a61f3aeae27e37093ebb0d5a80606.tar.xz nixpkgs-ad554b3e4e0a61f3aeae27e37093ebb0d5a80606.tar.zst nixpkgs-ad554b3e4e0a61f3aeae27e37093ebb0d5a80606.zip | |
hydra: only set buildMachinesFiles when nix.buildMachines is defined
This applies [hydra PR #432](https://github.com/NixOS/hydra/pull/432)
to the NixOS module in nixpkgs:
```
commit 4efd078977e5ea20e1104783efc324cba11690bc
Author: Bas van Dijk <v.dijk.bas@gmail.com>
Date: Sun Dec 11 15:35:38 2016 +0100
Only set buildMachinesFiles when nix.buildMachines is defined
```
Diffstat (limited to 'nixos/modules/services/continuous-integration')
| -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 30c5550f71c..c2e0f760e25 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."; }; |