From b22244c5badd0d5312cad68dc4c0571ba538fc52 Mon Sep 17 00:00:00 2001 From: Johan Tibell Date: Sun, 4 Jan 2015 08:50:33 -0500 Subject: [PATCH] bootstrap.sh: install network-uri before HTTP HTTP might need network-uri. --- cabal-install/bootstrap.sh | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/cabal-install/bootstrap.sh b/cabal-install/bootstrap.sh index f455e78bc10..ea89ee6999d 100755 --- a/cabal-install/bootstrap.sh +++ b/cabal-install/bootstrap.sh @@ -231,14 +231,15 @@ do_pkg "mtl" ${MTL_VER} ${MTL_VER_REGEXP} do_pkg "text" ${TEXT_VER} ${TEXT_VER_REGEXP} do_pkg "parsec" ${PARSEC_VER} ${PARSEC_VER_REGEXP} do_pkg "network" ${NETWORK_VER} ${NETWORK_VER_REGEXP} + +# We conditionally install network-uri, depending on the network version. +do_network_uri_pkg + do_pkg "HTTP" ${HTTP_VER} ${HTTP_VER_REGEXP} do_pkg "zlib" ${ZLIB_VER} ${ZLIB_VER_REGEXP} do_pkg "random" ${RANDOM_VER} ${RANDOM_VER_REGEXP} do_pkg "stm" ${STM_VER} ${STM_VER_REGEXP} -# We conditionally install network-uri, depending on the network version. -do_network_uri_pkg - install_pkg "cabal-install" echo