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

Restore subdir -> dir

Browse source 
Got this mixed up somewhere.
This commit is contained in:
Eelco Dolstra 2020-02-20 23:44:06 +01:00
parent d068f9ffff
commit 73c9840569
4 changed files with 13 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/libexpr/common-eval-args.cc
View file

@ -45,7 +45,7 @@ MixEvalArgs::MixEvalArgs()
auto from = parseFlakeRef(ss[0], absPath(".")); auto from = parseFlakeRef(ss[0], absPath("."));
auto to = parseFlakeRef(ss[1], absPath(".")); auto to = parseFlakeRef(ss[1], absPath("."));
fetchers::Input::Attrs extraAttrs; fetchers::Input::Attrs extraAttrs;
if (to.subdir != "") extraAttrs["subdir"] = to.subdir; if (to.subdir != "") extraAttrs["dir"] = to.subdir;
fetchers::overrideRegistry(from.input, to.input, extraAttrs); fetchers::overrideRegistry(from.input, to.input, extraAttrs);
}); });
} }

18
src/libexpr/flake/flakeref.cc
View file

@ -23,7 +23,7 @@ fetchers::Input::Attrs FlakeRef::toAttrs() const
{ {
auto attrs = input->toAttrs(); auto attrs = input->toAttrs();
if (subdir != "") if (subdir != "")
attrs.emplace("subdir", subdir); attrs.emplace("dir", subdir);
return attrs; return attrs;
} }
@ -41,7 +41,7 @@ bool FlakeRef::operator ==(const FlakeRef & other) const
FlakeRef FlakeRef::resolve(ref<Store> store) const FlakeRef FlakeRef::resolve(ref<Store> store) const
{ {
auto [input2, extraAttrs] = lookupInRegistries(store, input); auto [input2, extraAttrs] = lookupInRegistries(store, input);
return FlakeRef(input2, fetchers::maybeGetStrAttr(extraAttrs, "subdir").value_or(subdir)); return FlakeRef(input2, fetchers::maybeGetStrAttr(extraAttrs, "dir").value_or(subdir));
} }
FlakeRef parseFlakeRef( FlakeRef parseFlakeRef(
@ -138,13 +138,13 @@ std::pair<FlakeRef, std::string> parseFlakeRefWithFragment(
auto fragment = percentDecode(std::string(match[3])); auto fragment = percentDecode(std::string(match[3]));
if (subdir != "") { if (subdir != "") {
if (parsedURL.query.count("subdir")) if (parsedURL.query.count("dir"))
throw Error("flake URL '%s' has an inconsistent 'subdir' parameter", url); throw Error("flake URL '%s' has an inconsistent 'dir' parameter", url);
parsedURL.query.insert_or_assign("subdir", subdir); parsedURL.query.insert_or_assign("dir", subdir);
} }
return std::make_pair( return std::make_pair(
FlakeRef(inputFromURL(parsedURL), get(parsedURL.query, "subdir").value_or("")), FlakeRef(inputFromURL(parsedURL), get(parsedURL.query, "dir").value_or("")),
fragment); fragment);
} }
@ -153,7 +153,7 @@ std::pair<FlakeRef, std::string> parseFlakeRefWithFragment(
std::string fragment; std::string fragment;
std::swap(fragment, parsedURL.fragment); std::swap(fragment, parsedURL.fragment);
return std::make_pair( return std::make_pair(
FlakeRef(inputFromURL(parsedURL), get(parsedURL.query, "subdir").value_or("")), FlakeRef(inputFromURL(parsedURL), get(parsedURL.query, "dir").value_or("")),
fragment); fragment);
} }
} }
@ -171,10 +171,10 @@ std::optional<std::pair<FlakeRef, std::string>> maybeParseFlakeRefWithFragment(
FlakeRef FlakeRef::fromAttrs(const fetchers::Input::Attrs & attrs) FlakeRef FlakeRef::fromAttrs(const fetchers::Input::Attrs & attrs)
{ {
auto attrs2(attrs); auto attrs2(attrs);
attrs2.erase("subdir"); attrs2.erase("dir");
return FlakeRef( return FlakeRef(
fetchers::inputFromAttrs(attrs2), fetchers::inputFromAttrs(attrs2),
fetchers::maybeGetStrAttr(attrs, "subdir").value_or("")); fetchers::maybeGetStrAttr(attrs, "dir").value_or(""));
} }
std::pair<fetchers::Tree, FlakeRef> FlakeRef::fetchTree(ref<Store> store) const std::pair<fetchers::Tree, FlakeRef> FlakeRef::fetchTree(ref<Store> store) const

2
src/libstore/fetchers/registry.cc
View file

@ -37,7 +37,7 @@ std::shared_ptr<Registry> Registry::read(
for (auto & i : json["flakes"]) { for (auto & i : json["flakes"]) {
auto toAttrs = jsonToAttrs(i["to"]); auto toAttrs = jsonToAttrs(i["to"]);
Input::Attrs extraAttrs; Input::Attrs extraAttrs;
auto j = toAttrs.find("subdir"); auto j = toAttrs.find("dir");
if (j != toAttrs.end()) { if (j != toAttrs.end()) {
extraAttrs.insert(*j); extraAttrs.insert(*j);
toAttrs.erase(j); toAttrs.erase(j);

4
src/nix/flake.cc
View file

@ -507,7 +507,7 @@ struct CmdFlakeAdd : MixEvalArgs, Command
auto fromRef = parseFlakeRef(fromUrl); auto fromRef = parseFlakeRef(fromUrl);
auto toRef = parseFlakeRef(toUrl); auto toRef = parseFlakeRef(toUrl);
fetchers::Input::Attrs extraAttrs; fetchers::Input::Attrs extraAttrs;
if (toRef.subdir != "") extraAttrs["subdir"] = toRef.subdir; if (toRef.subdir != "") extraAttrs["dir"] = toRef.subdir;
auto userRegistry = fetchers::getUserRegistry(); auto userRegistry = fetchers::getUserRegistry();
userRegistry->remove(fromRef.input); userRegistry->remove(fromRef.input);
userRegistry->add(fromRef.input, toRef.input, extraAttrs); userRegistry->add(fromRef.input, toRef.input, extraAttrs);
@ -558,7 +558,7 @@ struct CmdFlakePin : virtual Args, EvalCommand
userRegistry->remove(ref.input); userRegistry->remove(ref.input);
auto [tree, resolved] = ref.resolve(store).input->fetchTree(store); auto [tree, resolved] = ref.resolve(store).input->fetchTree(store);
fetchers::Input::Attrs extraAttrs; fetchers::Input::Attrs extraAttrs;
if (ref.subdir != "") extraAttrs["subdir"] = ref.subdir; if (ref.subdir != "") extraAttrs["dir"] = ref.subdir;
userRegistry->add(ref.input, resolved, extraAttrs); userRegistry->add(ref.input, resolved, extraAttrs);
} }
}; };