From af241ae7d3d2a9975d43c9137806a6ffcb96e95b Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 24 Oct 2017 10:52:34 +0200 Subject: [PATCH] Remove the builder-files option You can now include files via the "builders" option, using the syntax "@". Having only one option makes it easier to override builders completely. For backward compatibility, the default is "@/etc/nix/machines", or "@" for each file name in NIX_REMOTE_SYSTEMS. --- src/libstore/globals.cc | 7 ++++++- src/libstore/globals.hh | 6 +----- src/libstore/machines.cc | 24 ++++++++++++++---------- 3 files changed, 21 insertions(+), 16 deletions(-) diff --git a/src/libstore/globals.cc b/src/libstore/globals.cc index 7da4bce87..bef2510d9 100644 --- a/src/libstore/globals.cc +++ b/src/libstore/globals.cc @@ -53,7 +53,12 @@ Settings::Settings() /* Backwards compatibility. */ auto s = getEnv("NIX_REMOTE_SYSTEMS"); - if (s != "") builderFiles = tokenizeString(s, ":"); + if (s != "") { + Strings ss; + for (auto & p : tokenizeString(s, ":")) + ss.push_back("@" + p); + builders = concatStringsSep(" ", ss); + } #if defined(__linux__) && defined(SANDBOX_SHELL) sandboxPaths = tokenizeString("/bin/sh=" SANDBOX_SHELL); diff --git a/src/libstore/globals.hh b/src/libstore/globals.hh index 12d57b3e7..4980615dc 100644 --- a/src/libstore/globals.hh +++ b/src/libstore/globals.hh @@ -138,13 +138,9 @@ public: PathSetting buildHook{this, true, nixLibexecDir + "/nix/build-remote", "build-hook", "The path of the helper program that executes builds to remote machines."}; - Setting builders{this, "", "builders", + Setting builders{this, "@" + nixConfDir + "/machines", "builders", "A semicolon-separated list of build machines, in the format of nix.machines."}; - Setting builderFiles{this, - {nixConfDir + "/machines"}, "builder-files", - "A list of files specifying build machines."}; - Setting reservedSize{this, 8 * 1024 * 1024, "gc-reserved-space", "Amount of reserved disk space for the garbage collector."}; diff --git a/src/libstore/machines.cc b/src/libstore/machines.cc index 076c3cab3..d2faf4535 100644 --- a/src/libstore/machines.cc +++ b/src/libstore/machines.cc @@ -47,9 +47,22 @@ bool Machine::mandatoryMet(const std::set & features) const { void parseMachines(const std::string & s, Machines & machines) { for (auto line : tokenizeString>(s, "\n;")) { - chomp(line); + trim(line); line.erase(std::find(line.begin(), line.end(), '#'), line.end()); if (line.empty()) continue; + + if (line[0] == '@') { + auto file = trim(std::string(line, 1)); + try { + parseMachines(readFile(file), machines); + } catch (const SysError & e) { + if (e.errNo != ENOENT) + throw; + debug("cannot find machines file '%s'", file); + } + continue; + } + auto tokens = tokenizeString>(line); auto sz = tokens.size(); if (sz < 1) @@ -74,15 +87,6 @@ Machines getMachines() { Machines machines; - for (auto & file : settings.builderFiles.get()) { - try { - parseMachines(readFile(file), machines); - } catch (const SysError & e) { - if (e.errNo != ENOENT) - throw; - } - } - parseMachines(settings.builders, machines); return machines;