[skip ci] Revert .gitmodules and update submodule pointer for spack

climbfuji · Jul 14, 2023 · 93e2a71 · 93e2a71
1 parent c429794
commit 93e2a71
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 8 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -1,11 +1,9 @@
 [submodule "spack"]
   path = spack
-  ##url = https://github.com/spack/spack
-  ##branch = develop
-  #url = https://github.com/jcsda/spack
-  #branch = jcsda_emc_spack_stack
-  url = https://github.com/climbfuji/spack
-  branch = feature/merge_141_into_jcsda_emc_spack_stack
+  #url = https://github.com/spack/spack
+  #branch = develop
+  url = https://github.com/jcsda/spack
+  branch = jcsda_emc_spack_stack
 [submodule "doc/CMakeModules"]
   path = doc/CMakeModules
   url = https://github.com/noaa-emc/cmakemodules

diff --git a/configs/sites/hercules/packages.yaml b/configs/sites/hercules/packages.yaml
@@ -144,7 +144,7 @@ packages:
   qt:
     externals:
     - spec: [email protected]
-      prefix: /apps/spack-managed/gcc-12.2.0/qt-5.15.8-gayzhaahclvlybiiykwj2cym4vo33w6x
+      prefix: /apps/spack-managed/gcc-11.3.1/qt-5.15.8-d47tsna6f5dylcpblkfgw4gpn2cucihd
       modules:
       - qt/5.15.8
   subversion:

diff --git a/spack b/spack