about summary refs log tree commit diff
path: root/third_party/nix/src/nix-env
diff options
context:
space:
mode:
Diffstat (limited to 'third_party/nix/src/nix-env')
-rw-r--r--third_party/nix/src/nix-env/nix-env.cc5
-rw-r--r--third_party/nix/src/nix-env/user-env.cc3
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. */