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: 4311cfa1577c
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: b517409c6b07
Choose a head ref
  • 2 commits
  • 1 file changed
  • 1 contributor

Commits on Jan 14, 2020

  1. hydra: remove the build-use-substitutes option 

    The following commit from 2016 in hydra removed the `--option
build-use-substitutes` from the hydra-queue-runner service:

```
commit ee2e9f5335c8c0288c102975b506f6b275793cfe
Author: Eelco Dolstra <edolstra@gmail.com>
Date:	Fri Oct 7 20:23:05 2016 +0200

    Update to reflect BinaryCacheStore changes

    BinaryCacheStore no longer implements buildPaths() and ensurePath(),
    so we need to use copyPath() / copyClosure().
```

It would be better if the hydra module in NixOS matches the upstream
module.
    @basvandijk
    basvandijk committed Jan 14, 2020
    Copy the full SHA
    f34aaa6 View commit details

Commits on Jan 15, 2020

  1. Merge pull request #77668 from basvandijk/hydra-rm-option-build-use-s… 

    …ubstitutes

hydra: remove the build-use-substitutes option
    @basvandijk
    basvandijk authored Jan 15, 2020
    Copy the full SHA
    b517409 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
@@ -333,7 +333,7 @@ in
IN_SYSTEMD = "1"; # to get log severity levels
};
serviceConfig =
{ ExecStart = "@${cfg.package}/bin/hydra-queue-runner hydra-queue-runner -v --option build-use-substitutes ${boolToString cfg.useSubstitutes}";
{ ExecStart = "@${cfg.package}/bin/hydra-queue-runner hydra-queue-runner -v";
ExecStopPost = "${cfg.package}/bin/hydra-queue-runner --unlock";
User = "hydra-queue-runner";
Restart = "always";