summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoradam <adam@pkgsrc.org>2022-07-06 07:26:31 +0000
committeradam <adam@pkgsrc.org>2022-07-06 07:26:31 +0000
commita8997eac65457a6aac3ec8ba143908b6174d2fa4 (patch)
treef5cb696780f734fa6a6126b29f221dbd63a2ad8d
parent54fdf3ae006342f545572bb4ecbfd218f2719e60 (diff)
downloadpkgsrc-a8997eac65457a6aac3ec8ba143908b6174d2fa4.tar.gz
py-setuptools-rust: updated to 1.4.1
v1.4.1 Fix crash when checking Rust version.
-rw-r--r--devel/py-setuptools-rust/Makefile4
-rw-r--r--devel/py-setuptools-rust/distinfo9
-rw-r--r--devel/py-setuptools-rust/patches/patch-setuptools__rust_rustc__info.py26
3 files changed, 6 insertions, 33 deletions
diff --git a/devel/py-setuptools-rust/Makefile b/devel/py-setuptools-rust/Makefile
index c3923a66d3c..00862d6c3ab 100644
--- a/devel/py-setuptools-rust/Makefile
+++ b/devel/py-setuptools-rust/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.7 2022/07/05 08:12:00 adam Exp $
+# $NetBSD: Makefile,v 1.8 2022/07/06 07:26:31 adam Exp $
-DISTNAME= setuptools-rust-1.4.0
+DISTNAME= setuptools-rust-1.4.1
PKGNAME= ${PYPKGPREFIX}-${DISTNAME}
CATEGORIES= devel python
MASTER_SITES= ${MASTER_SITE_PYPI:=s/setuptools-rust/}
diff --git a/devel/py-setuptools-rust/distinfo b/devel/py-setuptools-rust/distinfo
index d4e3bf25c76..70ac9e8d35c 100644
--- a/devel/py-setuptools-rust/distinfo
+++ b/devel/py-setuptools-rust/distinfo
@@ -1,6 +1,5 @@
-$NetBSD: distinfo,v 1.6 2022/07/05 08:12:00 adam Exp $
+$NetBSD: distinfo,v 1.7 2022/07/06 07:26:31 adam Exp $
-BLAKE2s (setuptools-rust-1.4.0.tar.gz) = 3e015202091ef8cee769561e81f47c27e94d9c75cb42021524d01d2c1d616fe6
-SHA512 (setuptools-rust-1.4.0.tar.gz) = e13ea85c682daa606d70544d1ddfe7e140854f3f01b9a3cecced7a2c8828678d1380b58ddcaebbd5f33183566149df1232b193aa24ce3dd7e89b1bcf5cc8b8c7
-Size (setuptools-rust-1.4.0.tar.gz) = 288808 bytes
-SHA1 (patch-setuptools__rust_rustc__info.py) = ec96ecef51cb0444db9a8724e57d4a7a2a84c739
+BLAKE2s (setuptools-rust-1.4.1.tar.gz) = 66a7e89269dab9fe26662eb5d4683abbd3bb566c463453e96fd7bb37c1fb8a78
+SHA512 (setuptools-rust-1.4.1.tar.gz) = 3b92eb37564872b4094e77c8412b006f57a3557213d1368e2db883bc04f5d0d516a97a5b1f0b5255b362ecc32832d2ef734ac759a49db72439f227d54f8a86f5
+Size (setuptools-rust-1.4.1.tar.gz) = 288848 bytes
diff --git a/devel/py-setuptools-rust/patches/patch-setuptools__rust_rustc__info.py b/devel/py-setuptools-rust/patches/patch-setuptools__rust_rustc__info.py
deleted file mode 100644
index 657dde265c6..00000000000
--- a/devel/py-setuptools-rust/patches/patch-setuptools__rust_rustc__info.py
+++ /dev/null
@@ -1,26 +0,0 @@
-$NetBSD: patch-setuptools__rust_rustc__info.py,v 1.1 2022/07/05 08:12:00 adam Exp $
-
-https://github.com/PyO3/setuptools-rust/issues/262
-
---- setuptools_rust/rustc_info.py.orig 2022-07-05 06:20:44.000000000 +0000
-+++ setuptools_rust/rustc_info.py
-@@ -10,7 +10,7 @@ def get_rust_version() -> Optional[Versi
- try:
- # first line of rustc -Vv is something like
- # rustc 1.61.0 (fe5b13d68 2022-05-18)
-- return Version(_rust_version_verbose().split(" ")[1])
-+ return Version(_rust_version().split(" ")[1])
- except (subprocess.CalledProcessError, OSError):
- return None
-
-@@ -59,5 +59,10 @@ def get_rust_target_list() -> List[str]:
-
-
- @lru_cache()
-+def _rust_version() -> str:
-+ return subprocess.check_output(["rustc", "-V"], text=True)
-+
-+
-+@lru_cache()
- def _rust_version_verbose() -> str:
- return subprocess.check_output(["rustc", "-Vv"], text=True)