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: b7ea98bf3409
Choose a base ref
...
head repository: NixOS/nix
compare: f435634a2955
Choose a head ref
  • 3 commits
  • 2 files changed
  • 2 contributors

Commits on Aug 16, 2019

  1. libutil: add SizedSource 

    Introduce the SizeSource which allows to bound how much data is being
read from a source. It also contains a drainAll() function to discard
the rest of the source, useful to keep the nix protocol in sync.
    @zimbatm
    zimbatm committed Aug 16, 2019
    Copy the full SHA
    91b00b1 View commit details
    Browse the repository at this point in the history

  2. nix-store: fix out of sync protocol 

    If a NAR is already in the store, addToStore doesn't read the source
which makes the protocol go out of sync. This happens for example when
two client try to nix-copy-closure the same derivation at the same time.
    @zimbatm
    zimbatm committed Aug 16, 2019
    Copy the full SHA
    b226b5c View commit details
    Browse the repository at this point in the history

  3. Merge pull request #3041 from zimbatm/nix-store-error-13 

    Fix for `unknown serve command 13`
    @edolstra
    edolstra committed Aug 16, 2019
    Copy the full SHA
    f435634 View commit details
    Browse the repository at this point in the history