diff --git a/pkgs/development/python-modules/maison/default.nix b/pkgs/development/python-modules/maison/default.nix index 72abcafee704..8202ab42651a 100644 --- a/pkgs/development/python-modules/maison/default.nix +++ b/pkgs/development/python-modules/maison/default.nix @@ -1,51 +1,50 @@ { lib, buildPythonPackage, - click, fetchFromGitHub, - poetry-core, + loguru, + platformdirs, pydantic, pytestCheckHook, - pythonOlder, - toml, + setuptools, + typer, + typing-extensions, }: buildPythonPackage rec { pname = "maison"; - version = "2.0.0"; + version = "2.0.2"; pyproject = true; - disabled = pythonOlder "3.8"; - src = fetchFromGitHub { owner = "dbatten5"; repo = "maison"; tag = "v${version}"; - hash = "sha256-1hsnSYDoCO5swWm3B4R5eXs0Mn4s8arlCQKfsS1OWRk="; + hash = "sha256-F0mxOeLFDCiPhhKaaUy4qV//Pb2JXCtOLNB1uW2KWZY="; }; - pythonRelaxDeps = [ "pydantic" ]; + build-system = [ setuptools ]; - nativeBuildInputs = [ - poetry-core + dependencies = [ + loguru + platformdirs + typer + typing-extensions ]; - propagatedBuildInputs = [ - click + checkInputs = [ pydantic - toml + pytestCheckHook ]; - checkInputs = [ pytestCheckHook ]; - pythonImportsCheck = [ "maison" ]; meta = with lib; { description = "Library to read settings from config files"; - mainProgram = "maison"; homepage = "https://github.com/dbatten5/maison"; changelog = "https://github.com/dbatten5/maison/releases/tag/${src.tag}"; license = licenses.mit; maintainers = with maintainers; [ fab ]; + mainProgram = "maison"; }; } diff --git a/pkgs/development/python-modules/yamlfix/default.nix b/pkgs/development/python-modules/yamlfix/default.nix index fb48b1960281..1c1cda272d74 100644 --- a/pkgs/development/python-modules/yamlfix/default.nix +++ b/pkgs/development/python-modules/yamlfix/default.nix @@ -5,38 +5,25 @@ fetchFromGitHub, maison, pdm-backend, + pydantic, pytest-freezegun, pytest-xdist, pytestCheckHook, - pythonOlder, ruyaml, setuptools, writableTmpDirAsHomeHook, }: -let - maison143 = maison.overridePythonAttrs (old: rec { - version = "1.4.3"; - src = fetchFromGitHub { - owner = "dbatten5"; - repo = "maison"; - tag = "v${version}"; - hash = "sha256-2hUmk91wr5o2cV3un2nMoXDG+3GT7SaIOKY+QaZY3nw="; - }; - }); -in buildPythonPackage rec { pname = "yamlfix"; - version = "1.16.1"; + version = "1.18.0"; pyproject = true; - disabled = pythonOlder "3.8"; - src = fetchFromGitHub { owner = "lyz-code"; repo = "yamlfix"; tag = version; - hash = "sha256-RRpU6cxb3a3g6RrJbUCxY7YC87HHbGkhOFtE3hf8HdA="; + hash = "sha256-g2X9fBUS5wbQJbP29V5pWwrQ1+P/Y8euK4Rv7C6r3WM="; }; build-system = [ @@ -46,12 +33,11 @@ buildPythonPackage rec { dependencies = [ click - maison143 + maison + pydantic ruyaml ]; - pythonRelaxDeps = [ "maison" ]; - nativeCheckInputs = [ pytest-freezegun pytest-xdist @@ -63,14 +49,15 @@ buildPythonPackage rec { pytestFlags = [ "-Wignore::DeprecationWarning" + "-Wignore::ResourceWarning" ]; meta = { description = "Python YAML formatter that keeps your comments"; homepage = "https://github.com/lyz-code/yamlfix"; - changelog = "https://github.com/lyz-code/yamlfix/blob/${version}/CHANGELOG.md"; - mainProgram = "yamlfix"; + changelog = "https://github.com/lyz-code/yamlfix/blob/${src.tag}/CHANGELOG.md"; license = lib.licenses.gpl3Only; maintainers = with lib.maintainers; [ koozz ]; + mainProgram = "yamlfix"; }; }