summary refs log tree commit diff
path: root/pkgs
diff options
context:
space:
mode:
authorKira Bruneau <kira.bruneau@pm.me>2021-07-24 11:39:20 -0400
committerKira Bruneau <kira.bruneau@pm.me>2021-07-24 13:10:54 -0400
commit16af37bfca2228c988283c4103492d9617f6b281 (patch)
treed5fdc2fa3c0d3c86a1dc17bc2af27e9294ce627d /pkgs
parent16105403bdd843540cbef9c63fc0f16c1c6eaa70 (diff)
downloadnixpkgs-16af37bfca2228c988283c4103492d9617f6b281.tar
nixpkgs-16af37bfca2228c988283c4103492d9617f6b281.tar.gz
nixpkgs-16af37bfca2228c988283c4103492d9617f6b281.tar.bz2
nixpkgs-16af37bfca2228c988283c4103492d9617f6b281.tar.lz
nixpkgs-16af37bfca2228c988283c4103492d9617f6b281.tar.xz
nixpkgs-16af37bfca2228c988283c4103492d9617f6b281.tar.zst
nixpkgs-16af37bfca2228c988283c4103492d9617f6b281.zip
pythonPackages.debugpy: 1.3.0 → 1.4.0
Diffstat (limited to 'pkgs')
-rw-r--r--pkgs/development/python-modules/debugpy/default.nix11
-rw-r--r--pkgs/development/python-modules/debugpy/hardcode-gdb.patch4
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 da1f25ad2c3..c29264ff288 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.0";
 
   src = fetchFromGitHub {
     owner = "Microsoft";
     repo = pname;
     rev = "v${version}";
-    hash = "sha256-YGzc9mMIzPTmUgIXuZROLdYKjUm69x9SR+JtYRVpn24=";
+    hash = "sha256-W4hUVHY2TbFgQhM1qIbosvDPORFxsuoJC+xuCzrYIMI=";
   };
 
   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 = [