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: fa37d03b3c44
Choose a base ref
...
head repository: NixOS/nix
compare: 9011a85ef6e8
Choose a head ref
  • 6 commits
  • 7 files changed
  • 3 contributors

Commits on Oct 1, 2018

  1. Bump version

    @edolstra
    edolstra committed Oct 1, 2018
    Configuration menu
    Copy the full SHA
    373cc12 View commit details
    Browse the repository at this point in the history

  2. Make NAR header check more robust 

    Changes

  std::bad_alloc

into

  bad archive: input doesn't look like a Nix archive

(cherry picked from commit 44e8630)
    @edolstra
    edolstra committed Oct 1, 2018
    Configuration menu
    Copy the full SHA
    87ad88f View commit details
    Browse the repository at this point in the history

  3. sinkToSource(): Start the coroutine lazily 

    In particular this causes copyStorePath() from HttpBinaryCacheStore to
only start a download if needed. E.g. if the destination LocalStore
goes to sleep waiting for the path lock and another process creates
the path, then LocalStore::addToStore() will never read from the
source so we don't have to do the download.

(cherry picked from commit ed78582)
    @edolstra
    edolstra committed Oct 1, 2018
    Configuration menu
    Copy the full SHA
    51d11e9 View commit details
    Browse the repository at this point in the history

  4. Ensure download thread liveness 

    * Don't wait forever for the client to remove data from the
  buffer. This does mean that the buffer can grow without bounds
  (e.g. when downloading is faster than writing to disk), but meh.

* Don't hold the state lock while calling the sink. The sink could
  take any amount of time to process the data (in particular when it's
  actually a coroutine), so we don't want to block the download
  thread.

(cherry picked from commit 9750430)
    @edolstra
    edolstra committed Oct 1, 2018
    Configuration menu
    Copy the full SHA
    96e03a3 View commit details
    Browse the repository at this point in the history

  5. Update docs to describe how s3:// URLS does in fact support endpoint,… 

    … region, and profile for upload

(cherry picked from commit 51cbeec)
    @grahamc @edolstra
    grahamc authored and edolstra committed Oct 1, 2018
    Configuration menu
    Copy the full SHA
    1c99c1b View commit details
    Browse the repository at this point in the history

  6. nix-profile-daemon: remove cruft 

    This removes part of the PATH that were being added automatically in multi-user installs:

- $HOME/.nix-profile/lib/kde4/libexec - shouldn't be needed anymore, we are now using kde5
- @localstatedir@/nix/profiles/default/lib/kde4/libexec - same as above
- @localstatedir@/nix/profiles/default - shouldn't ever contain binaries

(cherry picked from commit 9cc876f)
    @matthewbauer @edolstra
    matthewbauer authored and edolstra committed Oct 1, 2018
    Configuration menu
    Copy the full SHA
    9011a85 View commit details
    Browse the repository at this point in the history