From bc6b9c2fc7d4c413645f793b9a5089a4c673b977 Mon Sep 17 00:00:00 2001
From: Johan Mabille <johan.mabille@gmail.com>
Date: Thu, 12 Dec 2024 09:15:48 +0100
Subject: [PATCH] Fixes

---
 repo2docker/buildpacks/conda/activate-conda.sh     |  4 +++-
 repo2docker/buildpacks/conda/install-base-env.bash | 12 ++++++++----
 tests/conda/py35-binder-dir/verify                 |  9 +++------
 3 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/repo2docker/buildpacks/conda/activate-conda.sh b/repo2docker/buildpacks/conda/activate-conda.sh
index 48372318e..312646575 100755
--- a/repo2docker/buildpacks/conda/activate-conda.sh
+++ b/repo2docker/buildpacks/conda/activate-conda.sh
@@ -1,7 +1,9 @@
 # enable conda and activate the notebook environment
-eval $(micromamba shell hook -s posix -p ${CONDA_DIR})
+set -ex
+eval $(micromamba shell hook -s posix -r ${CONDA_DIR})
 for name in conda mamba; do
     CONDA_PROFILE="${CONDA_DIR}/etc/profile.d/${name}.sh"
+    echo "Activating profile: ${CONDA_PROFILE}"
     test -f $CONDA_PROFILE && . $CONDA_PROFILE
 done
 if [[ "${KERNEL_PYTHON_PREFIX}" != "${NB_PYTHON_PREFIX}" ]]; then
diff --git a/repo2docker/buildpacks/conda/install-base-env.bash b/repo2docker/buildpacks/conda/install-base-env.bash
index 4eb93f00c..99d926a10 100755
--- a/repo2docker/buildpacks/conda/install-base-env.bash
+++ b/repo2docker/buildpacks/conda/install-base-env.bash
@@ -5,8 +5,8 @@ set -ex
 
 cd $(dirname $0)
 
-export MAMBA_VERSION=1.5.9
-export CONDA_VERSION=24.5.0
+export MAMBA_VERSION="2.0.5.rc0"
+export CONDA_VERSION=24.11.0
 
 URL="https://anaconda.org/conda-forge/micromamba/${MAMBA_VERSION}/download/${CONDA_PLATFORM}/micromamba-${MAMBA_VERSION}-0.tar.bz2"
 
@@ -21,7 +21,7 @@ time wget -qO- ${URL} | tar -xvj bin/micromamba
 mv bin/micromamba "$MICROMAMBA_EXE"
 chmod 0755 "$MICROMAMBA_EXE"
 
-eval "$(${MICROMAMBA_EXE} shell hook -p ${CONDA_DIR} -s posix)"
+eval "$(${MICROMAMBA_EXE} shell hook --root-prefix ${CONDA_DIR} -s posix)"
 
 micromamba activate
 
@@ -36,7 +36,11 @@ update_dependencies: false
 # channel_priority: flexible
 EOT
 
-micromamba install conda=${CONDA_VERSION} mamba=${MAMBA_VERSION} -y
+micromamba install
+    -c conda-forge/label/mamba_prerelease \
+    -c conda-forge \
+    conda=${CONDA_VERSION} 
+    mamba=${MAMBA_VERSION} -y
 
 echo "installing notebook env:"
 cat "${NB_ENVIRONMENT_FILE}"
diff --git a/tests/conda/py35-binder-dir/verify b/tests/conda/py35-binder-dir/verify
index ef166558f..0b776b0ed 100755
--- a/tests/conda/py35-binder-dir/verify
+++ b/tests/conda/py35-binder-dir/verify
@@ -16,13 +16,10 @@ v = out.split()[1]
 assert v[:3] == "3.5", out
 
 out = sh(["micromamba", "--version"])
-assert out == "1.5.9", out
+assert out == "2.0.5.rc0", out
 
 out = sh(["mamba", "--version"])
-assert (
-    out
-    == """mamba 1.5.9
-conda 24.5.0"""
-), out
+assert out == "2.0.5.rc0", out
+
 
 sh([kernel_python, "-c", "import numpy"])