wroclaw-git-backups/nix
1
0
Fork 0
mirror of https://github.com/NixOS/nix synced 2025-06-28 22:01:15 +02:00
Code Activity

Fetch the flake registry from the NixOS/flake-registry repo

Browse source
This commit is contained in:
Eelco Dolstra 2019-05-22 22:56:46 +02:00
parent 55a0451e51
commit 66f1d7ee95
7 changed files with 19 additions and 41 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/libexpr/eval.cc
View file

@ -1978,14 +1978,6 @@ std::ostream & operator << (std::ostream & str, const ExternalValueBase & v) {
EvalSettings evalSettings;
EvalSettings::EvalSettings()
{
if (flakeRegistry == "")
// FIXME: static initialization order fiasco. But this will go
// away when we switch to an online registry.
flakeRegistry = settings.nixDataDir + "/nix/flake-registry.json";
}
static GlobalConfig::Register r1(&evalSettings);

10
src/libexpr/eval.hh
View file

@ -325,9 +325,11 @@ public:
const std::vector<std::shared_ptr<FlakeRegistry>> getFlakeRegistries();
std::shared_ptr<FlakeRegistry> getGlobalFlakeRegistry();
private:
std::shared_ptr<FlakeRegistry> _flakeRegistry;
std::once_flag _flakeRegistryInit;
std::shared_ptr<FlakeRegistry> _globalFlakeRegistry;
std::once_flag _globalFlakeRegistryInit;
};
@ -368,10 +370,8 @@ struct EvalSettings : Config
Setting<Strings> allowedUris{this, {}, "allowed-uris",
"Prefixes of URIs that builtin functions such as fetchurl and fetchGit are allowed to fetch."};
Setting<std::string> flakeRegistry{this, "", "flake-registry",
Setting<std::string> flakeRegistry{this, "https://raw.githubusercontent.com/NixOS/flake-registry/master/flake-registry.json", "flake-registry",
"Path or URI of the global flake registry."};
EvalSettings();
};
extern EvalSettings evalSettings;

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

@ -131,9 +131,19 @@ void writeLockFile(const LockFile & lockFile, const Path & path)
writeFile(path, json.dump(4) + "\n"); // '4' = indentation in json file
}
std::shared_ptr<FlakeRegistry> getGlobalRegistry()
std::shared_ptr<FlakeRegistry> EvalState::getGlobalFlakeRegistry()
{
return readRegistry(evalSettings.flakeRegistry);
std::call_once(_globalFlakeRegistryInit, [&]() {
auto path = evalSettings.flakeRegistry;
if (!hasPrefix(path, "/"))
path = getDownloader()->downloadCached(store,
evalSettings.flakeRegistry, false, "registry").path;
_globalFlakeRegistry = readRegistry(path);
});
return _globalFlakeRegistry;
}
Path getUserRegistryPath()
@ -162,7 +172,7 @@ const Registries EvalState::getFlakeRegistries()
Registries registries;
registries.push_back(getFlagRegistry(registryOverrides));
registries.push_back(getUserRegistry());
registries.push_back(getGlobalRegistry());
registries.push_back(getGlobalFlakeRegistry());
return registries;
}

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

@ -120,8 +120,6 @@ struct NonFlake
resolvedRef(sourceInfo.resolvedRef), revCount(sourceInfo.revCount), storePath(sourceInfo.storePath) {};
};
std::shared_ptr<FlakeRegistry> getGlobalRegistry();
Flake getFlake(EvalState &, const FlakeRef &, bool impureIsAllowed);
struct ResolvedFlake