From a2fd6883977fb73027f36357d7114e12bb683296 Mon Sep 17 00:00:00 2001
From: Lawrence Mitchell <lmitchell@nvidia.com>
Date: Thu, 31 Aug 2023 21:33:30 +0100
Subject: [PATCH] Explicitly depend on zlib in conda recipes (#14018)

We were previously obtaining zlib transitively through our cmake dependency, but since the 3.27.4 conda package, this dependency no longer exists. Therefore we must depend on zlib ourselves.

- Closes #14021

Authors:
  - Lawrence Mitchell (https://github.com/wence-)

Approvers:
  - Bradley Dice (https://github.com/bdice)
  - AJ Schmidt (https://github.com/ajschmidt8)
  - Vyas Ramasubramani (https://github.com/vyasr)

URL: https://github.com/rapidsai/cudf/pull/14018
---
 conda/environments/all_cuda-118_arch-x86_64.yaml | 1 +
 conda/environments/all_cuda-120_arch-x86_64.yaml | 1 +
 conda/recipes/libcudf/conda_build_config.yaml    | 2 ++
 conda/recipes/libcudf/meta.yaml                  | 1 +
 dependencies.yaml                                | 1 +
 5 files changed, 6 insertions(+)

diff --git a/conda/environments/all_cuda-118_arch-x86_64.yaml b/conda/environments/all_cuda-118_arch-x86_64.yaml
index e4a9b2f1d29..8965a43b8ac 100644
--- a/conda/environments/all_cuda-118_arch-x86_64.yaml
+++ b/conda/environments/all_cuda-118_arch-x86_64.yaml
@@ -95,6 +95,7 @@ dependencies:
 - tokenizers==0.13.1
 - transformers==4.24.0
 - typing_extensions>=4.0.0
+- zlib>=1.2.13
 - pip:
   - git+https://github.com/python-streamz/streamz.git@master
 name: all_cuda-118_arch-x86_64
diff --git a/conda/environments/all_cuda-120_arch-x86_64.yaml b/conda/environments/all_cuda-120_arch-x86_64.yaml
index d03c4364435..4542eb79267 100644
--- a/conda/environments/all_cuda-120_arch-x86_64.yaml
+++ b/conda/environments/all_cuda-120_arch-x86_64.yaml
@@ -92,6 +92,7 @@ dependencies:
 - tokenizers==0.13.1
 - transformers==4.24.0
 - typing_extensions>=4.0.0
+- zlib>=1.2.13
 - pip:
   - git+https://github.com/python-streamz/streamz.git@master
 name: all_cuda-120_arch-x86_64
diff --git a/conda/recipes/libcudf/conda_build_config.yaml b/conda/recipes/libcudf/conda_build_config.yaml
index 0397045786b..25b3f19de77 100644
--- a/conda/recipes/libcudf/conda_build_config.yaml
+++ b/conda/recipes/libcudf/conda_build_config.yaml
@@ -40,6 +40,8 @@ spdlog_version:
 nvcomp_version:
   - "=2.6.1"
 
+zlib_version:
+  - ">=1.2.13"
 # The CTK libraries below are missing from the conda-forge::cudatoolkit package
 # for CUDA 11. The "*_host_*" version specifiers correspond to `11.8` packages
 # and the "*_run_*" version specifiers correspond to `11.x` packages.
diff --git a/conda/recipes/libcudf/meta.yaml b/conda/recipes/libcudf/meta.yaml
index de32facba74..c844131ad31 100644
--- a/conda/recipes/libcudf/meta.yaml
+++ b/conda/recipes/libcudf/meta.yaml
@@ -73,6 +73,7 @@ requirements:
     - benchmark {{ gbench_version }}
     - gtest {{ gtest_version }}
     - gmock {{ gtest_version }}
+    - zlib {{ zlib_version }}
 
 outputs:
   - name: libcudf
diff --git a/dependencies.yaml b/dependencies.yaml
index a1d928797b0..97f86c6b864 100644
--- a/dependencies.yaml
+++ b/dependencies.yaml
@@ -179,6 +179,7 @@ dependencies:
           - c-compiler
           - cxx-compiler
           - dlpack>=0.5,<0.6.0a0
+          - zlib>=1.2.13
     specific:
       - output_types: conda
         matrices: