max/nix-super
1
0
Fork 0
mirror of https://github.com/privatevoid-net/nix-super.git synced 2024-11-14 02:06:16 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

FlakeIds are now properly looked up in registries

Browse source
This commit is contained in:
Nick Van den Broeck 2019-03-21 09:30:16 +01:00
parent 18c019b616
commit 641db127be
4 changed files with 36 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -123,6 +123,10 @@ static FlakeRef lookupFlake(EvalState & state, const FlakeRef & flakeRef,
auto newRef = FlakeRef(i->second.ref); auto newRef = FlakeRef(i->second.ref);
if (!newRef.isDirect()) if (!newRef.isDirect())
throw Error("found indirect flake URI '%s' in the flake registry", i->second.ref.to_string()); throw Error("found indirect flake URI '%s' in the flake registry", i->second.ref.to_string());
if (refData->ref)
newRef.setRef(*refData->ref);
if (refData->rev)
newRef.setRev(*refData->rev);
return newRef; return newRef;
} }
} }
@ -224,7 +228,6 @@ Flake getFlake(EvalState & state, const FlakeRef & flakeRef)
flake.path = flakePath; flake.path = flakePath;
flake.revCount = sourceInfo.revCount; flake.revCount = sourceInfo.revCount;
flake.path = flakePath;
Value vInfo; Value vInfo;
state.evalFile(flakePath + "/flake.nix", vInfo); // FIXME: symlink attack state.evalFile(flakePath + "/flake.nix", vInfo); // FIXME: symlink attack
@ -317,9 +320,9 @@ Dependencies resolveFlake(EvalState & state, const FlakeRef & topRef, bool impur
auto flakeRef = todo.front(); auto flakeRef = todo.front();
todo.pop(); todo.pop();
if (auto refData = std::get_if<FlakeRef::IsFlakeId>(&flakeRef.data)) { if (std::get_if<FlakeRef::IsFlakeId>(&flakeRef.data))
if (done.count(refData->id)) continue; // optimization
flakeRef = lookupFlake(state, flakeRef, registries); flakeRef = lookupFlake(state, flakeRef, registries);
if (evalSettings.pureEval && !flakeRef.isImmutable() && (!isTopLevel || !impureTopRef)) if (evalSettings.pureEval && !flakeRef.isImmutable() && (!isTopLevel || !impureTopRef))
throw Error("mutable flake '%s' is not allowed in pure mode; use --impure to disable", flakeRef.to_string()); throw Error("mutable flake '%s' is not allowed in pure mode; use --impure to disable", flakeRef.to_string());
@ -368,7 +371,7 @@ FlakeRegistry updateLockFile(EvalState & evalState, FlakeRef & flakeRef)
return newLockFile; return newLockFile;
} }
void updateLockFile(EvalState & state, std::string path) void updateLockFile(EvalState & state, Path path)
{ {
// 'path' is the path to the local flake repo. // 'path' is the path to the local flake repo.
FlakeRef flakeRef = FlakeRef("file://" + path); FlakeRef flakeRef = FlakeRef("file://" + path);
@ -384,7 +387,7 @@ void updateLockFile(EvalState & state, std::string path)
// Return the `provides` of the top flake, while assigning to `v` the provides // Return the `provides` of the top flake, while assigning to `v` the provides
// of the dependencies as well. // of the dependencies as well.
Value * makeFlakeValue(EvalState & state, FlakeUri flakeUri, bool impureTopRef, Value & v) Value * makeFlakeValue(EvalState & state, FlakeUri flakeUri, Value & v)
{ {
FlakeRef flakeRef = FlakeRef(flakeUri); FlakeRef flakeRef = FlakeRef(flakeUri);
@ -406,16 +409,16 @@ Value * makeFlakeValue(EvalState & state, FlakeUri flakeUri, bool impureTopRef,
state.mkAttrs(*vFlake, 4); state.mkAttrs(*vFlake, 4);
mkString(*state.allocAttr(*vFlake, state.sDescription), flake.second.description); mkString(*state.allocAttr(*vFlake, state.sDescription), flake.description);
state.store->assertStorePath(flake.second.path); state.store->assertStorePath(flake.path);
mkString(*state.allocAttr(*vFlake, state.sOutPath), flake.second.path, {flake.second.path}); mkString(*state.allocAttr(*vFlake, state.sOutPath), flake.path, {flake.path});
if (flake.second.revCount) if (flake.second.revCount)
mkInt(*state.allocAttr(*vFlake, state.symbols.create("revCount")), *flake.second.revCount); mkInt(*state.allocAttr(*vFlake, state.symbols.create("revCount")), *flake.revCount);
auto vProvides = state.allocAttr(*vFlake, state.symbols.create("provides")); auto vProvides = state.allocAttr(*vFlake, state.symbols.create("provides"));
mkApp(*vProvides, *flake.second.vProvides, *vResult); mkApp(*vProvides, *flake.vProvides, *vResult); // Should this be vResult or vFlake??? Or both!
vFlake->attrs->sort(); vFlake->attrs->sort();
} }

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

@ -68,5 +68,5 @@ Dependencies resolveFlake(EvalState &, const FlakeRef &, bool impureTopRef);
FlakeRegistry updateLockFile(EvalState &, Flake &); FlakeRegistry updateLockFile(EvalState &, Flake &);
void updateLockFile(EvalState &, std::string); void updateLockFile(EvalState &, Path);
} }

18
src/libexpr/primops/flakeref.hh
View file

@ -160,5 +160,23 @@ struct FlakeRef
bool isImmutable() const; bool isImmutable() const;
FlakeRef baseRef() const; FlakeRef baseRef() const;
void setRef(std::optional<std::string> ref) {
if (auto refData = std::get_if<IsGit>(&data))
refData->ref = ref;
else if (auto refData = std::get_if<IsGitHub>(&data))
refData->ref = ref;
else if (auto refData = std::get_if<IsFlakeId>(&data))
refData->ref = ref;
}
void setRev(std::optional<Hash> rev) {
if (auto refData = std::get_if<IsGit>(&data))
refData->rev = rev;
else if (auto refData = std::get_if<IsGitHub>(&data))
refData->rev = rev;
else if (auto refData = std::get_if<IsFlakeId>(&data))
refData->rev = rev;
}
}; };
} }

7
src/nix/build.cc
View file

@ -78,10 +78,11 @@ struct CmdBuild : MixDryRun, InstallablesCommand
} }
} }
std::string flakeUri = "";
if(updateLock) if(updateLock)
for (int i = 0; i < installables.size(); i++) for (uint i = 0; i < installables.size(); i++)
if (auto flakeUri = installableToFlakeUri) // if (auto flakeUri = installableToFlakeUri)
updateLockFile(*evalState, FlakeRef(*flakeUri)); updateLockFile(*evalState, flakeUri);
} }
}; };