Skip to content

[22.05] python3Packages.nbconvert: use mistune 2.x #187839

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
Ma27 wants to merge 4 commits into from
Closed

[22.05] python3Packages.nbconvert: use mistune 2.x #187839

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
4526204
python310Packages.nbconvert: use mistune 2.x
smancill Aug 15, 2022
5a182a0
python310Packages.nbconvert: 6.5.0 -> 6.5.3
onny Aug 17, 2022
32e0e57
python3Packages.nbconvert: actually switch to mistune2
Ma27 Aug 22, 2022
6d2066a
python3: make mistune2 the new default and mark failing builds as broken
Ma27 Aug 23, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions pkgs/development/python-modules/karton-dashboard/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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";
};
}
1 change: 1 addition & 0 deletions pkgs/development/python-modules/lektor/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,5 +79,6 @@ buildPythonPackage rec {
homepage = "https://www.getlektor.com/";
license = licenses.bsd0;
maintainers = with maintainers; [ costrouc ];
broken = true;
};
}
1 change: 1 addition & 0 deletions pkgs/development/python-modules/m2r/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,5 +29,6 @@ buildPythonPackage rec {
description = "Markdown to reStructuredText converter";
license = licenses.mit;
maintainers = with maintainers; [ SuperSandro2000 ];
broken = versionAtLeast mistune.version "2";
};
}
2 changes: 1 addition & 1 deletion pkgs/development/python-modules/mistune/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,5 +11,5 @@ self: rec {
sha256 = "sha256-nuCmYFPiJnq6dyxx4GiR+o8a9tSwHV6E4me0Vw1NmAg=";
format = "pyproject";
};
mistune = mistune_0_8;
mistune = mistune_2_0;
}
1 change: 1 addition & 0 deletions pkgs/development/python-modules/mrkd/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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";
};
}
21 changes: 17 additions & 4 deletions pkgs/development/python-modules/nbconvert/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,13 @@
, buildPythonPackage
, defusedxml
, fetchPypi
, fetchpatch
, ipywidgets
, jinja2
, jupyterlab-pygments
, lib
, markupsafe
, mistune
, mistune_2_0
, nbclient
, pandocfilters
, pyppeteer
Expand All @@ -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 = [
Expand All @@ -43,7 +56,7 @@ buildPythonPackage rec {
jinja2
jupyterlab-pygments
markupsafe
mistune
mistune_2_0
nbclient
pandocfilters
tinycss2
Expand Down
1 change: 1 addition & 0 deletions pkgs/development/python-modules/schema-salad/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
};
}