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

chore(3p/nix/libexpr): Delete Bindings::sort

Browse source 
This function does nothing anymore since the attributes are always
in-order.
This commit is contained in:
Vincent Ambo 2020-05-22 03:35:07 +01:00
parent 986a8f6b75
commit 68e6e92a20
14 changed files with 6 additions and 54 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -128,10 +128,6 @@ static void getAllExprs(EvalState& state, const Path& path, StringSet& attrs,
Value& vFun = state.getBuiltin("import");
Value& vArg(*state.allocValue());
mkString(vArg, path2);
if (v.attrs->size() == v.attrs->capacity()) {
throw Error(format("too many Nix expressions in directory '%1%'") %
path);
}
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);
@ -163,7 +159,6 @@ static void loadSourceExpr(EvalState& state, const Path& path, Value& v) {
0);
StringSet attrs;
getAllExprs(state, path, attrs, v);
v.attrs->sort();
}
else {

3
third_party/nix/src/nix-env/user-env.cc vendored
View file

@ -96,8 +96,6 @@ bool createUserEnv(EvalState& state, DrvInfos& elems, const Path& profile,
}
vMeta.attrs->push_back(Attr(state.symbols.Create(j), v));
}
vMeta.attrs->sort();
v.attrs->sort();
if (!drvPath.empty()) {
references.insert(drvPath);
@ -122,7 +120,6 @@ bool createUserEnv(EvalState& state, DrvInfos& elems, const Path& profile,
mkString(*state.allocAttr(args, state.symbols.Create("manifest")),
manifestFile, {manifestFile});
args.attrs->push_back(Attr(state.symbols.Create("derivations"), &manifest));
args.attrs->sort();
mkApp(topLevel, envBuilder, args);
/* Evaluate it. */