diff options
| author | Vincent Ambo <tazjin@google.com> | 2020-05-22T00·58+0100 |
|---|---|---|
| committer | Vincent Ambo <tazjin@google.com> | 2020-05-22T00·59+0100 |
| commit | 986a8f6b75ffa51682cbe730c5c2907296082cd4 (patch) | |
| tree | 32c266920223bbfbf0beb49689dc05cb8eb1f2b7 /third_party/nix/src/libexpr/primops/fetchMercurial.cc | |
| parent | 42205f27fc820ddc64616d55c04e2ffde1948043 (diff) | |
fix(3p/nix): Update for usage of new attribute set API r/802
The new attribute set API uses the iterators of the btree_map directly. This requires changes in various files because the internals of libexpr are very entangled. This code runs and compiles, but there is a bug causing empty attribute sets to be assigned incorrectly.
Diffstat (limited to 'third_party/nix/src/libexpr/primops/fetchMercurial.cc')
| -rw-r--r-- | third_party/nix/src/libexpr/primops/fetchMercurial.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/third_party/nix/src/libexpr/primops/fetchMercurial.cc b/third_party/nix/src/libexpr/primops/fetchMercurial.cc index 4205442c73..1e7064f97d 100644 --- a/third_party/nix/src/libexpr/primops/fetchMercurial.cc +++ b/third_party/nix/src/libexpr/primops/fetchMercurial.cc @@ -190,7 +190,8 @@ static void prim_fetchMercurial(EvalState& state, const Pos& pos, Value** args, if (args[0]->type == tAttrs) { state.forceAttrs(*args[0], pos); - for (auto& attr : *args[0]->attrs) { + for (auto& attr_iter : *args[0]->attrs) { + auto& attr = attr_iter.second; std::string n(attr.name); if (n == "url") url = |