diff options
| author | Sandro <sandro.jaeckel@gmail.com> | 2021-07-24 23:10:53 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-07-24 23:10:53 +0000 |
| commit | 26a5bdc81381950594fbab482559f7863d8e74b0 (patch) | |
| tree | 02503a3103d8d8caff6cba515314feee12007045 /pkgs | |
| parent | 077da41b406e968658ac5fcdcb2109ce7ab60c6e (diff) | |
| parent | 3786773dff5a1b2500ca5b13122a87f2097b34f3 (diff) | |
| download | nixpkgs-26a5bdc81381950594fbab482559f7863d8e74b0.tar nixpkgs-26a5bdc81381950594fbab482559f7863d8e74b0.tar.gz nixpkgs-26a5bdc81381950594fbab482559f7863d8e74b0.tar.bz2 nixpkgs-26a5bdc81381950594fbab482559f7863d8e74b0.tar.lz nixpkgs-26a5bdc81381950594fbab482559f7863d8e74b0.tar.xz nixpkgs-26a5bdc81381950594fbab482559f7863d8e74b0.tar.zst nixpkgs-26a5bdc81381950594fbab482559f7863d8e74b0.zip | |
Merge pull request #131357 from kira-bruneau/pythonPackages.debugpy
pythonPackages.debugpy: 1.3.0 → 1.4.1
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/development/python-modules/debugpy/default.nix | 11 | ||||
| -rw-r--r-- | pkgs/development/python-modules/debugpy/hardcode-gdb.patch | 4 |
2 files changed, 4 insertions, 11 deletions
diff --git a/pkgs/development/python-modules/debugpy/default.nix b/pkgs/development/python-modules/debugpy/default.nix index 28368270884..9e821bf2dd1 100644 --- a/pkgs/development/python-modules/debugpy/default.nix +++ b/pkgs/development/python-modules/debugpy/default.nix @@ -2,7 +2,6 @@ , stdenv , buildPythonPackage , fetchFromGitHub -, fetchpatch , substituteAll , gdb , flask @@ -18,13 +17,13 @@ buildPythonPackage rec { pname = "debugpy"; - version = "1.3.0"; + version = "1.4.1"; src = fetchFromGitHub { owner = "Microsoft"; repo = pname; rev = "v${version}"; - hash = "sha256-YGzc9mMIzPTmUgIXuZROLdYKjUm69x9SR+JtYRVpn24="; + hash = "sha256-W51Y9tZB1Uyp175+hWCpXChwL+MBpDWjudF87F1MRso="; }; patches = [ @@ -49,12 +48,6 @@ buildPythonPackage rec { # To avoid this issue, debugpy should be installed using python.withPackages: # python.withPackages (ps: with ps; [ debugpy ]) ./fix-test-pythonpath.patch - - # Fix tests with flask>=2.0 - (fetchpatch { - url = "https://github.com/microsoft/debugpy/commit/0a7f2cd67dda27ea4d38389b49a4e2a1899b834e.patch"; - sha256 = "1g070fn07n7jj01jaf5s570zn70akf6klkamigs3ix11gh736rpn"; - }) ]; # Remove pre-compiled "attach" libraries and recompile for host platform diff --git a/pkgs/development/python-modules/debugpy/hardcode-gdb.patch b/pkgs/development/python-modules/debugpy/hardcode-gdb.patch index 780cb1aed1c..8b87ec7bda7 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 6d031b4..ecf21f2 100644 +index 51017f2..46654ab 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 -@@ -293,7 +293,7 @@ def run_python_code_linux(pid, python_code, connect_debugger_tracing=False, show +@@ -398,7 +398,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 = [ |