NixOS/nix
NixOS/nix
1
0
Fork 0
mirror of https://github.com/NixOS/nix synced 2024-09-19 10:50:24 -04:00
Code Activity

Rename unforwarded-settings -> client-only-settings

Browse source
This commit is contained in:
Eelco Dolstra 2024-07-31 17:59:58 +02:00
parent f5009253d3
commit 3cab221b24
3 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/libstore/globals.hh
View file

@ -99,7 +99,7 @@ public:
*/
Path nixDaemonSocketFile;
Setting<StringSet> unforwardedSettings{this, {}, "unforwarded-settings",
Setting<StringSet> clientOnlySettings{this, {}, "client-only-settings",
R"(
The names of settings that will not be forwarded from the
Nix client to the Nix daemon.

4
src/libstore/remote-store.cc
View file

@ -129,8 +129,8 @@ void RemoteStore::setOptions(Connection & conn)
overrides.erase(loggerSettings.showTrace.name);
overrides.erase(experimentalFeatureSettings.experimentalFeatures.name);
overrides.erase("plugin-files");
overrides.erase(settings.unforwardedSettings.name);
for (auto & i : settings.unforwardedSettings.get())
overrides.erase(settings.clientOnlySettings.name);
for (auto & i : settings.clientOnlySettings.get())
overrides.erase(i);
conn.to << overrides.size();
for (auto & i : overrides)

4
tests/functional/remote-store.sh
View file

@ -41,5 +41,7 @@ killDaemon
extraDaemonFlags=("--trusted-users" "")
startDaemon
nix store info --netrc-file /foo 2>&1 | grepQuiet "ignoring the client-specified setting 'netrc-file'"
nix store info --netrc-file /foo --unforwarded-settings netrc-file 2>&1 | grep -v "ignoring the client-specified setting 'netrc-file'"
if nix store info --netrc-file /foo --client-only-settings netrc-file 2>&1 | grep "ignoring the client-specified setting 'netrc-file'"; then
exit 1
fi
killDaemon