From 28a30bcea656081ba988ec8500e6a70814ea8faa Mon Sep 17 00:00:00 2001 From: wspear Date: Thu, 29 Dec 2022 00:12:51 -0800 Subject: [PATCH] veloc: add v1.6 and dependencies (#34706) --- var/spack/repos/builtin/packages/veloc/package.py | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/var/spack/repos/builtin/packages/veloc/package.py b/var/spack/repos/builtin/packages/veloc/package.py index 17173434a4..4aa000d1a9 100644 --- a/var/spack/repos/builtin/packages/veloc/package.py +++ b/var/spack/repos/builtin/packages/veloc/package.py @@ -17,7 +17,8 @@ class Veloc(CMakePackage): tags = ["e4s"] - version("master", branch="master") + version("main", branch="main") + version("1.6", sha256="451b46ad13e360270044c0dba09d8e4fbd64149f8e8d71310fdb520424c5eeaa") version("1.5", sha256="892f3623c73254d40fbbb8cbc3056219a31510e37aae2ede4100c04743701a5c") version("1.4", sha256="d5d12aedb9e97f079c4428aaa486bfa4e31fe1db547e103c52e76c8ec906d0a8") version("1.3", sha256="3817ea57045443c1a9a819560911db1175dbe4153e317adaa1492437f3f13f3b") @@ -32,11 +33,18 @@ class Veloc(CMakePackage): depends_on("libpthread-stubs") depends_on("mpi") depends_on("er") - depends_on("axl@:0.3.0") + depends_on("axl@:0.3.0", when="@:1.5") depends_on("openssl") # Relies on the OpenSSL crypto library for checksums depends_on("pdsh", when="@master") depends_on("cmake@3.9:", type="build") + with when("@1.6:"): + depends_on("axl@0.5.0:") + depends_on("redset") + depends_on("rankstr") + depends_on("shuffile") + depends_on("kvtree") + conflicts("%gcc@:4.9.3") # requires C++11