6 files changed, 110 insertions, 8 deletions
diff --git a/etc/spack/defaults/config.yaml b/etc/spack/defaults/config.yaml
index b6a09a7738..8525947fbd 100644
--- a/etc/spack/defaults/config.yaml
+++ b/etc/spack/defaults/config.yaml
@@ -18,9 +18,15 @@ config:
   # You can use $spack here to refer to the root of the spack instance.
   install_tree: $spack/opt/spack
 
+
   # Locations where templates should be found
   template_dirs:
-    - $spack/templates
+    - $spack/share/spack/templates
+
+
+  # Default directory layout
+  install_path_scheme: "${ARCHITECTURE}/${COMPILERNAME}-${COMPILERVER}/${PACKAGE}-${VERSION}-${HASH}"
+
 
   # Locations where different types of modules should be installed.
   module_roots:
@@ -39,20 +45,20 @@ config:
   # builds directly inside its install directory without staging them in
   # temporary space.
   #
-  # The build stage can be purged with `spack purge --stage`.
+  # The build stage can be purged with `spack clean --stage`.
   build_stage:
     - $tempdir
     - /nfs/tmp2/$user
     - $spack/var/spack/stage
 
 
-  # Cache directory already downloaded source tarballs and archived
-  # repositories. This can be purged with `spack purge --downloads`.
+  # Cache directory for already downloaded source tarballs and archived
+  # repositories. This can be purged with `spack clean --downloads`.
   source_cache: $spack/var/spack/cache
 
 
   # Cache directory for miscellaneous files, like the package index.
-  # This can be purged with `spack purge --misc-cache`
+  # This can be purged with `spack clean --misc-cache`
   misc_cache: ~/.spack/cache
 
 
@@ -71,7 +77,43 @@ config:
   dirty: false
 
 
+  # The language the build environment will use. This will produce English
+  # compiler messages by default, so the log parser can highlight errors.
+  # If set to C, it will use English (see man locale).
+  # If set to the empty string (''), it will use the language from the
+  # user's environment.
+  build_language: C
+
+
+  # When set to true, concurrent instances of Spack will use locks to
+  # avoid modifying the install tree, database file, etc. If false, Spack
+  # will disable all locking, but you must NOT run concurrent instances
+  # of Spack.  For filesystems that don't support locking, you should set
+  # this to false and run one Spack at a time, but otherwise we recommend
+  # enabling locks.
+  locks: true
+
+
   # The default number of jobs to use when running `make` in parallel.
   # If set to 4, for example, `spack install` will run `make -j4`.
   # If not set, all available cores are used by default.
   # build_jobs: 4
+
+
+  # If set to true, Spack will use ccache to cache C compiles.
+  ccache: false
+
+
+  # How long to wait to lock the Spack installation database. This lock is used
+  # when Spack needs to manage its own package metadata and all operations are
+  # expected to complete within the default time limit. The timeout should
+  # therefore generally be left untouched.
+  db_lock_timeout: 120
+
+
+  # How long to wait when attempting to modify a package (e.g. to install it).
+  # This value should typically be 'null' (never time out) unless the Spack
+  # instance only ever has a single user at a time, and only if the user
+  # anticipates that a significant delay indicates that the lock attempt will
+  # never succeed.
+  package_lock_timeout: null
diff --git a/etc/spack/defaults/darwin/modules.yaml b/etc/spack/defaults/darwin/modules.yaml
new file mode 100644
index 0000000000..570aec2e84
--- /dev/null
+++ b/etc/spack/defaults/darwin/modules.yaml
@@ -0,0 +1,23 @@
+# -------------------------------------------------------------------------
+# This is the default configuration for Spack's module file generation.
+#
+# 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:
+  prefix_inspections:
+    lib:
+      - DYLD_LIBRARY_PATH
+      - DYLD_FALLBACK_LIBRARY_PATH
+    lib64:
+      - DYLD_LIBRARY_PATH
+      - DYLD_FALLBACK_LIBRARY_PATH
diff --git a/etc/spack/defaults/darwin/packages.yaml b/etc/spack/defaults/darwin/packages.yaml
index 24a08809db..1150f6bab7 100644
--- a/etc/spack/defaults/darwin/packages.yaml
+++ b/etc/spack/defaults/darwin/packages.yaml
@@ -16,3 +16,12 @@
 packages:
   all:
     compiler: [clang, gcc, intel]
+    providers:
+      elf: [libelf]
+      unwind: [apple-libunwind]
+  apple-libunwind:
+    paths:
+    # Apple bundles libunwind version 35.3 with macOS 10.9 and later,
+    # although the version number used here isn't critical
+      apple-libunwind@35.3: /usr
+    buildable: False
diff --git a/etc/spack/defaults/linux/modules.yaml b/etc/spack/defaults/linux/modules.yaml
new file mode 100644
index 0000000000..a86a4794f1
--- /dev/null
+++ b/etc/spack/defaults/linux/modules.yaml
@@ -0,0 +1,21 @@
+# -------------------------------------------------------------------------
+# This is the default configuration for Spack's module file generation.
+#
+# 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:
+  prefix_inspections:
+    lib:
+      - LD_LIBRARY_PATH
+    lib64:
+      - LD_LIBRARY_PATH
diff --git a/etc/spack/defaults/modules.yaml b/etc/spack/defaults/modules.yaml
index 8b6f1b40af..b5ea65da95 100644
--- a/etc/spack/defaults/modules.yaml
+++ b/etc/spack/defaults/modules.yaml
@@ -28,10 +28,8 @@ modules:
       - ACLOCAL_PATH
     lib:
       - LIBRARY_PATH
-      - LD_LIBRARY_PATH
     lib64:
       - LIBRARY_PATH
-      - LD_LIBRARY_PATH
     include:
       - CPATH
     lib/pkgconfig:
diff --git a/etc/spack/defaults/packages.yaml b/etc/spack/defaults/packages.yaml
index 2cfdd399df..aaab12b3ef 100644
--- a/etc/spack/defaults/packages.yaml
+++ b/etc/spack/defaults/packages.yaml
@@ -17,13 +17,18 @@ packages:
   all:
     compiler: [gcc, intel, pgi, clang, xl, nag]
     providers:
+      D: [ldc]
       awk: [gawk]
       blas: [openblas]
       daal: [intel-daal]
       elf: [elfutils]
+      fftw-api: [fftw]
+      gl: [mesa, opengl]
+      glu: [mesa-glu, openglu]
       golang: [gcc]
       ipp: [intel-ipp]
       java: [jdk]
+      jpeg: [libjpeg-turbo, libjpeg]
       lapack: [openblas]
       mkl: [intel-mkl]
       mpe: [mpe2]
@@ -31,7 +36,11 @@ packages:
       opencl: [pocl]
       openfoam: [openfoam-com, openfoam-org, foam-extend]
       pil: [py-pillow]
+      pkgconfig: [pkgconf, pkg-config]
       scalapack: [netlib-scalapack]
       szip: [libszip, libaec]
       tbb: [intel-tbb]
-      jpeg: [libjpeg-turbo, libjpeg]
+      unwind: [libunwind]
+    permissions:
+      read: world
+      write: user