summaryrefslogtreecommitdiff
path: root/var
diff options
context:
space:
mode:
authorCyrus Harrison <cyrush@llnl.gov>2020-11-18 10:34:14 -0800
committerGitHub <noreply@github.com>2020-11-18 12:34:14 -0600
commit676d68a9792b5bc6cea3ab91e77ed8a9eab10f55 (patch)
treec60ddbc5e1f2bad32b8868c17f7c0c5f3c5dfcdc /var
parent3069631f37703942e05ecc3eec8bd1ec9f7b98d5 (diff)
downloadspack-676d68a9792b5bc6cea3ab91e77ed8a9eab10f55.tar.gz
spack-676d68a9792b5bc6cea3ab91e77ed8a9eab10f55.tar.bz2
spack-676d68a9792b5bc6cea3ab91e77ed8a9eab10f55.tar.xz
spack-676d68a9792b5bc6cea3ab91e77ed8a9eab10f55.zip
add 0.6.0 conduit release and update for branch changes (#19696)
Diffstat (limited to 'var')
-rw-r--r--var/spack/repos/builtin/packages/conduit/package.py6
1 files changed, 5 insertions, 1 deletions
diff --git a/var/spack/repos/builtin/packages/conduit/package.py b/var/spack/repos/builtin/packages/conduit/package.py
index 57d49da70e..b834144b70 100644
--- a/var/spack/repos/builtin/packages/conduit/package.py
+++ b/var/spack/repos/builtin/packages/conduit/package.py
@@ -37,7 +37,11 @@ class Conduit(Package):
url = "https://github.com/LLNL/conduit/releases/download/v0.3.0/conduit-v0.3.0-src-with-blt.tar.gz"
git = "https://github.com/LLNL/conduit.git"
- version('master', branch='master', submodules=True, preferred=True)
+ version('develop', branch='develop', submodules=True, preferred=True)
+ # note: the main branch in conduit was renamed to develop, this next entry
+ # is to bridge any spack dependencies that are still using the name master
+ version('master', branch='develop', submodules=True)
+ version('0.6.0', sha256='078f086a13b67a97e4ab6fe1063f2fef2356df297e45b43bb43d74635f80475d')
version('0.5.1', sha256='68a3696d1ec6d3a4402b44a464d723e6529ec41016f9b44c053676affe516d44')
version('0.5.0', sha256='7efac668763d02bd0a2c0c1b134d9f5ee27e99008183905bb0512e5502b8b4fe')
version('0.4.0', sha256='c228e6f0ce5a9c0ffb98e0b3d886f2758ace1a4b40d00f3f118542c0747c1f52')