eisfunke/lix
0
0
Fork 0
forked from lix-project/lix
Code Pull requests Activity

Fix immutable flakeref construction

Browse source 
We were appending ref/revs incorrectly for the IsGit case (by
appending /<ref>/<rev> rather than ?ref=<ref>&rev=<rev).
This commit is contained in:
Eelco Dolstra 2019-05-07 23:20:42 +02:00
parent 2a41a567e2
commit ddd42b7e94
1 changed files with 9 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -48,7 +48,7 @@ LockFile::FlakeEntry readFlakeEntry(nlohmann::json json)
{ {
FlakeRef flakeRef(json["uri"]); FlakeRef flakeRef(json["uri"]);
if (!flakeRef.isImmutable()) if (!flakeRef.isImmutable())
throw Error("requested to fetch FlakeRef '%s' purely, which is mutable", flakeRef); throw Error("cannot use mutable flake '%s' in pure mode", flakeRef);
LockFile::FlakeEntry entry(flakeRef); LockFile::FlakeEntry entry(flakeRef);
@ -236,8 +236,8 @@ static SourceInfo fetchFlake(EvalState & state, const FlakeRef & flakeRef, bool
if (result.etag->size() != 42 || (*result.etag)[0] != '"' || (*result.etag)[41] != '"') if (result.etag->size() != 42 || (*result.etag)[0] != '"' || (*result.etag)[41] != '"')
throw Error("ETag header '%s' from '%s' is not a Git revision", *result.etag, url); throw Error("ETag header '%s' from '%s' is not a Git revision", *result.etag, url);
std::string rev = std::string(*result.etag, 1, result.etag->size() - 2); FlakeRef ref(resolvedRef.baseRef());
const FlakeRef ref(resolvedRef.baseRef().to_string() + "/" + rev); ref.rev = Hash(std::string(*result.etag, 1, result.etag->size() - 2), htSHA1);
SourceInfo info(ref); SourceInfo info(ref);
info.storePath = result.path; info.storePath = result.path;
@ -247,7 +247,9 @@ static SourceInfo fetchFlake(EvalState & state, const FlakeRef & flakeRef, bool
// This downloads the entire git history // This downloads the entire git history
else if (auto refData = std::get_if<FlakeRef::IsGit>(&resolvedRef.data)) { else if (auto refData = std::get_if<FlakeRef::IsGit>(&resolvedRef.data)) {
auto gitInfo = exportGit(state.store, refData->uri, resolvedRef.ref, resolvedRef.rev, "source"); auto gitInfo = exportGit(state.store, refData->uri, resolvedRef.ref, resolvedRef.rev, "source");
const FlakeRef ref(resolvedRef.baseRef().to_string() + "/" + gitInfo.ref + "/" + gitInfo.rev.to_string(Base16, false)); FlakeRef ref(resolvedRef.baseRef());
ref.ref = gitInfo.ref;
ref.rev = gitInfo.rev;
SourceInfo info(ref); SourceInfo info(ref);
info.storePath = gitInfo.storePath; info.storePath = gitInfo.storePath;
info.revCount = gitInfo.revCount; info.revCount = gitInfo.revCount;
@ -258,7 +260,9 @@ static SourceInfo fetchFlake(EvalState & state, const FlakeRef & flakeRef, bool
if (!pathExists(refData->path + "/.git")) if (!pathExists(refData->path + "/.git"))
throw Error("flake '%s' does not reference a Git repository", refData->path); throw Error("flake '%s' does not reference a Git repository", refData->path);
auto gitInfo = exportGit(state.store, refData->path, {}, {}, "source"); auto gitInfo = exportGit(state.store, refData->path, {}, {}, "source");
const FlakeRef ref(resolvedRef.baseRef().to_string() + "/" + gitInfo.ref + "/" + gitInfo.rev.to_string(Base16, false)); FlakeRef ref(resolvedRef.baseRef());
ref.ref = gitInfo.ref;
ref.rev = gitInfo.rev;
SourceInfo info(ref); SourceInfo info(ref);
info.storePath = gitInfo.storePath; info.storePath = gitInfo.storePath;
info.revCount = gitInfo.revCount; info.revCount = gitInfo.revCount;