summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTodd Gamblin <tgamblin@llnl.gov>2015-04-14 15:12:11 -0700
committerTodd Gamblin <tgamblin@llnl.gov>2015-04-14 15:12:11 -0700
commit1d6524f299644ef0db07d526bc71c9f4a1c0bf40 (patch)
treee624b05ef25cb69c050c420fcc10fd165ee3ef47
parent5c04b3c4800ae4ffb71f20bcd86fb42b2ba40183 (diff)
parent97a20cac586433f7e9e1171496e05f1594240edf (diff)
downloadspack-1d6524f299644ef0db07d526bc71c9f4a1c0bf40.tar.gz
spack-1d6524f299644ef0db07d526bc71c9f4a1c0bf40.tar.bz2
spack-1d6524f299644ef0db07d526bc71c9f4a1c0bf40.tar.xz
spack-1d6524f299644ef0db07d526bc71c9f4a1c0bf40.zip
Merge branch 'develop' of github.com:scalability-llnl/spack into develop
-rw-r--r--var/spack/packages/Mitos/package.py2
-rw-r--r--var/spack/packages/memaxes/package.py3
2 files changed, 2 insertions, 3 deletions
diff --git a/var/spack/packages/Mitos/package.py b/var/spack/packages/Mitos/package.py
index 272360a55c..53037a0732 100644
--- a/var/spack/packages/Mitos/package.py
+++ b/var/spack/packages/Mitos/package.py
@@ -7,7 +7,7 @@ class Mitos(Package):
homepage = "https://github.com/scalability-llnl/Mitos"
url = "https://github.com/scalability-llnl/Mitos"
- version('0.7', git='https://github.com/scalability-llnl/Mitos.git', tag='v0.7')
+ version('0.7', '319ece59d6794cccb66bfcc0abfec661', git='https://github.com/scalability-llnl/Mitos.git', tag='v0.7')
depends_on('dyninst')
diff --git a/var/spack/packages/memaxes/package.py b/var/spack/packages/memaxes/package.py
index afa62009a6..76d5d3f831 100644
--- a/var/spack/packages/memaxes/package.py
+++ b/var/spack/packages/memaxes/package.py
@@ -5,12 +5,11 @@ class Memaxes(Package):
homepage = "https://github.com/scalability-llnl/MemAxes"
- version('0.5', 'b0f561d48aa7301e028d074bc4b5751b',
+ version('0.5', '5874f3fda9fd2d313c0ff9684f915ab5',
url='https://github.com/scalability-llnl/MemAxes/archive/v0.5.tar.gz')
depends_on("cmake@2.8.9:")
depends_on("qt@5:")
- depends_on("vtk")
def install(self, spec, prefix):
with working_dir('spack-build', create=True):