Skip to content

Impl: Propagate Flake inputs #6550

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ysndr wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Impl: Propagate Flake inputs #6550

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e83285e
MVC: Locally register flakes
ysndr May 15, 2022
0e1e84b
New approach reusing actual lock nodes
ysndr May 16, 2022
26d4594
Lock nodes facilitating following mechanism
ysndr May 16, 2022
f5bb9ff
Cleanup Code Style and Comments
ysndr May 17, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
46 changes: 40 additions & 6 deletions src/libexpr/flake/flake.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
#include "fetchers.hh"
#include "finally.hh"
#include "fetch-settings.hh"
#include "registry.hh"

namespace nix {

Expand Down Expand Up @@ -104,6 +105,7 @@ static FlakeInput parseFlakeInput(EvalState & state,
auto sUrl = state.symbols.create("url");
auto sFlake = state.symbols.create("flake");
auto sFollows = state.symbols.create("follows");
auto sRegister = state.symbols.create("register");

fetchers::Attrs attrs;
std::optional<std::string> url;
Expand All @@ -124,7 +126,11 @@ static FlakeInput parseFlakeInput(EvalState & state,
auto follows(parseInputPath(attr.value->string.s));
follows.insert(follows.begin(), lockRootPath.begin(), lockRootPath.end());
input.follows = follows;
} else {
} else if (attr.name == sRegister) {
expectType(state, nBool, *attr.value, attr.pos);
input.registered = attr.value;
}
else {
switch (attr.value->type()) {
case nString:
attrs.emplace(state.symbols[attr.name], attr.value->string.s);
Expand Down Expand Up @@ -359,7 +365,8 @@ LockedFlake lockFlake(
std::shared_ptr<const Node> oldNode,
const InputPath & lockRootPath,
const Path & parentPath,
bool trustLock)>
bool trustLock,
std::map<Path, InputPath> registered)>
computeLocks;

computeLocks = [&](
Expand All @@ -369,10 +376,13 @@ LockedFlake lockFlake(
std::shared_ptr<const Node> oldNode,
const InputPath & lockRootPath,
const Path & parentPath,
bool trustLock)
bool trustLock,
std::map<Path, InputPath> registered)
{
debug("computing lock file node '%s'", printInputPath(inputPathPrefix));

std::set<Path> registeredChilds;

/* Get the overrides (i.e. attributes of the form
'inputs.nixops.inputs.nixpkgs.url = ...'). */
for (auto & [id, input] : flakeInputs) {
Expand All @@ -382,6 +392,16 @@ LockedFlake lockFlake(
inputPath.push_back(idOverride);
overrides.insert_or_assign(inputPath, inputOverride);
}
if (input.registered) {
/* Record the name and the eventual path of
registered inputs. Registered inputs are set to follow the recorded input path.
Only in the defining flake the registered input is handled explicitly to catch transistive inputs */
auto inputPath(inputPathPrefix);
inputPath.push_back(id);
debug("preregistering %s", id.c_str());
registeredChilds.insert(id);
registered.insert_or_assign(id, inputPath);
}
}

/* Go over the flake inputs, resolve/fetch them if
Expand Down Expand Up @@ -419,6 +439,19 @@ LockedFlake lockFlake(
continue;
}

auto registeredInputID = registered.find(id);
if (registeredInputID != registered.end()
&& (registeredChilds.find(id) == registeredChilds.end()) // do not substitute original input
&& (input.ref->to_string() == "flake:" + id) // check that the input is not explicitly defined
)
{
debug("Using already registered node for %s", id);
InputPath target;
target.insert(target.end(), registeredInputID->second.begin(), registeredInputID->second.end());
node->inputs.insert_or_assign(id, target);
continue;
}

assert(input.ref);

/* Do we have an entry in the existing lock file? And we
Expand Down Expand Up @@ -503,7 +536,7 @@ LockedFlake lockFlake(
mustRefetch
? getFlake(state, oldLock->lockedRef, false, flakeCache, inputPath).inputs
: fakeInputs,
childNode, inputPath, oldLock, lockRootPath, parentPath, !mustRefetch);
childNode, inputPath, oldLock, lockRootPath, parentPath, !mustRefetch, registered);

} else {
/* We need to create a new lock file entry. So fetch
Expand Down Expand Up @@ -553,7 +586,7 @@ LockedFlake lockFlake(
? std::dynamic_pointer_cast<const Node>(oldLock)
: LockFile::read(
inputFlake.sourceInfo->actualPath + "/" + inputFlake.lockedRef.subdir + "/flake.lock").root,
oldLock ? lockRootPath : inputPath, localPath, false);
oldLock ? lockRootPath : inputPath, localPath, false, registered);
}

else {
Expand All @@ -573,10 +606,11 @@ LockedFlake lockFlake(

// Bring in the current ref for relative path resolution if we have it
auto parentPath = canonPath(flake.sourceInfo->actualPath + "/" + flake.lockedRef.subdir, true);
std::map<Path, InputPath> registered;

computeLocks(
flake.inputs, newLockFile.root, {},
lockFlags.recreateLockFile ? nullptr : oldLockFile.root, {}, parentPath, false);
lockFlags.recreateLockFile ? nullptr : oldLockFile.root, {}, parentPath, false, registered);

for (auto & i : lockFlags.inputOverrides)
if (!overridesUsed.count(i.first))
Expand Down
1 change: 1 addition & 0 deletions src/libexpr/flake/flake.hh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@ struct FlakeInput
{
std::optional<FlakeRef> ref;
bool isFlake = true; // true = process flake to get outputs, false = (fetched) static source path
bool registered = false;
std::optional<InputPath> follows;
FlakeInputs overrides;
};
Expand Down