Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: b517409c6b07
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: b0b37569a741
Choose a head ref
  • 2 commits
  • 1 file changed
  • 1 contributor

Commits on Jan 14, 2020

  1. hydra: only set buildMachinesFiles when nix.buildMachines is defined 

    This applies [hydra PR #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
```
    @basvandijk
    basvandijk committed Jan 14, 2020
    Copy the full SHA
    ad554b3 View commit details

Commits on Jan 15, 2020

  1. Merge pull request #77669 from basvandijk/hydra-sync-buildMachinesFil… 

    …es-with-upstream

hydra: only set buildMachinesFiles when nix.buildMachines is defined
    @basvandijk
    basvandijk authored Jan 15, 2020

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    b0b3756 View commit details
Showing with 1 addition and 1 deletion.
  1. +1 −1 nixos/modules/services/continuous-integration/hydra/default.nix
2 changes: 1 addition & 1 deletion nixos/modules/services/continuous-integration/hydra/default.nix
View file
Original file line number Diff line number Diff line change
@@ -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.";
};