guiwf/lix
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

libexpr/primops: Migrate helper fn fetch to return a Value

Browse Source 
Part of #1136

Change-Id: I5b21998d437aa82fb89e75b0b645269a6a6a6964
This commit is contained in:
skye
2026-04-07 22:40:04 -04:00
parent a1f52a1ce6
commit fe38b58e50
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lix/libexpr/primops/fetchTree.cc
+7 -7
View File
@@ -233,8 +233,9 @@ void prim_fetchTree(EvalState & state, Value * * args, Value & v)
v = fetchTree(state, noPos, args, std::nullopt, FetchTreeParams{.allowNameArgument = false});
}
static void fetch(EvalState & state, const PosIdx pos, Value * * args, Value & v,
const std::string & who, bool unpack, std::string name)
static Value fetch(
EvalState & state, const PosIdx pos, Value ** args, const std::string & who, bool unpack, std::string name
)
{
std::optional<std::string> url;
std::optional<Hash> expectedHash;
@@ -299,8 +300,7 @@ static void fetch(EvalState & state, const PosIdx pos, Value * * args, Value & v
});
if (state.aio.blockOn(state.ctx.store->isValidPath(expectedPath))) {
v = state.ctx.paths.allowAndSetStorePathString(expectedPath);
return;
return state.ctx.paths.allowAndSetStorePathString(expectedPath);
}
}
@@ -331,17 +331,17 @@ static void fetch(EvalState & state, const PosIdx pos, Value * * args, Value & v
}
}
v = state.ctx.paths.allowAndSetStorePathString(storePath);
return state.ctx.paths.allowAndSetStorePathString(storePath);
}
void prim_fetchurl(EvalState & state, Value * * args, Value & v)
{
fetch(state, noPos, args, v, "fetchurl", false, "");
v = fetch(state, noPos, args, "fetchurl", false, "");
}
void prim_fetchTarball(EvalState & state, Value * * args, Value & v)
{
fetch(state, noPos, args, v, "fetchTarball", true, "source");
v = fetch(state, noPos, args, "fetchTarball", true, "source");
}
void prim_fetchGit(EvalState & state, Value * * args, Value & v)