From 75a8bd74b21a7c4ffbced395bc2ff801e840a972 Mon Sep 17 00:00:00 2001
From: Sylvain Corlay <sylvain.corlay@gmail.com>
Date: Wed, 11 Jan 2023 07:49:42 +0100
Subject: [PATCH] Upgrade to mamba 1.1 and enable rich SAT error messages

---
 repo2docker/buildpacks/conda/install-base-env.bash | 3 ++-
 tests/conda/py35-binder-dir/verify                 | 4 ++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/repo2docker/buildpacks/conda/install-base-env.bash b/repo2docker/buildpacks/conda/install-base-env.bash
index 875fe3b1..e8b3bb3e 100755
--- a/repo2docker/buildpacks/conda/install-base-env.bash
+++ b/repo2docker/buildpacks/conda/install-base-env.bash
@@ -5,7 +5,7 @@ set -ex
 
 cd $(dirname $0)
 
-export MAMBA_VERSION=1.0.0
+export MAMBA_VERSION=1.1.0
 export CONDA_VERSION=4.13.0
 
 URL="https://anaconda.org/conda-forge/micromamba/${MAMBA_VERSION}/download/${CONDA_PLATFORM}/micromamba-${MAMBA_VERSION}-0.tar.bz2"
@@ -34,6 +34,7 @@ channels:
 auto_update_conda: false
 show_channel_urls: true
 update_dependencies: false
+experimental_sat_error_message: true
 # channel_priority: flexible
 EOT
 
diff --git a/tests/conda/py35-binder-dir/verify b/tests/conda/py35-binder-dir/verify
index 32e73c42..8bad344d 100755
--- a/tests/conda/py35-binder-dir/verify
+++ b/tests/conda/py35-binder-dir/verify
@@ -5,12 +5,12 @@ from subprocess import check_output
 assert sys.version_info[:2] == (3, 5), sys.version
 
 out = check_output(["micromamba", "--version"]).decode("utf8").strip()
-assert out == "1.0.0", out
+assert out == "1.1.0", out
 
 out = check_output(["mamba", "--version"]).decode("utf8").strip()
 assert (
     out
-    == """mamba 1.0.0
+    == """mamba 1.1.0
 conda 4.13.0"""
 ), out