From 7308986be045b0a15d7b32937b66528ce8142083 Mon Sep 17 00:00:00 2001
From: germann_e <elsa.germann@psi.ch>
Date: Wed, 31 Jul 2024 16:46:12 +0200
Subject: [PATCH] Resolve "Put provisionary Merlin7 documentation back"

---
 _data/sidebars/merlin7_sidebar.yml         |  2 ++
 _data/topnav.yml                           |  4 ++--
 index.md                                   |  3 ++-
 pages/merlin7/05-Software-Support/spack.md | 19 +++++++++++++++++++
 4 files changed, 25 insertions(+), 3 deletions(-)
 create mode 100644 pages/merlin7/05-Software-Support/spack.md

diff --git a/_data/sidebars/merlin7_sidebar.yml b/_data/sidebars/merlin7_sidebar.yml
index 2b3978c..4b8a1c9 100644
--- a/_data/sidebars/merlin7_sidebar.yml
+++ b/_data/sidebars/merlin7_sidebar.yml
@@ -24,3 +24,5 @@ entries:
         folderitems:
           - title: ANSYS RSM
             url: /merlin7/ansys-rsm.html
+          - title: Spack
+            url: /merlin7/spack.html
diff --git a/_data/topnav.yml b/_data/topnav.yml
index c783b13..8ab83c3 100644
--- a/_data/topnav.yml
+++ b/_data/topnav.yml
@@ -32,5 +32,5 @@ topnav_dropdowns:
             url: /gmerlin6/slurm-configuration.html
           - title: Cluster 'gmerlin6'
             url: /gmerlin6/slurm-configuration.html
-          # - title: Cluster 'merlin7'
-          #   url: /merlin7/slurm-configuration.html
+          - title: Cluster 'merlin7'
+            url: /merlin7/slurm-configuration.html
diff --git a/index.md b/index.md
index 4e1b42b..b645a9c 100644
--- a/index.md
+++ b/index.md
@@ -14,4 +14,5 @@ engages in research activities on technologies (data analysis and machine learni
 
 ## Available documentation
 
-<button type="button" class="btn btn-primary" href="/merlin6">Merlin6</button>
\ No newline at end of file
+<button type="button" class="btn btn-primary" href="/merlin6">Merlin6</button>
+<button type="button" class="btn btn-primary" href="/merlin7">Merlin7</button>
diff --git a/pages/merlin7/05-Software-Support/spack.md b/pages/merlin7/05-Software-Support/spack.md
new file mode 100644
index 0000000..202da4d
--- /dev/null
+++ b/pages/merlin7/05-Software-Support/spack.md
@@ -0,0 +1,19 @@
+---
+title: Spack
+#tags:
+last_updated: 31 July 2024
+keywords: [spack, python, software, compile]
+summary: "Spack the HPC package manager documentation"
+sidebar: merlin7_sidebar
+permalink: /merlin7/spack.html
+---
+![Work In Progress](/images/WIP/WIP1.webp){:style="display:block; margin-left:auto; margin-right:auto"}
+
+{{site.data.alerts.warning}}The Merlin7 documentation is <b>Work In Progress</b>.
+Please do not use or rely on this documentation until this becomes official.  
+This applies to any page under <b><a href="https://lsm-hpce.gitpages.psi.ch/merlin7/">https://lsm-hpce.gitpages.psi.ch/merlin7/</a></b>
+{{site.data.alerts.end}}
+
+### The Spack PSI repo
+
+[README.md](https://gitlab.psi.ch/lsm-hpce/spack-psi/-/blob/main/README.md)