From 8446bebdd98460805f0f5f0c83b3608b9fb577f5 Mon Sep 17 00:00:00 2001
From: Harmen Stoppels <harmenstoppels@gmail.com>
Date: Mon, 17 May 2021 15:42:48 +0200
Subject: Revert "Separable module configurations (#22588)" (#23674)

This reverts commit cefbe48c89209dc3df654795644973b1885cdea4.
---
 etc/spack/defaults/config.yaml         |  7 +++++++
 etc/spack/defaults/darwin/modules.yaml | 11 +++++------
 etc/spack/defaults/linux/modules.yaml  | 11 +++++------
 etc/spack/defaults/modules.yaml        | 20 +++++---------------
 4 files changed, 22 insertions(+), 27 deletions(-)

(limited to 'etc')

diff --git a/etc/spack/defaults/config.yaml b/etc/spack/defaults/config.yaml
index 2400686e60..61c23f42df 100644
--- a/etc/spack/defaults/config.yaml
+++ b/etc/spack/defaults/config.yaml
@@ -33,6 +33,13 @@ config:
   template_dirs:
     - $spack/share/spack/templates
 
+
+  # Locations where different types of modules should be installed.
+  module_roots:
+    tcl:    $spack/share/spack/modules
+    lmod:   $spack/share/spack/lmod
+
+
   # Temporary locations Spack can try to use for builds.
   #
   # Recommended options are given below.
diff --git a/etc/spack/defaults/darwin/modules.yaml b/etc/spack/defaults/darwin/modules.yaml
index 3bfca8c613..a90cc24c60 100644
--- a/etc/spack/defaults/darwin/modules.yaml
+++ b/etc/spack/defaults/darwin/modules.yaml
@@ -14,9 +14,8 @@
 #   ~/.spack/modules.yaml
 # -------------------------------------------------------------------------
 modules:
-  default:
-    prefix_inspections:
-      lib:
-        - DYLD_FALLBACK_LIBRARY_PATH
-      lib64:
-        - DYLD_FALLBACK_LIBRARY_PATH
+  prefix_inspections:
+    lib:
+      - DYLD_FALLBACK_LIBRARY_PATH
+    lib64:
+      - DYLD_FALLBACK_LIBRARY_PATH
diff --git a/etc/spack/defaults/linux/modules.yaml b/etc/spack/defaults/linux/modules.yaml
index 353a6ea9ab..a86a4794f1 100644
--- a/etc/spack/defaults/linux/modules.yaml
+++ b/etc/spack/defaults/linux/modules.yaml
@@ -14,9 +14,8 @@
 #   ~/.spack/modules.yaml
 # -------------------------------------------------------------------------
 modules:
-  default:
-    prefix_inspections:
-      lib:
-        - LD_LIBRARY_PATH
-      lib64:
-        - LD_LIBRARY_PATH
+  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 4539dbc9c2..d6d245930c 100644
--- a/etc/spack/defaults/modules.yaml
+++ b/etc/spack/defaults/modules.yaml
@@ -14,7 +14,8 @@
 #   ~/.spack/modules.yaml
 # -------------------------------------------------------------------------
 modules:
-  # Paths to check when creating modules for all module sets
+  enable:
+    - tcl
   prefix_inspections:
     bin:
       - PATH
@@ -33,17 +34,6 @@ modules:
     '':
       - CMAKE_PREFIX_PATH
 
-  # These are configurations for the module set named "default"
-  default:
-    # Where to install modules
-    roots:
-      tcl:    $spack/share/spack/modules
-      lmod:   $spack/share/spack/lmod
-    # What type of modules to use
-    enable:
-      - tcl
-
-    # Default configurations if lmod is enabled
-    lmod:
-      hierarchy:
-        - mpi
+  lmod:
+    hierarchy:
+      - mpi
-- 
cgit v1.2.3-60-g2f50