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: b0c220c02ec5
Choose a base ref
...
head repository: NixOS/nix
compare: ad42a7846904
Choose a head ref
  • 7 commits
  • 12 files changed
  • 1 contributor

Commits on Jul 10, 2019

  1. nix copy: Rename --substitute to --substitute-on-destination 

    '--substitute' was being shadowed by the regular '--substitute' (the
short-hand for '--option substitute true').

Fixes #2983.
    @edolstra
    edolstra committed Jul 10, 2019
    Copy the full SHA
    aa739e7 View commit details
    Browse the repository at this point in the history

  2. Revert "Fix 'error 9 while decompressing xz file'" 

    This reverts commit 78fa47a.
    @edolstra
    edolstra committed Jul 10, 2019
    Copy the full SHA
    03f09e1 View commit details
    Browse the repository at this point in the history

  3. Downloader: Use warn()

    @edolstra
    edolstra committed Jul 10, 2019
    Copy the full SHA
    f76b2a7 View commit details
    Browse the repository at this point in the history

  4. HttpBinaryCacheStore: Use default number of retries for NARs

    @edolstra
    edolstra committed Jul 10, 2019
    Copy the full SHA
    00f6faf View commit details
    Browse the repository at this point in the history

  5. Resume NAR downloads 

    This is a much simpler fix to the 'error 9 while decompressing xz
file' problem than 78fa47a. We just
do a ranged HTTP request starting after the data that we previously
wrote into the sink.

Fixes #2952, #379.
    @edolstra
    edolstra committed Jul 10, 2019
    Copy the full SHA
    53247d6 View commit details
    Browse the repository at this point in the history

Commits on Jul 11, 2019

  1. Merge remote-tracking branch 'origin/master' into flakes

    @edolstra
    edolstra committed Jul 11, 2019
    Copy the full SHA
    4205234 View commit details
    Browse the repository at this point in the history

  2. Rename 'epoch' -> 'edition'

    @edolstra
    edolstra committed Jul 11, 2019
    Copy the full SHA
    ad42a78 View commit details
    Browse the repository at this point in the history