summaryrefslogtreecommitdiffstats
path: root/pkgs
diff options
context:
space:
mode:
authorBenjamin Hipple <bhipple@protonmail.com>2020-12-07 21:19:14 -0500
committerBenjamin Hipple <bhipple@protonmail.com>2020-12-08 18:18:18 -0500
commitb2d64e2c28417df522359b6bf0b3f140192aba26 (patch)
tree79ea41da5850b557a6b27ae9d751b39339f55236 /pkgs
parent3c9e1eb9a2033538cbb019438a07483d39a97161 (diff)
python3Packages.jupytext: fix build by adding missing markdown-it-py dep; python3 only
Co-authored-by: Sandro <sandro.jaeckel@gmail.com> Co-authored-by: Timo Kaufmann <timokau@zoho.com>
Diffstat (limited to 'pkgs')
-rw-r--r--pkgs/development/python-modules/jupytext/default.nix9
-rw-r--r--pkgs/development/python-modules/markdown-it-py/default.nix4
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 6f4c188c2f75..ba627449c123 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 eb93f2a5320b..2d915762fca2 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 ];
};