From c395a48be2ad58560590897e11793db032873ed6 Mon Sep 17 00:00:00 2001 From: Vincent Ambo Date: Thu, 21 May 2020 04:56:22 +0100 Subject: fix(3p/nix): Compatibility with updated SymbolTable The functions in SymbolTable have been renamed to match the Google Style guide, and some debug-only functions have been removed. --- third_party/nix/src/nix-prefetch-url/nix-prefetch-url.cc | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'third_party/nix/src/nix-prefetch-url/nix-prefetch-url.cc') diff --git a/third_party/nix/src/nix-prefetch-url/nix-prefetch-url.cc b/third_party/nix/src/nix-prefetch-url/nix-prefetch-url.cc index 5a9b81103d..17341e382d 100644 --- a/third_party/nix/src/nix-prefetch-url/nix-prefetch-url.cc +++ b/third_party/nix/src/nix-prefetch-url/nix-prefetch-url.cc @@ -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); } -- cgit 1.4.1