Unverified Commit 067c81c4 authored by Ward Poelmans's avatar Ward Poelmans
Browse files

Merge branch 'develop' into gnuplot5

* develop: (631 commits)
  Fixes in easyconfig
  Fixed config
  Both packages use dependency GMP-GCC-4.9.2
  commas corrected
  versionsuffix added for matplotlib dependency
  using GMP-GCC-4.9.2
  toolchain corrected in matplotlib
  Added external matplotlib dependency and source changed to PYPI
  cURL added as dependency
  fix typo
  drop gpfs versionsuffix and use no longer existing --enable-gpfs configopt for recent HDF5 versions
  {data}[intel/2015a] HDF5 1.8.15
  add missing Tk 8.6.3 intel/2015a easyconfig
  kbproto is just a build dep
  use Tk 8.6.3 rather than Tk 8.6.4 as dep in Python 2.7.9 easyconfigs
  include tk-devel is list of OS deps for Python 2.7.9 Cray easyconfigs, make sure 'import Tkinter' works
  include Tk as dependency in Python 2.7.9 easyconfigs
  {vis}[intel/2015a] libXScrnSaver 1.2.2 + libXft 2.3.2
  fix remark
  fix source_urls in QuantumESPRESSO 5.0.2 easyconfigs
  ...

Conflicts:
	easybuild/easyconfigs/e/expat/expat-2.1.0-intel-2015a.eb
parents 6717d0ad 0f21883e
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment