From 97f82c9d6308995e22042adbc7991d84c8b3af20 Mon Sep 17 00:00:00 2001
From: Luiz Ribeiro <luizribeiro@gmail.com>
Date: Thu, 27 Jul 2023 09:37:53 -0400
Subject: [PATCH 1/3] tomlkit: build with poetry-core

---
 pkgs/development/python-modules/poetry-core/default.nix | 2 --
 pkgs/development/python-modules/tomlkit/default.nix     | 4 ++++
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/poetry-core/default.nix b/pkgs/development/python-modules/poetry-core/default.nix
index daf45528202f9..270c78a69826f 100644
--- a/pkgs/development/python-modules/poetry-core/default.nix
+++ b/pkgs/development/python-modules/poetry-core/default.nix
@@ -11,7 +11,6 @@
 , pytest-mock
 , pytestCheckHook
 , setuptools
-, tomlkit
 , virtualenv
 }:
 
@@ -54,7 +53,6 @@ buildPythonPackage rec {
     pytest-mock
     pytestCheckHook
     setuptools
-    tomlkit
     virtualenv
   ];
 
diff --git a/pkgs/development/python-modules/tomlkit/default.nix b/pkgs/development/python-modules/tomlkit/default.nix
index 861560c2aee09..1d1fb1e4b684e 100644
--- a/pkgs/development/python-modules/tomlkit/default.nix
+++ b/pkgs/development/python-modules/tomlkit/default.nix
@@ -6,17 +6,21 @@
 , functools32, typing ? null
 , pytestCheckHook
 , pyaml
+, poetry-core
 }:
 
 buildPythonPackage rec {
   pname = "tomlkit";
   version = "0.11.6";
+  format = "pyproject";
 
   src = fetchPypi {
     inherit pname version;
     hash = "sha256-cblS5XIWiJN/sCz501TbzweFBmFJ0oVeRFMevdK2XXM=";
   };
 
+  nativeBuildInputs = [ poetry-core ];
+
   propagatedBuildInputs =
     lib.optionals isPy27 [ enum34 functools32 ]
     ++ lib.optional isPy27 typing;

From f68995642f6efc4fb0d4b208a5e90864237407ba Mon Sep 17 00:00:00 2001
From: Luiz Ribeiro <luizribeiro@gmail.com>
Date: Thu, 27 Jul 2023 09:39:48 -0400
Subject: [PATCH 2/3] tomlkit: 0.11.6 -> 0.11.8

---
 pkgs/development/python-modules/tomlkit/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/tomlkit/default.nix b/pkgs/development/python-modules/tomlkit/default.nix
index 1d1fb1e4b684e..87ef2205008ec 100644
--- a/pkgs/development/python-modules/tomlkit/default.nix
+++ b/pkgs/development/python-modules/tomlkit/default.nix
@@ -11,12 +11,12 @@
 
 buildPythonPackage rec {
   pname = "tomlkit";
-  version = "0.11.6";
+  version = "0.11.8";
   format = "pyproject";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-cblS5XIWiJN/sCz501TbzweFBmFJ0oVeRFMevdK2XXM=";
+    hash = "sha256-kzD8f6odtntUGyjmIBjBfSC+czF30pChOyTGLRYU4MM=";
   };
 
   nativeBuildInputs = [ poetry-core ];

From ffb9b68bd3629d81d082193db000959039347518 Mon Sep 17 00:00:00 2001
From: Luiz Ribeiro <luizribeiro@gmail.com>
Date: Thu, 27 Jul 2023 09:40:16 -0400
Subject: [PATCH 3/3] pkgs.format.toml: introduce test for checking semantics

---
 pkgs/pkgs-lib/tests/formats.nix | 29 +++++++++++++++++++++++++++++
 1 file changed, 29 insertions(+)

diff --git a/pkgs/pkgs-lib/tests/formats.nix b/pkgs/pkgs-lib/tests/formats.nix
index 80df247f7b6af..b7e958565ca68 100644
--- a/pkgs/pkgs-lib/tests/formats.nix
+++ b/pkgs/pkgs-lib/tests/formats.nix
@@ -219,6 +219,35 @@ in runBuildTests {
     '';
   };
 
+  # see https://github.com/NixOS/nixpkgs/issues/237521 for this particular test
+  testTomlSemantics = {
+    drv = evalFormat formats.toml {} {
+      processors = {
+        override = [
+          { tags = { cluster = "staging"; }; }
+        ];
+        rename = [
+          {
+            replace = [
+              { dest = "ceph_telegraf_check"; measurement = "exec"; }
+            ];
+          }
+        ];
+      };
+    };
+    expected = ''
+      [processors]
+      [[processors.override]]
+      [processors.override.tags]
+      cluster = "staging"
+
+      [[processors.rename]]
+      [[processors.rename.replace]]
+      dest = "ceph_telegraf_check"
+      measurement = "exec"
+    '';
+  };
+
   # This test is responsible for
   #   1. testing type coercions
   #   2. providing a more readable example test