diff options
| author | Todd Gamblin <tgamblin@llnl.gov> | 2016-07-19 23:48:12 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-07-19 23:48:12 -0700 |
| commit | 6501cba5a7bf4e3e3ae3a0554b89fd0df703ca0d (patch) | |
| tree | d5b954ade346613c6edd9e450ae72f5cec49c339 /etc | |
| parent | dd7bd4f320651411a1125268310b2b1f590ad213 (diff) | |
| parent | 26480f14f901da087efbac263835c8767eaea23a (diff) | |
| download | spack-6501cba5a7bf4e3e3ae3a0554b89fd0df703ca0d.tar.gz spack-6501cba5a7bf4e3e3ae3a0554b89fd0df703ca0d.tar.bz2 spack-6501cba5a7bf4e3e3ae3a0554b89fd0df703ca0d.tar.xz spack-6501cba5a7bf4e3e3ae3a0554b89fd0df703ca0d.zip | |
Merge pull request #1309 from LLNL/features/spack-defaults
Add "default" configuration scope.
Diffstat (limited to 'etc')
| -rw-r--r-- | etc/spack/defaults/modules.yaml (renamed from etc/spack/modules.yaml) | 15 | ||||
| -rw-r--r-- | etc/spack/defaults/packages.yaml | 21 | ||||
| -rw-r--r-- | etc/spack/defaults/repos.yaml | 14 | ||||
| -rw-r--r-- | etc/spack/repos.yaml | 8 |
4 files changed, 47 insertions, 11 deletions
diff --git a/etc/spack/modules.yaml b/etc/spack/defaults/modules.yaml index 9ae54a2d09..8864a76547 100644 --- a/etc/spack/modules.yaml +++ b/etc/spack/defaults/modules.yaml @@ -1,8 +1,17 @@ # ------------------------------------------------------------------------- -# This is the default spack module files generation configuration. +# This is the default configuration for Spack's module file generation. # -# Changes to this file will affect all users of this spack install, -# although users can override these settings in their ~/.spack/modules.yaml. +# Settings here are versioned with Spack and are intended to provide +# sensible defaults out of the box. Spack maintainers should edit this +# file to keep it current. +# +# Users can override these settings by editing the following files. +# +# Per-spack-instance settings (overrides defaults): +# $SPACK_ROOT/etc/spack/modules.yaml +# +# Per-user settings (overrides default and site settings): +# ~/.spack/modules.yaml # ------------------------------------------------------------------------- modules: enable: diff --git a/etc/spack/defaults/packages.yaml b/etc/spack/defaults/packages.yaml new file mode 100644 index 0000000000..83f9eb7ece --- /dev/null +++ b/etc/spack/defaults/packages.yaml @@ -0,0 +1,21 @@ +# ------------------------------------------------------------------------- +# This file controls default concretization preferences for Spack. +# +# Settings here are versioned with Spack and are intended to provide +# sensible defaults out of the box. Spack maintainers should edit this +# file to keep it current. +# +# Users can override these settings by editing the following files. +# +# Per-spack-instance settings (overrides defaults): +# $SPACK_ROOT/etc/spack/packages.yaml +# +# Per-user settings (overrides default and site settings): +# ~/.spack/packages.yaml +# ------------------------------------------------------------------------- +packages: + all: + providers: + mpi: [openmpi, mpich] + blas: [openblas] + lapack: [openblas] diff --git a/etc/spack/defaults/repos.yaml b/etc/spack/defaults/repos.yaml new file mode 100644 index 0000000000..f3e00653eb --- /dev/null +++ b/etc/spack/defaults/repos.yaml @@ -0,0 +1,14 @@ +# ------------------------------------------------------------------------- +# This is the default spack repository configuration. It includes the +# builtin spack package repository. +# +# Users can override these settings by editing the following files. +# +# Per-spack-instance settings (overrides defaults): +# $SPACK_ROOT/etc/spack/repos.yaml +# +# Per-user settings (overrides default and site settings): +# ~/.spack/repos.yaml +# ------------------------------------------------------------------------- +repos: + - $spack/var/spack/repos/builtin diff --git a/etc/spack/repos.yaml b/etc/spack/repos.yaml deleted file mode 100644 index 2d4ff54ce6..0000000000 --- a/etc/spack/repos.yaml +++ /dev/null @@ -1,8 +0,0 @@ -# ------------------------------------------------------------------------- -# This is the default spack repository configuration. -# -# Changes to this file will affect all users of this spack install, -# although users can override these settings in their ~/.spack/repos.yaml. -# ------------------------------------------------------------------------- -repos: - - $spack/var/spack/repos/builtin |