diff options
| author | Elizabeth Fischer <elizabeth.fischer@columbia.edu> | 2016-06-30 09:13:24 -0400 |
|---|---|---|
| committer | Elizabeth Fischer <elizabeth.fischer@columbia.edu> | 2016-06-30 09:13:24 -0400 |
| commit | 50ac98bc04d9be2eead0b31e0a898a2dfd24a7a4 (patch) | |
| tree | e190a29f85712b580d48d0ae6bca24367245f42c /etc | |
| parent | efa506b235523c8a9a925c1ecf91690266da4fd4 (diff) | |
| parent | 0e422dec8c8d075e68c31b032628b7d4db96c552 (diff) | |
| download | spack-50ac98bc04d9be2eead0b31e0a898a2dfd24a7a4.tar.gz spack-50ac98bc04d9be2eead0b31e0a898a2dfd24a7a4.tar.bz2 spack-50ac98bc04d9be2eead0b31e0a898a2dfd24a7a4.tar.xz spack-50ac98bc04d9be2eead0b31e0a898a2dfd24a7a4.zip | |
Merge remote-tracking branch 'upstream/develop' into efischer/160630-StagedPackage
# Conflicts:
# lib/spack/docs/packaging_guide.rst
# lib/spack/spack/package.py
Mostly minor/formatting issues in lib/spack/spack/package.py (the heavyweight merge was already done recently). Only one serious issue: it looks like the feature branch had accidentally deleted the line `spack.hooks.post_install(self)`. This got added back in from develop.
Diffstat (limited to 'etc')
| -rw-r--r-- | etc/spack/modules.yaml | 23 |
1 files changed, 22 insertions, 1 deletions
diff --git a/etc/spack/modules.yaml b/etc/spack/modules.yaml index aa2a2c3fe2..5f31cdd5c0 100644 --- a/etc/spack/modules.yaml +++ b/etc/spack/modules.yaml @@ -5,4 +5,25 @@ # although users can override these settings in their ~/.spack/modules.yaml. # ------------------------------------------------------------------------- modules: - enable: ['tcl', 'dotkit'] + enable: + - tcl + - dotkit + prefix_inspections: + bin: + - PATH + man: + - MANPATH + lib: + - LIBRARY_PATH + - LD_LIBRARY_PATH + lib64: + - LIBRARY_PATH + - LD_LIBRARY_PATH + include: + - CPATH + lib/pkgconfig: + - PKG_CONFIG_PATH + lib64/pkgconfig: + - PKG_CONFIG_PATH + '': + - CMAKE_PREFIX_PATH |