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

fix(3p/nix): Compatibility with updated SymbolTable

Browse source 
The functions in SymbolTable have been renamed to match the Google
Style guide, and some debug-only functions have been removed.
This commit is contained in:
Vincent Ambo 2020-05-21 04:56:22 +01:00
parent 97e85f94e5
commit c395a48be2
21 changed files with 141 additions and 137 deletions
Download patch file Download diff file Expand all files Collapse all files

8
third_party/nix/src/nix-prefetch-url/nix-prefetch-url.cc vendored
View file

@ -39,7 +39,7 @@ string resolveMirrorUri(EvalState& state, string uri) {
vMirrors);
state.forceAttrs(vMirrors);
auto mirrorList = vMirrors.attrs->find(state.symbols.create(mirrorName));
auto mirrorList = vMirrors.attrs->find(state.symbols.Create(mirrorName));
if (mirrorList == vMirrors.attrs->end()) {
throw Error(format("unknown mirror name '%1%'") % mirrorName);
}
@ -126,7 +126,7 @@ static int _main(int argc, char** argv) {
state->forceAttrs(v);
/* Extract the URI. */
auto attr = v.attrs->find(state->symbols.create("urls"));
auto attr = v.attrs->find(state->symbols.Create("urls"));
if (attr == v.attrs->end()) {
throw Error("attribute set does not contain a 'urls' attribute");
}
@ -137,7 +137,7 @@ static int _main(int argc, char** argv) {
uri = state->forceString(*attr->value->listElems()[0]);
/* Extract the hash mode. */
attr = v.attrs->find(state->symbols.create("outputHashMode"));
attr = v.attrs->find(state->symbols.Create("outputHashMode"));
if (attr == v.attrs->end()) {
LOG(WARNING) << "this does not look like a fetchurl call";
} else {
@ -146,7 +146,7 @@ static int _main(int argc, char** argv) {
/* Extract the name. */
if (name.empty()) {
attr = v.attrs->find(state->symbols.create("name"));
attr = v.attrs->find(state->symbols.Create("name"));
if (attr != v.attrs->end()) {
name = state->forceString(*attr->value);
}