nixos/nix
1
1
Fork 0
mirror of https://github.com/NixOS/nix.git synced 2025-11-12 05:26:02 +01:00
Code Activity

Issue #15 is finished

Browse source
This commit is contained in:
Nick Van den Broeck 2019-03-10 07:05:05 +01:00
parent e007f367bd
commit 5e4d92d267
6 changed files with 136 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -12,9 +12,14 @@
namespace nix {
Path getUserRegistryPath()
{
return getHome() + "/.config/nix/registry.json";
}
/* Read the registry or a lock file. (Currently they have an identical
format. */
static std::unique_ptr<FlakeRegistry> readRegistry(const Path & path)
std::unique_ptr<FlakeRegistry> readRegistry(const Path & path)
{
auto registry = std::make_unique<FlakeRegistry>();
@ -40,7 +45,7 @@ void writeRegistry(FlakeRegistry registry, Path path)
json["version"] = 1;
json["flakes"] = {};
for (auto elem : registry.entries) {
json["flakes"][elem.first] = elem.second.ref.to_string();
json["flakes"][elem.first] = { {"uri", elem.second.ref.to_string()} };
}
writeFile(path, json.dump(4)); // The '4' is the number of spaces used in the indentation in the json file.
}
@ -183,8 +188,8 @@ Flake getFlake(EvalState & state, const FlakeRef & flakeRef)
if (std::get_if<FlakeRef::IsGitHub>(&newFlakeRef.data)) {
FlakeSourceInfo srcInfo = fetchFlake(state, newFlakeRef);
if (srcInfo.rev) {
std::string uri = flakeRef.to_string();
newFlakeRef = FlakeRef(uri + "/" + srcInfo.rev->to_string());
std::string uri = flakeRef.baseRef().to_string();
newFlakeRef = FlakeRef(uri + "/" + srcInfo.rev->to_string(Base16, false));
}
}