From b2d64e2c28417df522359b6bf0b3f140192aba26 Mon Sep 17 00:00:00 2001 From: Benjamin Hipple Date: Mon, 7 Dec 2020 21:19:14 -0500 Subject: [PATCH] python3Packages.jupytext: fix build by adding missing markdown-it-py dep; python3 only Co-authored-by: Sandro Co-authored-by: Timo Kaufmann --- pkgs/development/python-modules/jupytext/default.nix | 9 ++++++--- .../python-modules/markdown-it-py/default.nix | 4 +--- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/jupytext/default.nix b/pkgs/development/python-modules/jupytext/default.nix index 6f4c188c2f7..ba627449c12 100644 --- a/pkgs/development/python-modules/jupytext/default.nix +++ b/pkgs/development/python-modules/jupytext/default.nix @@ -1,5 +1,5 @@ { lib, buildPythonPackage, fetchPypi, isPy27 -, mock +, markdown-it-py , nbformat , pytest , pyyaml @@ -10,16 +10,19 @@ buildPythonPackage rec { pname = "jupytext"; version = "1.7.1"; + disabled = isPy27; + src = fetchPypi { inherit pname version; sha256 = "23123b90c267c67716fe6a022dfae49b84fd3809370d83211f2920eb3106bf40"; }; propagatedBuildInputs = [ - pyyaml + markdown-it-py nbformat + pyyaml toml - ] ++ lib.optionals isPy27 [ mock ]; # why they put it in install_requires, who knows + ]; checkInputs = [ pytest diff --git a/pkgs/development/python-modules/markdown-it-py/default.nix b/pkgs/development/python-modules/markdown-it-py/default.nix index eb93f2a5320..2d915762fca 100644 --- a/pkgs/development/python-modules/markdown-it-py/default.nix +++ b/pkgs/development/python-modules/markdown-it-py/default.nix @@ -2,7 +2,6 @@ , attrs , coverage , psutil -, pytest , pytest-benchmark }: @@ -25,7 +24,6 @@ buildPythonPackage rec { coverage pytest-benchmark psutil - pytest pytestCheckHook ]; @@ -42,7 +40,7 @@ buildPythonPackage rec { meta = with lib; { description = "Markdown parser done right"; homepage = "https://markdown-it-py.readthedocs.io/en/latest"; - changelog = "https://github.com/executablebooks/markdown-it-py/blob/master/CHANGELOG.md"; + changelog = "https://github.com/executablebooks/markdown-it-py/blob/${src.rev}/CHANGELOG.md"; license = licenses.mit; maintainers = with maintainers; [ bhipple ]; };