From fbfe6f5f1215682e4802a537625b3cdbe705939f Mon Sep 17 00:00:00 2001 From: Theodore Ni <3806110+tjni@users.noreply.github.com> Date: Tue, 22 Aug 2023 12:39:32 -0700 Subject: [PATCH] python3.pkgs.python-lsp-server: relax jedi dependency constraint --- .../python-modules/python-lsp-server/default.nix | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/python-lsp-server/default.nix b/pkgs/development/python-modules/python-lsp-server/default.nix index 67bbaf998dbbd..2dca97b7f858c 100644 --- a/pkgs/development/python-modules/python-lsp-server/default.nix +++ b/pkgs/development/python-modules/python-lsp-server/default.nix @@ -4,6 +4,7 @@ , buildPythonPackage , docstring-to-markdown , fetchFromGitHub +, fetchpatch , flake8 , flaky , jedi @@ -28,6 +29,7 @@ , ujson , websockets , whatthepatch +, wheel , yapf }: @@ -45,7 +47,14 @@ buildPythonPackage rec { hash = "sha256-plciPUROFileVULGBZpwUTkW2NZVHy4Nuf4+fSjd8nM="; }; - SETUPTOOLS_SCM_PRETEND_VERSION = version; + patches = [ + # https://github.com/python-lsp/python-lsp-server/pull/416 + (fetchpatch { + name = "bump-jedi-upper-pin-to-0.20.patch"; + url = "https://github.com/python-lsp/python-lsp-server/commit/f33a93afc8c3a0f16751f9e1f6601a37967fd7df.patch"; + hash = "sha256-lBpzXxjlQp2ig0z2DRJw+jQZ5eRLIOJYjGrzfgvknDA="; + }) + ]; postPatch = '' substituteInPlace pyproject.toml \ @@ -53,6 +62,8 @@ buildPythonPackage rec { --replace "--cov pylsp --cov test" "" ''; + env.SETUPTOOLS_SCM_PRETEND_VERSION = version; + pythonRelaxDeps = [ "autopep8" "flake8" @@ -65,6 +76,7 @@ buildPythonPackage rec { nativeBuildInputs = [ pythonRelaxDepsHook setuptools-scm + wheel ]; propagatedBuildInputs = [