about summary refs log tree commit diff
path: root/third_party/nix/src/nix-env/nix-env.cc
diff options
context:
space:
mode:
authorVincent Ambo <tazjin@google.com>2020-05-22T02·35+0100
committerVincent Ambo <tazjin@google.com>2020-05-22T02·35+0100
commit68e6e92a20b8ee01de3b89e72fc68517fea6f70c (patch)
treeeb44f148e6cabe0d9281d861a379f7c19cd2783a /third_party/nix/src/nix-env/nix-env.cc
parent986a8f6b75ffa51682cbe730c5c2907296082cd4 (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/nix-env.cc')
-rw-r--r--third_party/nix/src/nix-env/nix-env.cc5
1 files changed, 0 insertions, 5 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 {