py-ruff: fix build

[pin <voidpin%protonmail.com@localhost>]

Module Name:	pkgsrc-wip
Committed By:	pin <voidpin%protonmail.com@localhost>
Pushed By:	pin
Date:		Sat Jun 8 20:13:04 2024 +0200
Changeset:	850368ad87e757e7c1e5a4de5775260a24f762f6

Modified Files:
	py-ruff/Makefile
	py-ruff/cargo-depends.mk
	py-ruff/distinfo
	py-ruff/patches/patch-Cargo.toml

Log Message:
py-ruff: fix build

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=850368ad87e757e7c1e5a4de5775260a24f762f6

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 py-ruff/Makefile                 | 6 ++++--
 py-ruff/cargo-depends.mk         | 3 ++-
 py-ruff/distinfo                 | 5 +----
 py-ruff/patches/patch-Cargo.toml | 2 +-
 4 files changed, 8 insertions(+), 8 deletions(-)

diffs:
diff --git a/py-ruff/Makefile b/py-ruff/Makefile
index 21dd81f103..d94aec4d37 100644
--- a/py-ruff/Makefile
+++ b/py-ruff/Makefile
@@ -12,10 +12,12 @@ LICENSE=	mit
 
 TOOL_DEPENDS+=	${PYPKGPREFIX}-maturin>=1.0:../../devel/py-maturin
 
+USE_LANGUAGES=	c c++
+
 # for tikv-jemalloc-sys
 USE_TOOLS+=	gmake
 
--lsp-types=	{ git = "https://github.com/astral-sh/lsp-types.git";, rev = "3512a9f", features = ["proposed"] }
+# Depends on an unpublished crate. Can't use cargo.mk to fetch it.
 LSP_TYPES_REV=	3512a9f33eadc5402cfab1b8f7340824c8ca1439
 DISTFILES=	${DEFAULT_DISTFILES}
 DISTFILES+=	lsp-types-${LSP_TYPES_REV}.tar.gz
@@ -26,7 +28,7 @@ MAKE_ENV+=	CARGO_NET_OFFLINE=true
 PYTHON_VERSIONS_INCOMPATIBLE=	27
 
 post-extract:
-	mv ${WRKDIR}/lsp-types* ${WRKDIR}/lsp-types
+	mv ${WRKDIR}/lsp-types* ${WRKSRC}
 
 post-install:
 	cd ${DESTDIR}${PREFIX}/bin && \
diff --git a/py-ruff/cargo-depends.mk b/py-ruff/cargo-depends.mk
index f903811f81..0a93e0b2bb 100644
--- a/py-ruff/cargo-depends.mk
+++ b/py-ruff/cargo-depends.mk
@@ -138,7 +138,8 @@ CARGO_CRATE_DEPENDS+=	linux-raw-sys-0.4.13
 CARGO_CRATE_DEPENDS+=	lock_api-0.4.11
 CARGO_CRATE_DEPENDS+=	log-0.4.21
 CARGO_CRATE_DEPENDS+=	lsp-server-0.7.6
-CARGO_CRATE_DEPENDS+=	lsp-types-0.95.1
+#Workaround for unpublished crate in the Makefile
+#CARGO_CRATE_DEPENDS+=	lsp-types-0.95.1
 CARGO_CRATE_DEPENDS+=	matchers-0.1.0
 CARGO_CRATE_DEPENDS+=	matches-0.1.10
 CARGO_CRATE_DEPENDS+=	matchit-0.8.2
diff --git a/py-ruff/distinfo b/py-ruff/distinfo
index 61688bb4a3..7664b3975e 100644
--- a/py-ruff/distinfo
+++ b/py-ruff/distinfo
@@ -414,9 +414,6 @@ Size (log-0.4.21.crate) = 43442 bytes
 BLAKE2s (lsp-server-0.7.6.crate) = 691b5c09418d8c9e5bb4f4f2d021f42de498e246ebad6eece31abae1bdfe1aaf
 SHA512 (lsp-server-0.7.6.crate) = d9b35963ae171505413f1879879e3d5bec2c36cc50dd2e796f8e209768608b36a7d77ae441128f939f15f743f994c2fa479c7ec1a53296d3b65d44e969bebffd
 Size (lsp-server-0.7.6.crate) = 12133 bytes
-BLAKE2s (lsp-types-0.95.1.crate) = b224ff52ea8d403adffde60f4cf41aa06b1d99c06aa796708e66c39355c54141
-SHA512 (lsp-types-0.95.1.crate) = 5358645b22a4e43cfd227c2266333a019bf9ac4b4e3d42d0bbdfbeaa25a6f02c405cae89a0caed719103ed87c4e68ee270f13a43f614008e753ad69ad6f34414
-Size (lsp-types-0.95.1.crate) = 68324 bytes
 BLAKE2s (lsp-types-3512a9f33eadc5402cfab1b8f7340824c8ca1439.tar.gz) = 03edce10f88b077ba56b3176fed630b770a7d88b606f0bf203a85b4b0cec9d64
 SHA512 (lsp-types-3512a9f33eadc5402cfab1b8f7340824c8ca1439.tar.gz) = 3362f9db4e78261825ae17b3429f9c54dc1b32a8b6a275ecff7bbe457c610d27ac37e68be3e9e27378f5f54c786dee787fd87b33c102f2507a46cf7290390ab5
 Size (lsp-types-3512a9f33eadc5402cfab1b8f7340824c8ca1439.tar.gz) = 71124 bytes
@@ -1023,4 +1020,4 @@ Size (zerocopy-derive-0.7.32.crate) = 37623 bytes
 BLAKE2s (zeroize-1.7.0.crate) = baa7e9c604cbab771f49a3a213e3e2bb1c598b370aba7cdb7b5370c85cb7d733
 SHA512 (zeroize-1.7.0.crate) = 9d31e3e76e8c861309a3579c21f6da5fd6b056c7d7a350427445a1a832e8827204804783f7f9b808acaa2148efef883d9078bf84943b1db55526bba5bf5a2756
 Size (zeroize-1.7.0.crate) = 19039 bytes
-SHA1 (patch-Cargo.toml) = 81b6c5cf3c106ff178ccafbbf0dc94ec5749c60c
+SHA1 (patch-Cargo.toml) = cd2a61823db75f950f5738dc7d15814cdfd10288
diff --git a/py-ruff/patches/patch-Cargo.toml b/py-ruff/patches/patch-Cargo.toml
index f1d8aa8907..c64964a97b 100644
--- a/py-ruff/patches/patch-Cargo.toml
+++ b/py-ruff/patches/patch-Cargo.toml
@@ -7,7 +7,7 @@ $NetBSD$
  log = { version = "0.4.17" }
  lsp-server = { version = "0.7.6" }
 -lsp-types = { git = "https://github.com/astral-sh/lsp-types.git";, rev = "3512a9f", features = ["proposed"] }
-+lsp-types = { path = "../../lsp-types", features = ["proposed"] }
++lsp-types = { path = "lsp-types-3512a9f33eadc5402cfab1b8f7340824c8ca1439", features = ["proposed"] }
  matchit = { version = "0.8.1" }
  memchr = { version = "2.7.1" }
  mimalloc = { version = "0.1.39" }