From 7bccc0b7efe120d19afa4f076598b5bcc61a445f Mon Sep 17 00:00:00 2001 From: dadada Date: Mon, 15 Mar 2021 18:13:16 +0100 Subject: [PATCH] Update recipemd package --- pkgs/python-pkgs/recipemd/default.nix | 41 ++++++--------------------- 1 file changed, 8 insertions(+), 33 deletions(-) diff --git a/pkgs/python-pkgs/recipemd/default.nix b/pkgs/python-pkgs/recipemd/default.nix index 4c0c41a..39937fd 100644 --- a/pkgs/python-pkgs/recipemd/default.nix +++ b/pkgs/python-pkgs/recipemd/default.nix @@ -2,14 +2,16 @@ , buildPythonPackage , fetchFromGitHub , pytestCheckHook -, python3Packages +, pythonPackages +, isPy36 +, isPy27 }: buildPythonPackage rec { pname = "recipemd"; version = "4.0.5"; - disabled = false; # requires python version >=3.7,<4 + disabled = isPy36 || isPy27; src = fetchFromGitHub { owner = "tstehr"; @@ -18,49 +20,22 @@ buildPythonPackage rec { sha256 = "17ph5gnbrx6159cryjlpkkp15gvazvxgm6ixcmrbdmsg6rgyqcpn"; }; - # # Package conditions to handle - # # might have to sed setup.py and egg.info in patchPhase - # # sed -i "s/...//" - # # Extra packages (may not be necessary) - # pytest-cov==2.8.1 # tests - # tox==3.20.1 # tests - # Sphinx==2.2.2 # docs - # m2r==0.2.1 # docs - # sphinxcontrib.fulltoc==1.2.0 # docs - # sphinxcontrib.autoprogram==0.1.5 # docs - # sphinx_autodoc_typehints==1.10.3 # docs - # sphinxcontrib.apidoc==0.3.0 # docs - # sphinx-autobuild==0.7.1 # docs - # twine==3.1.1 # release - # pytest==5.3.1 # dev - # pytest-cov==2.8.1 # dev - # tox==3.20.1 # dev - # Sphinx==2.2.2 # dev - # m2r==0.2.1 # dev - # sphinxcontrib.fulltoc==1.2.0 # dev - # sphinxcontrib.autoprogram==0.1.5 # dev - # sphinx_autodoc_typehints==1.10.3 # dev - # sphinxcontrib.apidoc==0.3.0 # dev - # sphinx-autobuild==0.7.1 # dev - # twine==3.1.1 # dev - patchPhase = '' - # Override yarl version sed -i 's/argcomplete~=1.10.0/yarl~=1.0/' setup.py sed -i 's/yarl~=1.3.0/yarl~=1.0/' setup.py ''; - propagatedBuildInputs = with python3Packages; [ - dataclasses-json - yarl + propagatedBuildInputs = with pythonPackages; [ CommonMark argcomplete + dataclasses-json pyparsing + yarl ]; checkInputs = [ pytestCheckHook - python3Packages.pytestcov + pythonPackages.pytestcov ]; doCheck = true;