summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStephen Herbein <SteVwonder@users.noreply.github.com>2016-10-25 14:11:23 -0400
committerTodd Gamblin <tgamblin@llnl.gov>2016-10-25 11:11:23 -0700
commit14e3a541e1eb24d4ac225e37f9df2ed28b3b9046 (patch)
treed972c63108e35f5599c55ca2499cca28ff101d2a
parent65c250699f12fac5deb618e7dd719669e2c65497 (diff)
downloadspack-14e3a541e1eb24d4ac225e37f9df2ed28b3b9046.tar.gz
spack-14e3a541e1eb24d4ac225e37f9df2ed28b3b9046.tar.bz2
spack-14e3a541e1eb24d4ac225e37f9df2ed28b3b9046.tar.xz
spack-14e3a541e1eb24d4ac225e37f9df2ed28b3b9046.zip
Add latest versions of Flux prerequisites (#2108)
* libsodium: add latest versions, fix old versions older versions of libsodium were added to an "old" subdirectory * zeromq: add 4.1.4 prerequiste for the latest develop version of flux
-rw-r--r--var/spack/repos/builtin/packages/libsodium/package.py10
-rw-r--r--var/spack/repos/builtin/packages/zeromq/package.py2
2 files changed, 11 insertions, 1 deletions
diff --git a/var/spack/repos/builtin/packages/libsodium/package.py b/var/spack/repos/builtin/packages/libsodium/package.py
index 1c930e21dd..805881ce07 100644
--- a/var/spack/repos/builtin/packages/libsodium/package.py
+++ b/var/spack/repos/builtin/packages/libsodium/package.py
@@ -29,14 +29,22 @@ class Libsodium(Package):
"""Sodium is a modern, easy-to-use software library for encryption,
decryption, signatures, password hashing and more."""
homepage = "https://download.libsodium.org/doc/"
- url = "https://download.libsodium.org/libsodium/releases/libsodium-1.0.3.tar.gz"
+ url = "https://download.libsodium.org/libsodium/releases/libsodium-1.0.11.tar.gz"
+ version('1.0.11', 'b58928d035064b2a46fb564937b83540')
+ version('1.0.10', 'ea89dcbbda0b2b6ff6a1c476231870dd')
version('1.0.3', 'b3bcc98e34d3250f55ae196822307fab')
version('1.0.2', 'dc40eb23e293448c6fc908757738003f')
version('1.0.1', '9a221b49fba7281ceaaf5e278d0f4430')
version('1.0.0', '3093dabe4e038d09f0d150cef064b2f7')
version('0.7.1', 'c224fe3923d1dcfe418c65c8a7246316')
+ def url_for_version(self, version):
+ url = 'https://download.libsodium.org/libsodium/releases/'
+ if version < Version('1.0.4'):
+ url += 'old/'
+ return url + 'libsodium-{0}.tar.gz'.format(version)
+
def install(self, spec, prefix):
configure("--prefix=%s" % prefix)
diff --git a/var/spack/repos/builtin/packages/zeromq/package.py b/var/spack/repos/builtin/packages/zeromq/package.py
index 6a657dc39c..cafd3c2125 100644
--- a/var/spack/repos/builtin/packages/zeromq/package.py
+++ b/var/spack/repos/builtin/packages/zeromq/package.py
@@ -30,6 +30,7 @@ class Zeromq(Package):
homepage = "http://zguide.zeromq.org/"
url = "http://download.zeromq.org/zeromq-4.1.2.tar.gz"
+ version('4.1.4', 'a611ecc93fffeb6d058c0e6edf4ad4fb')
version('4.1.2', '159c0c56a895472f02668e692d122685')
version('4.1.1', '0a4b44aa085644f25c177f79dc13f253')
version('4.0.7', '9b46f7e7b0704b83638ef0d461fd59ab')
@@ -37,6 +38,7 @@ class Zeromq(Package):
version('4.0.5', '73c39f5eb01b9d7eaf74a5d899f1d03d')
depends_on("libsodium")
+ depends_on("libsodium@:1.0.3", when='@:4.1.2')
def install(self, spec, prefix):
configure("--with-libsodium", "--prefix=%s" % prefix)