diff --git a/pkgs/development/python-modules/poetry-core/default.nix b/pkgs/development/python-modules/poetry-core/default.nix index daf45528202f..270c78a69826 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 861560c2aee0..87ef2205008e 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"; + version = "0.11.8"; + format = "pyproject"; src = fetchPypi { inherit pname version; - hash = "sha256-cblS5XIWiJN/sCz501TbzweFBmFJ0oVeRFMevdK2XXM="; + hash = "sha256-kzD8f6odtntUGyjmIBjBfSC+czF30pChOyTGLRYU4MM="; }; + nativeBuildInputs = [ poetry-core ]; + propagatedBuildInputs = lib.optionals isPy27 [ enum34 functools32 ] ++ lib.optional isPy27 typing; diff --git a/pkgs/pkgs-lib/tests/formats.nix b/pkgs/pkgs-lib/tests/formats.nix index 80df247f7b6a..b7e958565ca6 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