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: 94f11d0a61bb
Choose a base ref
...
head repository: NixOS/nix
compare: 64ec087f582c
Choose a head ref
  • 7 commits
  • 15 files changed
  • 1 contributor

Commits on Jun 24, 2019

  1. downloadCached: Return ETag 

    (cherry picked from commit 529add3)
    @edolstra
    edolstra committed Jun 24, 2019
    Copy the full SHA
    dc29e9f View commit details
    Browse the repository at this point in the history

  2. CachedDownloadResult: Include store path 

    Also, make fetchGit and fetchMercurial update allowedPaths properly.

(Maybe the evaluator, rather than the caller of the evaluator, should
apply toRealPath(), but that's a bigger change.)

(cherry picked from commit 5c34d66)
    @edolstra
    edolstra committed Jun 24, 2019
    Copy the full SHA
    b43e1e1 View commit details
    Browse the repository at this point in the history

  3. Downloader: Propagate exceptions from decompressionSink->finish() 

    (cherry picked from commit 15fa70c)
    @edolstra
    edolstra committed Jun 24, 2019
    Copy the full SHA
    2fef4dd View commit details
    Browse the repository at this point in the history

  4. Fix 'error 9 while decompressing xz file' 

    Once we've started writing data to a Sink, we can't restart a download
request, because then we end up writing duplicate data to the
Sink. Therefore we shouldn't handle retries in Downloader but at a
higher level (in particular, in copyStorePath()).

Fixes #2952.

(cherry picked from commit a67cf5a)
    @edolstra
    edolstra committed Jun 24, 2019
    2
    Copy the full SHA
    78fa47a View commit details
    Browse the repository at this point in the history

  5. Add '--no-net' convenience flag 

    This flag

* Disables substituters.

* Sets the tarball-ttl to infinity (ensuring e.g. that the flake
  registry and any downloaded flakes are considered current).

* Disables retrying downloads and sets the connection timeout to the
  minimum. (So it doesn't completely disable downloads at the moment.)

(cherry picked from commit 8ea8422)
    @edolstra
    edolstra committed Jun 24, 2019
    Copy the full SHA
    7b9c687 View commit details
    Browse the repository at this point in the history

  6. Refactor downloadCached() interface 

    (cherry picked from commit df3f5a7)
    @edolstra
    edolstra committed Jun 24, 2019
    Copy the full SHA
    f8b3033 View commit details
    Browse the repository at this point in the history

  7. Fix 32-bit overflow with --no-net 

    --no-net causes tarballTtl to be set to the largest 32-bit integer,
which causes comparison like 'time + tarballTtl < other_time' to
fail on 32-bit systems. So cast them to 64-bit first.

https://hydra.nixos.org/build/95076624
(cherry picked from commit 29ccb2e)
    @edolstra
    edolstra committed Jun 24, 2019
    Copy the full SHA
    64ec087 View commit details
    Browse the repository at this point in the history