git.iko.soy/typeable/nixpkgs
on master help sign in
spyder: fix build
commitf9776d3db7b3f1c05d7999ae953bfaabc3fcf851 authorEduardo Sánchez Muñoz <esm@eduardosm.net> dateTue 27 Apr 2021, 18:19 (6 years ago) parent458914e
1 file changed+8−4
pkgs/development/python-modules/spyder/default.nix+8−4
pkgs/development/python-modules/spyder/default.nix+8−4
@@ -3,7 +3,7 @@
33 keyring, numpydoc, qtconsole, qtawesome, nbconvert, mccabe, pyopengl,
44 cloudpickle, pygments, spyder-kernels, qtpy, pyzmq, chardet, qdarkstyle,
55 watchdog, python-language-server, pyqtwebengine, atomicwrites, pyxdg,
6− diff-match-patch, three-merge, pyls-black, pyls-spyder, flake8
6+ diff-match-patch, three-merge, pyls-black, pyls-spyder, flake8, textdistance
77}:
88
99buildPythonPackage rec {
@@ -20,11 +20,11 @@ buildPythonPackage rec {
2020 nativeBuildInputs = [ pyqtwebengine.wrapQtAppsHook ];
2121
2222 propagatedBuildInputs = [
23− intervaltree jedi pycodestyle psutil pyflakes rope numpy scipy matplotlib pylint keyring
23+ intervaltree jedi pycodestyle psutil rope numpy scipy matplotlib pylint keyring
2424 numpydoc qtconsole qtawesome nbconvert mccabe pyopengl cloudpickle spyder-kernels
2525 pygments qtpy pyzmq chardet pyqtwebengine qdarkstyle watchdog python-language-server
2626 atomicwrites pyxdg diff-match-patch three-merge pyls-black pyls-spyder
27− flake8
27+ flake8 textdistance
2828 ];
2929
3030 # There is no test for spyder
@@ -44,9 +44,13 @@ buildPythonPackage rec {
4444 # remove dependency on pyqtwebengine
4545 # this is still part of the pyqt 5.11 version we have in nixpkgs
4646 sed -i /pyqtwebengine/d setup.py
47+ # The major version bump in watchdog is due to changes in supported
48+ # platforms, not API break.
49+ # https://github.com/gorakhargosh/watchdog/issues/761#issuecomment-777001518
4750 substituteInPlace setup.py \
4851 --replace "pyqt5<5.13" "pyqt5" \
49− --replace "parso==0.7.0" "parso"
52+ --replace "parso==0.7.0" "parso" \
53+ --replace "watchdog>=0.10.3,<2.0.0" "watchdog>=0.10.3,<3.0.0"
5054 '';
5155
5256 postInstall = ''