summaryrefslogtreecommitdiff
path: root/pkgs/development/python-modules/debugpy
diff options
context:
space:
mode:
authorKira Bruneau <kira.bruneau@pm.me>2024-09-25 11:16:01 -0400
committerKira Bruneau <kira.bruneau@pm.me>2024-09-25 11:53:07 -0400
commita36e20faceafcbedb0ce3c034d6d460663c01151 (patch)
tree8c86489e74054423e897edc0abecabaa10d4e337 /pkgs/development/python-modules/debugpy
parenta1d92660c6b3b7c26fb883500a80ea9d33321be2 (diff)
python312Packages.debugpy: 1.8.5 -> 1.8.6
Diffstat (limited to 'pkgs/development/python-modules/debugpy')
-rw-r--r--pkgs/development/python-modules/debugpy/default.nix4
-rw-r--r--pkgs/development/python-modules/debugpy/hardcode-gdb.patch12
-rw-r--r--pkgs/development/python-modules/debugpy/hardcode-lldb.patch8
-rw-r--r--pkgs/development/python-modules/debugpy/skip-attach-pid-tests.patch2
4 files changed, 13 insertions, 13 deletions
diff --git a/pkgs/development/python-modules/debugpy/default.nix b/pkgs/development/python-modules/debugpy/default.nix
index 18e9acec9b57..3c20434d7208 100644
--- a/pkgs/development/python-modules/debugpy/default.nix
+++ b/pkgs/development/python-modules/debugpy/default.nix
@@ -22,7 +22,7 @@
buildPythonPackage rec {
pname = "debugpy";
- version = "1.8.5";
+ version = "1.8.6";
format = "setuptools";
disabled = pythonOlder "3.8";
@@ -31,7 +31,7 @@ buildPythonPackage rec {
owner = "microsoft";
repo = "debugpy";
rev = "refs/tags/v${version}";
- hash = "sha256-SmSYhmLnVpBPEPO2o40wIv+e3cBbmZXSz+IKMRcnScw=";
+ hash = "sha256-kkFNIJ3QwojwgiRAOmBiWIg5desxOKTmo9YH1Qup6fI=";
};
patches =
diff --git a/pkgs/development/python-modules/debugpy/hardcode-gdb.patch b/pkgs/development/python-modules/debugpy/hardcode-gdb.patch
index 5cc68b21b3c6..d977f78771f5 100644
--- a/pkgs/development/python-modules/debugpy/hardcode-gdb.patch
+++ b/pkgs/development/python-modules/debugpy/hardcode-gdb.patch
@@ -1,13 +1,13 @@
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
diff --git a/pkgs/development/python-modules/debugpy/hardcode-lldb.patch b/pkgs/development/python-modules/debugpy/hardcode-lldb.patch
index 215e7ee0f9ca..5edbe3545695 100644
--- a/pkgs/development/python-modules/debugpy/hardcode-lldb.patch
+++ b/pkgs/development/python-modules/debugpy/hardcode-lldb.patch
@@ -1,13 +1,13 @@
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),
diff --git a/pkgs/development/python-modules/debugpy/skip-attach-pid-tests.patch b/pkgs/development/python-modules/debugpy/skip-attach-pid-tests.patch
index a993940f7266..cef0a97eb300 100644
--- a/pkgs/development/python-modules/debugpy/skip-attach-pid-tests.patch
+++ b/pkgs/development/python-modules/debugpy/skip-attach-pid-tests.patch
@@ -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):