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/libexpr/primops/context.cc | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'third_party/nix/src/libexpr/primops/context.cc') diff --git a/third_party/nix/src/libexpr/primops/context.cc b/third_party/nix/src/libexpr/primops/context.cc index 347b7a0a521e..7fa33bd87fb2 100644 --- a/third_party/nix/src/libexpr/primops/context.cc +++ b/third_party/nix/src/libexpr/primops/context.cc @@ -108,10 +108,10 @@ static void prim_getContext(EvalState& state, const Pos& pos, Value** args, state.mkAttrs(v, contextInfos.size()); - auto sPath = state.symbols.create("path"); - auto sAllOutputs = state.symbols.create("allOutputs"); + auto sPath = state.symbols.Create("path"); + auto sAllOutputs = state.symbols.Create("allOutputs"); for (const auto& info : contextInfos) { - auto& infoVal = *state.allocAttr(v, state.symbols.create(info.first)); + auto& infoVal = *state.allocAttr(v, state.symbols.Create(info.first)); state.mkAttrs(infoVal, 3); if (info.second.path) { mkBool(*state.allocAttr(infoVal, sPath), true); @@ -145,8 +145,8 @@ static void prim_appendContext(EvalState& state, const Pos& pos, Value** args, state.forceAttrs(*args[1], pos); - auto sPath = state.symbols.create("path"); - auto sAllOutputs = state.symbols.create("allOutputs"); + auto sPath = state.symbols.Create("path"); + auto sAllOutputs = state.symbols.Create("allOutputs"); for (auto& i : *args[1]->attrs) { if (!state.store->isStorePath(i.name)) throw EvalError("Context key '%s' is not a store path, at %s", i.name, -- cgit 1.4.1