diff options
| author | Alyssa Ross <hi@alyssa.is> | 2023-08-08 16:04:42 +0000 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2023-08-13 06:35:37 +0000 |
| commit | 12aaa58dac35800b5b7d77f81cf2a87c21ee55da (patch) | |
| tree | be0add9e5c22a85d20b5d78206aa74f956eb2a1b /nixpkgs/pkgs/development/python-modules/myst-nb | |
| parent | 45892a5591202f75a1c2f1ca7c62a92c7566e3c5 (diff) | |
| parent | 5a8e9243812ba528000995b294292d3b5e120947 (diff) | |
| download | nixlib-12aaa58dac35800b5b7d77f81cf2a87c21ee55da.tar nixlib-12aaa58dac35800b5b7d77f81cf2a87c21ee55da.tar.gz nixlib-12aaa58dac35800b5b7d77f81cf2a87c21ee55da.tar.bz2 nixlib-12aaa58dac35800b5b7d77f81cf2a87c21ee55da.tar.lz nixlib-12aaa58dac35800b5b7d77f81cf2a87c21ee55da.tar.xz nixlib-12aaa58dac35800b5b7d77f81cf2a87c21ee55da.tar.zst nixlib-12aaa58dac35800b5b7d77f81cf2a87c21ee55da.zip | |
Merge branch 'nixos-unstable' of https://github.com/NixOS/nixpkgs
Conflicts: nixpkgs/pkgs/applications/window-managers/sway/default.nix nixpkgs/pkgs/build-support/go/module.nix nixpkgs/pkgs/build-support/rust/build-rust-package/default.nix nixpkgs/pkgs/development/libraries/mesa/default.nix nixpkgs/pkgs/servers/dict/dictd-db.nix Link: https://gitlab.freedesktop.org/xkeyboard-config/xkeyboard-config/-/issues/391
Diffstat (limited to 'nixpkgs/pkgs/development/python-modules/myst-nb')
| -rw-r--r-- | nixpkgs/pkgs/development/python-modules/myst-nb/default.nix | 27 |
1 files changed, 26 insertions, 1 deletions
diff --git a/nixpkgs/pkgs/development/python-modules/myst-nb/default.nix b/nixpkgs/pkgs/development/python-modules/myst-nb/default.nix index a5694987abd5..6ede481fba85 100644 --- a/nixpkgs/pkgs/development/python-modules/myst-nb/default.nix +++ b/nixpkgs/pkgs/development/python-modules/myst-nb/default.nix @@ -2,6 +2,7 @@ , buildPythonPackage , pythonOlder , fetchPypi +, fetchpatch , flit-core , importlib-metadata , ipython @@ -30,6 +31,27 @@ buildPythonPackage rec { hash = "sha256-D2E4ZRX6sHxzZGrcqX//L2n0HpDTE6JgIXxbvkGdhYs="; }; + patches = [ + # Fix compatiblity with myst-parser 1.0. Remove with the next release. + (fetchpatch { + url = "https://github.com/executablebooks/MyST-NB/commit/48c45c6a8c4501005766c2d821b5e9ddfbedd5fa.patch"; + hash = "sha256-jGL2MjZArvPtbiaR/rRGCIi0QwYO0iTIK26GLuTrBM8="; + excludes = [ + "myst_nb/__init__.py" + "docs/authoring/custom-formats.Rmd" + "docs/authoring/jupyter-notebooks.md" + "docs/index.md" + "pyproject.toml" + "tests/nb_fixtures/reporter_warnings.txt" + ]; + }) + ]; + + postPatch = '' + substituteInPlace pyproject.toml \ + --replace "myst-parser~=0.18.0" "myst-parser" + ''; + nativeBuildInputs = [ flit-core pythonRelaxDepsHook @@ -53,7 +75,10 @@ buildPythonPackage rec { "myst-parser" ]; - pythonImportsCheck = [ "myst_nb" ]; + pythonImportsCheck = [ + "myst_nb" + "myst_nb.sphinx_ext" + ]; meta = with lib; { description = "A Jupyter Notebook Sphinx reader built on top of the MyST markdown parser"; |