0
0
Fork 0
forked from lix-project/lix

Fix some typos

Fixes .
This commit is contained in:
Eelco Dolstra 2021-03-26 16:14:38 +01:00
parent dc6a8f1548
commit 4638bcfb2c
12 changed files with 54 additions and 54 deletions

View file

@ -79,7 +79,7 @@ paths. Realisation is a somewhat overloaded term:
system). If the path is already valid, we are done immediately. system). If the path is already valid, we are done immediately.
Otherwise, the path and any missing paths in its closure may be Otherwise, the path and any missing paths in its closure may be
produced through substitutes. If there are no (successful) produced through substitutes. If there are no (successful)
subsitutes, realisation fails. substitutes, realisation fails.
The output path of each derivation is printed on standard output. (For The output path of each derivation is printed on standard output. (For
non-derivations argument, the argument itself is printed.) non-derivations argument, the argument itself is printed.)

View file

@ -113,7 +113,7 @@ struct LockFlags
/* Whether to commit changes to flake.lock. */ /* Whether to commit changes to flake.lock. */
bool commitLockFile = false; bool commitLockFile = false;
/* Flake inputs to be overriden. */ /* Flake inputs to be overridden. */
std::map<InputPath, FlakeRef> inputOverrides; std::map<InputPath, FlakeRef> inputOverrides;
/* Flake inputs to be updated. This means that any existing lock /* Flake inputs to be updated. This means that any existing lock

View file

@ -81,7 +81,7 @@ void loadConfFile()
/* We only want to send overrides to the daemon, i.e. stuff from /* We only want to send overrides to the daemon, i.e. stuff from
~/.nix/nix.conf or the command line. */ ~/.nix/nix.conf or the command line. */
globalConfig.resetOverriden(); globalConfig.resetOverridden();
auto files = settings.nixUserConfFiles; auto files = settings.nixUserConfFiles;
for (auto file = files.rbegin(); file != files.rend(); file++) { for (auto file = files.rbegin(); file != files.rend(); file++) {

View file

@ -20,7 +20,7 @@ bool Config::set(const std::string & name, const std::string & value)
return false; return false;
} }
i->second.setting->set(value, append); i->second.setting->set(value, append);
i->second.setting->overriden = true; i->second.setting->overridden = true;
return true; return true;
} }
@ -35,7 +35,7 @@ void Config::addSetting(AbstractSetting * setting)
auto i = unknownSettings.find(setting->name); auto i = unknownSettings.find(setting->name);
if (i != unknownSettings.end()) { if (i != unknownSettings.end()) {
setting->set(i->second); setting->set(i->second);
setting->overriden = true; setting->overridden = true;
unknownSettings.erase(i); unknownSettings.erase(i);
set = true; set = true;
} }
@ -48,7 +48,7 @@ void Config::addSetting(AbstractSetting * setting)
alias, setting->name); alias, setting->name);
else { else {
setting->set(i->second); setting->set(i->second);
setting->overriden = true; setting->overridden = true;
unknownSettings.erase(i); unknownSettings.erase(i);
set = true; set = true;
} }
@ -69,10 +69,10 @@ void AbstractConfig::reapplyUnknownSettings()
set(s.first, s.second); set(s.first, s.second);
} }
void Config::getSettings(std::map<std::string, SettingInfo> & res, bool overridenOnly) void Config::getSettings(std::map<std::string, SettingInfo> & res, bool overriddenOnly)
{ {
for (auto & opt : _settings) for (auto & opt : _settings)
if (!opt.second.isAlias && (!overridenOnly || opt.second.setting->overriden)) if (!opt.second.isAlias && (!overriddenOnly || opt.second.setting->overridden))
res.emplace(opt.first, SettingInfo{opt.second.setting->to_string(), opt.second.setting->description}); res.emplace(opt.first, SettingInfo{opt.second.setting->to_string(), opt.second.setting->description});
} }
@ -136,10 +136,10 @@ void AbstractConfig::applyConfigFile(const Path & path)
} catch (SysError &) { } } catch (SysError &) { }
} }
void Config::resetOverriden() void Config::resetOverridden()
{ {
for (auto & s : _settings) for (auto & s : _settings)
s.second.setting->overriden = false; s.second.setting->overridden = false;
} }
nlohmann::json Config::toJSON() nlohmann::json Config::toJSON()
@ -169,7 +169,7 @@ AbstractSetting::AbstractSetting(
void AbstractSetting::setDefault(const std::string & str) void AbstractSetting::setDefault(const std::string & str)
{ {
if (!overriden) set(str); if (!overridden) set(str);
} }
nlohmann::json AbstractSetting::toJSON() nlohmann::json AbstractSetting::toJSON()
@ -203,7 +203,7 @@ void BaseSetting<T>::convertToArg(Args & args, const std::string & category)
.description = fmt("Set the `%s` setting.", name), .description = fmt("Set the `%s` setting.", name),
.category = category, .category = category,
.labels = {"value"}, .labels = {"value"},
.handler = {[=](std::string s) { overriden = true; set(s); }}, .handler = {[=](std::string s) { overridden = true; set(s); }},
}); });
if (isAppendable()) if (isAppendable())
@ -212,7 +212,7 @@ void BaseSetting<T>::convertToArg(Args & args, const std::string & category)
.description = fmt("Append to the `%s` setting.", name), .description = fmt("Append to the `%s` setting.", name),
.category = category, .category = category,
.labels = {"value"}, .labels = {"value"},
.handler = {[=](std::string s) { overriden = true; set(s, true); }}, .handler = {[=](std::string s) { overridden = true; set(s, true); }},
}); });
} }
@ -365,16 +365,16 @@ bool GlobalConfig::set(const std::string & name, const std::string & value)
return false; return false;
} }
void GlobalConfig::getSettings(std::map<std::string, SettingInfo> & res, bool overridenOnly) void GlobalConfig::getSettings(std::map<std::string, SettingInfo> & res, bool overriddenOnly)
{ {
for (auto & config : *configRegistrations) for (auto & config : *configRegistrations)
config->getSettings(res, overridenOnly); config->getSettings(res, overriddenOnly);
} }
void GlobalConfig::resetOverriden() void GlobalConfig::resetOverridden()
{ {
for (auto & config : *configRegistrations) for (auto & config : *configRegistrations)
config->resetOverriden(); config->resetOverridden();
} }
nlohmann::json GlobalConfig::toJSON() nlohmann::json GlobalConfig::toJSON()

View file

@ -71,9 +71,9 @@ public:
/** /**
* Adds the currently known settings to the given result map `res`. * Adds the currently known settings to the given result map `res`.
* - res: map to store settings in * - res: map to store settings in
* - overridenOnly: when set to true only overridden settings will be added to `res` * - overriddenOnly: when set to true only overridden settings will be added to `res`
*/ */
virtual void getSettings(std::map<std::string, SettingInfo> & res, bool overridenOnly = false) = 0; virtual void getSettings(std::map<std::string, SettingInfo> & res, bool overriddenOnly = false) = 0;
/** /**
* Parses the configuration in `contents` and applies it * Parses the configuration in `contents` and applies it
@ -91,7 +91,7 @@ public:
/** /**
* Resets the `overridden` flag of all Settings * Resets the `overridden` flag of all Settings
*/ */
virtual void resetOverriden() = 0; virtual void resetOverridden() = 0;
/** /**
* Outputs all settings to JSON * Outputs all settings to JSON
@ -127,7 +127,7 @@ public:
MyClass() : Config(readConfigFile("/etc/my-app.conf")) MyClass() : Config(readConfigFile("/etc/my-app.conf"))
{ {
std::cout << foo << "\n"; // will print 123 unless overriden std::cout << foo << "\n"; // will print 123 unless overridden
} }
}; };
*/ */
@ -163,9 +163,9 @@ public:
void addSetting(AbstractSetting * setting); void addSetting(AbstractSetting * setting);
void getSettings(std::map<std::string, SettingInfo> & res, bool overridenOnly = false) override; void getSettings(std::map<std::string, SettingInfo> & res, bool overriddenOnly = false) override;
void resetOverriden() override; void resetOverridden() override;
nlohmann::json toJSON() override; nlohmann::json toJSON() override;
@ -184,7 +184,7 @@ public:
int created = 123; int created = 123;
bool overriden = false; bool overridden = false;
void setDefault(const std::string & str); void setDefault(const std::string & str);
@ -215,7 +215,7 @@ protected:
virtual void convertToArg(Args & args, const std::string & category); virtual void convertToArg(Args & args, const std::string & category);
bool isOverriden() const { return overriden; } bool isOverridden() const { return overridden; }
}; };
/* A setting of type T. */ /* A setting of type T. */
@ -252,7 +252,7 @@ public:
virtual void override(const T & v) virtual void override(const T & v)
{ {
overriden = true; overridden = true;
value = v; value = v;
} }
@ -324,9 +324,9 @@ struct GlobalConfig : public AbstractConfig
bool set(const std::string & name, const std::string & value) override; bool set(const std::string & name, const std::string & value) override;
void getSettings(std::map<std::string, SettingInfo> & res, bool overridenOnly = false) override; void getSettings(std::map<std::string, SettingInfo> & res, bool overriddenOnly = false) override;
void resetOverriden() override; void resetOverridden() override;
nlohmann::json toJSON() override; nlohmann::json toJSON() override;

View file

@ -29,20 +29,20 @@ namespace nix {
std::map<std::string, Config::SettingInfo> settings; std::map<std::string, Config::SettingInfo> settings;
Setting<std::string> foo{&config, value, "name-of-the-setting", "description"}; Setting<std::string> foo{&config, value, "name-of-the-setting", "description"};
config.getSettings(settings, /* overridenOnly = */ false); config.getSettings(settings, /* overriddenOnly = */ false);
const auto iter = settings.find("name-of-the-setting"); const auto iter = settings.find("name-of-the-setting");
ASSERT_NE(iter, settings.end()); ASSERT_NE(iter, settings.end());
ASSERT_EQ(iter->second.value, ""); ASSERT_EQ(iter->second.value, "");
ASSERT_EQ(iter->second.description, "description\n"); ASSERT_EQ(iter->second.description, "description\n");
} }
TEST(Config, getDefinedOverridenSettingNotSet) { TEST(Config, getDefinedOverriddenSettingNotSet) {
Config config; Config config;
std::string value; std::string value;
std::map<std::string, Config::SettingInfo> settings; std::map<std::string, Config::SettingInfo> settings;
Setting<std::string> foo{&config, value, "name-of-the-setting", "description"}; Setting<std::string> foo{&config, value, "name-of-the-setting", "description"};
config.getSettings(settings, /* overridenOnly = */ true); config.getSettings(settings, /* overriddenOnly = */ true);
const auto e = settings.find("name-of-the-setting"); const auto e = settings.find("name-of-the-setting");
ASSERT_EQ(e, settings.end()); ASSERT_EQ(e, settings.end());
} }
@ -55,7 +55,7 @@ namespace nix {
setting.assign("value"); setting.assign("value");
config.getSettings(settings, /* overridenOnly = */ false); config.getSettings(settings, /* overriddenOnly = */ false);
const auto iter = settings.find("name-of-the-setting"); const auto iter = settings.find("name-of-the-setting");
ASSERT_NE(iter, settings.end()); ASSERT_NE(iter, settings.end());
ASSERT_EQ(iter->second.value, "value"); ASSERT_EQ(iter->second.value, "value");
@ -69,7 +69,7 @@ namespace nix {
ASSERT_TRUE(config.set("name-of-the-setting", "value")); ASSERT_TRUE(config.set("name-of-the-setting", "value"));
config.getSettings(settings, /* overridenOnly = */ false); config.getSettings(settings, /* overriddenOnly = */ false);
const auto e = settings.find("name-of-the-setting"); const auto e = settings.find("name-of-the-setting");
ASSERT_NE(e, settings.end()); ASSERT_NE(e, settings.end());
ASSERT_EQ(e->second.value, "value"); ASSERT_EQ(e->second.value, "value");
@ -100,7 +100,7 @@ namespace nix {
{ {
std::map<std::string, Config::SettingInfo> settings; std::map<std::string, Config::SettingInfo> settings;
config.getSettings(settings, /* overridenOnly = */ false); config.getSettings(settings, /* overriddenOnly = */ false);
ASSERT_EQ(settings.find("key"), settings.end()); ASSERT_EQ(settings.find("key"), settings.end());
} }
@ -108,17 +108,17 @@ namespace nix {
{ {
std::map<std::string, Config::SettingInfo> settings; std::map<std::string, Config::SettingInfo> settings;
config.getSettings(settings, /* overridenOnly = */ false); config.getSettings(settings, /* overriddenOnly = */ false);
ASSERT_EQ(settings["key"].value, "value"); ASSERT_EQ(settings["key"].value, "value");
} }
} }
TEST(Config, resetOverriden) { TEST(Config, resetOverridden) {
Config config; Config config;
config.resetOverriden(); config.resetOverridden();
} }
TEST(Config, resetOverridenWithSetting) { TEST(Config, resetOverriddenWithSetting) {
Config config; Config config;
Setting<std::string> setting{&config, "", "name-of-the-setting", "description"}; Setting<std::string> setting{&config, "", "name-of-the-setting", "description"};
@ -127,7 +127,7 @@ namespace nix {
setting.set("foo"); setting.set("foo");
ASSERT_EQ(setting.get(), "foo"); ASSERT_EQ(setting.get(), "foo");
config.getSettings(settings, /* overridenOnly = */ true); config.getSettings(settings, /* overriddenOnly = */ true);
ASSERT_TRUE(settings.empty()); ASSERT_TRUE(settings.empty());
} }
@ -135,18 +135,18 @@ namespace nix {
std::map<std::string, Config::SettingInfo> settings; std::map<std::string, Config::SettingInfo> settings;
setting.override("bar"); setting.override("bar");
ASSERT_TRUE(setting.overriden); ASSERT_TRUE(setting.overridden);
ASSERT_EQ(setting.get(), "bar"); ASSERT_EQ(setting.get(), "bar");
config.getSettings(settings, /* overridenOnly = */ true); config.getSettings(settings, /* overriddenOnly = */ true);
ASSERT_FALSE(settings.empty()); ASSERT_FALSE(settings.empty());
} }
{ {
std::map<std::string, Config::SettingInfo> settings; std::map<std::string, Config::SettingInfo> settings;
config.resetOverriden(); config.resetOverridden();
ASSERT_FALSE(setting.overriden); ASSERT_FALSE(setting.overridden);
config.getSettings(settings, /* overridenOnly = */ true); config.getSettings(settings, /* overriddenOnly = */ true);
ASSERT_TRUE(settings.empty()); ASSERT_TRUE(settings.empty());
} }
} }

View file

@ -1590,7 +1590,7 @@ void startSignalHandlerThread()
updateWindowSize(); updateWindowSize();
if (sigprocmask(SIG_BLOCK, nullptr, &savedSignalMask)) if (sigprocmask(SIG_BLOCK, nullptr, &savedSignalMask))
throw SysError("quering signal mask"); throw SysError("querying signal mask");
sigset_t set; sigset_t set;
sigemptyset(&set); sigemptyset(&set);

View file

@ -81,7 +81,7 @@ path installables are substituted.
Unless `--no-link` is specified, after a successful build, it creates Unless `--no-link` is specified, after a successful build, it creates
symlinks to the store paths of the installables. These symlinks have symlinks to the store paths of the installables. These symlinks have
the prefix `./result` by default; this can be overriden using the the prefix `./result` by default; this can be overridden using the
`--out-link` option. Each symlink has a suffix `-<N>-<outname>`, where `--out-link` option. Each symlink has a suffix `-<N>-<outname>`, where
*N* is the index of the installable (with the left-most installable *N* is the index of the installable (with the left-most installable
having index 0), and *outname* is the symbolic derivation output name having index 0), and *outname* is the symbolic derivation output name

View file

@ -24,7 +24,7 @@ R""(
This command creates a flake in the current directory by copying the This command creates a flake in the current directory by copying the
files of a template. It will not overwrite existing files. The default files of a template. It will not overwrite existing files. The default
template is `templates#defaultTemplate`, but this can be overriden template is `templates#defaultTemplate`, but this can be overridden
using `-t`. using `-t`.
# Template definitions # Template definitions

View file

@ -70,7 +70,7 @@ Here are some examples of flake references in their URL-like representation:
* `/home/alice/src/patchelf`: A flake in some other directory. * `/home/alice/src/patchelf`: A flake in some other directory.
* `nixpkgs`: The `nixpkgs` entry in the flake registry. * `nixpkgs`: The `nixpkgs` entry in the flake registry.
* `nixpkgs/a3a3dda3bacf61e8a39258a0ed9c924eeca8e293`: The `nixpkgs` * `nixpkgs/a3a3dda3bacf61e8a39258a0ed9c924eeca8e293`: The `nixpkgs`
entry in the flake registry, with its Git revision overriden to a entry in the flake registry, with its Git revision overridden to a
specific value. specific value.
* `github:NixOS/nixpkgs`: The `master` branch of the `NixOS/nixpkgs` * `github:NixOS/nixpkgs`: The `master` branch of the `NixOS/nixpkgs`
repository on GitHub. repository on GitHub.
@ -377,7 +377,7 @@ outputs = { self, nixpkgs, grcov }: {
}; };
``` ```
Transitive inputs can be overriden from a `flake.nix` file. For Transitive inputs can be overridden from a `flake.nix` file. For
example, the following overrides the `nixpkgs` input of the `nixops` example, the following overrides the `nixpkgs` input of the `nixops`
input: input:

View file

@ -309,13 +309,13 @@ void mainWrapped(int argc, char * * argv)
if (!args.useNet) { if (!args.useNet) {
// FIXME: should check for command line overrides only. // FIXME: should check for command line overrides only.
if (!settings.useSubstitutes.overriden) if (!settings.useSubstitutes.overridden)
settings.useSubstitutes = false; settings.useSubstitutes = false;
if (!settings.tarballTtl.overriden) if (!settings.tarballTtl.overridden)
settings.tarballTtl = std::numeric_limits<unsigned int>::max(); settings.tarballTtl = std::numeric_limits<unsigned int>::max();
if (!fileTransferSettings.tries.overriden) if (!fileTransferSettings.tries.overridden)
fileTransferSettings.tries = 0; fileTransferSettings.tries = 0;
if (!fileTransferSettings.connectTimeout.overriden) if (!fileTransferSettings.connectTimeout.overridden)
fileTransferSettings.connectTimeout = 1; fileTransferSettings.connectTimeout = 1;
} }

View file

@ -27,6 +27,6 @@ the resulting store path and the cryptographic hash of the contents of
the file. the file.
The name component of the store path defaults to the last component of The name component of the store path defaults to the last component of
*url*, but this can be overriden using `--name`. *url*, but this can be overridden using `--name`.
)"" )""