push sheeet
Some checks failed
Periodic Merges (6h) / master → staging-nixos (push) Failing after 12m50s
Periodic Merges (6h) / master → staging-next (push) Failing after 12m54s
Periodic Merges (24h) / merge-base(master,staging) → haskell-updates (push) Failing after 11m54s
Periodic Merges (6h) / staging-next → staging (push) Failing after 12m13s
Periodic Merges (24h) / staging-next-25.05 → staging-25.05 (push) Failing after 13m24s
Periodic Merges (24h) / release-25.05 → staging-next-25.05 (push) Failing after 14m28s

This commit is contained in:
Dark Steveneq
2025-10-09 14:15:47 +02:00
commit 646b892680
49168 changed files with 5897842 additions and 0 deletions

View File

@@ -0,0 +1,50 @@
{
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 = with lib; {
homepage = "https://github.com/miyakogi/m2r";
description = "Markdown to reStructuredText converter";
license = licenses.mit;
maintainers = [ ];
# https://github.com/miyakogi/m2r/issues/66
broken = versionAtLeast mistune.version "2";
};
}

View File

@@ -0,0 +1,15 @@
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, ):