quickdudley/lix
0
0
Fork 0
forked from lix-project/lix
Code Pull requests Activity

Fix makeFlakeValue()

Browse source
This commit is contained in:
Eelco Dolstra 2019-04-16 13:56:08 +02:00
parent 529acfd24f
commit 035ac44354
3 changed files with 37 additions and 39 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

68
src/libexpr/primops/flake.cc
View file

@ -304,6 +304,7 @@ Flake getFlake(EvalState & state, const FlakeRef & flakeRef, bool impureIsAllowe
state.forceAttrs(vInfo); state.forceAttrs(vInfo);
// FIXME: change to "id"?
if (auto name = vInfo.attrs->get(state.sName)) if (auto name = vInfo.attrs->get(state.sName))
flake.id = state.forceStringNoCtx(*(**name).value, *(**name).pos); flake.id = state.forceStringNoCtx(*(**name).value, *(**name).pos);
else else
@ -423,48 +424,45 @@ void updateLockFile(EvalState & state, Path path)
} }
} }
// Return the `provides` of the top flake, while assigning to `v` the provides void callFlake(EvalState & state, const Dependencies & flake, Value & v)
// of the dependencies as well.
Value * makeFlakeValue(EvalState & state, const FlakeRef & flakeRef, bool impureTopRef, Value & v)
{ {
Dependencies deps = resolveFlake(state, flakeRef, impureTopRef); // Construct the resulting attrset '{description, provides,
// ...}'. This attrset is passed lazily as an argument to 'provides'.
// FIXME: we should call each flake with only its dependencies state.mkAttrs(v, flake.flakeDeps.size() + flake.nonFlakeDeps.size() + 4);
// (rather than the closure of the top-level flake).
auto vResult = state.allocValue(); for (auto & dep : flake.flakeDeps) {
// This will store the attribute set of the `nonFlakeRequires` and the `requires.provides`. auto vFlake = state.allocAttr(v, dep.flake.id);
callFlake(state, dep, *vFlake);
state.mkAttrs(*vResult, deps.flakeDeps.size());
Value * vTop = state.allocAttr(*vResult, deps.flake.id);
for (auto & dep : deps.flakeDeps) {
Flake flake = dep.flake;
auto vFlake = state.allocAttr(*vResult, flake.id);
state.mkAttrs(*vFlake, 4);
mkString(*state.allocAttr(*vFlake, state.sDescription), flake.description);
state.store->assertStorePath(flake.path);
mkString(*state.allocAttr(*vFlake, state.sOutPath), flake.path, {flake.path});
if (flake.revCount)
mkInt(*state.allocAttr(*vFlake, state.symbols.create("revCount")), *flake.revCount);
auto vProvides = state.allocAttr(*vFlake, state.symbols.create("provides"));
mkApp(*vProvides, *flake.vProvides, *vResult);
vFlake->attrs->sort();
} }
vResult->attrs->sort(); for (auto & dep : flake.nonFlakeDeps) {
auto vNonFlake = state.allocAttr(v, dep.alias);
state.mkAttrs(*vNonFlake, 4);
v = *vResult; state.store->isValidPath(dep.path);
mkString(*state.allocAttr(*vNonFlake, state.sOutPath), dep.path, {dep.path});
}
assert(vTop); mkString(*state.allocAttr(v, state.sDescription), flake.flake.description);
return vTop;
state.store->isValidPath(flake.flake.path);
mkString(*state.allocAttr(v, state.sOutPath), flake.flake.path, {flake.flake.path});
if (flake.flake.revCount)
mkInt(*state.allocAttr(v, state.symbols.create("revCount")), *flake.flake.revCount);
auto vProvides = state.allocAttr(v, state.symbols.create("provides"));
mkApp(*vProvides, *flake.flake.vProvides, v);
v.attrs->sort();
}
// Return the `provides` of the top flake, while assigning to `v` the provides
// of the dependencies as well.
void makeFlakeValue(EvalState & state, const FlakeRef & flakeRef, bool impureTopRef, Value & v)
{
callFlake(state, resolveFlake(state, flakeRef, impureTopRef), v);
} }
// This function is exposed to be used in nix files. // This function is exposed to be used in nix files.

2
src/libexpr/primops/flake.hh
View file

@ -31,7 +31,7 @@ Path getUserRegistryPath();
Value * makeFlakeRegistryValue(EvalState & state); Value * makeFlakeRegistryValue(EvalState & state);
Value * makeFlakeValue(EvalState & state, const FlakeRef & flakeRef, bool impureTopRef, Value & v); void makeFlakeValue(EvalState & state, const FlakeRef & flakeRef, bool impureTopRef, Value & v);
std::shared_ptr<FlakeRegistry> readRegistry(const Path &); std::shared_ptr<FlakeRegistry> readRegistry(const Path &);

6
src/nix/installables.cc
View file

@ -146,10 +146,10 @@ struct InstallableFlake : InstallableValue
Value * toValue(EvalState & state) override Value * toValue(EvalState & state) override
{ {
auto vTemp = state.allocValue(); auto vFlake = state.allocValue();
auto vFlake = *makeFlakeValue(state, flakeRef, true, *vTemp); makeFlakeValue(state, flakeRef, true, *vFlake);
auto vProvides = (*vFlake.attrs->get(state.symbols.create("provides")))->value; auto vProvides = (*vFlake->attrs->get(state.symbols.create("provides")))->value;
state.forceValue(*vProvides); state.forceValue(*vProvides);