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

Unified fetcher caching system

Browse Source
This commit is contained in:
Eelco Dolstra
2020-03-17 22:35:29 +01:00
parent fbcb897e21
commit 2a4e4f6a6e
20 changed files with 425 additions and 197 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libexpr/flake/flake.cc
+3 -3
View File
@@ -132,10 +132,10 @@ static FlakeInput parseFlakeInput(EvalState & state,
auto sFlake = state.symbols.create("flake");
auto sFollows = state.symbols.create("follows");
fetchers::Input::Attrs attrs;
fetchers::Attrs attrs;
std::optional<std::string> url;
for (Attr attr : *(value->attrs)) {
for (nix::Attr attr : *(value->attrs)) {
try {
if (attr.name == sUrl || attr.name == sUri) {
expectType(state, tString, *attr.value, *attr.pos);
@@ -188,7 +188,7 @@ static std::map<FlakeId, FlakeInput> parseFlakeInputs(
expectType(state, tAttrs, *value, pos);
for (Attr & inputAttr : *(*value).attrs) {
for (nix::Attr & inputAttr : *(*value).attrs) {
inputs.emplace(inputAttr.name,
parseFlakeInput(state,
inputAttr.name,