zhangyiss/spack
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Rust: don't apply constraints to nightly/beta versions (#33723)

Browse Source
This commit is contained in:
Adam J. Stewart 2022-11-07 09:21:46 -08:00 committed by GitHub
parent 1dcb5d1fa7
commit 8fb8381b6f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
var/spack/repos/builtin/packages/py-tokenizers/package.py
View File

@ -21,7 +21,9 @@ class PyTokenizers(PythonPackage):
depends_on("py-setuptools", type="build") depends_on("py-setuptools", type="build")
depends_on("py-setuptools-rust", type="build") depends_on("py-setuptools-rust", type="build")
# TODO: This package currently requires internet access to install. # A nightly or dev version of rust is required to build older versions.
# Also, a nightly or dev version of rust is required to build older versions.
# https://github.com/huggingface/tokenizers/issues/176 # https://github.com/huggingface/tokenizers/issues/176
# https://github.com/PyO3/pyo3/issues/5 # https://github.com/PyO3/pyo3/issues/5
depends_on("rust@nightly", when="@:0.10", type="build")
# TODO: This package currently requires internet access to install.

4
var/spack/repos/builtin/packages/rust/package.py
View File

@ -54,7 +54,7 @@ class Rust(Package):
) )
depends_on("python@2.7:", type="build") depends_on("python@2.7:", type="build")
depends_on("python@2.7:2.8", when="@:1.43", type="build") depends_on("python@2.7:2.8", when="@0:1.43", type="build")
depends_on("gmake@3.81:", type="build") depends_on("gmake@3.81:", type="build")
depends_on("cmake@3.4.3:", type="build") depends_on("cmake@3.4.3:", type="build")
depends_on("ninja", when="@1.48.0:", type="build") depends_on("ninja", when="@1.48.0:", type="build")
@ -63,7 +63,7 @@ class Rust(Package):
depends_on("openssl@:1") depends_on("openssl@:1")
depends_on("libssh2") depends_on("libssh2")
# https://github.com/rust-lang/cargo/issues/10446 # https://github.com/rust-lang/cargo/issues/10446
depends_on("libgit2@:1.3", when="@:1.60") depends_on("libgit2@:1.3", when="@0:1.60")
depends_on("libgit2") depends_on("libgit2")
# Pre-release Versions # Pre-release Versions