diff --git a/pkgs/development/python-modules/rstcheck-core/default.nix b/pkgs/development/python-modules/rstcheck-core/default.nix index 74a1dd2dbff2..971e0b12cfd1 100644 --- a/pkgs/development/python-modules/rstcheck-core/default.nix +++ b/pkgs/development/python-modules/rstcheck-core/default.nix @@ -1,23 +1,23 @@ -{ stdenv -, lib -, buildPythonPackage -, docutils -, fetchFromGitHub -, importlib-metadata -, mock -, pydantic -, pytest-mock -, pytestCheckHook -, pythonOlder -, setuptools -, setuptools-scm -, typing-extensions -, wheel +{ + lib, + stdenv, + buildPythonPackage, + docutils, + fetchFromGitHub, + importlib-metadata, + mock, + pydantic, + pytest-mock, + pytestCheckHook, + pythonOlder, + setuptools, + setuptools-scm, + typing-extensions, }: buildPythonPackage rec { pname = "rstcheck-core"; - version = "1.2.0"; + version = "1.2.1"; pyproject = true; disabled = pythonOlder "3.8"; @@ -26,26 +26,27 @@ buildPythonPackage rec { owner = "rstcheck"; repo = "rstcheck-core"; rev = "refs/tags/v${version}"; - hash = "sha256-cKJNktIB4vXt1MPRgYrJQ0aksmrVu7Y2uTyUjdx5YdA="; + hash = "sha256-PiQMk0lIv24S6qXMYIQR+SkSji+WA30ivWs2uPQwf2A="; }; - nativeBuildInputs = [ + build-system = [ setuptools setuptools-scm - wheel ]; env = { NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isClang "-Wno-strict-prototypes"; }; - propagatedBuildInputs = [ - docutils - pydantic - ] ++ lib.optionals (pythonOlder "3.9") [ - importlib-metadata - typing-extensions - ]; + dependencies = + [ + docutils + pydantic + ] + ++ lib.optionals (pythonOlder "3.9") [ + importlib-metadata + typing-extensions + ]; nativeCheckInputs = [ mock @@ -58,9 +59,7 @@ buildPythonPackage rec { "test_check_yaml_returns_error_on_bad_code_block" ]; - pythonImportsCheck = [ - "rstcheck_core" - ]; + pythonImportsCheck = [ "rstcheck_core" ]; meta = with lib; { description = "Library for checking syntax of reStructuredText"; diff --git a/pkgs/development/python-modules/rstcheck/default.nix b/pkgs/development/python-modules/rstcheck/default.nix index 3e648e792b20..91f58f134710 100644 --- a/pkgs/development/python-modules/rstcheck/default.nix +++ b/pkgs/development/python-modules/rstcheck/default.nix @@ -1,58 +1,47 @@ -{ stdenv -, lib -, buildPythonPackage -, docutils -, fetchFromGitHub -, importlib-metadata -, poetry-core -, pydantic -, pytestCheckHook -, pythonOlder -, pythonRelaxDepsHook -, rstcheck-core -, typer -, types-docutils -, typing-extensions +{ + lib, + stdenv, + buildPythonPackage, + docutils, + fetchFromGitHub, + setuptools, + setuptools-scm, + pydantic, + pytestCheckHook, + pythonOlder, + rstcheck-core, + typer, + types-docutils, }: buildPythonPackage rec { pname = "rstcheck"; - version = "6.1.2"; - format = "pyproject"; + version = "6.2.1"; + pyproject = true; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "rstcheck"; - repo = pname; + repo = "rstcheck"; rev = "refs/tags/v${version}"; - hash = "sha256-UMByfnnP1va3v1IgyQL0f3kC+W6HoiWScb7U2FAvWkU="; + hash = "sha256-S04l+x/rIc/XSvq2lSKCQp6KK5mmKI2mOgPgJ3WKe5M="; }; - pythonRelaxDeps = [ - "typer" + build-system = [ + setuptools + setuptools-scm ]; - nativeBuildInputs = [ - poetry-core - pythonRelaxDepsHook - ]; - - propagatedBuildInputs = [ + dependencies = [ docutils rstcheck-core types-docutils - typing-extensions pydantic typer - ] ++ lib.optionals (pythonOlder "3.8") [ - typing-extensions - importlib-metadata ] ++ typer.optional-dependencies.all; - nativeCheckInputs = [ - pytestCheckHook - ]; + nativeCheckInputs = [ pytestCheckHook ]; disabledTests = lib.optionals stdenv.isDarwin [ # Disabled until https://github.com/rstcheck/rstcheck-core/issues/19 is resolved. @@ -60,9 +49,7 @@ buildPythonPackage rec { "test_file_1_is_bad_without_config_macos" ]; - pythonImportsCheck = [ - "rstcheck" - ]; + pythonImportsCheck = [ "rstcheck" ]; preCheck = '' # The tests need to find and call the rstcheck executable @@ -71,10 +58,10 @@ buildPythonPackage rec { meta = with lib; { description = "Checks syntax of reStructuredText and code blocks nested within it"; - mainProgram = "rstcheck"; homepage = "https://github.com/myint/rstcheck"; changelog = "https://github.com/rstcheck/rstcheck/blob/v${version}/CHANGELOG.md"; license = licenses.mit; maintainers = with maintainers; [ staccato ]; + mainProgram = "rstcheck"; }; }