Merge remote-tracking branch 'origin/master' into flake

2019-09-24 19:03:18 +02:00
parent 1ab3b26b67 4223202c99
commit 0ccf36ca3b
4 changed files with 12 additions and 4 deletions
--- a/hydra-module.nix
+++ b/hydra-module.nix
@ -166,7 +166,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.";
      };