diff --git a/pkgs/development/python-modules/spyder/default.nix b/pkgs/development/python-modules/spyder/default.nix index b3d91997fc90..febf8c66dd3f 100644 --- a/pkgs/development/python-modules/spyder/default.nix +++ b/pkgs/development/python-modules/spyder/default.nix @@ -5,11 +5,14 @@ pythonOlder, # dependencies + aiohttp, + asyncssh, atomicwrites, chardet, cloudpickle, cookiecutter, diff-match-patch, + fzf, intervaltree, jedi, jellyfish, @@ -20,6 +23,7 @@ numpydoc, pickleshare, psutil, + pygithub, pygments, pylint-venv, pyls-spyder, @@ -27,7 +31,7 @@ pyqtwebengine, python-lsp-black, python-lsp-server, - pyxdg, + pyuca, pyzmq, qdarkstyle, qstylizer, @@ -39,21 +43,21 @@ scipy, setuptools, spyder-kernels, + superqt, textdistance, three-merge, watchdog, + yarl, }: buildPythonPackage rec { pname = "spyder"; - version = "5.5.6"; + version = "6.0.0"; pyproject = true; - disabled = pythonOlder "3.8"; - src = fetchPypi { inherit pname version; - hash = "sha256-lYtmn0oBXFw5EFDrbv+o2EZWqL/Eel9GrbopeEnYK90="; + hash = "sha256-/UUtSpSkt1hJeIZfBLe8owP82jRx02kUF6TdfCsq6CY="; }; patches = [ ./dont-clear-pythonpath.patch ]; @@ -64,11 +68,14 @@ buildPythonPackage rec { ]; dependencies = [ + aiohttp + asyncssh atomicwrites chardet cloudpickle cookiecutter diff-match-patch + fzf intervaltree jedi jellyfish @@ -79,6 +86,7 @@ buildPythonPackage rec { numpydoc pickleshare psutil + pygithub pygments pylint-venv pyls-spyder @@ -86,7 +94,7 @@ buildPythonPackage rec { pyqtwebengine python-lsp-black python-lsp-server - pyxdg + pyuca pyzmq qdarkstyle qstylizer @@ -97,9 +105,11 @@ buildPythonPackage rec { rtree scipy spyder-kernels + superqt textdistance three-merge watchdog + yarl ] ++ python-lsp-server.optional-dependencies.all; # There is no test for spyder diff --git a/pkgs/development/python-modules/spyder/dont-clear-pythonpath.patch b/pkgs/development/python-modules/spyder/dont-clear-pythonpath.patch index abb021e39554..0d623c69ee34 100644 --- a/pkgs/development/python-modules/spyder/dont-clear-pythonpath.patch +++ b/pkgs/development/python-modules/spyder/dont-clear-pythonpath.patch @@ -1,25 +1,21 @@ diff --git a/spyder/app/start.py b/spyder/app/start.py -index 97b08a600..66486e510 100644 +index ad9f2b8d0..442b4fc46 100644 --- a/spyder/app/start.py +++ b/spyder/app/start.py -@@ -6,20 +6,8 @@ +@@ -6,16 +6,8 @@ # (see spyder/__init__.py for details) # ----------------------------------------------------------------------------- - + -# Remove PYTHONPATH paths from sys.path before other imports to protect against -# shadowed standard libraries. import os import sys -if os.environ.get('PYTHONPATH'): - for path in os.environ['PYTHONPATH'].split(os.pathsep): -- if os.name == 'nt' and 'pkgs' in path: -- # Don't remove pynsist installer entry for 'pkgs' directory -- continue -- else: -- try: -- sys.path.remove(path.rstrip(os.sep)) -- except ValueError: -- pass - +- try: +- sys.path.remove(path.rstrip(os.sep)) +- except ValueError: +- pass + # Standard library imports import ctypes