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: 25da1c64f90b
Choose a base ref
...
head repository: NixOS/nix
compare: 2825e05d21ec
Choose a head ref
  • 6 commits
  • 9 files changed
  • 1 contributor

Commits on Aug 3, 2018

  1. LegacySSHStore: Add remote-store option 

    This is primarily useful for testing, e.g.

  $ nix copy --to 'ssh://localhost?remote-store=/tmp/nix' ...
    @edolstra
    edolstra committed Aug 3, 2018
    Copy the full SHA
    e268bbc View commit details
    Browse the repository at this point in the history

  2. SSHMaster: Bypass SSH when connecting to localhost 

    This is primarily useful for testing since it removes the need to have
SSH working.
    @edolstra
    edolstra committed Aug 3, 2018
    Copy the full SHA
    4e7d5f6 View commit details
    Browse the repository at this point in the history

  3. Support escaping in store URIs

    @edolstra
    edolstra committed Aug 3, 2018
    Copy the full SHA
    848a937 View commit details
    Browse the repository at this point in the history

  4. cmdDumpStorePath: Support chroot stores

    @edolstra
    edolstra committed Aug 3, 2018
    Copy the full SHA
    eeebe4c View commit details
    Browse the repository at this point in the history

  5. Add a test for LegacySSHStore that doesn't require a VM

    @edolstra
    edolstra committed Aug 3, 2018
    Copy the full SHA
    34c17fd View commit details
    Browse the repository at this point in the history

  6. Make adding paths via nix-store --serve run in constant memory 

    It adds a new operation, cmdAddToStoreNar, that does the same thing as
the corresponding nix-daemon operation, i.e. call addToStore(). This
replaces cmdImportPaths, which has the major issue that it sends the
NAR first and the store path second, thus requiring us to store the
incoming NAR either in memory or on disk until we decide what to do
with it.

For example, this reduces the memory usage of

  $ nix copy --to 'ssh://localhost?remote-store=/tmp/nix' /nix/store/95cwv4q54dc6giaqv6q6p4r02ia2km35-blender-2.79

from 267 MiB to 12 MiB.

Probably fixes #1988.
    @edolstra
    edolstra committed Aug 3, 2018
    Copy the full SHA
    2825e05 View commit details
    Browse the repository at this point in the history