Skip to content

Commit 33a5311

Browse files
committed
bootstrap: Add support for cabal-install-* packages
1 parent 8a9ed40 commit 33a5311

File tree

1 file changed

+8
-0
lines changed

1 file changed

+8
-0
lines changed

cabal-install/bootstrap.sh

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -209,6 +209,10 @@ OLD_TIME_VER="1.1.0.3"; OLD_TIME_VER_REGEXP="1\.[01]\.?"
209209
# >=1.0.0.0 && <1.2
210210
OLD_LOCALE_VER="1.0.0.7"; OLD_LOCALE_VER_REGEXP="1\.0\.?"
211211
# >=1.0.0.0 && <1.1
212+
CABAL_INSTALL_LIB_VER="1.23.0.0"; CABAL_INSTALL_LIB_VER_REGEXP="1\.23\.?"
213+
# >= 1.23 && < 1.24
214+
CABAL_INSTALL_SOLVER_VER="1.23.0.0"; CABAL_INSTALL_SOLVER_VER_REGEXP="1\.23\.?"
215+
# >= 1.23 && < 1.24
212216

213217
HACKAGE_URL="https://hackage.haskell.org/package"
214218

@@ -378,6 +382,8 @@ info_pkg "HTTP" ${HTTP_VER} ${HTTP_VER_REGEXP}
378382
info_pkg "zlib" ${ZLIB_VER} ${ZLIB_VER_REGEXP}
379383
info_pkg "random" ${RANDOM_VER} ${RANDOM_VER_REGEXP}
380384
info_pkg "stm" ${STM_VER} ${STM_VER_REGEXP}
385+
info_pkg "cabal-install-lib" ${CABAL_INSTALL_LIB_VER} ${CABAL_INSTALL_LIB_VER_REGEXP}
386+
info_pkg "cabal-install-solve" ${CABAL_INSTALL_SOLVE_VER} ${CABAL_INSTALL_SOLVE_VER_REGEXP}
381387

382388
do_pkg "deepseq" ${DEEPSEQ_VER} ${DEEPSEQ_VER_REGEXP}
383389
do_pkg "binary" ${BINARY_VER} ${BINARY_VER_REGEXP}
@@ -398,6 +404,8 @@ do_pkg "HTTP" ${HTTP_VER} ${HTTP_VER_REGEXP}
398404
do_pkg "zlib" ${ZLIB_VER} ${ZLIB_VER_REGEXP}
399405
do_pkg "random" ${RANDOM_VER} ${RANDOM_VER_REGEXP}
400406
do_pkg "stm" ${STM_VER} ${STM_VER_REGEXP}
407+
do_pkg "cabal-install-lib" ${CABAL_INSTALL_LIB_VER} ${CABAL_INSTALL_LIB_VER_REGEXP}
408+
do_pkg "cabal-install-solve" ${CABAL_INSTALL_SOLVE_VER} ${CABAL_INSTALL_SOLVE_VER_REGEXP}
401409

402410
install_pkg "cabal-install"
403411

0 commit comments

Comments
 (0)