diff options
| author | Alyssa Ross <hi@alyssa.is> | 2023-09-01 11:51:02 +0000 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2023-09-01 11:51:02 +0000 |
| commit | aa4353b499e6950b7333578f936455a628145c31 (patch) | |
| tree | c6332cedece2327a18d08794755b3fc0f9f1905b /nixpkgs/pkgs/development/python-modules/python-lsp-server | |
| parent | ac456d475f4e50818499b804359355c0f3b4bbf7 (diff) | |
| parent | 52185f4d76c18d8348f963795dfed1de018e8dfe (diff) | |
| download | nixlib-aa4353b499e6950b7333578f936455a628145c31.tar nixlib-aa4353b499e6950b7333578f936455a628145c31.tar.gz nixlib-aa4353b499e6950b7333578f936455a628145c31.tar.bz2 nixlib-aa4353b499e6950b7333578f936455a628145c31.tar.lz nixlib-aa4353b499e6950b7333578f936455a628145c31.tar.xz nixlib-aa4353b499e6950b7333578f936455a628145c31.tar.zst nixlib-aa4353b499e6950b7333578f936455a628145c31.zip | |
Merge https://github.com/NixOS/nixpkgs
Diffstat (limited to 'nixpkgs/pkgs/development/python-modules/python-lsp-server')
| -rw-r--r-- | nixpkgs/pkgs/development/python-modules/python-lsp-server/default.nix | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/nixpkgs/pkgs/development/python-modules/python-lsp-server/default.nix b/nixpkgs/pkgs/development/python-modules/python-lsp-server/default.nix index 67bbaf998dbb..2dca97b7f858 100644 --- a/nixpkgs/pkgs/development/python-modules/python-lsp-server/default.nix +++ b/nixpkgs/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 = [ |