From e18ede29fea1cac9573793f3554b3f5ceccddee9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Wed, 27 May 2026 00:56:14 +0200 Subject: [PATCH] m2r: drop as it was marked broken for 4 years --- .../python-modules/m2r/default.nix | 50 ------------------- .../m2r/docutils-0.19-compat.patch | 15 ------ pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 2 - pkgs/top-level/python-aliases.nix | 1 + pkgs/top-level/python-packages.nix | 2 - 6 files changed, 2 insertions(+), 69 deletions(-) delete mode 100644 pkgs/development/python-modules/m2r/default.nix delete mode 100644 pkgs/development/python-modules/m2r/docutils-0.19-compat.patch diff --git a/pkgs/development/python-modules/m2r/default.nix b/pkgs/development/python-modules/m2r/default.nix deleted file mode 100644 index dc14012dc06b..000000000000 --- a/pkgs/development/python-modules/m2r/default.nix +++ /dev/null @@ -1,50 +0,0 @@ -{ - lib, - buildPythonPackage, - fetchpatch, - fetchPypi, - docutils, - mistune, - pygments, -}: - -buildPythonPackage rec { - pname = "m2r"; - version = "0.3.1"; - format = "setuptools"; - - src = fetchPypi { - inherit pname version; - hash = "sha256-qvtn/EnPsdieRqNEOsdH4V9LtC3yDtBPBnrZ777iVqs="; - }; - - patches = [ - # fix tests in python 3.10 - (fetchpatch { - url = "https://github.com/miyakogi/m2r/commit/58ee9cabdadf5e3deb13037f3052238f0f2bffcd.patch"; - hash = "sha256-CN3PWmnk7xsn1wngRHuEWmDTP3HtVNxkFv0xzD2Zjlo="; - }) - ./docutils-0.19-compat.patch - ]; - - postPatch = '' - substituteInPlace tests/test_cli.py \ - --replace "optional" "positional" - ''; - - propagatedBuildInputs = [ - mistune - docutils - ]; - - nativeCheckInputs = [ pygments ]; - - meta = { - homepage = "https://github.com/miyakogi/m2r"; - description = "Markdown to reStructuredText converter"; - license = lib.licenses.mit; - maintainers = [ ]; - # https://github.com/miyakogi/m2r/issues/66 - broken = lib.versionAtLeast mistune.version "2"; - }; -} diff --git a/pkgs/development/python-modules/m2r/docutils-0.19-compat.patch b/pkgs/development/python-modules/m2r/docutils-0.19-compat.patch deleted file mode 100644 index 9392702b982e..000000000000 --- a/pkgs/development/python-modules/m2r/docutils-0.19-compat.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff --git a/m2r.py b/m2r.py -index a4e43c2..fb9e588 100644 ---- a/m2r.py -+++ b/m2r.py -@@ -10,8 +10,8 @@ from argparse import ArgumentParser, Namespace - - from docutils import statemachine, nodes, io, utils - from docutils.parsers import rst --from docutils.core import ErrorString --from docutils.utils import SafeString, column_width -+from docutils.utils.error_reporting import ErrorString, SafeString -+from docutils.utils import column_width - import mistune - - if sys.version_info < (3, ): diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 6b3eb9a5099d..16fef09ac131 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -1380,6 +1380,7 @@ mapAliases { lxde.lxtask = throw "'lxtask' has been moved to top-level. Use 'lxtask' directly"; # Added 2025-08-31 lxdvdrip = throw "'lxdvdrip' has been removed due to lack of upstream maintenance."; # Added 2025-06-09 LycheeSlicer = warnAlias "'LycheeSlicer' has been renamed to 'lycheeslicer'" lycheeslicer; # Added 2026-02-08 + m2r = throw "'m2r' has been removed because it was marked broken for a long time."; # Added 2026-05-27 mac = throw "'mac' has been renamed to/replaced by 'monkeysAudio'"; # Converted to throw 2025-10-27 MACS2 = throw "'MACS2' has been renamed to/replaced by 'macs2'"; # Converted to throw 2025-10-27 magma_2_6_2 = throw "'magma_2_6_2' has been removed, use the latest 'magma' package instead."; # Added 2025-07-20 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 40a7918d215f..f34dbc284f70 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2640,8 +2640,6 @@ with pkgs; maubot = with python3Packages; toPythonApplication maubot; - m2r = with python3Packages; toPythonApplication m2r; - md2gemini = with python3.pkgs; toPythonApplication md2gemini; mdcat = callPackage ../tools/text/mdcat { diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index 760280221a0e..69ec301b08e9 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -328,6 +328,7 @@ mapAliases { lsprotocol_2025 = lsprotocol; # added 2026-01-05 lxml-stubs = throw "'lxml-stubs' has been removed as it was broken and unmaintained upstream. Consider using 'types-lxml' instead."; # Converted to throw 2025-11-07 lzstring = throw "'lzstring' has been removed as it was unmaintained upstream"; # Added 2025-11-22 + m2r = throw "'m2r' has been removed because it was marked broken for a long time."; # Added 2026-05-27 mac_alias = throw "'mac_alias' has been renamed to/replaced by 'mac-alias'"; # Converted to throw 2025-10-29 macropy = throw "macropy has been removed as it was broken since 2020"; # added 2025-10-04 Mako = throw "'Mako' has been renamed to/replaced by 'mako'"; # Converted to throw 2025-10-29 diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index f9cea08d2077..5949646142bf 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -9518,8 +9518,6 @@ self: super: with self; { m2crypto = callPackage ../development/python-modules/m2crypto { }; - m2r = callPackage ../development/python-modules/m2r { }; - m3u8 = callPackage ../development/python-modules/m3u8 { }; mac-alias = callPackage ../development/python-modules/mac-alias { };