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

4
third_party/nix/src/nix-env/nix-env.cc vendored
View file

@ -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);