From 0bf4e956108e6a1bbb49b414f0beb21bcf9df2d3 Mon Sep 17 00:00:00 2001 From: Johan Tibell <johan.tibell@gmail.com> Date: Tue, 30 Dec 2014 13:45:09 -0500 Subject: [PATCH] bootstrap.sh: don't run Haddock on network-uri-2.5.0.0 That package doesn't have any modules and Hadddock chokes. --- cabal-install/bootstrap.sh | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/cabal-install/bootstrap.sh b/cabal-install/bootstrap.sh index 6d3b9854b3..73e242a314 100755 --- a/cabal-install/bootstrap.sh +++ b/cabal-install/bootstrap.sh @@ -209,6 +209,9 @@ STM_VER="2.4.4"; STM_VER_REGEXP="2\." HACKAGE_URL="https://hackage.haskell.org/package" +# Haddock fails for network-2.5.0.0. +NO_DOCS_PACKAGES_VER_REGEXP="network-uri-2\.5\.[0-9]+\.[0-9]+" + # Cache the list of packages: echo "Checking installed packages for ghc-${GHC_VER}..." ${GHC_PKG} list --global ${SCOPE_OF_INSTALLATION} > ghc-pkg.list || @@ -280,6 +283,7 @@ unpack_pkg () { install_pkg () { PKG=$1 + VER=$2 [ -x Setup ] && ./Setup clean [ -f Setup ] && rm Setup @@ -300,8 +304,13 @@ install_pkg () { if [ ! ${NO_DOCUMENTATION} ] then - ./Setup haddock --with-ghc=${GHC} --with-haddock=${HADDOCK} ${VERBOSE} || - die "Documenting the ${PKG} package failed." + if echo "${PKG}-${VER}" | egrep ${NO_DOCS_PACKAGES_VER_REGEXP} > /dev/null 2>&1 + then + echo "Skipping documentation for the ${PKG} package." + else + ./Setup haddock --with-ghc=${GHC} --with-haddock=${HADDOCK} ${VERBOSE} || + die "Documenting the ${PKG} package failed." + fi fi ./Setup install ${EXTRA_INSTALL_OPTS} ${VERBOSE} || -- GitLab