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: a67cf5a3585c
Choose a base ref
...
head repository: NixOS/nix
compare: 2cc248c4fd9c
Choose a head ref
  • 15 commits
  • 8 files changed
  • 2 contributors

Commits on Jun 20, 2019

  1. Copy the full SHA
    74a65d3 View commit details
    Browse the repository at this point in the history
  2. Merge pull request #2963 from backuitist/s3-sdk

    Nix uses the CPP SDK, not Java
    edolstra committed Jun 20, 2019
    Copy the full SHA
    8884c36 View commit details
    Browse the repository at this point in the history

Commits on Jun 24, 2019

  1. Add more fromTOML tests

    edolstra committed Jun 24, 2019
    Copy the full SHA
    99cec65 View commit details
    Browse the repository at this point in the history
  2. Fix abort in fromTOML

    Fixes #2969.
    edolstra committed Jun 24, 2019
    Copy the full SHA
    94f11d0 View commit details
    Browse the repository at this point in the history
  3. downloadCached: Return ETag

    (cherry picked from commit 529add3)
    edolstra committed Jun 24, 2019
    Copy the full SHA
    dc29e9f View commit details
    Browse the repository at this point in the history
  4. 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 committed Jun 24, 2019
    Copy the full SHA
    b43e1e1 View commit details
    Browse the repository at this point in the history
  5. Downloader: Propagate exceptions from decompressionSink->finish()

    (cherry picked from commit 15fa70c)
    edolstra committed Jun 24, 2019
    Copy the full SHA
    2fef4dd View commit details
    Browse the repository at this point in the history
  6. 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 committed Jun 24, 2019
    2
    Copy the full SHA
    78fa47a View commit details
    Browse the repository at this point in the history
  7. 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 committed Jun 24, 2019
    Copy the full SHA
    7b9c687 View commit details
    Browse the repository at this point in the history
  8. Refactor downloadCached() interface

    (cherry picked from commit df3f5a7)
    edolstra committed Jun 24, 2019
    Copy the full SHA
    f8b3033 View commit details
    Browse the repository at this point in the history
  9. 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 committed Jun 24, 2019
    Copy the full SHA
    64ec087 View commit details
    Browse the repository at this point in the history

Commits on Jun 25, 2019

  1. Add "warning" verbosity level

    This ensures that "nix" shows warnings. Previously these were hidden
    because they were at "info" level.
    
    (cherry picked from commit 615a9d0)
    edolstra committed Jun 25, 2019
    Copy the full SHA
    5600b07 View commit details
    Browse the repository at this point in the history
  2. Automatically use --no-net if there are no network interfaces

    (cherry picked from commit 04a5976)
    edolstra committed Jun 25, 2019
    Copy the full SHA
    09dde33 View commit details
    Browse the repository at this point in the history
  3. nix-channel: Don't fetch binary-cache-url

    This has been ignored since the Perl->C++ rewrite.
    edolstra committed Jun 25, 2019
    Copy the full SHA
    8857121 View commit details
    Browse the repository at this point in the history
  4. Copy the full SHA
    2cc248c View commit details
    Browse the repository at this point in the history