diff options
author | Todd Gamblin <tgamblin@llnl.gov> | 2016-01-17 19:42:28 -0800 |
---|---|---|
committer | Todd Gamblin <tgamblin@llnl.gov> | 2016-01-19 01:16:08 -0800 |
commit | 8d6342c53d91f302204d0bbb54f06978a6de26a7 (patch) | |
tree | 8848c00c94c5c87bd8c6fb4882e4362920d7096e /etc | |
parent | d802165e039a3661831e84ecbdd31f1c4107d39d (diff) | |
parent | 97b492756acce93dbd5f1c305504f07df7582ba0 (diff) | |
download | spack-8d6342c53d91f302204d0bbb54f06978a6de26a7.tar.gz spack-8d6342c53d91f302204d0bbb54f06978a6de26a7.tar.bz2 spack-8d6342c53d91f302204d0bbb54f06978a6de26a7.tar.xz spack-8d6342c53d91f302204d0bbb54f06978a6de26a7.zip |
Merge branch 'mplegendre-multi_pkgsrc_roots' into develop
- This moves var/spack/packages to var/spack/repos/builtin/packages.
- Packages that did not exist in the source branch, or were changed in
develop, were moved into var/spack/repos/builtin/packages as part of
the integration.
Conflicts:
lib/spack/spack/test/unit_install.py
var/spack/repos/builtin/packages/clang/package.py
Diffstat (limited to 'etc')
-rw-r--r-- | etc/spack/repos.yaml | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/etc/spack/repos.yaml b/etc/spack/repos.yaml new file mode 100644 index 0000000000..2d4ff54ce6 --- /dev/null +++ b/etc/spack/repos.yaml @@ -0,0 +1,8 @@ +# ------------------------------------------------------------------------- +# 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 |