diff --git a/pkgs/development/python-modules/debugpy/default.nix b/pkgs/development/python-modules/debugpy/default.nix index 35ac416d5992..10ed4c62e764 100644 --- a/pkgs/development/python-modules/debugpy/default.nix +++ b/pkgs/development/python-modules/debugpy/default.nix @@ -17,13 +17,13 @@ buildPythonPackage rec { pname = "debugpy"; - version = "1.4.1"; + version = "1.4.3"; src = fetchFromGitHub { owner = "Microsoft"; repo = pname; rev = "v${version}"; - hash = "sha256-W51Y9tZB1Uyp175+hWCpXChwL+MBpDWjudF87F1MRso="; + hash = "sha256-ULxVoZuMNDL0Win/+55RnbkCPZ8OI8nhSKshvJOMFQ4="; }; patches = [ diff --git a/pkgs/development/python-modules/debugpy/fix-test-pythonpath.patch b/pkgs/development/python-modules/debugpy/fix-test-pythonpath.patch index f74b53a831b3..537531cd9747 100644 --- a/pkgs/development/python-modules/debugpy/fix-test-pythonpath.patch +++ b/pkgs/development/python-modules/debugpy/fix-test-pythonpath.patch @@ -1,5 +1,5 @@ diff --git a/tests/debug/session.py b/tests/debug/session.py -index 101492f..4ee7cfb 100644 +index 101492fc..4ee7cfbe 100644 --- a/tests/debug/session.py +++ b/tests/debug/session.py @@ -630,6 +630,7 @@ class Session(object): diff --git a/pkgs/development/python-modules/debugpy/hardcode-gdb.patch b/pkgs/development/python-modules/debugpy/hardcode-gdb.patch index 8b87ec7bda7a..09851260233f 100644 --- a/pkgs/development/python-modules/debugpy/hardcode-gdb.patch +++ b/pkgs/development/python-modules/debugpy/hardcode-gdb.patch @@ -1,8 +1,8 @@ diff --git a/src/debugpy/_vendored/pydevd/pydevd_attach_to_process/add_code_to_python_process.py b/src/debugpy/_vendored/pydevd/pydevd_attach_to_process/add_code_to_python_process.py -index 51017f2..46654ab 100644 +index 3c0e1b94..e995a20f 100644 --- a/src/debugpy/_vendored/pydevd/pydevd_attach_to_process/add_code_to_python_process.py +++ b/src/debugpy/_vendored/pydevd/pydevd_attach_to_process/add_code_to_python_process.py -@@ -398,7 +398,7 @@ def run_python_code_linux(pid, python_code, connect_debugger_tracing=False, show +@@ -399,7 +399,7 @@ def run_python_code_linux(pid, python_code, connect_debugger_tracing=False, show is_debug = 0 # Note that the space in the beginning of each line in the multi-line is important! cmd = [ diff --git a/pkgs/development/python-modules/debugpy/hardcode-version.patch b/pkgs/development/python-modules/debugpy/hardcode-version.patch index 2879716f704d..7d3fd5abfc2d 100644 --- a/pkgs/development/python-modules/debugpy/hardcode-version.patch +++ b/pkgs/development/python-modules/debugpy/hardcode-version.patch @@ -1,27 +1,25 @@ diff --git a/setup.py b/setup.py -index cfec60d..32ca206 100644 +index e7487100..10d36520 100644 --- a/setup.py +++ b/setup.py -@@ -24,7 +24,6 @@ elif "--abi" in sys.argv: - from setuptools import setup # noqa +@@ -12,7 +12,6 @@ import sys + sys.path.insert(0, os.path.dirname(os.path.abspath(__file__))) -import versioneer # noqa del sys.path[0] -@@ -86,7 +85,7 @@ if __name__ == "__main__": - if not os.getenv("SKIP_CYTHON_BUILD"): - cython_build() +@@ -141,13 +140,13 @@ if __name__ == "__main__": + if platforms is not None: + extras["platforms"] = platforms - cmds = versioneer.get_cmdclass() + cmds = {} - cmds["bdist_wheel"] = bdist_wheel + override_build(cmds) + override_build_py(cmds) - extras = {} -@@ -96,7 +95,7 @@ if __name__ == "__main__": - - setup( + setuptools.setup( name="debugpy", - version=versioneer.get_version(), + version="@version@", @@ -29,7 +27,7 @@ index cfec60d..32ca206 100644 long_description=long_description, long_description_content_type="text/markdown", diff --git a/src/debugpy/__init__.py b/src/debugpy/__init__.py -index baa5a7c..5355327 100644 +index baa5a7c5..53553272 100644 --- a/src/debugpy/__init__.py +++ b/src/debugpy/__init__.py @@ -27,7 +27,6 @@ __all__ = [