Loading pkgs/development/python-modules/debugpy/default.nix +2 −2 Original line number Diff line number Diff line Loading @@ -22,7 +22,7 @@ buildPythonPackage rec { pname = "debugpy"; version = "1.8.5"; version = "1.8.6"; format = "setuptools"; disabled = pythonOlder "3.8"; Loading @@ -31,7 +31,7 @@ buildPythonPackage rec { owner = "microsoft"; repo = "debugpy"; rev = "refs/tags/v${version}"; hash = "sha256-SmSYhmLnVpBPEPO2o40wIv+e3cBbmZXSz+IKMRcnScw="; hash = "sha256-kkFNIJ3QwojwgiRAOmBiWIg5desxOKTmo9YH1Qup6fI="; }; patches = Loading pkgs/development/python-modules/debugpy/hardcode-gdb.patch +6 −6 Original line number Diff line number Diff line 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 85f3353b..56fab577 100644 index a1a852a0..0bb91807 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 @@ -410,7 +410,7 @@ def run_python_code_linux(pid, python_code, connect_debugger_tracing=False, show @@ -412,7 +412,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 = [ - 'gdb', - "gdb", + '@gdb@/bin/gdb', '--nw', # no gui interface '--nh', # no ~/.gdbinit '--nx', # no .gdbinit "--nw", # no gui interface "--nh", # no ~/.gdbinit "--nx", # no .gdbinit pkgs/development/python-modules/debugpy/hardcode-lldb.patch +4 −4 Original line number Diff line number Diff line 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 56fab577..989ede03 100644 index 0bb91807..8026a5ad 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 @@ -500,7 +500,7 @@ def run_python_code_mac(pid, python_code, connect_debugger_tracing=False, show_d @@ -503,7 +503,7 @@ def run_python_code_mac(pid, python_code, connect_debugger_tracing=False, show_d is_debug = 0 # Note that the space in the beginning of each line in the multi-line is important! cmd = [ - 'lldb', - "lldb", + '@lldb@/bin/lldb', '--no-lldbinit', # Do not automatically parse any '.lldbinit' files. "--no-lldbinit", # Do not automatically parse any '.lldbinit' files. # '--attach-pid', # str(pid), pkgs/development/python-modules/debugpy/skip-attach-pid-tests.patch +1 −1 Original line number Diff line number Diff line Loading @@ -12,7 +12,7 @@ index dc60d0ae..cf4a06a3 100644 log.info("Attaching {0} to {1} by PID.", session, target) diff --git a/tests/debugpy/test_attach.py b/tests/debugpy/test_attach.py index afabc1ac..2fff3982 100644 index 017d7f59..63e86328 100644 --- a/tests/debugpy/test_attach.py +++ b/tests/debugpy/test_attach.py @@ -151,8 +151,7 @@ def test_reattach(pyfile, target, run): Loading Loading
pkgs/development/python-modules/debugpy/default.nix +2 −2 Original line number Diff line number Diff line Loading @@ -22,7 +22,7 @@ buildPythonPackage rec { pname = "debugpy"; version = "1.8.5"; version = "1.8.6"; format = "setuptools"; disabled = pythonOlder "3.8"; Loading @@ -31,7 +31,7 @@ buildPythonPackage rec { owner = "microsoft"; repo = "debugpy"; rev = "refs/tags/v${version}"; hash = "sha256-SmSYhmLnVpBPEPO2o40wIv+e3cBbmZXSz+IKMRcnScw="; hash = "sha256-kkFNIJ3QwojwgiRAOmBiWIg5desxOKTmo9YH1Qup6fI="; }; patches = Loading
pkgs/development/python-modules/debugpy/hardcode-gdb.patch +6 −6 Original line number Diff line number Diff line 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 85f3353b..56fab577 100644 index a1a852a0..0bb91807 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 @@ -410,7 +410,7 @@ def run_python_code_linux(pid, python_code, connect_debugger_tracing=False, show @@ -412,7 +412,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 = [ - 'gdb', - "gdb", + '@gdb@/bin/gdb', '--nw', # no gui interface '--nh', # no ~/.gdbinit '--nx', # no .gdbinit "--nw", # no gui interface "--nh", # no ~/.gdbinit "--nx", # no .gdbinit
pkgs/development/python-modules/debugpy/hardcode-lldb.patch +4 −4 Original line number Diff line number Diff line 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 56fab577..989ede03 100644 index 0bb91807..8026a5ad 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 @@ -500,7 +500,7 @@ def run_python_code_mac(pid, python_code, connect_debugger_tracing=False, show_d @@ -503,7 +503,7 @@ def run_python_code_mac(pid, python_code, connect_debugger_tracing=False, show_d is_debug = 0 # Note that the space in the beginning of each line in the multi-line is important! cmd = [ - 'lldb', - "lldb", + '@lldb@/bin/lldb', '--no-lldbinit', # Do not automatically parse any '.lldbinit' files. "--no-lldbinit", # Do not automatically parse any '.lldbinit' files. # '--attach-pid', # str(pid),
pkgs/development/python-modules/debugpy/skip-attach-pid-tests.patch +1 −1 Original line number Diff line number Diff line Loading @@ -12,7 +12,7 @@ index dc60d0ae..cf4a06a3 100644 log.info("Attaching {0} to {1} by PID.", session, target) diff --git a/tests/debugpy/test_attach.py b/tests/debugpy/test_attach.py index afabc1ac..2fff3982 100644 index 017d7f59..63e86328 100644 --- a/tests/debugpy/test_attach.py +++ b/tests/debugpy/test_attach.py @@ -151,8 +151,7 @@ def test_reattach(pyfile, target, run): Loading