Merge ebef09bf3d into aa9b8e9a5a

bin/pyenv-sh-activate

@@ -214,9 +214,11 @@ if [ -d "${prefix}/conda-meta" ] ||
   case "${shell}" in
   fish )
     echo "set -gx CONDA_DEFAULT_ENV \"${CONDA_DEFAULT_ENV}\";"
+    echo "set -gx CONDA_PREFIX \"${prefix}\";"
     ;;
   * )
     echo "export CONDA_DEFAULT_ENV=\"${CONDA_DEFAULT_ENV}\";"
+    echo "export CONDA_PREFIX=\"${prefix}\";"
     ;;
   esac
 fi

bin/pyenv-sh-deactivate

@@ -88,7 +88,7 @@ if [ -d "${prefix}/conda-meta" ] ||
   shopt -s nullglob
   case "${shell}" in
   fish )
-    : # conda doesn't support fish
+      echo "set -e CONDA_PREFIX"
     ;;
   * )
     for script in "${prefix}/etc/conda/deactivate.d"/*.sh; do