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

The functions in SymbolTable have been renamed to match the Google
Style guide, and some debug-only functions have been removed.

2 files changed, 6 insertions, 6 deletions

diff --git a/third_party/nix/src/nix-env/nix-env.cc b/third_party/nix/src/nix-env/nix-env.cc
index 95a395a96f..93a8e4c1ec 100644
--- a/third_party/nix/src/nix-env/nix-env.cc
+++ b/third_party/nix/src/nix-env/nix-env.cc
@@ -132,7 +132,7 @@ static void getAllExprs(EvalState& state, const Path& path, StringSet& attrs,
         throw Error(format("too many Nix expressions in directory '%1%'") %
                     path);
       }
-      mkApp(*state.allocAttr(v, state.symbols.create(attrName)), vFun, vArg);
+      mkApp(*state.allocAttr(v, state.symbols.Create(attrName)), vFun, vArg);
     } else if (S_ISDIR(st.st_mode)) {
       /* `path2' is a directory (with no default.nix in it);
          recurse into it. */
@@ -159,7 +159,7 @@ static void loadSourceExpr(EvalState& state, const Path& path, Value& v) {
      directory). */
   else if (S_ISDIR(st.st_mode)) {
     state.mkAttrs(v, 1024);
-    state.mkList(*state.allocAttr(v, state.symbols.create("_combineChannels")),
+    state.mkList(*state.allocAttr(v, state.symbols.Create("_combineChannels")),
                  0);
     StringSet attrs;
     getAllExprs(state, path, attrs, v);
diff --git a/third_party/nix/src/nix-env/user-env.cc b/third_party/nix/src/nix-env/user-env.cc
index bf15543c3f..adff263ff4 100644
--- a/third_party/nix/src/nix-env/user-env.cc
+++ b/third_party/nix/src/nix-env/user-env.cc
@@ -73,7 +73,7 @@ bool createUserEnv(EvalState& state, DrvInfos& elems, const Path& profile,
     unsigned int m = 0;
     for (auto& j : outputs) {
       mkString(*(vOutputs.listElems()[m++] = state.allocValue()), j.first);
-      Value& vOutputs = *state.allocAttr(v, state.symbols.create(j.first));
+      Value& vOutputs = *state.allocAttr(v, state.symbols.Create(j.first));
       state.mkAttrs(vOutputs, 2);
       mkString(*state.allocAttr(vOutputs, state.sOutPath), j.second);
 
@@ -94,7 +94,7 @@ bool createUserEnv(EvalState& state, DrvInfos& elems, const Path& profile,
       if (v == nullptr) {
         continue;
       }
-      vMeta.attrs->push_back(Attr(state.symbols.create(j), v));
+      vMeta.attrs->push_back(Attr(state.symbols.Create(j), v));
     }
     vMeta.attrs->sort();
     v.attrs->sort();
@@ -119,9 +119,9 @@ bool createUserEnv(EvalState& state, DrvInfos& elems, const Path& profile,
   Value args;
   Value topLevel;
   state.mkAttrs(args, 3);
-  mkString(*state.allocAttr(args, state.symbols.create("manifest")),
+  mkString(*state.allocAttr(args, state.symbols.Create("manifest")),
            manifestFile, {manifestFile});
-  args.attrs->push_back(Attr(state.symbols.create("derivations"), &manifest));
+  args.attrs->push_back(Attr(state.symbols.Create("derivations"), &manifest));
   args.attrs->sort();
   mkApp(topLevel, envBuilder, args);