WIP

lib/GHCup/Errors.hs

@@ -360,13 +360,18 @@ deriving instance Show InstallSetError
 
 
 -- | A build failed.
-data BuildFailed = forall es . (ToVariantMaybe BuildFailed es, PopVariant BuildFailed es, Pretty (V es), Show (V es)) => BuildFailed FilePath (V es)
+data BuildFailed = forall es . (ToVariantMaybe BuildFailed es, PopVariant BuildFailed es, Pretty (V es), Show (V es)) => BuildFailed FilePath (V es) (Just Requirements)
 
 instance Pretty BuildFailed where
-  pPrint (BuildFailed path reason) =
+  pPrint (BuildFailed path reason req) =
     case reason of
       VMaybe (_ :: BuildFailed) -> pPrint reason
       _ -> text "BuildFailed failed in dir" <+> text (path <> ":") <+> pPrint reason
+           <+> printToolReq'
+   where
+    printToolReq' = case req of
+                      Nothing -> T.pack ""
+                      Just req' -> prettyRequirementsError req'
 
 deriving instance Show BuildFailed
 

lib/GHCup/Requirements.hs

@@ -68,6 +68,17 @@ prettyRequirements Requirements {..} =
       n = if not . T.null $ _notes then "\n  Note: " <> _notes else ""
   in  "System requirements " <> d <> n
 
+
+prettyRequirementsError :: Requirements -> T.Text
+prettyRequirementsError Requirements {..} =
+  let d = if not . null $ _distroPKGs
+        then "\nMake sure the following distro packages "
+          <> "are installed: "
+          <> T.intercalate " " _distroPKGs
+        else ""
+      n = if not . T.null $ _notes then "\nMake sure the following requirements are met: " <> _notes else ""
+  in d <> n
+
 rawRequirements :: Requirements -> T.Text
 rawRequirements Requirements {..} =
   if not . null $ _distroPKGs

scripts/bootstrap/bootstrap-haskell

@@ -12,8 +12,7 @@
 #   * BOOTSTRAP_HASKELL_VERBOSE - any nonzero value for more verbose installation
 #   * BOOTSTRAP_HASKELL_GHC_VERSION - the ghc version to install
 #   * BOOTSTRAP_HASKELL_CABAL_VERSION - the cabal version to install
-#   * BOOTSTRAP_HASKELL_INSTALL_NO_STACK - disable installation of stack
-#   * BOOTSTRAP_HASKELL_INSTALL_NO_STACK_HOOK - disable installation stack ghcup hook
+#   * BOOTSTRAP_HASKELL_INSTALL_STACK - whether to install latest stack
 #   * BOOTSTRAP_HASKELL_INSTALL_HLS - whether to install latest hls
 #   * BOOTSTRAP_HASKELL_ADJUST_BASHRC - whether to adjust PATH in bashrc (prepend)
 #   * BOOTSTRAP_HASKELL_ADJUST_CABAL_CONFIG - whether to adjust mingw paths in cabal.config on windows
@@ -693,44 +692,40 @@ ask_hls() {
 }
 
 ask_stack() {
-    if [ -n "${BOOTSTRAP_HASKELL_INSTALL_NO_STACK}" ] ; then
-		return 0
-    elif [ -n "${BOOTSTRAP_HASKELL_INSTALL_NO_STACK_HOOK}" ] ; then
+	if [ -n "${BOOTSTRAP_HASKELL_INSTALL_STACK}" ] ; then
 		return 1
 	fi
 
 	if [ -z "${BOOTSTRAP_HASKELL_NONINTERACTIVE}" ] ; then
 		echo "-------------------------------------------------------------------------------"
 
-		warn "Do you want to enable better integration of stack with GHCup?"
-        warn "This means that stack won't install its own GHC versions, but uses GHCup's."
-        warn "For more information see:"
-        warn "  https://docs.haskellstack.org/en/stable/yaml_configuration/#ghc-installation-customisation-experimental"
-        warn "If you want to keep stacks vanilla behavior, answer 'No'."
+		warn "Do you want to install stack?"
+		warn "Stack is a haskell build tool similar to cabal that is used by some projects."
+		warn "Also see https://docs.haskellstack.org/"
 		warn ""
-		warn "[Y] Yes  [N] No  [?] Help (default is \"Y\")."
+		warn "[Y] Yes  [N] No  [?] Help (default is \"N\")."
 		warn ""
 
 		while true; do
 			read -r stack_answer </dev/tty
 
 			case $stack_answer in
-				[Yy]* | "")
-					return 2 ;;
-				[Nn]*)
+				[Yy]*)
 					return 1 ;;
+				[Nn]* | "")
+					return 0 ;;
 				*)
 					echo "Possible choices are:"
 					echo
-                    echo "Y - Yes, enable better integration (default)"
-					echo "N - No, keep stacks vanilla behavior"
+					echo "Y - Yes, install stack"
+					echo "N - No, don't install anything more (default)"
 					echo
 					echo "Please make your choice and press ENTER."
 					;;
 			esac
 		done
 	else
-		return 2
+		return 0
 	fi
 
 	unset stack_answer
@@ -747,7 +742,7 @@ echo "This script can download and install the following binaries:"
 echo "  * ghcup - The Haskell toolchain installer"
 echo "  * ghc   - The Glasgow Haskell Compiler"
 echo "  * cabal - The Cabal build tool for managing Haskell software"
-echo "  * stack - A cross-platform program for developing Haskell projects (similar to cabal)"
+echo "  * stack - (optional) A cross-platform program for developing Haskell projects"
 echo "  * hls   - (optional) A language server for developers to integrate with their editor/IDE"
 echo
 if [ -z "${GHCUP_USE_XDG_DIRS}" ] ; then
@@ -844,35 +839,7 @@ esac
 
 case $ask_stack_answer in
 	1)
-		_eghcup --cache install stack || die "Stack installation failed"
-		;;
-	2)
-		_eghcup --cache install stack || die "Stack installation failed"
-        edo mkdir -p "${STACK_ROOOT:-$HOME/.stack}"/hooks
-        hook_exe="${STACK_ROOOT:-$HOME/.stack}"/hooks/ghc-install.sh
-        hook_url="https://www.haskell.org/ghcup/sh/hooks/stack/ghc-install.sh"
-
-        if [ -e "${hook_exe}" ] ; then
-            warn "$hook_exe already exists, skipping hook installation."
-            warn "If you want to reinstall the hook, delete it manually and re-run"
-            warn "this script!"
-        else
-            case "${BOOTSTRAP_HASKELL_DOWNLOADER}" in
-                "curl")
-                    # shellcheck disable=SC2086
-                    edo curl -Lf ${GHCUP_CURL_OPTS} "${hook_url}" > "${hook_exe}"
-                    ;;
-                "wget")
-                    # shellcheck disable=SC2086
-                    edo wget -O /dev/stdout ${GHCUP_WGET_OPTS} "${hook_url}" > "${hook_exe}"
-                    ;;
-                *)
-                    die "Unknown downloader: ${BOOTSTRAP_HASKELL_DOWNLOADER}"
-                    ;;
-            esac
-            edo chmod +x "${hook_exe}"
-        fi
-
+		_eghcup --cache install stack || warn "Stack installation failed, continuing anyway"
 		;;
 	*) ;;
 esac

scripts/bootstrap/bootstrap-haskell.ps1

@@ -577,8 +577,8 @@ $Msys2Shell = ('{0}\msys2_shell.cmd' -f $MsysDir)
 # The bootstrap script is always silent, since we ask relevant questions here
 $SilentExport = 'export BOOTSTRAP_HASKELL_NONINTERACTIVE=1 ;'
 
-if (!($InstallStack)) {
-  $StackInstallExport = 'export BOOTSTRAP_HASKELL_INSTALL_NO_STACK=1 ;'
+if ($InstallStack) {
+  $StackInstallExport = 'export BOOTSTRAP_HASKELL_INSTALL_STACK=1 ;'
 }
 
 if ($InstallHLS) {

scripts/hooks/stack/ghc-install.sh

@@ -1,24 +0,0 @@
-#!/bin/sh
-
-# !! KEEP THIS SCRIPT POSIX COMPLIANT !!
-
-# see https://docs.haskellstack.org/en/stable/yaml_configuration/#ghc-installation-customisation-experimental
-# for documentation about hooks
-
-set -eu
-
-case $HOOK_GHC_TYPE in
-    bindist)
-        ghcdir=$(ghcup whereis --directory ghc "$HOOK_GHC_VERSION" || ghcup run --ghc "$HOOK_GHC_VERSION" --install) || exit 3
-        printf "%s/ghc" "${ghcdir}"
-        ;;
-    git)
-        # TODO: should be somewhat possible
-        >&2 echo "Hook doesn't support installing from source"
-        exit 1
-        ;;
-    *)
-        >&2 echo "Unsupported GHC installation type: $HOOK_GHC_TYPE"
-        exit 2
-        ;;
-esac