maurice/snix
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix(3p/nix): Update for usage of new attribute set API

Browse source 
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.
This commit is contained in:
Vincent Ambo 2020-05-22 01:58:12 +01:00
parent 42205f27fc
commit 986a8f6b75
14 changed files with 187 additions and 176 deletions
Download patch file Download diff file Expand all files Collapse all files

8
third_party/nix/src/libexpr/attr-set.cc vendored
View file

@ -34,13 +34,9 @@ Bindings::iterator Bindings::find(const Symbol& name) {
return attributes_.find(name);
}
Bindings::iterator Bindings::begin() {
return attributes_.begin();
}
Bindings::iterator Bindings::begin() { return attributes_.begin(); }
Bindings::iterator Bindings::end() {
return attributes_.end();
}
Bindings::iterator Bindings::end() { return attributes_.end(); }
void Bindings::merge(Bindings* other) {
// We want the values from the other attribute set to take