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: 29edbfe2d257
Choose a base ref
...
head repository: NixOS/nix
compare: 680d8a5b8697
Choose a head ref
  • 11 commits
  • 15 files changed
  • 2 contributors

Commits on Dec 23, 2020

  1. Test nix-instantiate with binary cache store

    Trying to make sure it work with obscurers stores.
    Ericson2314 committed Dec 23, 2020
    Copy the full SHA
    29bd63e View commit details
    Browse the repository at this point in the history
  2. Copy the full SHA
    5706217 View commit details
    Browse the repository at this point in the history
  3. Copy the full SHA
    12f7a1f View commit details
    Browse the repository at this point in the history
  4. Crudely make worker only provide a Store, not LocalStore

    We downcast in a few places, this will be refactored to be better later.
    Ericson2314 committed Dec 23, 2020
    Copy the full SHA
    450c350 View commit details
    Browse the repository at this point in the history
  5. Expose schedule entrypoints to all stores

    Remote stores still override so the other end schedules.
    Ericson2314 committed Dec 23, 2020
    Copy the full SHA
    85f2e9e View commit details
    Browse the repository at this point in the history
  6. Test nix-build with non-local-store --store

    Just a few small things needed fixing!
    Ericson2314 committed Dec 23, 2020
    Copy the full SHA
    fed1237 View commit details
    Browse the repository at this point in the history

Commits on Jan 15, 2021

  1. Copy the full SHA
    0027b05 View commit details
    Browse the repository at this point in the history
  2. Make public keys and requireSigs local-store specific again

    Thanks @regnat and @edolstra for catching this and comming up with the
    solution.
    
    They way I had generalized those is wrong, because local settings for
    non-local stores is confusing default. And due to the nature of C++
    inheritance, fixing the defaults is more annoying than it should be.
    Additionally, I thought we might just drop the check in the substitution
    logic since `Store::addToStore` is now streaming, but @regnat rightfully
    pointed out that as it downloads dependencies first, that would still be
    too late, and also waste effort on possibly unneeded/unwanted
    dependencies.
    
    The simple and correct thing to do is just make a store method for the
    boolean logic, keeping all the setting and key stuff the way it was
    before. That new method is both used by `LocalStore::addToStore` and the
    substitution goal check. Perhaps we might eventually make it fancier,
    e.g. sending the ValidPathInfo to remote stores for them to validate,
    but this is good enough for now.
    Ericson2314 committed Jan 15, 2021
    Copy the full SHA
    7af7434 View commit details
    Browse the repository at this point in the history

Commits on Jan 22, 2021

  1. Copy the full SHA
    8c07ed1 View commit details
    Browse the repository at this point in the history
  2. Apply suggestions from code review

    Thanks!
    
    Co-authored-by: Eelco Dolstra <edolstra@gmail.com>
    Ericson2314 and edolstra committed Jan 22, 2021
    Copy the full SHA
    53a7095 View commit details
    Browse the repository at this point in the history

Commits on Jan 25, 2021

  1. Merge pull request #4387 from obsidiansystems/non-local-store-build

    Make `nix-build --store whatever` work
    edolstra committed Jan 25, 2021
    Copy the full SHA
    680d8a5 View commit details
    Browse the repository at this point in the history