NixOS/nix
NixOS/nix
1
0
Fork 0
mirror of https://github.com/NixOS/nix synced 2024-09-20 23:28:26 -04:00
Code Activity

Merge remote-tracking branch 'tweag/fix' into flakes

Browse source
This commit is contained in:
Eelco Dolstra 2019-04-25 14:02:28 +02:00
parent 21d5abfc14 e9c42c06ef
commit 514117a6bb
1 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -146,15 +146,14 @@ std::shared_ptr<FlakeRegistry> getFlagRegistry()
return std::make_shared<FlakeRegistry>(); return std::make_shared<FlakeRegistry>();
} }
// This always returns a vector with globalReg, userReg, localReg, flakeReg. // This always returns a vector with flakeRef, userReg, globalReg.
// If one of them doesn't exist, the registry is left empty but does exist. // If one of them doesn't exist, the registry is left empty but does exist.
const Registries EvalState::getFlakeRegistries() const Registries EvalState::getFlakeRegistries()
{ {
Registries registries; Registries registries;
registries.push_back(getGlobalRegistry()); // TODO (Nick): Doesn't this break immutability?
registries.push_back(getUserRegistry());
registries.push_back(std::make_shared<FlakeRegistry>()); // local
registries.push_back(getFlagRegistry()); registries.push_back(getFlagRegistry());
registries.push_back(getUserRegistry());
registries.push_back(getGlobalRegistry());
return registries; return registries;
} }
@ -169,8 +168,10 @@ static FlakeRef lookupFlake(EvalState & state, const FlakeRef & flakeRef, const
if (i != registry->entries.end()) { if (i != registry->entries.end()) {
auto newRef = i->second; auto newRef = i->second;
if (std::get_if<FlakeRef::IsAlias>(&flakeRef.data)) { if (std::get_if<FlakeRef::IsAlias>(&flakeRef.data)) {
if (flakeRef.ref) newRef.ref = flakeRef.ref; if (flakeRef.ref || flakeRef.rev) {
if (flakeRef.rev) newRef.rev = flakeRef.rev; newRef.ref = flakeRef.ref;
newRef.rev = flakeRef.rev;
}
} }
std::string errorMsg = "found cycle in flake registries: "; std::string errorMsg = "found cycle in flake registries: ";
for (FlakeRef oldRef : pastSearches) { for (FlakeRef oldRef : pastSearches) {