summaryrefslogtreecommitdiff
path: root/var
diff options
context:
space:
mode:
authorAdam J. Stewart <ajstewart426@gmail.com>2022-11-07 09:21:46 -0800
committerGitHub <noreply@github.com>2022-11-07 09:21:46 -0800
commit8fb8381b6f8fd42aa49fd71e14c2c02b145228ba (patch)
tree151015163e0ae8dfe93d13c6d7c3f8c494be2940 /var
parent1dcb5d1fa75476fb4f8744e7f1a5a2512ba1ea93 (diff)
downloadspack-8fb8381b6f8fd42aa49fd71e14c2c02b145228ba.tar.gz
spack-8fb8381b6f8fd42aa49fd71e14c2c02b145228ba.tar.bz2
spack-8fb8381b6f8fd42aa49fd71e14c2c02b145228ba.tar.xz
spack-8fb8381b6f8fd42aa49fd71e14c2c02b145228ba.zip
Rust: don't apply constraints to nightly/beta versions (#33723)
Diffstat (limited to 'var')
-rw-r--r--var/spack/repos/builtin/packages/py-tokenizers/package.py6
-rw-r--r--var/spack/repos/builtin/packages/rust/package.py4
2 files changed, 6 insertions, 4 deletions
diff --git a/var/spack/repos/builtin/packages/py-tokenizers/package.py b/var/spack/repos/builtin/packages/py-tokenizers/package.py
index 24befd2986..d306e57950 100644
--- a/var/spack/repos/builtin/packages/py-tokenizers/package.py
+++ b/var/spack/repos/builtin/packages/py-tokenizers/package.py
@@ -21,7 +21,9 @@ class PyTokenizers(PythonPackage):
depends_on("py-setuptools", type="build")
depends_on("py-setuptools-rust", type="build")
- # TODO: This package currently requires internet access to install.
- # Also, a nightly or dev version of rust is required to build older versions.
+ # A nightly or dev version of rust is required to build older versions.
# https://github.com/huggingface/tokenizers/issues/176
# 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.
diff --git a/var/spack/repos/builtin/packages/rust/package.py b/var/spack/repos/builtin/packages/rust/package.py
index a17d34e266..2ffdf495cf 100644
--- a/var/spack/repos/builtin/packages/rust/package.py
+++ b/var/spack/repos/builtin/packages/rust/package.py
@@ -54,7 +54,7 @@ class Rust(Package):
)
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("cmake@3.4.3:", type="build")
depends_on("ninja", when="@1.48.0:", type="build")
@@ -63,7 +63,7 @@ class Rust(Package):
depends_on("openssl@:1")
depends_on("libssh2")
# 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")
# Pre-release Versions