diff options
Diffstat (limited to 'var')
6 files changed, 15 insertions, 10 deletions
diff --git a/var/spack/repos/builtin/packages/votca-csg-tutorials/package.py b/var/spack/repos/builtin/packages/votca-csg-tutorials/package.py index 6f8636e52a..a89e698819 100644 --- a/var/spack/repos/builtin/packages/votca-csg-tutorials/package.py +++ b/var/spack/repos/builtin/packages/votca-csg-tutorials/package.py @@ -19,13 +19,14 @@ class VotcaCsgTutorials(CMakePackage): url = "https://github.com/votca/csg-tutorials/tarball/v1.4" git = "https://github.com/votca/csg-tutorials.git" - version('develop', branch='master') + version('master', branch='master') + version('1.6_rc2', sha256='3c82e6fe03c7d5226f37b787eee23eb629901734d19b93ef9eb519660ff5223c') version('1.6_rc1', sha256='87c4d945d2bdcb247e985cd407b0767c441f7810f1237ae65a63617f136e2ac9') version('1.5.1', sha256='e35cea92df0e7d05ca7b449c1b5d84d887a3a23c7796abe3b84e4d6feec7faca', preferred=True) version('1.5', sha256='03b841fb94129cf59781a7a5e3b71936c414aa9dfa17a50d7bc856d46274580c') version('1.4.1', sha256='623724192c3a7d76b603a74a3326f181045f10f38b9f56dce754a90f1a74556e') version('1.4', sha256='27d50acd68a9d8557fef18ec2b0c62841ae91c22275ab9afbd65c35e4dd5f719') - for v in ["1.4", "1.4.1", "1.5", "1.5.1", "1.6_rc1", "develop"]: + for v in ["1.4", "1.4.1", "1.5", "1.5.1", "1.6_rc1", "1.6_rc2", "master"]: depends_on('votca-csg@%s' % v, when="@%s:%s.0" % (v, v)) depends_on("boost") diff --git a/var/spack/repos/builtin/packages/votca-csg/package.py b/var/spack/repos/builtin/packages/votca-csg/package.py index f4f38e7aa2..a9b5ae6183 100644 --- a/var/spack/repos/builtin/packages/votca-csg/package.py +++ b/var/spack/repos/builtin/packages/votca-csg/package.py @@ -19,7 +19,8 @@ class VotcaCsg(CMakePackage): url = "https://github.com/votca/csg/tarball/v1.4" git = "https://github.com/votca/csg.git" - version('develop', branch='master') + version('master', branch='master') + version('1.6_rc2', sha256='32d19c7f8e30baece35462b6f8ae06bf0d7be038f875be38dc49da5798209236') version('1.6_rc1', sha256='163701a65a34f90e8a850370167a82cbebf2b5c0774b7a8ad07884451fe9e332') version('1.5.1', sha256='7fca1261bd267bf38d2edd26259730fed3126c0c3fd91fb81940dbe17bb568fd', preferred=True) version('1.5', sha256='160387cdc51f87dd20ff2e2eed97086beee415d48f3c92f4199f6109068c8ff4') @@ -27,7 +28,7 @@ class VotcaCsg(CMakePackage): version('1.4', sha256='c13e7febd792de8c3d426203f089bd4d33b8067f9db5e8840e4579c88b61146e') depends_on("cmake@2.8:", type='build') - for v in ["1.4", "1.4.1", "1.5", "1.5.1", "1.6_rc1", "develop"]: + for v in ["1.4", "1.4.1", "1.5", "1.5.1", "1.6_rc1", "1.6_rc2", "master"]: depends_on('votca-tools@%s' % v, when="@%s:%s.0" % (v, v)) depends_on("boost") depends_on("gromacs~mpi@5.1:") diff --git a/var/spack/repos/builtin/packages/votca-csgapps/package.py b/var/spack/repos/builtin/packages/votca-csgapps/package.py index 40ba51a96f..65093442af 100644 --- a/var/spack/repos/builtin/packages/votca-csgapps/package.py +++ b/var/spack/repos/builtin/packages/votca-csgapps/package.py @@ -19,13 +19,14 @@ class VotcaCsgapps(CMakePackage): url = "https://github.com/votca/csgapps/tarball/v1.4" git = "https://github.com/votca/csgapps.git" - version('develop', branch='master') + version('master', branch='master') + version('1.6_rc2', sha256='4d829b10ada32ca9e589f894ca3f69fc14329af4b6f5fee32d5e07d2457a615a') version('1.6_rc1', sha256='069002f93f891e4aeb24920c1b2458bf8ee4842d273481aea5fa32247f815f02') version('1.5.1', sha256='b4946711e88a1745688b6cce5aad872e6e2ea200fededf38d77a864883e3750e', preferred=True) version('1.5', sha256='18b40ce6222509bc70aa9d56b8c538cd5903edf7294d6f95530668e555206d5b') version('1.4.1', sha256='095d9ee4cd49d2fd79c10e0e84e6890b755e54dec6a5cd580a2b4241ba230a2b') version('1.4', sha256='4ea8348c2f7de3cc488f48fbd8652e69b52515441952766c06ff67ed1aaf69a0') - for v in ["1.4", "1.4.1", "1.5", "1.5.1", "1.6_rc1", "develop"]: + for v in ["1.4", "1.4.1", "1.5", "1.5.1", "1.6_rc1", "1.6_rc2", "master"]: depends_on('votca-csg@%s' % v, when="@%s:%s.0" % (v, v)) depends_on("boost") diff --git a/var/spack/repos/builtin/packages/votca-ctp/package.py b/var/spack/repos/builtin/packages/votca-ctp/package.py index 00dccfd4c8..15648f5d50 100644 --- a/var/spack/repos/builtin/packages/votca-ctp/package.py +++ b/var/spack/repos/builtin/packages/votca-ctp/package.py @@ -19,7 +19,7 @@ class VotcaCtp(CMakePackage): url = "https://github.com/votca/ctp/tarball/v1.5" git = "https://github.com/votca/ctp.git" - version('develop', branch='master') + version('master', branch='master') version('1.5.1', sha256='ef957c2f6b09335d0d27ecb7e1b80b55e76a100247bc0d0b3cfef7718d2a1126') version('1.5', sha256='31eb6bcc9339e575116f0c91fe7a4ce7d4189f31f0640329c993fea911401d65') diff --git a/var/spack/repos/builtin/packages/votca-tools/package.py b/var/spack/repos/builtin/packages/votca-tools/package.py index fc276e0a44..f9eaedb6fa 100644 --- a/var/spack/repos/builtin/packages/votca-tools/package.py +++ b/var/spack/repos/builtin/packages/votca-tools/package.py @@ -19,7 +19,8 @@ class VotcaTools(CMakePackage): url = "https://github.com/votca/tools/tarball/v1.4" git = "https://github.com/votca/tools.git" - version('develop', branch='master') + version('master', branch='master') + version('1.6_rc2', sha256='1998148dc5bbdb63d05c24d19b4a803d9b2c800891a813fd846e53616d49abcd') version('1.6_rc1', sha256='59b4bb64a93786a693e0cbc743a27c0bc451b9db2b0f63e4d2866f7aba10c268') version('1.5.1', sha256='4be4fe25a2910e24e1720cd9022d214001d38196033ade8f9d6e618b4f47d5c4', preferred=True) version('1.5', sha256='a82a6596c24ff06e79eab17ca02f4405745ceeeb66369693a59023ad0b62cf22') diff --git a/var/spack/repos/builtin/packages/votca-xtp/package.py b/var/spack/repos/builtin/packages/votca-xtp/package.py index d18611f48b..7b7b7d928b 100644 --- a/var/spack/repos/builtin/packages/votca-xtp/package.py +++ b/var/spack/repos/builtin/packages/votca-xtp/package.py @@ -19,14 +19,15 @@ class VotcaXtp(CMakePackage): url = "https://github.com/votca/xtp/tarball/v1.4.1" git = "https://github.com/votca/xtp.git" - version('develop', branch='master') + version('master', branch='master') + version('1.6_rc2', sha256='adc155e741a05e2bbfe9d928cdc4b2ec2ded34bc06aff59eaacf56c13a680be5') version('1.6_rc1', sha256='144e74a6c4d31e490ca2bfaf4a30df12ccdc303efa5a7d1177c9b80035365ad5') version('1.5.1', sha256='17a7722e5a32d236e4f1f6f88b680da4ba5f52bcf65bca3687c6a1c731d10881', preferred=True) version('1.5', sha256='b40b6d19e13f0650e84b8beebe86ce5c09071624f18d66df826f9d8584b4d3c8') version('1.4.1', sha256='4b53d371d6cf648c9e9e9bd1f104d349cafeaf10a02866e3f1d05c574b595a21') depends_on("cmake@2.8:", type='build') - for v in ["1.4.1", "1.5", "1.5.1", "1.6_rc1", "develop"]: + for v in ["1.4.1", "1.5", "1.5.1", "1.6_rc1", "1.6_rc2", "master"]: depends_on('votca-tools@%s' % v, when="@%s:%s.0" % (v, v)) depends_on('votca-csg@%s' % v, when="@%s:%s.0" % (v, v)) depends_on("libxc", when='@1.5:') |