Only set buildMachinesFiles when nix.buildMachines is defined #432
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
Any reason this is not being reviewed/merged? Just ran into this issue with a self-contained Hydra installation, and it seems like a relatively simple change to apply. |
|
One reason might be hydra.nixos.org's build machines file is managed manually, and this would change that behavior some. |
|
In the process of working on #665 I was bitten by this again. I spend the best part of an hour figuring out why my jobs weren't being build until I remembered this PR. If |
basvandijk
added a commit
to basvandijk/nixpkgs
that referenced
this pull request
Jan 14, 2020
This applies [hydra PR NixOS#432](NixOS/hydra#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 ```
10 tasks
dtzWill
pushed a commit
to dtzWill/nixpkgs
that referenced
this pull request
Jan 15, 2020
This applies [hydra PR NixOS#432](NixOS/hydra#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 ``` (cherry picked from commit ad554b3)
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This should fix #430.
We should set
buildMachinesFilesto[ "/etc/nix/machines" ]only whennix.buildMachinesis set to a non-empty list because that causes that file to be generated.This should also be applied to <nixpkgs/nixos/modules/services/continuous-integration/hydra/default.nix>.