pyrox.dev / nixpkgs
lol
fork atom

Merge pull request #245763 from NixOS/revert-245440-pin-tomlkit

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

authored by 0x4A6F and committed by GitHub 1fb56074 869d0f85

+4 -35
unified split
+2
pkgs/development/python-modules/poetry-core/default.nix
··· 11 , pytest-mock 12 , pytestCheckHook 13 , setuptools 14 , virtualenv 15 }: 16 ··· 53 pytest-mock 54 pytestCheckHook 55 setuptools 56 virtualenv 57 ]; 58
··· 11 , pytest-mock 12 , pytestCheckHook 13 , setuptools 14 + , tomlkit 15 , virtualenv 16 }: 17 ··· 54 pytest-mock 55 pytestCheckHook 56 setuptools 57 + tomlkit 58 virtualenv 59 ]; 60
+2 -6
pkgs/development/python-modules/tomlkit/default.nix
··· 6 , functools32, typing ? null 7 , pytestCheckHook 8 , pyaml 9 - , poetry-core 10 }: 11 12 buildPythonPackage rec { 13 pname = "tomlkit"; 14 - version = "0.11.8"; 15 - format = "pyproject"; 16 17 src = fetchPypi { 18 inherit pname version; 19 - hash = "sha256-kzD8f6odtntUGyjmIBjBfSC+czF30pChOyTGLRYU4MM="; 20 }; 21 - 22 - nativeBuildInputs = [ poetry-core ]; 23 24 propagatedBuildInputs = 25 lib.optionals isPy27 [ enum34 functools32 ]
··· 6 , functools32, typing ? null 7 , pytestCheckHook 8 , pyaml 9 }: 10 11 buildPythonPackage rec { 12 pname = "tomlkit"; 13 + version = "0.11.6"; 14 15 src = fetchPypi { 16 inherit pname version; 17 + hash = "sha256-cblS5XIWiJN/sCz501TbzweFBmFJ0oVeRFMevdK2XXM="; 18 }; 19 20 propagatedBuildInputs = 21 lib.optionals isPy27 [ enum34 functools32 ]
-29
pkgs/pkgs-lib/tests/formats.nix
··· 219 ''; 220 }; 221 222 - # see https://github.com/NixOS/nixpkgs/issues/237521 for this particular test 223 - testTomlSemantics = { 224 - drv = evalFormat formats.toml {} { 225 - processors = { 226 - override = [ 227 - { tags = { cluster = "staging"; }; } 228 - ]; 229 - rename = [ 230 - { 231 - replace = [ 232 - { dest = "ceph_telegraf_check"; measurement = "exec"; } 233 - ]; 234 - } 235 - ]; 236 - }; 237 - }; 238 - expected = '' 239 - [processors] 240 - [[processors.override]] 241 - [processors.override.tags] 242 - cluster = "staging" 243 - 244 - [[processors.rename]] 245 - [[processors.rename.replace]] 246 - dest = "ceph_telegraf_check" 247 - measurement = "exec" 248 - ''; 249 - }; 250 - 251 # This test is responsible for 252 # 1. testing type coercions 253 # 2. providing a more readable example test
··· 219 ''; 220 }; 221 222 # This test is responsible for 223 # 1. testing type coercions 224 # 2. providing a more readable example test