Merge master into staging-next

2026-10-30 08:00:59 +00:00 · 2022-03-27 18:01:05 +00:00
parent 086c62dd5e 5f6a4fb8a7
commit e3d20dfaa5
67 changed files with 753 additions and 199 deletions
--- a/pkgs/development/python-modules/ipykernel/default.nix
+++ b/pkgs/development/python-modules/ipykernel/default.nix
@@ -4,7 +4,6 @@
 , fetchPypi
 , pythonOlder
 , argcomplete
-, debugpy
 , ipython
 , jupyter-client
 , tornado
@@ -20,8 +19,13 @@ buildPythonPackage rec {
    sha256 = "sha256-+VBwot/TFH+KsZ8Y7kZzMxCBN1hZN0XgfsGPsItAnx0=";
  };

+  # debugpy is optional, see https://github.com/ipython/ipykernel/pull/767
+  postPatch = ''
+    substituteInPlace setup.py \
+      --replace "'debugpy>=1.0.0,<2.0'," ""
+  '';
+
  propagatedBuildInputs = [
-    debugpy
    ipython
    jupyter-client
    tornado