Fix FreeBSD 13 build

app/ghcup/GHCup/OptParse.hs

@@ -15,9 +15,7 @@ module GHCup.OptParse (
   , module GHCup.OptParse.Config
   , module GHCup.OptParse.Whereis
   , module GHCup.OptParse.List
-#ifndef DISABLE_UPGRADE
   , module GHCup.OptParse.Upgrade
-#endif
   , module GHCup.OptParse.ChangeLog
   , module GHCup.OptParse.Prefetch
   , module GHCup.OptParse.GC
@@ -37,9 +35,7 @@ import           GHCup.OptParse.Compile
 import           GHCup.OptParse.Config
 import           GHCup.OptParse.Whereis
 import           GHCup.OptParse.List
-#ifndef DISABLE_UPGRADE
 import           GHCup.OptParse.Upgrade
-#endif
 import           GHCup.OptParse.ChangeLog
 import           GHCup.OptParse.Prefetch
 import           GHCup.OptParse.GC
@@ -93,9 +89,7 @@ data Command
   | Compile CompileCommand
   | Config ConfigCommand
   | Whereis WhereisOptions WhereisCommand
-#ifndef DISABLE_UPGRADE
   | Upgrade UpgradeOpts Bool
-#endif
   | ToolRequirements
   | ChangeLog ChangeLogOptions
   | Nuke
@@ -214,7 +208,6 @@ com =
            (info (List <$> listOpts <**> helper)
                  (progDesc "Show available GHCs and other tools")
            )
-#ifndef DISABLE_UPGRADE
       <> command
            "upgrade"
            (info
@@ -225,7 +218,6 @@ com =
              )
              (progDesc "Upgrade ghcup")
            )
-#endif
       <> command
            "compile"
            (   Compile

app/ghcup/GHCup/OptParse/Common.hs

@@ -89,6 +89,18 @@ toolVersionArgument criteria tool =
   mv _          = "VERSION|TAG"
 
 
+toolVersionOption :: Maybe ListCriteria -> Maybe Tool -> Parser ToolVersion
+toolVersionOption criteria tool =
+  option (eitherReader toolVersionEither)
+    (  sh tool
+    <> completer (tagCompleter (fromMaybe GHC tool) [])
+    <> foldMap (completer . versionCompleter criteria) tool)
+ where
+  sh (Just GHC) = long "ghc" <> metavar "GHC_VERSION|TAG"
+  sh (Just HLS) = long "hls" <> metavar "HLS_VERSION|TAG"
+  sh _          = long "version" <> metavar "VERSION|TAG"
+
+
 versionParser :: Parser GHCTargetVersion
 versionParser = option
   (eitherReader tVersionEither)

app/ghcup/GHCup/OptParse/Compile.hs

@@ -212,7 +212,7 @@ ghcCompileOpts =
             (fmap Left $ option
               str
               (short 'p' <> long "patchdir" <> metavar "PATCH_DIR" <> help
-                "Absolute path to patch directory (applies all .patch and .diff files in order using -p1. This order is determined by a quilt series file if it exists, or the patches are lexicographically ordered)"
+                "Absolute path to patch directory (applies all .patch and .diff files in order using -p1)"
               )
             )
           )
@@ -340,12 +340,7 @@ hlsCompileOpts =
             )
           )
         )
-    <*> some (
-          option (eitherReader toolVersionEither)
-            (  long "ghc" <> metavar "GHC_VERSION|TAG" <> help "For which GHC version to compile for (can be specified multiple times)"
-            <> completer (tagCompleter GHC [])
-            <> completer (versionCompleter Nothing GHC))
-        )
+    <*> some (toolVersionOption Nothing (Just GHC))
     <*> many (argument str (metavar "CABAL_ARGS" <> help "Additional arguments to cabal install, prefix with '-- ' (longopts)"))
 
 

app/ghcup/Main.hs

@@ -140,12 +140,7 @@ main = do
         <> hidden
         )
   let listCommands = infoOption
-        ("install set rm install-cabal list"
-#ifndef DISABLE_UPGRADE
-          <> " upgrade"
-#endif
-          <> " compile debug-info tool-requirements changelog"
-        )
+        "install set rm install-cabal list upgrade compile debug-info tool-requirements changelog"
         (  long "list-commands"
         <> help "List available commands for shell completion"
         <> internal
@@ -243,14 +238,10 @@ Report bugs at <https://gitlab.haskell.org/haskell/ghcup-hs/issues>|]
                              alreadyInstalling' <- alreadyInstalling optCommand newTool
                              when (not alreadyInstalling') $
                                case t of
-#ifdef DISABLE_UPGRADE
-                                 GHCup -> pure ()
-#else
                                  GHCup -> runLogger $
                                             logWarn ("New GHCup version available: "
                                               <> prettyVer l
                                               <> ". To upgrade, run 'ghcup upgrade'")
-#endif
                                  _ -> runLogger $
                                         logWarn ("New "
                                           <> T.pack (prettyShow t)
@@ -305,9 +296,7 @@ Report bugs at <https://gitlab.haskell.org/haskell/ghcup-hs/issues>|]
             Config configCommand     -> config configCommand settings keybindings runLogger
             Whereis whereisOptions
                     whereisCommand   -> whereis whereisCommand whereisOptions runAppState leanAppstate runLogger
-#ifndef DISABLE_UPGRADE
             Upgrade uOpts force'     -> upgrade uOpts force' dirs runAppState runLogger
-#endif
             ToolRequirements         -> toolRequirements runAppState runLogger
             ChangeLog changelogOpts  -> changelog changelogOpts runAppState runLogger
             Nuke                     -> nuke appState runLogger
@@ -350,9 +339,7 @@ Report bugs at <https://gitlab.haskell.org/haskell/ghcup-hs/issues>|]
     (HLS, ver)   = cmp' HLS (Just $ ToolVersion (mkTVer over)) ver
   alreadyInstalling (Compile (CompileHLS HLSCompileOptions{ targetHLS = Left tver }))
     (HLS, ver)   = cmp' HLS (Just $ ToolVersion (mkTVer tver)) ver
-#ifndef DISABLE_UPGRADE
   alreadyInstalling (Upgrade _ _) (GHCup, _) = pure True
-#endif
   alreadyInstalling _ _ = pure False
 
   cmp' :: ( HasLog env

cabal.project

@@ -15,7 +15,8 @@ source-repository-package
 
 constraints: http-io-streams -brotli,
              any.Cabal ==3.6.2.0,
-             any.aeson >= 2.0.1.0
+             any.aeson >= 2.0.1.0,
+             streamly == 0.8.0
 
 package libarchive
   flags: -system-libarchive

docs/dev.md

@@ -12,7 +12,8 @@ organised tree-ish in `GHCup.Utils` and `GHCup.Utils.*`.
 Anything dealing with ghcup specific directories is in
 `GHCup.Utils.Dirs`.
 
-Download information on where to fetch bindists from is in the [ghcup-metadata](https://github.com/haskell/ghcup-metadata) repository.
+Download information on where to fetch bindists from is in the appropriate
+yaml files: `data/metadata/ghcup-<yaml-ver>.yaml`.
 
 ## Design decisions
 

docs/guide.md

@@ -32,17 +32,6 @@ ghcup install cabal
 ghcup upgrade
 ```
 
-### Tags and shortcuts
-
-GHCup has a number of tags and version shortcuts, that can be used as arguments to **install**/**set** etc.
-All of the following are valid arguments to `ghcup install ghc`:
-
-* `latest`, `recommended`
-* `base-4.15.1.0`
-* `9.0.2`, `9.0`, `9`
-
-If the argument is omitted, the default is `recommended`.
-
 ## Configuration
 
 A configuration file can be put in `~/.ghcup/config.yaml`. The default config file
@@ -149,31 +138,6 @@ and produce the binaries `ghc-8.10.2-eff` and `ghc-head` respectively.
 GHCup always needs to know which version the bindist corresponds to (this is not automatically
 detected).
 
-## Mirrors
-
-GHCup allows to use custom mirrors/download-info hosted by yourself or 3rd parties.
-
-To use a mirror, set the following option in `~/.ghcup/config.yaml`:
-
-```yml
-url-source:
-  # Accepts file/http/https scheme
-  OwnSource: "https://some-url/ghcup-0.0.6.yaml"
-```
-
-See [config.yaml](https://gitlab.haskell.org/haskell/ghcup-hs/-/blob/master/data/config.yaml)
-for more options.
-
-Alternatively you can do it via a cli switch:
-
-```sh
-ghcup --url-source=https://some-url/ghcup-0.0.6.yaml list
-```
-
-### Known mirrors
-
-1. [https://mirror.sjtu.edu.cn/docs/ghcup](https://mirror.sjtu.edu.cn/docs/ghcup)
-
 ## Isolated installs
 
 Ghcup also enables you to install a tool (GHC, Cabal, HLS, Stack) at an isolated location of your choosing.

docs/install.md

@@ -24,14 +24,6 @@ Set-ExecutionPolicy Bypass -Scope Process -Force;[System.Net.ServicePointManager
 
 If you want to know what these scripts do, check out the [source code at the repository](https://gitlab.haskell.org/haskell/ghcup-hs/-/tree/master/scripts/bootstrap). Advanced users may want to perform a [manual installation](#manual-install) and GPG verify the binaries.
 
-### Which versions get installed?
-
-GHCup has two main channels for every tool: **recommended** and **latest**. By default, it installs *recommended*.
-
-*latest* follows the latest release of every tool, while *recommended* is at the discretion of the GHCup maintainers and based on community adoption (hackage libraries, tools like HLS, stackage support, etc.) and known bugs.
-
-Also see [tags and shortcuts](../guide/#tags-and-shortcuts) for more information.
-
 ## First steps
 
 1. To get started with creating a Haskell project, follow the [Getting Started with Haskell and Cabal](https://cabal.readthedocs.io/en/latest/getting-started.html) guide

ghcup.cabal

@@ -48,13 +48,6 @@ flag no-exe
   default:     False
   manual:      True
 
-flag disable-upgrade
-  description:
-    Build the brick powered tui (ghcup tui). This is disabled on windows.
-
-  default:     False
-  manual:      True
-
 library
   exposed-modules:
     GHCup
@@ -202,6 +195,7 @@ executable ghcup
     GHCup.OptParse.Set
     GHCup.OptParse.ToolRequirements
     GHCup.OptParse.UnSet
+    GHCup.OptParse.Upgrade
     GHCup.OptParse.Whereis
 
   hs-source-dirs:     app/ghcup
@@ -268,12 +262,6 @@ executable ghcup
   if flag(no-exe)
     buildable: False
 
-  if (flag(disable-upgrade))
-    cpp-options:   -DDISABLE_UPGRADE
-  else
-    other-modules:
-        GHCup.OptParse.Upgrade
-
 test-suite ghcup-test
   type:               exitcode-stdio-1.0
   main-is:            Main.hs

lib/GHCup/Platform.hs

@@ -4,7 +4,7 @@
 {-# LANGUAGE FlexibleInstances     #-}
 {-# LANGUAGE OverloadedStrings     #-}
 {-# LANGUAGE QuasiQuotes           #-}
-{-# LANGUAGE TemplateHaskellQuotes #-}
+{-# LANGUAGE TemplateHaskell       #-}
 
 
 {-|

lib/GHCup/Utils.hs

@@ -3,7 +3,7 @@
 {-# LANGUAGE FlexibleContexts      #-}
 {-# LANGUAGE OverloadedStrings     #-}
 {-# LANGUAGE QuasiQuotes           #-}
-{-# LANGUAGE TemplateHaskellQuotes #-}
+{-# LANGUAGE TemplateHaskell       #-}
 {-# LANGUAGE TypeApplications      #-}
 {-# LANGUAGE ViewPatterns          #-}
 
@@ -715,7 +715,7 @@ unpackToDir dfp av = do
       (untar . GZip.decompress =<< rf av)
     | ".tar.xz" `isSuffixOf` fn -> do
       filecontents <- liftE $ rf av
-      let decompressed = Lzma.decompressWith (Lzma.defaultDecompressParams { Lzma.decompressAutoDecoder= True }) filecontents
+      let decompressed = Lzma.decompress filecontents
       liftE $ untar decompressed
     | ".tar.bz2" `isSuffixOf` fn ->
       liftE (untar . BZip.decompress =<< rf av)
@@ -744,7 +744,7 @@ getArchiveFiles av = do
       (entries . GZip.decompress =<< rf av)
     | ".tar.xz" `isSuffixOf` fn -> do
       filecontents <- liftE $ rf av
-      let decompressed = Lzma.decompressWith (Lzma.defaultDecompressParams { Lzma.decompressAutoDecoder= True }) filecontents
+      let decompressed = Lzma.decompress filecontents
       liftE $ entries decompressed
     | ".tar.bz2" `isSuffixOf` fn ->
       liftE (entries . BZip.decompress =<< rf av)
@@ -879,28 +879,20 @@ makeOut args workdir = do
   executeOut mymake args workdir
 
 
--- | Try to apply patches in order. The order is determined by
--- a quilt series file (in the patch directory) if one exists,
--- else the patches are applied in lexicographical order.
--- Fails with 'PatchFailed' on first failure.
+-- | Try to apply patches in order. Fails with 'PatchFailed'
+-- on first failure.
 applyPatches :: (MonadReader env m, HasDirs env, HasLog env, MonadIO m)
              => FilePath   -- ^ dir containing patches
              -> FilePath   -- ^ dir to apply patches in
              -> Excepts '[PatchFailed] m ()
 applyPatches pdir ddir = do
-  let lexicographical = (fmap . fmap) (pdir </>) $ sort <$> findFiles
-        pdir
-        (makeRegexOpts compExtended
-                       execBlank
-                       ([s|.+\.(patch|diff)$|] :: ByteString)
-        )
-  let quilt = map (pdir </>) . lines <$> readFile (pdir </> "series")
-
-  patches <- liftIO $ quilt `catchIO` (\e ->
-    if isDoesNotExistError e || isPermissionError e then
-      lexicographical 
-    else throwIO e)
-  forM_ patches $ \patch' -> applyPatch patch' ddir
+  patches <- (fmap . fmap) (pdir </>) $ liftIO $ findFiles
+      pdir
+      (makeRegexOpts compExtended
+                     execBlank
+                     ([s|.+\.(patch|diff)$|] :: ByteString)
+      )
+  forM_ (sort patches) $ \patch' -> applyPatch patch' ddir
 
 
 applyPatch :: (MonadReader env m, HasDirs env, HasLog env, MonadIO m)

lib/GHCup/Utils/File/Posix.hs

@@ -35,7 +35,6 @@ import           Data.Sequence                  ( Seq, (|>) )
 import           Data.List
 import           Data.Word8
 import           GHC.IO.Exception
-import           System.IO                      ( stderr )
 import           System.IO.Error
 import           System.FilePath
 import           System.Directory
@@ -143,14 +142,14 @@ execLogged exe args chdir lfile env = do
   printToRegion :: Fd -> Fd -> Int -> MVar Bool -> Bool -> IO ()
   printToRegion fileFd fdIn size pState no_color = do
     -- init region
-    forM_ [1..size] $ \_ -> BS.hPut stderr "\n"
+    forM_ [1..size] $ \_ -> BS.putStr "\n"
 
     void $ flip runStateT mempty
       $ do
         handle
           (\(ex :: SomeException) -> do
             ps <- liftIO $ takeMVar pState
-            when ps (liftIO $ BS.hPut stderr (pos1 <> moveLineUp size <> clearScreen))
+            when ps (liftIO $ BS.putStr (pos1 <> moveLineUp size <> clearScreen))
             throw ex
           ) $ readTilEOF lineAction fdIn
 
@@ -185,7 +184,7 @@ execLogged exe args chdir lfile env = do
         Just (TP.Window _ w) -> do
           regs <- get
           liftIO $ forM_ (Sq.zip regs (Sq.fromList [0..(Sq.length regs - 1)])) $ \(bs, i) -> do
-              BS.hPut stderr
+              BS.putStr
               . overwriteNthLine (size - i)
               . trim w
               . blue

lib/GHCup/Utils/File/Windows.hs

@@ -196,8 +196,7 @@ execLogged exe args chdir lfile env = do
           then pure ()
           else do
             void $ BS.appendFile logFile some
-            -- subprocess stdout also goes to stderr for logging
-            void $ BS.hPut stderr some
+            void $ BS.hPut stdout some
             go
         
 

lib/GHCup/Utils/String/QQ.hs

@@ -1,4 +1,4 @@
-{-# LANGUAGE TemplateHaskellQuotes #-}
+{-# LANGUAGE TemplateHaskell #-}
 
 {-|
 Module      : GHCup.Utils.String.QQ

lib/GHCup/Utils/Version/QQ.hs

@@ -4,7 +4,7 @@
 {-# LANGUAGE DeriveLift         #-}
 {-# LANGUAGE FlexibleInstances  #-}
 {-# LANGUAGE StandaloneDeriving #-}
-{-# LANGUAGE TemplateHaskellQuotes #-}
+{-# LANGUAGE TemplateHaskell    #-}
 
 
 {-|

scripts/bootstrap/bootstrap-haskell

@@ -222,7 +222,8 @@ download_ghcup() {
             if freebsd-version | grep -E '^12.*' ; then
                 freebsd_ver=12
             elif freebsd-version | grep -E '^13.*' ; then
-                freebsd_ver=13
+                # TODO: missing FreeBSD13 version
+                freebsd_ver=12
             else
                 die "Unsupported FreeBSD version! Please report a bug at https://gitlab.haskell.org/haskell/ghcup-hs/-/issues"
             fi
@@ -280,20 +281,7 @@ download_ghcup() {
 
 	# we may overwrite this in adjust_bashrc
 	cat <<-EOF > "${GHCUP_DIR}"/env || die "Failed to create env file"
-		case ":\$PATH:" in
-		    *:"${GHCUP_BIN}":*)
-		        ;;
-		    *)
-		        export PATH="${GHCUP_BIN}:\$PATH"
-		        ;;
-		esac
-		case ":\$PATH:" in
-		    *:"\$HOME/.cabal/bin":*)
-		        ;;
-		    *)
-		        export PATH="\$HOME/.cabal/bin:\$PATH"
-		        ;;
-		esac
+		export PATH="\$HOME/.cabal/bin:${GHCUP_BIN}:\$PATH"
 		EOF
 
 	# shellcheck disable=SC1090
@@ -381,38 +369,12 @@ adjust_bashrc() {
 	case $1 in
 		1)
 			cat <<-EOF > "${GHCUP_DIR}"/env || die "Failed to create env file"
-				case ":\$PATH:" in
-				    *:"${GHCUP_BIN}":*)
-				        ;;
-				    *)
-				        export PATH="${GHCUP_BIN}:\$PATH"
-				        ;;
-				esac
-				case ":\$PATH:" in
-				    *:"\$HOME/.cabal/bin":*)
-				        ;;
-				    *)
-				        export PATH="\$HOME/.cabal/bin:\$PATH"
-				        ;;
-				esac
+				export PATH="\$HOME/.cabal/bin:${GHCUP_BIN}:\$PATH"
 				EOF
 			;;
 		2)
 			cat <<-EOF > "${GHCUP_DIR}"/env || die "Failed to create env file"
-				case ":\$PATH:" in
-				    *:"\$HOME/.cabal/bin":*)
-				        ;;
-				    *)
-				        export PATH="\$PATH:\$HOME/.cabal/bin"
-				        ;;
-				esac
-				case ":\$PATH:" in
-				    *:"${GHCUP_BIN}":*)
-				        ;;
-				    *)
-				        export PATH="\$PATH:${GHCUP_BIN}"
-				        ;;
-				esac
+				export PATH="\$PATH:\$HOME/.cabal/bin:${GHCUP_BIN}"
 				EOF
 			;;
 		*) ;;

scripts/bootstrap/bootstrap-haskell.ps1

@@ -29,11 +29,11 @@ param (
     [switch]$InstallStack,
     # Whether to install hls as well
     [switch]$InstallHLS,
-    # Specify the install root (default: 'C:\')
-    [string]$InstallDir,
     # Specify the bootstrap url (default: 'https://www.haskell.org/ghcup/sh/bootstrap-haskell')
-    [string]$BootstrapUrl,
+    [string]$InstallDir,
     # Instead of installing a new MSys2, use an existing installation
+    [string]$BootstrapUrl,
+    # Specify the install root (default: 'C:\')
     [string]$ExistingMsys2Dir,
     # Specify the cabal root directory (default: '$InstallDir\cabal')
     [string]$CabalDir