From 3b4d945bf7ede5d45ab1675e71c5ce4d4beac7ef Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 22 Jun 2025 04:36:50 +0000 Subject: [PATCH 1/3] python3Packages.doc8: 1.1.2 -> 2.0.0 --- pkgs/development/python-modules/doc8/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/doc8/default.nix b/pkgs/development/python-modules/doc8/default.nix index 566a60d47f2e..e8cd7f52f1f8 100644 --- a/pkgs/development/python-modules/doc8/default.nix +++ b/pkgs/development/python-modules/doc8/default.nix @@ -16,14 +16,14 @@ buildPythonPackage rec { pname = "doc8"; - version = "1.1.2"; + version = "2.0.0"; format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-EiXzAUThzJfjiNuvf+PpltKJdHOlOm2uJo3d4hw1S5g="; + hash = "sha256-EmetMnWJcfvPmRRCQXo5Nce8nlJVDnNiLg5WulXqHUA="; }; nativeBuildInputs = [ From 0a5083eb9dd3dbf1f7528f98f250d74e039246e2 Mon Sep 17 00:00:00 2001 From: Jonas Heinrich Date: Sun, 22 Jun 2025 11:12:33 +0200 Subject: [PATCH 2/3] python3Packages.doc8: Python support starting with 3.10 --- pkgs/development/python-modules/doc8/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/doc8/default.nix b/pkgs/development/python-modules/doc8/default.nix index e8cd7f52f1f8..a2e1cab9b8c5 100644 --- a/pkgs/development/python-modules/doc8/default.nix +++ b/pkgs/development/python-modules/doc8/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { version = "2.0.0"; format = "pyproject"; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.10"; src = fetchPypi { inherit pname version; From 1c494aa9adb4900f62539c28050e20e621bcdbfe Mon Sep 17 00:00:00 2001 From: Jonas Heinrich Date: Sun, 22 Jun 2025 11:14:35 +0200 Subject: [PATCH 3/3] python3Packages.doc8: Modernize derivation --- pkgs/development/python-modules/doc8/default.nix | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/pkgs/development/python-modules/doc8/default.nix b/pkgs/development/python-modules/doc8/default.nix index a2e1cab9b8c5..1f3b4a7ba61b 100644 --- a/pkgs/development/python-modules/doc8/default.nix +++ b/pkgs/development/python-modules/doc8/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "doc8"; version = "2.0.0"; - format = "pyproject"; + pyproject = true; disabled = pythonOlder "3.10"; @@ -26,14 +26,14 @@ buildPythonPackage rec { hash = "sha256-EmetMnWJcfvPmRRCQXo5Nce8nlJVDnNiLg5WulXqHUA="; }; - nativeBuildInputs = [ + build-system = [ setuptools-scm wheel ]; buildInputs = [ pbr ]; - propagatedBuildInputs = [ + dependencies = [ docutils chardet stevedore @@ -43,16 +43,14 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook ]; - pythonRelaxDeps = [ "docutils" ]; - pythonImportsCheck = [ "doc8" ]; - meta = with lib; { + meta = { description = "Style checker for Sphinx (or other) RST documentation"; mainProgram = "doc8"; homepage = "https://github.com/pycqa/doc8"; changelog = "https://github.com/PyCQA/doc8/releases/tag/v${version}"; - license = licenses.asl20; - maintainers = with maintainers; [ onny ]; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ onny ]; }; }