cafkafk/lix
cafkafk/lix
1
0
Fork 0
Code Issues Pull requests 1 Projects Releases Packages Wiki Activity Actions

getFlakeRegistries(): Return registries regardless of pureEval

Browse source 
This makes e.g. 'nix flake list' work.
This commit is contained in:
Eelco Dolstra 2019-04-15 13:48:56 +02:00
parent 84c12dbd7c
commit f6d684b5e2
1 changed files with 4 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -126,7 +126,8 @@ void writeLockFile(LockFile lockFile, Path path)
std::shared_ptr<FlakeRegistry> getGlobalRegistry() std::shared_ptr<FlakeRegistry> getGlobalRegistry()
{ {
return std::make_shared<FlakeRegistry>(); Path registryFile = settings.nixDataDir + "/nix/flake-registry.json";
return readRegistry(registryFile);
} }
Path getUserRegistryPath() Path getUserRegistryPath()
@ -139,12 +140,6 @@ std::shared_ptr<FlakeRegistry> getUserRegistry()
return readRegistry(getUserRegistryPath()); return readRegistry(getUserRegistryPath());
} }
std::shared_ptr<FlakeRegistry> getLocalRegistry()
{
Path registryFile = settings.nixDataDir + "/nix/flake-registry.json";
return readRegistry(registryFile);
}
std::shared_ptr<FlakeRegistry> getFlagRegistry() std::shared_ptr<FlakeRegistry> getFlagRegistry()
{ {
// TODO (Nick): Implement this. // TODO (Nick): Implement this.
@ -154,15 +149,8 @@ std::shared_ptr<FlakeRegistry> getFlagRegistry()
const std::vector<std::shared_ptr<FlakeRegistry>> EvalState::getFlakeRegistries() const std::vector<std::shared_ptr<FlakeRegistry>> EvalState::getFlakeRegistries()
{ {
std::vector<std::shared_ptr<FlakeRegistry>> registries; std::vector<std::shared_ptr<FlakeRegistry>> registries;
if (evalSettings.pureEval) { registries.push_back(getGlobalRegistry());
registries.push_back(std::make_shared<FlakeRegistry>()); // global registries.push_back(getUserRegistry());
registries.push_back(std::make_shared<FlakeRegistry>()); // user
registries.push_back(std::make_shared<FlakeRegistry>()); // local
} else {
registries.push_back(getGlobalRegistry());
registries.push_back(getUserRegistry());
registries.push_back(getLocalRegistry());
}
registries.push_back(getFlagRegistry()); registries.push_back(getFlagRegistry());
return registries; return registries;
} }