From 1e1ce488af46af001060016e963936dde0c66658 Mon Sep 17 00:00:00 2001
From: Xylar Asay-Davis <xylarstorm@gmail.com>
Date: Thu, 5 Oct 2023 11:11:45 +0200
Subject: [PATCH 1/2] Temporary fix to reinstall mamba=1.5.1

There is an issue where the latest mamba isn't compatible with
the latest conda but locally cached versions of the mamba package
don't know this.  The mamba package has been patched to a reinstall
will fix teh issue. This should be fixed more permanently in mamba
1.5.2, which should be released soon.
---
 conda/shared.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/conda/shared.py b/conda/shared.py
index dc2c37451f..d3c1eaa705 100644
--- a/conda/shared.py
+++ b/conda/shared.py
@@ -181,6 +181,8 @@ def install_miniconda(conda_base, activate_base, logger):
     check_call(commands, logger=logger)
 
     commands = f'{activate_base} && ' \
+               f'conda install -y --force-reinstall' \
+               f'   mamba=1.5.1 conda=23.7.4 && ' \
                f'mamba update -y --all && ' \
                f'mamba init'
 

From e3f13b5fc1f4ea0aea60eb513de9fdfa0d7f5916 Mon Sep 17 00:00:00 2001
From: Xylar Asay-Davis <xylarstorm@gmail.com>
Date: Thu, 5 Oct 2023 11:24:31 +0200
Subject: [PATCH 2/2] Add mamba to the load script

---
 conda/compass_env/load_compass.template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/conda/compass_env/load_compass.template b/conda/compass_env/load_compass.template
index 1b1a7242aa..15513a6631 100644
--- a/conda/compass_env/load_compass.template
+++ b/conda/compass_env/load_compass.template
@@ -1,6 +1,7 @@
 echo Loading conda environment
 source {{ conda_base }}/etc/profile.d/conda.sh
-conda activate {{ compass_env }}
+source {{ conda_base }}/etc/profile.d/mamba.sh
+mamba activate {{ compass_env }}
 echo Done.
 echo
 
@@ -8,4 +9,4 @@ echo
 
 {{ spack }}
 
-{{ env_vars }}
\ No newline at end of file
+{{ env_vars }}