diff --git a/pkgs/development/python-modules/python-lsp-black/default.nix b/pkgs/development/python-modules/python-lsp-black/default.nix index e129a26a5f2f..573f400a4bd7 100644 --- a/pkgs/development/python-modules/python-lsp-black/default.nix +++ b/pkgs/development/python-modules/python-lsp-black/default.nix @@ -1,7 +1,6 @@ { lib, buildPythonPackage, - pythonOlder, fetchFromGitHub, black, fetchpatch, @@ -11,10 +10,10 @@ # dependencies python-lsp-server, - tomli, # checks pytestCheckHook, + setuptools_80, }: buildPythonPackage rec { @@ -29,19 +28,23 @@ buildPythonPackage rec { hash = "sha256-nV6mePSWzfPW2RwXg/mxgzfT9wD95mmTuPnPEro1kEY="; }; - patches = - /** - includes a series of patches fixing tests not yet released as 2.0.1+ version - they are meant to keep up to date with black releases - */ - lib.optional (lib.versionAtLeast black.version "24.2.0") (fetchpatch { + patches = [ + # includes a series of patches fixing tests not yet released as 2.0.1+ version + # they are meant to keep up to date with black releases + (fetchpatch { url = "https://github.com/python-lsp/python-lsp-black/commit/d43b41431379f9c9bb05fab158c4d97e6d515f8f.patch"; hash = "sha256-38bYU27+xtA8Kq3appXTkNnkG5/XgrUJ2nQ5+yuSU2U="; }) - ++ lib.optional (lib.versionAtLeast black.version "24.3.0") (fetchpatch { + (fetchpatch { url = "https://github.com/python-lsp/python-lsp-black/commit/9298585a9d14d25920c33b188d79e820dc98d4a9.patch"; hash = "sha256-4u0VIS7eidVEiKRW2wc8lJVkJwhzJD/M+uuqmTtiZ7E="; - }); + }) + # https://github.com/python-lsp/python-lsp-black/pull/65 (black >= 26.5) + (fetchpatch { + url = "https://github.com/python-lsp/python-lsp-black/commit/35b5bc6f944bddac0c896127dc44a9404e95f482.patch"; + hash = "sha256-FRxM8leFVkPjRiR3wNjy5g5BazHc6ZvtnoI8Qgz4co4="; + }) + ]; build-system = [ setuptools ]; @@ -52,7 +55,10 @@ buildPythonPackage rec { pythonImportsCheck = [ "pylsp_black" ]; - nativeCheckInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ + pytestCheckHook + setuptools_80 # for pkg_resources, removed in setuptools 81+ (tests/test_plugin.py) + ]; meta = { homepage = "https://github.com/python-lsp/python-lsp-black";