maurice/snix
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Change the default for use-ssh-substituter to ‘true’

Browse source 
Now you only have to pass ‘--option ssh-substituter-hosts
nix-ssh@bla’ to enable SSH substitution.
This commit is contained in:
Eelco Dolstra 2014-07-25 12:57:12 +02:00
parent 1a44f1cb65
commit 71a20d4d95
1 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/libstore/globals.cc
View file

@ -48,7 +48,7 @@ Settings::Settings()
useSubstitutes = true; useSubstitutes = true;
buildUsersGroup = getuid() == 0 ? "nixbld" : ""; buildUsersGroup = getuid() == 0 ? "nixbld" : "";
useChroot = false; useChroot = false;
useSshSubstituter = false; useSshSubstituter = true;
impersonateLinux26 = false; impersonateLinux26 = false;
keepLog = true; keepLog = true;
compressLog = true; compressLog = true;
@ -166,7 +166,7 @@ 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) if (useSshSubstituter && !sshSubstituterHosts.empty())
substituters.push_back(nixLibexecDir + "/nix/substituters/download-via-ssh"); substituters.push_back(nixLibexecDir + "/nix/substituters/download-via-ssh");
} else } else
substituters = tokenizeString<Strings>(subs, ":"); substituters = tokenizeString<Strings>(subs, ":");