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/nix
base: 880375366602
Choose a base ref
...
head repository: NixOS/nix
compare: 0828ace09b99
Choose a head ref
  • 4 commits
  • 1 file changed
  • 2 contributors

Commits on Dec 22, 2020

  1. DerivationGoal: only retry if output closure incomplete is only problem 

    (cherry picked from commit bd9eb5c)
    @roberth
    roberth committed Dec 22, 2020
    Copy the full SHA
    c29fffe View commit details
    Browse the repository at this point in the history

  2. Tests for #3964 

    (cherry picked from commit ea8d320)
    @roberth
    roberth committed Dec 22, 2020
    Copy the full SHA
    e90530e View commit details
    Browse the repository at this point in the history

  3. Revert "Tests for #3964" 

    This reverts commit e90530e.

It appears that this backported test relies on new functionality.

The error is:

    + nix copy --to file:///build/nix-test/binary-cache /build/nix-test/store/dckdy2xp7sn8qvyx8axxjq7clnxddri1-multi-output
    warning: you don't have Internet access; disabling some network-dependent features
    error: uploading to 'file:///build/nix-test/binary-cache/nar/0hpfhrig9h6fvbjmiwsb7zkaxr19vr2w048y4xb3nrs36bagf92n.nar.xz' is not supported
    @roberth
    roberth committed Dec 22, 2020
    Copy the full SHA
    8388e2e View commit details
    Browse the repository at this point in the history

Commits on Dec 25, 2020

  1. Merge pull request #4389 from hercules-ci/backport-issue-3964-substit… 

    …ution-loop

Backport issue 3964 substitution loop
    @domenkozar
    domenkozar committed Dec 25, 2020
    Copy the full SHA
    0828ace View commit details
    Browse the repository at this point in the history