diff options
7 files changed, 53 insertions, 37 deletions
diff --git a/pkgs/development/python-modules/doc8/default.nix b/pkgs/development/python-modules/doc8/default.nix index 8c687f583ad..915918bc54b 100644 --- a/pkgs/development/python-modules/doc8/default.nix +++ b/pkgs/development/python-modules/doc8/default.nix @@ -8,7 +8,7 @@ , pygments , pytestCheckHook , pythonOlder -, restructuredtext_lint +, restructuredtext-lint , setuptools-scm , stevedore , wheel @@ -48,7 +48,7 @@ buildPythonPackage rec { docutils chardet stevedore - restructuredtext_lint + restructuredtext-lint pygments ]; diff --git a/pkgs/development/python-modules/recurring-ical-events/default.nix b/pkgs/development/python-modules/recurring-ical-events/default.nix index 8fcb212c702..b6c20812d9c 100644 --- a/pkgs/development/python-modules/recurring-ical-events/default.nix +++ b/pkgs/development/python-modules/recurring-ical-events/default.nix @@ -6,7 +6,7 @@ , python-dateutil , x-wr-timezone , pytestCheckHook -, restructuredtext_lint +, restructuredtext-lint , pygments , tzdata }: @@ -33,7 +33,7 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook - restructuredtext_lint + restructuredtext-lint pygments tzdata ]; diff --git a/pkgs/development/python-modules/restructuredtext-lint/default.nix b/pkgs/development/python-modules/restructuredtext-lint/default.nix new file mode 100644 index 00000000000..3b7f4dfd57f --- /dev/null +++ b/pkgs/development/python-modules/restructuredtext-lint/default.nix @@ -0,0 +1,45 @@ +{ lib +, buildPythonPackage +, fetchPypi +, setuptools +, docutils +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "restructuredtext-lint"; + version = "1.4.0"; + pyproject = true; + + src = fetchPypi { + pname = "restructuredtext_lint"; + inherit version; + hash = "sha256-GyNcDJIjQatsUwOQiS656S+QubdQRgY+BHys+w8FDEU="; + }; + + nativeBuildInputs = [ + setuptools + ]; + + propagatedBuildInputs = [ docutils ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + pytestFlagsArray = [ + "restructuredtext_lint/test/test.py" + ]; + + pythonImportsCheck = [ + "restructuredtext_lint" + ]; + + meta = { + description = "reStructuredText linter"; + homepage = "https://github.com/twolfson/restructuredtext-lint"; + changelog = "https://github.com/twolfson/restructuredtext-lint/blob/${version}/CHANGELOG.rst"; + license = lib.licenses.unlicense; + mainProgram = "rst-lint"; + }; +} diff --git a/pkgs/development/python-modules/restructuredtext_lint/default.nix b/pkgs/development/python-modules/restructuredtext_lint/default.nix deleted file mode 100644 index ebb682a9c51..00000000000 --- a/pkgs/development/python-modules/restructuredtext_lint/default.nix +++ /dev/null @@ -1,30 +0,0 @@ -{ lib -, buildPythonPackage -, fetchPypi -, docutils -, nose -, testtools -}: - -buildPythonPackage rec { - pname = "restructuredtext_lint"; - version = "1.4.0"; - - src = fetchPypi { - inherit pname version; - hash = "sha256-GyNcDJIjQatsUwOQiS656S+QubdQRgY+BHys+w8FDEU="; - }; - - nativeCheckInputs = [ nose testtools ]; - propagatedBuildInputs = [ docutils ]; - - checkPhase = '' - nosetests --nocapture - ''; - - meta = { - description = "reStructuredText linter"; - homepage = "https://github.com/twolfson/restructuredtext-lint"; - license = lib.licenses.unlicense; - }; -} diff --git a/pkgs/development/python-modules/x-wr-timezone/default.nix b/pkgs/development/python-modules/x-wr-timezone/default.nix index 611536ded15..17afeaf5a34 100644 --- a/pkgs/development/python-modules/x-wr-timezone/default.nix +++ b/pkgs/development/python-modules/x-wr-timezone/default.nix @@ -4,7 +4,7 @@ , icalendar , pytz , pytestCheckHook -, restructuredtext_lint +, restructuredtext-lint , pygments }: @@ -28,7 +28,7 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook - restructuredtext_lint + restructuredtext-lint pygments ]; diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index fde18d413bc..ecd5a40c38b 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -371,6 +371,7 @@ mapAliases ({ repeated_test = repeated-test; # added 2022-11-15 requests_oauthlib = requests-oauthlib; # added 2022-02-12 requests_toolbelt = requests-toolbelt; # added 2017-09-26 + restructuredtext_lint = restructuredtext-lint; # added 2023-11-04 rig = throw "rig has been removed because it was pinned to python 2.7 and 3.5, failed to build and is otherwise unmaintained"; # added 2022-11-28 rl-coach = "rl-coach was removed because the project is discontinued and was archived by upstream"; # added 2023-05-03 roboschool = throw "roboschool is deprecated in favor of PyBullet and has been removed"; # added 2022-01-15 diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 8ce520f6619..b51096ec991 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -12227,7 +12227,7 @@ self: super: with self; { restrictedpython = callPackage ../development/python-modules/restrictedpython { }; - restructuredtext_lint = callPackage ../development/python-modules/restructuredtext_lint { }; + restructuredtext-lint = callPackage ../development/python-modules/restructuredtext-lint { }; restview = callPackage ../development/python-modules/restview { }; |