CVS commit: pkgsrc/devel

["Adam Ciarcinski" <adam%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   adam
Date:           Mon Nov 17 08:11:23 UTC 2025

Modified Files:
        pkgsrc/devel/py-uv: Makefile.common
        pkgsrc/devel/py-uv-build: Makefile distinfo
Added Files:
        pkgsrc/devel/py-uv-build/patches: patch-Cargo.toml
            patch-python_uv__build_____init____.py

Log Message:
py-uv-build: find versioned binary


To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 pkgsrc/devel/py-uv/Makefile.common
cvs rdiff -u -r1.4 -r1.5 pkgsrc/devel/py-uv-build/Makefile
cvs rdiff -u -r1.5 -r1.6 pkgsrc/devel/py-uv-build/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/devel/py-uv-build/patches/patch-Cargo.toml \
    pkgsrc/devel/py-uv-build/patches/patch-python_uv__build_____init____.py

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

Modified files:

Index: pkgsrc/devel/py-uv/Makefile.common
diff -u pkgsrc/devel/py-uv/Makefile.common:1.6 pkgsrc/devel/py-uv/Makefile.common:1.7
--- pkgsrc/devel/py-uv/Makefile.common:1.6      Mon Nov 17 07:36:03 2025
+++ pkgsrc/devel/py-uv/Makefile.common  Mon Nov 17 08:11:23 2025
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.6 2025/11/17 07:36:03 adam Exp $
+# $NetBSD: Makefile.common,v 1.7 2025/11/17 08:11:23 adam Exp $
 # used by devel/py-uv/Makefile
 # used by devel/py-uv-build/Makefile
 
@@ -8,7 +8,7 @@ TOOL_DEPENDS+=  ${PYPKGPREFIX}-setuptools
 
 CFLAGS+=       -Wno-implicit-function-declaration
 
-PATCHDIR=      ${.CURDIR}/../../devel/py-uv/patches
+#PATCHDIR=     ${.CURDIR}/../../devel/py-uv/patches
 
 # Depends on an unpublished crate. Can't use cargo.mk to fetch it.
 ASYNC_ZIP_REV= f6a41d32866003c868d03ed791a89c794f61b703

Index: pkgsrc/devel/py-uv-build/Makefile
diff -u pkgsrc/devel/py-uv-build/Makefile:1.4 pkgsrc/devel/py-uv-build/Makefile:1.5
--- pkgsrc/devel/py-uv-build/Makefile:1.4       Sun Nov 16 20:47:49 2025
+++ pkgsrc/devel/py-uv-build/Makefile   Mon Nov 17 08:11:23 2025
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2025/11/16 20:47:49 wiz Exp $
+# $NetBSD: Makefile,v 1.5 2025/11/17 08:11:23 adam Exp $
 
 DISTNAME=      uv_build-${UV_VERSION}
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME:S/_/-/}
@@ -13,6 +13,7 @@ LICENSE=      mit OR apache-2.0
 .include "../../devel/py-uv/Makefile.common"
 
 post-install:
+       ${RM} ${DESTDIR}${PREFIX}/${PYSITELIB}/uv_build/__init__.py.orig
        cd ${DESTDIR}${PREFIX}/bin && \
        ${MV} uv-build uv-build-${PYVERSSUFFIX} || ${TRUE}
 

Index: pkgsrc/devel/py-uv-build/distinfo
diff -u pkgsrc/devel/py-uv-build/distinfo:1.5 pkgsrc/devel/py-uv-build/distinfo:1.6
--- pkgsrc/devel/py-uv-build/distinfo:1.5       Mon Nov 17 07:36:03 2025
+++ pkgsrc/devel/py-uv-build/distinfo   Mon Nov 17 08:11:23 2025
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.5 2025/11/17 07:36:03 adam Exp $
+$NetBSD: distinfo,v 1.6 2025/11/17 08:11:23 adam Exp $
 
 BLAKE2s (addr2line-0.24.2.crate) = 5bdb03ff8621c0993eda0ec3682c467ad3fc0015f48e46a70779bbd4bfbe8267
 SHA512 (addr2line-0.24.2.crate) = 39cbec3c920ffc0f37584afb55e1cfe4f182e4415319a4e9bfe842360f102f7b9315f6171c0cf71ba0337123903e604096cd573fe98698a26c8eebc2376d965b
@@ -1906,3 +1906,4 @@ BLAKE2s (zvariant_utils-3.2.0.crate) = a
 SHA512 (zvariant_utils-3.2.0.crate) = 9176e3240078a3d240f81272cd6e04438048ee044dabd0233bce0ba9567e97655e2721332dcd43376b09c055c07080e12ffd2888355f003cc32c3bfddbc4c479
 Size (zvariant_utils-3.2.0.crate) = 14779 bytes
 SHA1 (patch-Cargo.toml) = 12b97b96925e64879606ba2812101e95e33b5320
+SHA1 (patch-python_uv__build_____init____.py) = ca65b89a8af0a2eea3a3c3af3d3895d53cced314

Added files:

Index: pkgsrc/devel/py-uv-build/patches/patch-Cargo.toml
diff -u /dev/null pkgsrc/devel/py-uv-build/patches/patch-Cargo.toml:1.1
--- /dev/null   Mon Nov 17 08:11:23 2025
+++ pkgsrc/devel/py-uv-build/patches/patch-Cargo.toml   Mon Nov 17 08:11:23 2025
@@ -0,0 +1,52 @@
+$NetBSD: patch-Cargo.toml,v 1.1 2025/11/17 08:11:23 adam Exp $
+
+Depends on unpublished crates. Can't use cargo.mk to fetch it.
+
+--- Cargo.toml.orig    1970-01-01 00:00:00.000000000 +0000
++++ Cargo.toml
+@@ -88,7 +88,7 @@ async-channel = { version = "2.3.1" }
+ async-compression = { version = "0.4.12", features = ["bzip2", "gzip", "xz", "zstd"] }
+ async-trait = { version = "0.1.82" }
+ async_http_range_reader = { version = "0.9.1" }
+-async_zip = { git = "https://github.com/astral-sh/rs-async-zip";, rev = "f6a41d32866003c868d03ed791a89c794f61b703", features = ["bzip2", "deflate", "lzma", "tokio", "xz", "zstd"] }
++async_zip = { path = "../rs-async-zip-f6a41d32866003c868d03ed791a89c794f61b703", features = ["bzip2", "deflate", "lzma", "tokio", "xz", "zstd"] }
+ axoupdater = { version = "0.9.0", default-features = false }
+ backon = { version = "1.3.0" }
+ base64 = { version = "0.22.1" }
+@@ -143,7 +143,7 @@ percent-encoding = { version = "2.3.1" }
+ petgraph = { version = "0.8.0" }
+ proc-macro2 = { version = "1.0.86" }
+ procfs = { version = "0.17.0", default-features = false, features = ["flate2"] }
+-pubgrub = { git = "https://github.com/astral-sh/pubgrub";, rev = "d8efd77673c9a90792da9da31b6c0da7ea8a324b" }
++pubgrub = { path = "../pubgrub-d8efd77673c9a90792da9da31b6c0da7ea8a324b" }
+ quote = { version = "1.0.37" }
+ rayon = { version = "1.10.0" }
+ ref-cast = { version = "1.0.24" }
+@@ -152,8 +152,8 @@ regex = { version = "1.10.6" }
+ regex-automata = { version = "0.4.8", default-features = false, features = ["dfa-build", "dfa-search", "perf", "std", "syntax"] }
+ reqsign = { version = "0.18.0", features = ["aws", "default-context"], default-features = false }
+ reqwest = { version = "0.12.22", default-features = false, features = ["json", "gzip", "deflate", "zstd", "stream", "system-proxy", "rustls-tls", "rustls-tls-native-roots", "socks", "multipart", 
"http2", "blocking"] }
+-reqwest-middleware = { git = "https://github.com/astral-sh/reqwest-middleware";, rev = "7650ed76215a962a96d94a79be71c27bffde7ab2", features = ["multipart"] }
+-reqwest-retry = { git = "https://github.com/astral-sh/reqwest-middleware";, rev = "7650ed76215a962a96d94a79be71c27bffde7ab2" }
++reqwest-middleware = { path = "../reqwest-middleware-7650ed76215a962a96d94a79be71c27bffde7ab2/reqwest-middleware", features = ["multipart"] }
++reqwest-retry = { path = "../reqwest-middleware-7650ed76215a962a96d94a79be71c27bffde7ab2/reqwest-retry" }
+ rkyv = { version = "0.8.8", features = ["bytecheck"] }
+ rmp-serde = { version = "1.3.0" }
+ rust-netrc = { version = "0.1.2" }
+@@ -193,7 +193,7 @@ unicode-width = { version = "0.2.0" }
+ unscanny = { version = "0.1.0" }
+ url = { version = "2.5.2", features = ["serde"] }
+ uuid = { version = "1.16.0" }
+-version-ranges = { git = "https://github.com/astral-sh/pubgrub";, rev = "d8efd77673c9a90792da9da31b6c0da7ea8a324b" }
++version-ranges = { path = "../pubgrub-d8efd77673c9a90792da9da31b6c0da7ea8a324b/version-ranges" }
+ walkdir = { version = "2.5.0" }
+ which = { version = "8.0.0", features = ["regex"] }
+ windows = { version = "0.59.0", features = ["std", "Win32_Globalization", "Win32_System_LibraryLoader", "Win32_System_Console", "Win32_System_Kernel", "Win32_System_Diagnostics_Debug", 
"Win32_Storage_FileSystem", "Win32_Security", "Win32_System_Registry", "Win32_System_IO", "Win32_System_Ioctl"] }
+@@ -330,5 +330,5 @@ codegen-units = 1
+ inherits = "release"
+ 
+ [patch.crates-io]
+-reqwest-middleware = { git = "https://github.com/astral-sh/reqwest-middleware";, rev = "7650ed76215a962a96d94a79be71c27bffde7ab2" }
+-reqwest-retry = { git = "https://github.com/astral-sh/reqwest-middleware";, rev = "7650ed76215a962a96d94a79be71c27bffde7ab2" }
++reqwest-middleware = { path = "../reqwest-middleware-7650ed76215a962a96d94a79be71c27bffde7ab2/reqwest-middleware" }
++reqwest-retry = { path = "../reqwest-middleware-7650ed76215a962a96d94a79be71c27bffde7ab2/reqwest-retry" }
Index: pkgsrc/devel/py-uv-build/patches/patch-python_uv__build_____init____.py
diff -u /dev/null pkgsrc/devel/py-uv-build/patches/patch-python_uv__build_____init____.py:1.1
--- /dev/null   Mon Nov 17 08:11:23 2025
+++ pkgsrc/devel/py-uv-build/patches/patch-python_uv__build_____init____.py     Mon Nov 17 08:11:23 2025
@@ -0,0 +1,14 @@
+$NetBSD: patch-python_uv__build_____init____.py,v 1.1 2025/11/17 08:11:23 adam Exp $
+
+Find versioned binary.
+
+--- python/uv_build/__init__.py.orig   2025-11-17 07:49:39.731763510 +0000
++++ python/uv_build/__init__.py
+@@ -45,6 +45,7 @@ def call(
+     warn_config_settings(config_settings)
+ 
+     uv_bin_name = "uv" if USE_UV_EXECUTABLE else "uv-build"
++    uv_bin_name += f"-{sys.version_info.major}.{sys.version_info.minor}"
+     # Unlike `find_uv_bin`, this mechanism must work according to PEP 517
+     uv_bin = shutil.which(uv_bin_name)
+     if uv_bin is None: