Skip to content

pkgs.formats.toml: fix TOML semantics by upgrading tomlkit #245440

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
infinisil merged 3 commits into from
Jul 27, 2023
Merged

pkgs.formats.toml: fix TOML semantics by upgrading tomlkit #245440

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
97f82c9
tomlkit: build with poetry-core
luizribeiro Jul 27, 2023
f689956
tomlkit: 0.11.6 -> 0.11.8
luizribeiro Jul 27, 2023
ffb9b68
pkgs.format.toml: introduce test for checking semantics
luizribeiro Jul 27, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions pkgs/development/python-modules/poetry-core/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@
, pytest-mock
, pytestCheckHook
, setuptools
, tomlkit
, virtualenv
}:

Expand Down Expand Up @@ -54,7 +53,6 @@ buildPythonPackage rec {
pytest-mock
pytestCheckHook
setuptools
tomlkit
virtualenv
];

Expand Down
8 changes: 6 additions & 2 deletions pkgs/development/python-modules/tomlkit/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
29 changes: 29 additions & 0 deletions pkgs/pkgs-lib/tests/formats.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down