From f9776d3db7b3f1c05d7999ae953bfaabc3fcf851 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Eduardo=20S=C3=A1nchez=20Mu=C3=B1oz?= Date: Tue, 27 Apr 2021 18:19:17 +0200 Subject: [PATCH] spyder: fix build --- pkgs/development/python-modules/spyder/default.nix | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/spyder/default.nix b/pkgs/development/python-modules/spyder/default.nix index 0293699a450..12dd743751f 100644 --- a/pkgs/development/python-modules/spyder/default.nix +++ b/pkgs/development/python-modules/spyder/default.nix @@ -3,7 +3,7 @@ keyring, numpydoc, qtconsole, qtawesome, nbconvert, mccabe, pyopengl, cloudpickle, pygments, spyder-kernels, qtpy, pyzmq, chardet, qdarkstyle, watchdog, python-language-server, pyqtwebengine, atomicwrites, pyxdg, - diff-match-patch, three-merge, pyls-black, pyls-spyder, flake8 + diff-match-patch, three-merge, pyls-black, pyls-spyder, flake8, textdistance }: buildPythonPackage rec { @@ -20,11 +20,11 @@ buildPythonPackage rec { nativeBuildInputs = [ pyqtwebengine.wrapQtAppsHook ]; propagatedBuildInputs = [ - intervaltree jedi pycodestyle psutil pyflakes rope numpy scipy matplotlib pylint keyring + intervaltree jedi pycodestyle psutil rope numpy scipy matplotlib pylint keyring numpydoc qtconsole qtawesome nbconvert mccabe pyopengl cloudpickle spyder-kernels pygments qtpy pyzmq chardet pyqtwebengine qdarkstyle watchdog python-language-server atomicwrites pyxdg diff-match-patch three-merge pyls-black pyls-spyder - flake8 + flake8 textdistance ]; # There is no test for spyder @@ -44,9 +44,13 @@ buildPythonPackage rec { # remove dependency on pyqtwebengine # this is still part of the pyqt 5.11 version we have in nixpkgs sed -i /pyqtwebengine/d setup.py + # The major version bump in watchdog is due to changes in supported + # platforms, not API break. + # https://github.com/gorakhargosh/watchdog/issues/761#issuecomment-777001518 substituteInPlace setup.py \ --replace "pyqt5<5.13" "pyqt5" \ - --replace "parso==0.7.0" "parso" + --replace "parso==0.7.0" "parso" \ + --replace "watchdog>=0.10.3,<2.0.0" "watchdog>=0.10.3,<3.0.0" ''; postInstall = ''