diff options
Diffstat (limited to 'third_party/nix/src/libexpr/primops')
4 files changed, 4 insertions, 8 deletions
diff --git a/third_party/nix/src/libexpr/primops/context.cc b/third_party/nix/src/libexpr/primops/context.cc index 1661ffbe2e..2ae8ba8aa9 100644 --- a/third_party/nix/src/libexpr/primops/context.cc +++ b/third_party/nix/src/libexpr/primops/context.cc @@ -126,9 +126,7 @@ static void prim_getContext(EvalState& state, const Pos& pos, Value** args, mkString(*(outputsVal.listElems()[i++] = state.allocValue()), output); } } - infoVal.attrs->sort(); } - v.attrs->sort(); } static RegisterPrimOp r4("__getContext", 1, prim_getContext); diff --git a/third_party/nix/src/libexpr/primops/fetchGit.cc b/third_party/nix/src/libexpr/primops/fetchGit.cc index cb4c008cdd..67641258d5 100644 --- a/third_party/nix/src/libexpr/primops/fetchGit.cc +++ b/third_party/nix/src/libexpr/primops/fetchGit.cc @@ -252,10 +252,10 @@ static void prim_fetchGit(EvalState& state, const Pos& pos, Value** args, gitInfo.shortRev); mkInt(*state.allocAttr(v, state.symbols.Create("revCount")), gitInfo.revCount); - v.attrs->sort(); - if (state.allowedPaths) + if (state.allowedPaths) { state.allowedPaths->insert(state.store->toRealPath(gitInfo.storePath)); + } } static RegisterPrimOp r("fetchGit", 1, prim_fetchGit); diff --git a/third_party/nix/src/libexpr/primops/fetchMercurial.cc b/third_party/nix/src/libexpr/primops/fetchMercurial.cc index 1e7064f97d..9223f1c3ca 100644 --- a/third_party/nix/src/libexpr/primops/fetchMercurial.cc +++ b/third_party/nix/src/libexpr/primops/fetchMercurial.cc @@ -226,10 +226,10 @@ static void prim_fetchMercurial(EvalState& state, const Pos& pos, Value** args, mkString(*state.allocAttr(v, state.symbols.Create("shortRev")), std::string(hgInfo.rev, 0, 12)); mkInt(*state.allocAttr(v, state.symbols.Create("revCount")), hgInfo.revCount); - v.attrs->sort(); - if (state.allowedPaths) + if (state.allowedPaths) { state.allowedPaths->insert(state.store->toRealPath(hgInfo.storePath)); + } } static RegisterPrimOp r("fetchMercurial", 1, prim_fetchMercurial); diff --git a/third_party/nix/src/libexpr/primops/fromTOML.cc b/third_party/nix/src/libexpr/primops/fromTOML.cc index 320b6120e7..cc7b3cfcc3 100644 --- a/third_party/nix/src/libexpr/primops/fromTOML.cc +++ b/third_party/nix/src/libexpr/primops/fromTOML.cc @@ -35,8 +35,6 @@ static void prim_fromTOML(EvalState& state, const Pos& pos, Value** args, } else visit(v2, i.second); } - - v.attrs->sort(); } else if (auto t2 = t->as_array()) { |