lix-project/lix
20
57
Fork 31
Code Issues 350 Code Review (Gerrit) Projects 3 Releases Wiki Activity

removes MaxSubstitutionJobsSetting

Browse source
This commit is contained in:
Matej Urbas 2023-05-08 19:21:57 +01:00
parent 613bc699bb
commit 1ea1e378de
2 changed files with 2 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/libstore/globals.cc
View file

@ -249,17 +249,6 @@ unsigned int MaxBuildJobsSetting::parse(const std::string & str) const
}
}
unsigned int MaxSubstitutionJobsSetting::parse(const std::string & str) const
{
if (str == "auto") return std::max(1U, std::thread::hardware_concurrency());
else {
if (auto n = string2Int<decltype(value)>(str))
return std::max(1U, *n);
else
throw UsageError("configuration setting '%s' should be 'auto' or an integer", name);
}
}
Paths PluginFilesSetting::parse(const std::string & str) const
{

22
src/libstore/globals.hh
View file

@ -29,21 +29,6 @@ struct MaxBuildJobsSetting : public BaseSetting<unsigned int>
unsigned int parse(const std::string & str) const override;
};
struct MaxSubstitutionJobsSetting : public BaseSetting<unsigned int>
{
MaxSubstitutionJobsSetting(Config * options,
unsigned int def,
const std::string & name,
const std::string & description,
const std::set<std::string> & aliases = {})
: BaseSetting<unsigned int>(def, true, name, description, aliases)
{
options->addSetting(this);
}
unsigned int parse(const std::string & str) const override;
};
struct PluginFilesSetting : public BaseSetting<Paths>
{
bool pluginsLoaded = false;
@ -174,15 +159,12 @@ public:
)",
{"build-max-jobs"}};
MaxSubstitutionJobsSetting maxSubstitutionJobs{
Setting<unsigned int> maxSubstitutionJobs{
this, 16, "max-substitution-jobs",
R"(
This option defines the maximum number of substitution jobs that Nix
will try to run in parallel. The default is `16`. The minimum value
one can choose is `1` and lower values will be interpreted as `1`. The
special value `auto` causes Nix to use the number of CPUs in your
system. It can be overridden using the `--max-substitution-jobs`
command line switch.
one can choose is `1` and lower values will be interpreted as `1`.
)",
{"substitution-max-jobs"}};