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
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 035d0adfd8a4
Choose a base ref
...
head repository: NixOS/nix
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: db5424bf0988
Choose a head ref
  • 1 commit
  • 1 file changed
  • 1 contributor

Commits on Nov 2, 2020

  1. Don't send eval-related settings to the daemon

    @edolstra
    edolstra committed Nov 2, 2020
    Copy the full SHA
    db5424b View commit details
Showing with 3 additions and 1 deletion.
  1. +3 −1 src/libstore/remote-store.cc
4 changes: 3 additions & 1 deletion src/libstore/remote-store.cc
View file
Original file line number Diff line number Diff line change
@@ -11,6 +11,7 @@
#include "finally.hh"
#include "logging.hh"
#include "callback.hh"
#include "filetransfer.hh"

namespace nix {

@@ -171,7 +172,8 @@ void RemoteStore::setOptions(Connection & conn)

if (GET_PROTOCOL_MINOR(conn.daemonVersion) >= 12) {
std::map<std::string, Config::SettingInfo> overrides;
globalConfig.getSettings(overrides, true);
settings.getSettings(overrides, true); // libstore settings
fileTransferSettings.getSettings(overrides, true);
overrides.erase(settings.keepFailed.name);
overrides.erase(settings.keepGoing.name);
overrides.erase(settings.tryFallback.name);