Revert "pkgs.formats.toml: fix TOML semantics by upgrading tomlkit"

This commit is contained in:
Martin Weinelt 2023-07-27 18:55:56 +02:00 committed by GitHub
parent 6774f3fc04
commit 1cdde769c8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 4 additions and 35 deletions

View File

@ -11,6 +11,7 @@
, pytest-mock , pytest-mock
, pytestCheckHook , pytestCheckHook
, setuptools , setuptools
, tomlkit
, virtualenv , virtualenv
}: }:
@ -53,6 +54,7 @@ buildPythonPackage rec {
pytest-mock pytest-mock
pytestCheckHook pytestCheckHook
setuptools setuptools
tomlkit
virtualenv virtualenv
]; ];

View File

@ -6,21 +6,17 @@
, functools32, typing ? null , functools32, typing ? null
, pytestCheckHook , pytestCheckHook
, pyaml , pyaml
, poetry-core
}: }:
buildPythonPackage rec { buildPythonPackage rec {
pname = "tomlkit"; pname = "tomlkit";
version = "0.11.8"; version = "0.11.6";
format = "pyproject";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
hash = "sha256-kzD8f6odtntUGyjmIBjBfSC+czF30pChOyTGLRYU4MM="; hash = "sha256-cblS5XIWiJN/sCz501TbzweFBmFJ0oVeRFMevdK2XXM=";
}; };
nativeBuildInputs = [ poetry-core ];
propagatedBuildInputs = propagatedBuildInputs =
lib.optionals isPy27 [ enum34 functools32 ] lib.optionals isPy27 [ enum34 functools32 ]
++ lib.optional isPy27 typing; ++ lib.optional isPy27 typing;

View File

@ -219,35 +219,6 @@ 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 # This test is responsible for
# 1. testing type coercions # 1. testing type coercions
# 2. providing a more readable example test # 2. providing a more readable example test