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

Commits on Nov 5, 2020

  1. Allow substituting paths when building remotely using ssh-ng://

    Until now, it was not possible to substitute missing paths from e.g.
    `https://cache.nixos.org` on a remote server when building on it using
    the new `ssh-ng` protocol.
    
    This is because every store implementation except legacy `ssh://`
    ignores the substitution flag passed to `Store::queryValidPaths` while
    the `legacy-ssh-store` substitutes the remote store using
    `cmdQueryValidPaths` when the remote store is opened with `nix-store
    --serve`.
    
    This patch slightly modifies the daemon protocol to allow passing an
    integer value suggesting whether to substitute missing paths during
    `wopQueryValidPaths`. To implement this on the daemon-side, the
    substitution logic from `nix-store --serve` has been moved into a
    protected method named `Store::substitutePaths` which gets currently
    called from `LocalStore::queryValidPaths` and `Store::queryValidPaths`
    if `maybeSubstitute` is `true`.
    
    Fixes #2770
    Ma27 committed Nov 5, 2020
    Copy the full SHA
    3a63fc6 View commit details
    Browse the repository at this point in the history

Commits on Nov 17, 2020

  1. Merge pull request #4180 from Ma27/ssh-ng-substitute

    Allow substituting paths when building remotely using `ssh-ng://`
    edolstra committed Nov 17, 2020
    Copy the full SHA
    df5c69a View commit details
    Browse the repository at this point in the history