From 601eee4575ca9abbb1c82640f5c868a716589179 Mon Sep 17 00:00:00 2001
From: Bradley Dice <bdice@bradleydice.com>
Date: Wed, 21 Feb 2024 17:18:45 -0800
Subject: [PATCH] Add conda-merge to ci-conda images.

---
 ci-conda.Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ci-conda.Dockerfile b/ci-conda.Dockerfile
index 8c2f0d8..20196d5 100644
--- a/ci-conda.Dockerfile
+++ b/ci-conda.Dockerfile
@@ -152,7 +152,7 @@ RUN cat /tmp/condarc.tmpl | envsubst | tee /opt/conda/.condarc; \
 RUN /opt/conda/bin/git config --system --add safe.directory '*'
 
 # Install CI tools using pip
-RUN pip install dunamai "rapids-dependency-file-generator==1.*" \
+RUN pip install conda-merge dunamai "rapids-dependency-file-generator==1.*" \
     && pip cache purge
 
 COPY --from=mikefarah/yq:4.40.7 /usr/bin/yq /usr/local/bin/yq