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: b94a35ef4043
Choose a base ref
...
head repository: NixOS/nix
compare: 649d3aaf2481
Choose a head ref
  • 8 commits
  • 9 files changed
  • 3 contributors

Commits on Jul 17, 2020

  1. Remove StoreType abstraction and delegate regStore 

    to each Store implementation. The generic regStore implementation will
only be for the ambiguous shorthands, like "" and "auto".

This also could get us close to simplifying the daemon command.
    @meditans
    meditans committed Jul 17, 2020
    Copy the full SHA
    0aa79dc View commit details
    Browse the repository at this point in the history

Commits on Jul 21, 2020

  1. Merge branch 'allow-relative-paths-in-store-option' into remove-store… 

    …type-delegate-regStore
    @Ericson2314
    Ericson2314 committed Jul 21, 2020
    Copy the full SHA
    0263971 View commit details
    Browse the repository at this point in the history

Commits on Aug 19, 2020

  1. Merge branch 'master' of github.com:NixOS/nix into remove-storetype-d… 

    …elegate-regStore
    @Ericson2314
    Ericson2314 committed Aug 19, 2020
    Copy the full SHA
    d5af576 View commit details
    Browse the repository at this point in the history

  2. Use RemoteStore to open connection for proxying daemon 

    Removes duplicate websocket opening code, and also means we should be
able to to ssh-ssh-... daemon relays, not just uds-uds-... ones.
    @Ericson2314
    Ericson2314 committed Aug 19, 2020
    Copy the full SHA
    a83694c View commit details
    Browse the repository at this point in the history

Commits on Aug 20, 2020

  1. Fix max fd calc and add test

    @Ericson2314
    Ericson2314 committed Aug 20, 2020
    Copy the full SHA
    3df7885 View commit details
    Browse the repository at this point in the history

Commits on Sep 15, 2020

  1. Merge remote-tracking branch 'upstream/master' into remove-storetype-… 

    …delegate-regStore
    @Ericson2314
    Ericson2314 committed Sep 15, 2020
    Copy the full SHA
    c08c9f0 View commit details
    Browse the repository at this point in the history

Commits on Sep 16, 2020

  1. Merge remote-tracking branch 'upstream/master' into remove-storetype-… 

    …delegate-regStore
    @Ericson2314
    Ericson2314 committed Sep 16, 2020
    Copy the full SHA
    f60b380 View commit details
    Browse the repository at this point in the history

Commits on Sep 17, 2020

  1. Merge pull request #3829 from obsidiansystems/remove-storetype-delega… 

    …te-regStore

Remove storetype delegate reg store -- contains #3736
    @edolstra
    edolstra committed Sep 17, 2020
    Copy the full SHA
    649d3aa View commit details
    Browse the repository at this point in the history