diff options
author | Vincent Ambo <tazjin@google.com> | 2020-05-22T02·35+0100 |
---|---|---|
committer | Vincent Ambo <tazjin@google.com> | 2020-05-22T02·35+0100 |
commit | 68e6e92a20b8ee01de3b89e72fc68517fea6f70c (patch) | |
tree | eb44f148e6cabe0d9281d861a379f7c19cd2783a /third_party/nix/src/nix-env | |
parent | 986a8f6b75ffa51682cbe730c5c2907296082cd4 (diff) |
chore(3p/nix/libexpr): Delete Bindings::sort r/803
This function does nothing anymore since the attributes are always in-order.
Diffstat (limited to 'third_party/nix/src/nix-env')
-rw-r--r-- | third_party/nix/src/nix-env/nix-env.cc | 5 | ||||
-rw-r--r-- | third_party/nix/src/nix-env/user-env.cc | 3 |
2 files changed, 0 insertions, 8 deletions
diff --git a/third_party/nix/src/nix-env/nix-env.cc b/third_party/nix/src/nix-env/nix-env.cc index a645fa31489c..e5b76979245d 100644 --- a/third_party/nix/src/nix-env/nix-env.cc +++ b/third_party/nix/src/nix-env/nix-env.cc @@ -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 { diff --git a/third_party/nix/src/nix-env/user-env.cc b/third_party/nix/src/nix-env/user-env.cc index 21e7d42e8845..1535ca0a5cd0 100644 --- a/third_party/nix/src/nix-env/user-env.cc +++ b/third_party/nix/src/nix-env/user-env.cc @@ -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. */ |