wroclaw-git-backups/nix
1
0
Fork 0
mirror of https://github.com/NixOS/nix synced 2025-06-27 12:41:15 +02:00
Code Activity

Fix various typos in source code

Browse source 
This only touches code comments, class names, documentation,
enumeration names and tests.
This commit is contained in:
Sergei Zimmerman 2025-05-25 20:14:11 +00:00
parent 9e97ecabb6
commit 114de63d88
No known key found for this signature in database
GPG key ID: A9B0B557CA632325
63 changed files with 104 additions and 104 deletions
Download patch file Download diff file Expand all files Collapse all files

14
src/libflake/flake.cc
View file

@ -531,7 +531,7 @@ LockedFlake lockFlake(
/* Resolve relative 'path:' inputs relative to
the source path of the overrider. */
auto overridenSourcePath = hasOverride ? i->second.sourcePath : sourcePath;
auto overriddenSourcePath = hasOverride ? i->second.sourcePath : sourcePath;
/* Respect the "flakeness" of the input even if we
override it. */
@ -552,7 +552,7 @@ LockedFlake lockFlake(
assert(input.ref);
auto overridenParentPath =
auto overriddenParentPath =
input.ref->input.isRelative()
? std::optional<InputAttrPath>(hasOverride ? i->second.parentInputAttrPath : inputAttrPathPrefix)
: std::nullopt;
@ -561,8 +561,8 @@ LockedFlake lockFlake(
{
if (auto relativePath = input.ref->input.isRelative()) {
return SourcePath {
overridenSourcePath.accessor,
CanonPath(*relativePath, overridenSourcePath.path.parent().value())
overriddenSourcePath.accessor,
CanonPath(*relativePath, overriddenSourcePath.path.parent().value())
};
} else
return std::nullopt;
@ -596,7 +596,7 @@ LockedFlake lockFlake(
if (oldLock
&& oldLock->originalRef.canonicalize() == input.ref->canonicalize()
&& oldLock->parentInputAttrPath == overridenParentPath
&& oldLock->parentInputAttrPath == overriddenParentPath
&& !hasCliOverride)
{
debug("keeping existing input '%s'", inputAttrPathS);
@ -694,7 +694,7 @@ LockedFlake lockFlake(
inputFlake.lockedRef,
ref,
true,
overridenParentPath);
overriddenParentPath);
node->inputs.insert_or_assign(id, childNode);
@ -741,7 +741,7 @@ LockedFlake lockFlake(
}
}();
auto childNode = make_ref<LockedNode>(lockedRef, ref, false, overridenParentPath);
auto childNode = make_ref<LockedNode>(lockedRef, ref, false, overriddenParentPath);
nodePaths.emplace(childNode, path);