nixo
/
guix-devel
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

daemon: Remove unused 'Settings' fields. 

* nix/libstore/globals.hh (Settings)[sshSubstituterHosts]
[useSshSubstituter, logServers, enableImportNative]: Remove fields.
* nix/libstore/globals.cc (Settings::Settings, Settings::update): Remove
references to these.
This commit is contained in:
Ludovic Courtès 2018-10-02 22:57:13 +02:00
parent 7eca789201
commit c577ac194a
No known key found for this signature in database
GPG Key ID: 090B11993D9AEBB5
2 changed files with 0 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
nix/libstore/globals.cc
View File

@ -42,7 +42,6 @@ Settings::Settings()
syncBeforeRegistering = false; syncBeforeRegistering = false;
useSubstitutes = true; useSubstitutes = true;
useChroot = false; useChroot = false;
useSshSubstituter = false;
impersonateLinux26 = false; impersonateLinux26 = false;
keepLog = true; keepLog = true;
#if HAVE_BZLIB_H #if HAVE_BZLIB_H
@ -60,7 +59,6 @@ Settings::Settings()
envKeepDerivations = false; envKeepDerivations = false;
lockCPU = getEnv("NIX_AFFINITY_HACK", "1") == "1"; lockCPU = getEnv("NIX_AFFINITY_HACK", "1") == "1";
showTrace = false; showTrace = false;
enableImportNative = false;
} }
@ -142,11 +140,6 @@ void Settings::update()
_get(gcKeepDerivations, "gc-keep-derivations"); _get(gcKeepDerivations, "gc-keep-derivations");
_get(autoOptimiseStore, "auto-optimise-store"); _get(autoOptimiseStore, "auto-optimise-store");
_get(envKeepDerivations, "env-keep-derivations"); _get(envKeepDerivations, "env-keep-derivations");
_get(sshSubstituterHosts, "ssh-substituter-hosts");
_get(useSshSubstituter, "use-ssh-substituter");
_get(logServers, "log-servers");
_get(enableImportNative, "allow-unsafe-native-code-during-evaluation");
_get(useCaseHack, "use-case-hack");
string subs = getEnv("NIX_SUBSTITUTERS", "default"); string subs = getEnv("NIX_SUBSTITUTERS", "default");
if (subs == "default") { if (subs == "default") {
@ -157,8 +150,6 @@ void Settings::update()
#endif #endif
substituters.push_back(nixLibexecDir + "/nix/substituters/download-using-manifests.pl"); substituters.push_back(nixLibexecDir + "/nix/substituters/download-using-manifests.pl");
substituters.push_back(nixLibexecDir + "/nix/substituters/download-from-binary-cache.pl"); substituters.push_back(nixLibexecDir + "/nix/substituters/download-from-binary-cache.pl");
if (useSshSubstituter)
substituters.push_back(nixLibexecDir + "/nix/substituters/download-via-ssh");
} else } else
substituters = tokenizeString<Strings>(subs, ":"); substituters = tokenizeString<Strings>(subs, ":");
} }

12
nix/libstore/globals.hh
View File

@ -161,12 +161,6 @@ struct Settings {
/* Whether to build in chroot. */ /* Whether to build in chroot. */
bool useChroot; bool useChroot;
/* Set of ssh connection strings for the ssh substituter */
Strings sshSubstituterHosts;
/* Whether to use the ssh substituter at all */
bool useSshSubstituter;
/* Whether to impersonate a Linux 2.6 machine on newer kernels. */ /* Whether to impersonate a Linux 2.6 machine on newer kernels. */
bool impersonateLinux26; bool impersonateLinux26;
@ -212,12 +206,6 @@ struct Settings {
/* Whether to show a stack trace if Nix evaluation fails. */ /* Whether to show a stack trace if Nix evaluation fails. */
bool showTrace; bool showTrace;
/* A list of URL prefixes that can return Nix build logs. */
Strings logServers;
/* Whether the importNative primop should be enabled */
bool enableImportNative;
private: private:
SettingsMap settings, overrides; SettingsMap settings, overrides;