diff --git a/pkgs/development/python-modules/karton-dashboard/default.nix b/pkgs/development/python-modules/karton-dashboard/default.nix index 5b67123ee2788..89664f6da8e66 100644 --- a/pkgs/development/python-modules/karton-dashboard/default.nix +++ b/pkgs/development/python-modules/karton-dashboard/default.nix @@ -43,5 +43,6 @@ buildPythonPackage rec { homepage = "https://github.com/CERT-Polska/karton-dashboard"; license = with licenses; [ bsd3 ]; maintainers = with maintainers; [ fab ]; + broken = versionAtLeast mistune.version "2"; }; } diff --git a/pkgs/development/python-modules/lektor/default.nix b/pkgs/development/python-modules/lektor/default.nix index 0c0c5c108a46a..fa8e12dfc9c66 100644 --- a/pkgs/development/python-modules/lektor/default.nix +++ b/pkgs/development/python-modules/lektor/default.nix @@ -79,5 +79,6 @@ buildPythonPackage rec { homepage = "https://www.getlektor.com/"; license = licenses.bsd0; maintainers = with maintainers; [ costrouc ]; + broken = true; }; } diff --git a/pkgs/development/python-modules/m2r/default.nix b/pkgs/development/python-modules/m2r/default.nix index fd1483826177b..147d41e166b49 100644 --- a/pkgs/development/python-modules/m2r/default.nix +++ b/pkgs/development/python-modules/m2r/default.nix @@ -29,5 +29,6 @@ buildPythonPackage rec { description = "Markdown to reStructuredText converter"; license = licenses.mit; maintainers = with maintainers; [ SuperSandro2000 ]; + broken = versionAtLeast mistune.version "2"; }; } diff --git a/pkgs/development/python-modules/mistune/default.nix b/pkgs/development/python-modules/mistune/default.nix index 515844443f121..97787b1ba315c 100644 --- a/pkgs/development/python-modules/mistune/default.nix +++ b/pkgs/development/python-modules/mistune/default.nix @@ -11,5 +11,5 @@ self: rec { sha256 = "sha256-nuCmYFPiJnq6dyxx4GiR+o8a9tSwHV6E4me0Vw1NmAg="; format = "pyproject"; }; - mistune = mistune_0_8; + mistune = mistune_2_0; } diff --git a/pkgs/development/python-modules/mrkd/default.nix b/pkgs/development/python-modules/mrkd/default.nix index 22cd93910d6b9..a33c1639e7acd 100644 --- a/pkgs/development/python-modules/mrkd/default.nix +++ b/pkgs/development/python-modules/mrkd/default.nix @@ -24,5 +24,6 @@ buildPythonPackage rec { description = "Write man pages using Markdown, and convert them to Roff or HTML"; homepage = "https://github.com/refi64/mrkd"; license = licenses.bsd2; + broken = versionAtLeast mistune.version "2"; }; } diff --git a/pkgs/development/python-modules/nbconvert/default.nix b/pkgs/development/python-modules/nbconvert/default.nix index 9b85586f7d9be..a4b7e3c451f4f 100644 --- a/pkgs/development/python-modules/nbconvert/default.nix +++ b/pkgs/development/python-modules/nbconvert/default.nix @@ -3,12 +3,13 @@ , buildPythonPackage , defusedxml , fetchPypi +, fetchpatch , ipywidgets , jinja2 , jupyterlab-pygments , lib , markupsafe -, mistune +, mistune_2_0 , nbclient , pandocfilters , pyppeteer @@ -18,22 +19,34 @@ buildPythonPackage rec { pname = "nbconvert"; - version = "6.5.0"; + version = "6.5.3"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-Ij5G4nq+hZa4rtVDAfrbukM7f/6oGWpo/Xsf9Qnu6Z0="; + hash = "sha256-EO1pPEz9PGNYPIfKXDovbth0FFEDWV84JO/Mjfy3Uiw="; }; # Add $out/share/jupyter to the list of paths that are used to search for # various exporter templates patches = [ ./templates.patch + + # Use mistune 2.x + (fetchpatch { + name = "support-mistune-2.x.patch"; + url = "https://github.com/jupyter/nbconvert/commit/e870d9a4a61432a65bee5466c5fa80c9ee28966e.patch"; + hash = "sha256-kdOmE7BnkRy2lsNQ2OVrEXXZntJUPJ//b139kSsfKmI="; + excludes = [ "pyproject.toml" ]; + }) ]; postPatch = '' substituteAllInPlace ./nbconvert/exporters/templateexporter.py + + # Use mistune 2.x + substituteInPlace setup.py \ + --replace "mistune>=0.8.1,<2" "mistune>=2.0.3,<3" ''; propagatedBuildInputs = [ @@ -43,7 +56,7 @@ buildPythonPackage rec { jinja2 jupyterlab-pygments markupsafe - mistune + mistune_2_0 nbclient pandocfilters tinycss2 diff --git a/pkgs/development/python-modules/schema-salad/default.nix b/pkgs/development/python-modules/schema-salad/default.nix index 995c7e206faf3..3bf2fc36a6960 100644 --- a/pkgs/development/python-modules/schema-salad/default.nix +++ b/pkgs/development/python-modules/schema-salad/default.nix @@ -53,5 +53,6 @@ buildPythonPackage rec { homepage = "https://github.com/common-workflow-language/schema_salad"; license = with licenses; [ asl20 ]; maintainers = with maintainers; [ veprbl ]; + broken = true; }; }