Bump ghcupURL

Update Changelog
Drop 'ghcup compile cabal'
2020-09-22 23:41:19 +02:00 · 2020-09-22 21:31:01 +02:00 · 2020-09-22 21:26:10 +02:00 · 2020-09-22 21:05:59 +02:00 · 2020-09-22 19:23:24 +02:00 · 2020-09-22 15:23:10 +02:00
6 changed files with 132 additions and 303 deletions
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -9,7 +9,7 @@
  - `ghcup install ghc -u <url> <version>`
 * fix bug when cabal isn't marked executable in bindist
 * fix bug when `~/.ghcup` is a valid symlink wrt #49
-* Add JSON roundtrip tests
+* Drop support for compiling cabal from source (the old bootstrap script is discontinued)

 ## 0.1.10 -- 2020-08-14

--- a/app/ghcup/Main.hs
+++ b/app/ghcup/Main.hs
@@ -64,7 +64,6 @@ import           System.Environment
 import           System.Exit
 import           System.IO               hiding ( appendFile )
 import           Text.Read               hiding ( lift )
-import           Text.Layout.Table
 import           URI.ByteString

 import qualified Data.ByteString               as B
@@ -73,6 +72,7 @@ import qualified Data.Text                     as T
 import qualified Data.Text.IO                  as T
 import qualified Data.Text.Encoding            as E
 import qualified Text.Megaparsec               as MP
+import qualified Text.Megaparsec.Char          as MPC



@@ -148,7 +148,6 @@ data RmOptions = RmOptions


 data CompileCommand = CompileGHC GHCCompileOptions
-                    | CompileCabal CabalCompileOptions


 data GHCCompileOptions = GHCCompileOptions
@@ -612,16 +611,6 @@ compileP = subparser
            )
          )
      )
-  <> command
-       "cabal"
-       (   CompileCabal
-       <$> (info
-             (cabalCompileOpts <**> helper)
-             (  progDesc "Compile Cabal from source"
-             <> footerDoc (Just $ text compileCabalFooter)
-             )
-           )
-       )
  )
 where
  compileFooter = [s|Discussion:
@@ -642,13 +631,6 @@ Examples:
  ghcup compile ghc -j 4 -v 8.4.2 -b /usr/bin/ghc-8.2.2
  # build cross compiler
  ghcup compile ghc -j 4 -v 8.4.2 -b 8.2.2 -x armv7-unknown-linux-gnueabihf --config $(pwd)/build.mk -- --enable-unregisterised|]
-  compileCabalFooter = [i|Discussion:
-  Compiles and installs the specified Cabal version
-  into "~/.ghcup/bin".
-
-Examples:
-  ghcup compile cabal -j 4 -v 3.2.0.0 -b 8.6.5
-  ghcup compile cabal -j 4 -v 3.2.0.0 -b /usr/bin/ghc-8.6.5|]


 ghcCompileOpts :: Parser GHCCompileOptions
@@ -1060,26 +1042,6 @@ Report bugs at <https://gitlab.haskell.org/haskell/ghcup-hs/issues>|]
 #endif
                      ]

-          let runCompileCabal =
-                runLogger
-                  . flip runReaderT settings
-                  . runResourceT
-                  . runE
-                    @'[ AlreadyInstalled
-                      , BuildFailed
-                      , CopyError
-                      , DigestError
-                      , DownloadFailed
-                      , NoDownload
-                      , NotInstalled
-                      , PatchFailed
-                      , UnknownArchive
-                      , TarDirDoesNotExist
-#if !defined(TAR)
-                      , ArchiveResult
-#endif
-                      ]
-
          let runUpgrade =
                runLogger
                  . flip runReaderT settings
@@ -1385,28 +1347,6 @@ Make sure to clean up #{tmpdir} afterwards.|])
                        runLogger ($(logError) [i|#{e}|])
                        pure $ ExitFailure 9

-            Compile (CompileCabal CabalCompileOptions {..}) ->
-              (runCompileCabal $ do
-                  liftE $ compileCabal dls targetVer bootstrapGhc jobs patchDir pfreq
-                )
-                >>= \case
-                      VRight _ -> do
-                        runLogger
-                          ($(logInfo)
-                            "Cabal successfully compiled and installed"
-                          )
-                        pure ExitSuccess
-                      VLeft (V (BuildFailed tmpdir e)) -> do
-                        case keepDirs of
-                          Never -> runLogger ($(logError) [i|Build failed with #{e}|])
-                          _ -> runLogger ($(logError) [i|Build failed with #{e}
-Check the logs at #{logsDir} and the build directory #{tmpdir} for more clues.
-Make sure to clean up #{tmpdir} afterwards.|])
-                        pure $ ExitFailure 10
-                      VLeft e -> do
-                        runLogger ($(logError) [i|#{e}|])
-                        pure $ ExitFailure 10
-
            Upgrade (uOpts) force -> do
              target <- case uOpts of
                UpgradeInplace -> do
@@ -1523,50 +1463,144 @@ printListResult raw lr = do
  setLocaleEncoding utf8

  let
-    formatted =
-      gridString
-          (  (if raw then [] else [column expand left def def])
-          ++ [ column expand left def def
-             , column expand left def def
-             , column expand left def def
-             , column expand left def def
-             ]
-          )
-        . (\x -> if raw
-            then x
-            else [color Green "", "Tool", "Version", "Tags", "Notes"] : x
-          )
-        $ fmap
+    rows =
+      (\x -> if raw
+          then x
+          else [color Green "", "Tool", "Version", "Tags", "Notes"] : x
+        )
+        . fmap
            (\ListResult {..} ->
              let marks = if
                    | lSet       -> (color Green "✔✔")
-                    | lInstalled -> (color Green "✓")
-                    | otherwise  -> (color Red "✗")
-              in  (if raw then [] else [marks])
-                    ++ [ fmap toLower . show $ lTool
-                       , case lCross of
-                           Nothing -> T.unpack . prettyVer $ lVer
-                           Just c  -> T.unpack (c <> "-" <> prettyVer lVer)
-                       , intercalate "," $ (fmap printTag $ sort lTag)
-                       , intercalate ","
-                       $  (if hlsPowered then [color' Green "hls-powered"] else mempty)
-                       ++ (if fromSrc then [color' Blue "compiled"] else mempty)
-                       ++ (if lStray then [color' Yellow "stray"] else mempty)
-                       ++ (if lNoBindist then [color' Red "no-bindist"] else mempty)
-                       ]
+                    | lInstalled -> (color Green "✓ ")
+                    | otherwise  -> (color Red "✗ ")
+              in
+                (if raw then [] else [marks])
+                  ++ [ fmap toLower . show $ lTool
+                     , case lCross of
+                       Nothing -> T.unpack . prettyVer $ lVer
+                       Just c  -> T.unpack (c <> "-" <> prettyVer lVer)
+                     , intercalate "," $ (fmap printTag $ sort lTag)
+                     , intercalate ","
+                     $  (if hlsPowered
+                          then [color' Green "hls-powered"]
+                          else mempty
+                        )
+                     ++ (if fromSrc then [color' Blue "compiled"] else mempty)
+                     ++ (if lStray then [color' Yellow "stray"] else mempty)
+                     ++ (if lNoBindist
+                          then [color' Red "no-bindist"]
+                          else mempty
+                        )
+                     ]
            )
-            lr
-  putStrLn $ formatted
+        $ lr
+  let cols =
+        foldr (\xs ys -> zipWith (:) xs ys) (replicate (length rows) []) rows
+      lengths = fmap maximum . (fmap . fmap) strWidth $ cols
+      padded  = fmap (\xs -> zipWith padTo xs lengths) rows
+
+  forM_ padded $ \row -> putStrLn $ intercalate " " row
 where
  printTag Recommended        = color' Green "recommended"
  printTag Latest             = color' Yellow "latest"
  printTag Prerelease         = color' Red "prerelease"
-  printTag (Base pvp'') = "base-" ++ T.unpack (prettyPVP pvp'')
+  printTag (Base       pvp'') = "base-" ++ T.unpack (prettyPVP pvp'')
  printTag (UnknownTag t    ) = t
+
  color' = case raw of
    True  -> flip const
    False -> color

+  padTo str' x =
+    let lstr = strWidth str'
+        add' = x - lstr
+    in  if add' < 0 then str' else str' ++ replicate add' ' '
+
+  -- | Calculate the render width of a string, considering
+  -- wide characters (counted as double width), ANSI escape codes
+  -- (not counted), and line breaks (in a multi-line string, the longest
+  -- line determines the width).
+  strWidth :: String -> Int
+  strWidth =
+    maximum
+      . (0 :)
+      . map (foldr (\a b -> charWidth a + b) 0)
+      . lines
+      . stripAnsi
+
+  -- | Strip ANSI escape sequences from a string.
+  --
+  -- >>> stripAnsi "\ESC[31m-1\ESC[m"
+  -- "-1"
+  stripAnsi :: String -> String
+  stripAnsi s' =
+    case
+        MP.parseMaybe (many $ "" <$ MP.try ansi <|> pure <$> MP.anySingle) s'
+      of
+        Nothing -> error "Bad ansi escape"  -- PARTIAL: should not happen
+        Just xs -> concat xs
+   where
+      -- This parses lots of invalid ANSI escape codes, but that should be fine
+    ansi =
+      MPC.string "\ESC[" *> digitSemicolons *> suffix MP.<?> "ansi" :: MP.Parsec
+          Void
+          String
+          Char
+    digitSemicolons = MP.takeWhileP Nothing (\c -> isDigit c || c == ';')
+    suffix = MP.oneOf ['A', 'B', 'C', 'D', 'H', 'J', 'K', 'f', 'm', 's', 'u']
+
+  -- | Get the designated render width of a character: 0 for a combining
+  -- character, 1 for a regular character, 2 for a wide character.
+  -- (Wide characters are rendered as exactly double width in apps and
+  -- fonts that support it.) (From Pandoc.)
+  charWidth :: Char -> Int
+  charWidth c = case c of
+    _ | c < '\x0300'                     -> 1
+      | c >= '\x0300' && c <= '\x036F'   -> 0
+      |  -- combining
+        c >= '\x0370' && c <= '\x10FC'   -> 1
+      | c >= '\x1100' && c <= '\x115F'   -> 2
+      | c >= '\x1160' && c <= '\x11A2'   -> 1
+      | c >= '\x11A3' && c <= '\x11A7'   -> 2
+      | c >= '\x11A8' && c <= '\x11F9'   -> 1
+      | c >= '\x11FA' && c <= '\x11FF'   -> 2
+      | c >= '\x1200' && c <= '\x2328'   -> 1
+      | c >= '\x2329' && c <= '\x232A'   -> 2
+      | c >= '\x232B' && c <= '\x2E31'   -> 1
+      | c >= '\x2E80' && c <= '\x303E'   -> 2
+      | c == '\x303F'                    -> 1
+      | c >= '\x3041' && c <= '\x3247'   -> 2
+      | c >= '\x3248' && c <= '\x324F'   -> 1
+      | -- ambiguous
+        c >= '\x3250' && c <= '\x4DBF'   -> 2
+      | c >= '\x4DC0' && c <= '\x4DFF'   -> 1
+      | c >= '\x4E00' && c <= '\xA4C6'   -> 2
+      | c >= '\xA4D0' && c <= '\xA95F'   -> 1
+      | c >= '\xA960' && c <= '\xA97C'   -> 2
+      | c >= '\xA980' && c <= '\xABF9'   -> 1
+      | c >= '\xAC00' && c <= '\xD7FB'   -> 2
+      | c >= '\xD800' && c <= '\xDFFF'   -> 1
+      | c >= '\xE000' && c <= '\xF8FF'   -> 1
+      | -- ambiguous
+        c >= '\xF900' && c <= '\xFAFF'   -> 2
+      | c >= '\xFB00' && c <= '\xFDFD'   -> 1
+      | c >= '\xFE00' && c <= '\xFE0F'   -> 1
+      | -- ambiguous
+        c >= '\xFE10' && c <= '\xFE19'   -> 2
+      | c >= '\xFE20' && c <= '\xFE26'   -> 1
+      | c >= '\xFE30' && c <= '\xFE6B'   -> 2
+      | c >= '\xFE70' && c <= '\xFEFF'   -> 1
+      | c >= '\xFF01' && c <= '\xFF60'   -> 2
+      | c >= '\xFF61' && c <= '\x16A38'  -> 1
+      | c >= '\x1B000' && c <= '\x1B001' -> 2
+      | c >= '\x1D000' && c <= '\x1F1FF' -> 1
+      | c >= '\x1F200' && c <= '\x1F251' -> 2
+      | c >= '\x1F300' && c <= '\x1F773' -> 1
+      | c >= '\x20000' && c <= '\x3FFFD' -> 2
+      | otherwise                        -> 1
+
+
 checkForUpdates :: (MonadReader Settings m, MonadCatch m, MonadLogger m, MonadThrow m, MonadIO m, MonadFail m, MonadLogger m)
                => GHCupDownloads
                -> PlatformRequest
--- a/ghcup-0.0.2.yaml
+++ b/ghcup-0.0.2.yaml
@@ -1193,86 +1193,10 @@ ghcupDownloads:
              dlUri: https://files.hasufell.de/ghc/ghc-8.10.2-i386-alpine-linux.tar.xz
              dlSubdir: ghc-8.10.2
              dlHash: 9ee1cf1e85e9536088b3c9e80e975074e525ea378cd4eb156071bbc4b7b38327
-    9.0.1-alpha1:
-      viTags:
-      - Prerelease
-      - base-4.15.0.0
-      viSourceDL:
-        dlUri: https://downloads.haskell.org/~ghc/9.0.1-alpha1/ghc-9.0.0.20200821-src.tar.xz
-        dlSubdir: ghc-9.0.0.20200821
-        dlHash: 8a3a36a0d770dbe678dbc084c3cc9a426749ac9d695f34fa30dc4da1564be6cb
-      viArch:
-        A_64:
-          Linux_Debian:
-            '9': &ghc-901a1-64-deb9
-              dlUri: https://downloads.haskell.org/~ghc/9.0.1-alpha1/ghc-9.0.0.20200821-x86_64-deb9-linux.tar.xz
-              dlSubdir: ghc-9.0.0
-              dlHash: a58b508e5d9f85a5831c7e451766105c4b2188987b3110ac62c8182e3e6ed0f6
-            '10': &ghc-901a1-64-deb10
-              dlUri: https://downloads.haskell.org/~ghc/9.0.1-alpha1/ghc-9.0.0.20200821-x86_64-deb10-linux-dwarf.tar.xz
-              dlSubdir: ghc-9.0.0
-              dlHash: 963d4cef71780f24d23cd947d33f61e9ee338f85e2aed06ec588fdb8be339a04
-            unknown_versioning: *ghc-901a1-64-deb9
-          Linux_Ubuntu:
-            unknown_versioning: &ghc-901a1-64-fedora
-              dlUri: https://downloads.haskell.org/~ghc/9.0.1-alpha1/ghc-9.0.0.20200821-x86_64-fedora27-linux.tar.xz
-              dlSubdir: ghc-9.0.0
-              dlHash: e6c241d7945fe84e03501c8a9b947a5f50ad489cdf2b6e286d5de76046a8a6f3
-            '16.04': *ghc-901a1-64-deb9
-            '18.04': *ghc-901a1-64-deb9
-          Linux_Mint:
-            unknown_versioning: *ghc-901a1-64-deb10
-          Linux_Fedora:
-            '27': *ghc-901a1-64-fedora
-            unknown_versioning: *ghc-901a1-64-fedora
-          Linux_CentOS:
-            '7': &ghc-901a1-64-centos
-              dlUri: https://downloads.haskell.org/~ghc/9.0.1-alpha1/ghc-9.0.0.20200821-x86_64-centos7-linux.tar.xz
-              dlSubdir: ghc-9.0.0
-              dlHash: e9be471727d6753514667781335018be0fed91483bf80da3f24d21c2e49086e9
-            unknown_versioning: *ghc-901a1-64-centos
-          Linux_RedHat:
-            unknown_versioning: *ghc-901a1-64-centos
-          Linux_Alpine:
-            unknown_versioning:
-              dlUri: https://downloads.haskell.org/~ghc/9.0.1-alpha1/ghc-9.0.0.20200821-x86_64-alpine3.10-linux-integer-simple.tar.xz
-              dlSubdir: ghc-9.0.0
-              dlHash: 8a73cbcebe8aac004dda4411873b6cd57169af9af74cbeb636d695852da1f10c
-          Linux_AmazonLinux:
-            unknown_versioning: *ghc-901a1-64-centos
-          Linux_UnknownLinux:
-            unknown_versioning: *ghc-901a1-64-fedora
-          Darwin:
-            unknown_versioning:
-              dlUri: https://downloads.haskell.org/~ghc/9.0.1-alpha1/ghc-9.0.0.20200821-x86_64-apple-darwin.tar.xz
-              dlSubdir: ghc-9.0.0
-              dlHash: 5bb43fe34997222ae092f3c255d0545dd8ff17409d00f56a356aece9042ace2a
-          FreeBSD:
-            unknown_versioning:
-              dlUri: https://downloads.haskell.org/~ghc/9.0.1-alpha1/ghc-9.0.0.20200821-x86_64-unknown-freebsd.tar.xz
-              dlSubdir: ghc-9.0.0
-              dlHash: 2cb2763fa59bff4c045b7012170132a7a49f09e4f0f894c5367f990b60c38830
-        A_32:
-          Linux_Debian:
-            '9': &ghc-901a1-32-deb9
-              dlUri: https://downloads.haskell.org/~ghc/9.0.1-alpha1/ghc-9.0.0.20200821-i386-deb9-linux.tar.xz
-              dlSubdir: ghc-9.0.0
-              dlHash: 8b025e0c66bb4e21c050755d4c77b7cea66d0269f00f5206c3cef51861aa360f
-            unknown_versioning: *ghc-901a1-32-deb9
-          Linux_Ubuntu:
-            unknown_versioning: *ghc-901a1-32-deb9
-          Linux_Mint:
-            unknown_versioning: *ghc-901a1-32-deb9
-          Linux_UnknownLinux:
-            unknown_versioning: *ghc-901a1-32-deb9
  Cabal:
    2.4.1.0:
      viTags: []
      viChangeLog: https://downloads.haskell.org/~cabal/cabal-install-2.4.1.0/changelog
-      viSourceDL:
-        dlUri: https://github.com/haskell/cabal/archive/cabal-install-v2.4.1.0.tar.gz
-        dlSubdir: cabal-cabal-install-v2.4.1.0/cabal-install
-        dlHash: 61eb64a5addafca026aff9277291f4643fe07e83886f76d059d42c734fed829c
      viArch:
        A_64:
          Linux_Alpine:
@@ -1304,10 +1228,6 @@ ghcupDownloads:
    3.0.0.0:
      viTags: []
      viChangeLog: https://downloads.haskell.org/~cabal/cabal-install-3.0.0.0/changelog
-      viSourceDL:
-        dlUri: https://github.com/haskell/cabal/archive/cabal-install-v3.0.0.0.tar.gz
-        dlSubdir: cabal-cabal-install-v3.0.0.0/cabal-install
-        dlHash: c0b26817a7b7c2907e45cb38235ce1157e732211880f62e92eaff4066202e674
      viArch:
        A_64:
          Linux_Alpine:
@@ -1340,10 +1260,6 @@ ghcupDownloads:
      - Recommended
      - Latest
      viChangeLog: https://downloads.haskell.org/~cabal/cabal-install-3.2.0.0/changelog
-      viSourceDL:
-        dlUri: https://github.com/haskell/cabal/archive/cabal-install-v3.2.0.0.tar.gz
-        dlSubdir: cabal-cabal-install-v3.2.0.0/cabal-install
-        dlHash: 77202358bdf0b481c09326268ce18880df14194c5aaa840f99510bdd1a124b75
      viArch:
        A_64:
          Linux_Alpine:
@@ -1436,9 +1352,9 @@ ghcupDownloads:
        A_64:
          Linux_UnknownLinux:
            unknown_versioning:
-              dlUri: https://files.hasufell.de/hls/haskell-language-server-Linux-0.4.0.tar.gz
-              dlHash: a132365554a1bfcbdfef7403366854f09e6f05376c6aec6562500f09e32af9ed
+              dlUri: https://github.com/haskell/haskell-language-server/releases/download/0.4.0/haskell-language-server-Linux-0.4.0.tar.gz
+              dlHash: 325b21b38a5e570f00b983885e8ec1eadcb5504a29b28ea4cbe1b85b32058f6d
          Darwin:
            unknown_versioning:
-              dlUri: https://files.hasufell.de/hls/haskell-language-server-macOS-0.4.0.tar.gz
-              dlHash: 8f7ceaf1150774029d45420895546b50fd70605c0ef0b055344a3600e54721ce
+              dlUri: https://github.com/haskell/haskell-language-server/releases/download/0.4.0/haskell-language-server-macOS-0.4.0.tar.gz
+              dlHash: 06a23f1495086438e9676213f7aeddbbc382014ad8016ed7c8ad241a2a15fcfe
--- a/ghcup.cabal
+++ b/ghcup.cabal
@@ -180,9 +180,6 @@ common strict-base
 common string-interpolate
  build-depends: string-interpolate >=0.2.0.0

-common table-layout
-  build-depends: table-layout >=0.8
-
 common template-haskell
  build-depends: template-haskell >=2.7

@@ -378,7 +375,6 @@ executable ghcup
    , safe
    , safe-exceptions
    , string-interpolate
-    , table-layout
    , template-haskell
    , text
    , uri-bytestring
@@ -433,7 +429,6 @@ executable ghcup-gen
    , resourcet
    , safe-exceptions
    , string-interpolate
-    , table-layout
    , text
    , transformers
    , uri-bytestring
--- a/lib/GHCup.hs
+++ b/lib/GHCup.hs
@@ -1261,122 +1261,6 @@ Stage1Only = YES|]



-- | Compile a cabal from source. This behaves wrt symlinks and installation
-- the same as 'installCabalBin'.
-compileCabal :: ( MonadReader Settings m
-                , MonadResource m
-                , MonadMask m
-                , MonadLogger m
-                , MonadIO m
-                , MonadFail m
-                )
-             => GHCupDownloads
-             -> Version                    -- ^ version to install
-             -> Either Version (Path Abs)  -- ^ version to bootstrap with
-             -> Maybe Int
-             -> Maybe (Path Abs)
-             -> PlatformRequest
-             -> Excepts
-                  '[ AlreadyInstalled
-                   , BuildFailed
-                   , CopyError
-                   , DigestError
-                   , DownloadFailed
-                   , NoDownload
-                   , NotInstalled
-                   , PatchFailed
-                   , UnknownArchive
-                   , TarDirDoesNotExist
-#if !defined(TAR)
-                   , ArchiveResult
-#endif
-                   ]
-                  m
-                  ()
-compileCabal dls tver bghc jobs patchdir PlatformRequest{..} = do
-  lift $ $(logDebug) [i|Requested to compile: #{tver} with ghc-#{bghc}|]
-
-  Settings {dirs = Dirs {..}} <- lift ask
-
-  whenM
-      (lift (cabalInstalled tver) >>= \a -> liftIO $
-        handleIO (\_ -> pure False)
-          $ fmap (\x -> a && isSymbolicLink x)
-          -- ignore when the installation is a legacy cabal (binary, not symlink)
-          $ getSymbolicLinkStatus (toFilePath (binDir </> [rel|cabal|]))
-      )
-    $ (throwE $ AlreadyInstalled Cabal tver)
-
-  -- download source tarball
-  dlInfo <- preview (ix Cabal % ix tver % viSourceDL % _Just) dls ?? NoDownload
-  dl <- liftE $ downloadCached dlInfo Nothing
-
-  -- unpack
-  tmpUnpack <- lift mkGhcupTmpDir
-  liftE $ unpackToDir tmpUnpack dl
-  void $ liftIO $ darwinNotarization _rPlatform tmpUnpack
-
-  workdir <- maybe (pure tmpUnpack) (liftE . intoSubdir tmpUnpack) (view dlSubdir dlInfo)
-
-  cbin         <- liftE $ runBuildAction tmpUnpack Nothing (compile workdir)
-
-  destFileName <- lift $ parseRel ("cabal-" <> verToBS tver)
-  handleIO (throwE . CopyError . show) $ liftIO $ copyFile
-    cbin
-    (binDir </> destFileName)
-    Overwrite
-
-  -- create symlink if this is the latest version
-  cVers <- lift $ fmap rights $ getInstalledCabals
-  let lInstCabal = headMay . reverse . sort $ cVers
-  when (maybe True (tver >=) lInstCabal) $ liftE $ setCabal tver
-
-  pure ()
-
- where
-  compile :: (MonadReader Settings m, MonadThrow m, MonadLogger m, MonadIO m, MonadResource m)
-          => Path Abs
-          -> Excepts '[ProcessError , PatchFailed] m (Path Abs)
-  compile workdir = do
-    lift $ $(logInfo) [i|Building (this may take a while)...|]
-
-    forM_ patchdir $ \dir -> liftE $ applyPatches dir workdir
-
-    ghcEnv <- case bghc of
-      Right path -> do
-        -- recover the version from /foo/ghc-6.5.4
-        bn <- basename path
-        let dn  = toFilePath $ dirname path
-        let ver = snd . B.break (== _hyphen) . toFilePath $ bn
-
-        pure
-          [ ("GHC"    , toFilePath path)
-          , ("GHC_PKG", dn <> "/" <> "ghc-pkg" <> ver)
-          , ("HADDOCK", dn <> "/" <> "haddock" <> ver)
-          ]
-      Left bver -> do
-        let v' = verToBS bver
-        pure
-          [ ("GHC"    , "ghc-" <> v')
-          , ("GHC_PKG", "ghc-pkg-" <> v')
-          , ("HADDOCK", "haddock-" <> v')
-          ]
-
-    tmp <- lift withGHCupTmpDir
-    liftIO $ createDirRecursive' (tmp </> [rel|bin|])
-    newEnv <- lift $ addToCurrentEnv (("PREFIX", toFilePath tmp) : ghcEnv)
-    lift $ $(logDebug) [i|Environment: #{newEnv}|]
-
-    lEM $ execLogged "./bootstrap.sh"
-                              False
-                              (maybe [] (\j -> ["-j", fS (show j)]) jobs)
-                              [rel|cabal-bootstrap|]
-                              (Just workdir)
-                              (Just newEnv)
-    pure $ (tmp </> [rel|bin/cabal|])
-
-
-

    ---------------------
    --[ Upgrade GHCup ]--
--- a/lib/GHCup/Version.hs
+++ b/lib/GHCup/Version.hs
@@ -22,7 +22,7 @@ import qualified Data.Text                     as T

 -- | This reflects the API version of the YAML.
 ghcupURL :: URI
-ghcupURL = [uri|https://www.haskell.org/ghcup/data/ghcup-0.0.2.yaml|]
+ghcupURL = [uri|https://www.haskell.org/ghcup/data/ghcup-0.0.3.yaml|]

 -- | The current ghcup version.
 ghcUpVer :: PVP
Author	SHA1	Message	Date
Julian Ospald	9d7914e69a	Bump ghcupURL	2020-09-22 23:41:19 +02:00
Julian Ospald	6c62884b24	Update Changelog	2020-09-22 21:31:01 +02:00
Julian Ospald	965d2a3ba8	Drop 'ghcup compile cabal' Upstream has discontinued the old bootstrap shell script. The new python shell script doesn't work like the old one and is only useful for bootstrapping to a new architecture. If you miss this feature, consider running: cabal install cabal-install with the appropriate GHC version set (this might need some experimenting). This also fixes #64	2020-09-22 21:26:10 +02:00
Julian Ospald	40a1cc98c6	Drop use of table-layout, thanks to Simon	2020-09-22 21:05:59 +02:00
Julian Ospald	4c2d4ee6bd	Update hls tarballs	2020-09-22 19:23:24 +02:00
Julian Ospald	9276664465	Merge branch 'hls' into master	2020-09-22 15:23:10 +02:00
Julian Ospald	a94bcdb92d	Remove 9.0.1-alpha1 Ben requested removal, since this wasn't an announced release.	2020-09-21 14:13:45 +02:00