cabal-install 1.20.0.5 → 1.20.0.6

raw patch · 2 files changed

+11/−3 lines, 2 files

Files

bootstrap.sh +10/−2
cabal-install.cabal +1/−1

bootstrap.sh view

@@ -147,6 +147,9 @@  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 ||@@ -233,8 +236,13 @@    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 ${SCOPE_OF_INSTALLATION} ${EXTRA_INSTALL_OPTS} ${VERBOSE} ||

cabal-install.cabal view

@@ -1,5 +1,5 @@ Name:               cabal-install-Version:            1.20.0.5+Version:            1.20.0.6 Synopsis:           The command-line interface for Cabal and Hackage. Description:     The \'cabal\' command-line program simplifies the process of managing