From 92c7d33ee32b9597fedee5f7371de54c0a10a5a5 Mon Sep 17 00:00:00 2001
From: Lily Foster <lily@lily.flowers>
Date: Tue, 28 Dec 2021 10:10:58 -0500
Subject: [PATCH] Sort attrs from tables in fromTOML

This was dropped in 10a8b5d for the migration from cpptoml to toml11 but
seems to be necessary for the attrsets to work correctly.

Fixes #5833
---
 src/libexpr/primops/fromTOML.cc | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/libexpr/primops/fromTOML.cc b/src/libexpr/primops/fromTOML.cc
index 221c40db9..30466fc5b 100644
--- a/src/libexpr/primops/fromTOML.cc
+++ b/src/libexpr/primops/fromTOML.cc
@@ -31,6 +31,8 @@ static void prim_fromTOML(EvalState & state, const Pos & pos, Value * * args, Va
                         auto & v2 = *state.allocAttr(v, state.symbols.create(elem.first));
                         visit(v2, elem.second);
                     }
+
+                    v.attrs->sort();
                 }
                 break;;
             case toml::value_t::array: