Smarter logging

Fix spelling
Warn when overwriting current GHC due to compile
2021-04-29 14:47:30 +02:00 · 2021-04-29 14:47:22 +02:00 · 2021-04-29 14:46:45 +02:00 · 2021-04-28 21:17:57 +02:00 · 2021-04-25 22:44:41 +02:00 · 2021-04-25 21:32:58 +02:00
15 changed files with 361 additions and 205 deletions
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,11 @@
 # Revision history for ghcup

+## 0.1.15 -- ????-??-??
+
+* Add date to GHC bindist names created by ghcup
+* Warn when /tmp doesn't have 5GB or more of disk space
+* Allow to compile GHC from git repo wrt [#126](https://gitlab.haskell.org/haskell/ghcup-hs/-/issues/126)
+
 ## 0.1.14.1 -- 2021-04-11

 * Make internal symlink target parser more lax, fixes [#119](https://gitlab.haskell.org/haskell/ghcup-hs/-/issues/119)
--- a/app/ghcup-gen/Validate.hs
+++ b/app/ghcup-gen/Validate.hs
@@ -37,7 +37,7 @@ import           Data.IORef
 import           Data.List
 import           Data.String.Interpolate
 import           Data.Versions
-import           HPath                          ( toFilePath )
+import           HPath                          ( toFilePath, rel )
 import           Haskus.Utils.Variant.Excepts
 import           Optics
 import           System.Exit
@@ -202,6 +202,7 @@ validateTarballs (TarballFilter tool versionRegex) dls = do
          %& indices (matchTest versionRegex . T.unpack . prettyVer)
          % (viSourceDL % _Just `summing` viArch % each % each % each)
    when (null dlis) $ $(logError) [i|no tarballs selected by filter|] *> addError
+
    forM_ dlis downloadAll

    -- exit
@@ -235,13 +236,21 @@ validateTarballs (TarballFilter tool versionRegex) dls = do
 #endif
               ]
      $ do
-        p <- liftE $ downloadCached dli Nothing
-        fmap (head . splitDirectories . head)
-          . liftE
-          . getArchiveFiles
-          $ p
+        case tool of
+          Just GHCup -> do
+            let fn = [rel|ghcup|]
+            dir <- liftIO ghcupCacheDir
+            p <- liftE $ download dli dir (Just fn)
+            liftE $ checkDigest dli p
+            pure Nothing
+          _ -> do
+            p <- liftE $ downloadCached dli Nothing
+            fmap (Just . head . splitDirectories . head)
+              . liftE
+              . getArchiveFiles
+              $ p
    case r of
-      VRight basePath -> do
+      VRight (Just basePath) -> do
        case _dlSubdir dli of
          Just (RealDir (toFilePath -> prel)) -> do
            lift $ $(logInfo)
@@ -262,7 +271,8 @@ validateTarballs (TarballFilter tool versionRegex) dls = do
                [i|Subdir doesn't match: expected regex "#{regexString}", got "#{basePath}"|]
              addError
          Nothing -> pure ()
+      VRight Nothing -> pure ()
      VLeft  e -> do
        lift $ $(logError)
-          [i|Could not download (or verify hash) of #{dli}, Error was: #{e}|]
+          [i|Could not download (or verify hash) of #{dli}, Error was: #{prettyShow e}|]
        addError
--- a/app/ghcup/Main.hs
+++ b/app/ghcup/Main.hs
@@ -165,9 +165,8 @@ data RmOptions = RmOptions

 data CompileCommand = CompileGHC GHCCompileOptions

-
 data GHCCompileOptions = GHCCompileOptions
-  { targetVer    :: Version
+  { targetGhc    :: Either Version GitBranch
  , bootstrapGhc :: Either Version (Path Abs)
  , jobs         :: Maybe Int
  , buildConfig  :: Maybe (Path Abs)
@@ -177,14 +176,6 @@ data GHCCompileOptions = GHCCompileOptions
  , setCompile   :: Bool
  }

-data CabalCompileOptions = CabalCompileOptions
-  { targetVer    :: Version
-  , bootstrapGhc :: Either Version (Path Abs)
-  , jobs         :: Maybe Int
-  , buildConfig  :: Maybe (Path Abs)
-  , patchDir     :: Maybe (Path Abs)
-  }
-
 data UpgradeOpts = UpgradeInplace
                 | UpgradeAt (Path Abs)
                 | UpgradeGHCupDir
@@ -659,7 +650,10 @@ ENV variables:
  such as: CC, LD, OBJDUMP, NM, AR, RANLIB.

 Examples:
+  # compile from known version
  ghcup compile ghc -j 4 -v 8.4.2 -b 8.2.2
+  # compile from git commit/reference
+  ghcup compile ghc -j 4 -g master -b 8.2.2
  # specify path to bootstrap ghc
  ghcup compile ghc -j 4 -v 8.4.2 -b /usr/bin/ghc-8.2.2
  # build cross compiler
@@ -668,34 +662,22 @@ Examples:

 ghcCompileOpts :: Parser GHCCompileOptions
 ghcCompileOpts =
-  (\CabalCompileOptions {..} crossTarget addConfArgs setCompile -> GHCCompileOptions { .. }
-    )
-    <$> cabalCompileOpts
-    <*> optional
-          (option
-            str
-            (short 'x' <> long "cross-target" <> metavar "CROSS_TARGET" <> help
-              "Build cross-compiler for this platform"
-            )
-          )
-    <*> many (argument str (metavar "CONFIGURE_ARGS" <> help "Additional arguments to configure, prefix with '-- ' (longopts)"))
-    <*> flag
-          False
-          True
-          (long "set" <> help
-            "Set as active version after install"
-          )
-
-cabalCompileOpts :: Parser CabalCompileOptions
-cabalCompileOpts =
-  CabalCompileOptions
-    <$> option
+  GHCCompileOptions
+    <$> ((Left <$> option
          (eitherReader
            (first (const "Not a valid version") . version . T.pack)
          )
          (short 'v' <> long "version" <> metavar "VERSION" <> help
            "The tool version to compile"
          )
+          ) <|>
+          (Right <$> (GitBranch <$> option
+          str
+          (short 'g' <> long "git-ref" <> metavar "GIT_REFERENCE" <> help
+            "The git commit/branch/ref to build from"
+          ) <*>
+          optional (option str (short 'r' <> long "repository" <> metavar "GIT_REPOSITORY" <> help "The git repository to build from (defaults to GHC upstream)"))
+          )))
    <*> option
          (eitherReader
            (\x ->
@@ -742,6 +724,20 @@ cabalCompileOpts =
              "Absolute path to patch directory (applied in order, uses -p1)"
            )
          )
+    <*> optional
+          (option
+            str
+            (short 'x' <> long "cross-target" <> metavar "CROSS_TARGET" <> help
+              "Build cross-compiler for this platform"
+            )
+          )
+    <*> many (argument str (metavar "CONFIGURE_ARGS" <> help "Additional arguments to configure, prefix with '-- ' (longopts)"))
+    <*> flag
+          False
+          True
+          (long "set" <> help
+            "Set as active version after install"
+          )


 toolVersionParser :: Parser ToolVersion
@@ -1073,7 +1069,7 @@ Report bugs at <https://gitlab.haskell.org/haskell/ghcup-hs/issues>|]
          createDirRecursive' baseDir

          -- logger interpreter
-          logfile <- flip runReaderT appstate $ initGHCupFileLogging [rel|ghcup.log|]
+          logfile <- flip runReaderT appstate $ initGHCupFileLogging
          let loggerConfig = LoggerConfig
                { lcPrintDebug = verbose settings
                , colorOutter  = B.hPut stderr
@@ -1470,22 +1466,26 @@ Report bugs at <https://gitlab.haskell.org/haskell/ghcup-hs/issues>|]

            Compile (CompileGHC GHCCompileOptions {..}) ->
              runCompileGHC (do
-                let vi = getVersionInfo targetVer GHC dls
-                forM_ (_viPreCompile =<< vi) $ \msg -> do
-                  lift $ $(logInfo) msg
-                  lift $ $(logInfo)
-                    "...waiting for 5 seconds, you can still abort..."
-                  liftIO $ threadDelay 5000000 -- for compilation, give the user a sec to intervene
-                liftE $ compileGHC dls
-                            (GHCTargetVersion crossTarget targetVer)
+                case targetGhc of
+                  Left targetVer -> do
+                    let vi = getVersionInfo targetVer GHC dls
+                    forM_ (_viPreCompile =<< vi) $ \msg -> do
+                      lift $ $(logInfo) msg
+                      lift $ $(logInfo)
+                        "...waiting for 5 seconds, you can still abort..."
+                      liftIO $ threadDelay 5000000 -- for compilation, give the user a sec to intervene
+                  Right _ -> pure ()
+                targetVer <- liftE $ compileGHC dls
+                            (first (GHCTargetVersion crossTarget) targetGhc)
                            bootstrapGhc
                            jobs
                            buildConfig
                            patchDir
                            addConfArgs
                            pfreq
+                let vi = getVersionInfo (_tvVersion targetVer) GHC dls
                when setCompile $ void $ liftE $
-                  setGHC (GHCTargetVersion crossTarget targetVer) SetGHCOnly
+                  setGHC targetVer SetGHCOnly
                pure vi
                )
                >>= \case
--- a/2
+++ b/2
@@ -69,7 +69,7 @@ _done() {
 download_ghcup() {
 	_plat="$(uname -s)"
 	_arch=$(uname -m)
-	_ghver="0.1.14"
+	_ghver="0.1.14.1"
 	_base_url="https://downloads.haskell.org/~ghcup"

    case "${_plat}" in
--- a/ghcup-0.0.4.yaml
+++ b/ghcup-0.0.4.yaml
@@ -139,6 +139,7 @@ ghcupDownloads:
        dlSubdir: ghc-7.10.3
        dlHash: cf90cedce1c28fd0e2b9e72fe8a938756668d18ea1fcc884a19f698658ac4fef
      viPostRemove: &ghc-post-remove "After removing GHC you might also want to clean up your cabal store at: ~/.cabal/store/ghc-<ghcver>"
+      viPostInstall: "GHC-7.10.3 may give linking errors on most modern distros. You may have to pass '--ghc-option=-optc-no-pie --ghc-option=-optl-no-pie' to cabal build/install. Also see https://gitlab.haskell.org/ghc/ghc/-/issues/18763"
      viArch:
        A_64:
          Linux_Debian:
@@ -1553,86 +1554,91 @@ ghcupDownloads:
              dlUri: https://downloads.haskell.org/~ghc/9.0.1/ghc-9.0.1-armv7-deb9-linux.tar.xz
              dlSubdir: ghc-9.0.1
              dlHash: 6f404f9b88468407b3a9ec5800bcc2d01dd453ef3d63414853b4fbbd4d8df496
-    9.2.0.20210331:
+    9.2.0.20210422:
      viTags:
      - Prerelease
      - base-4.16.0.0
-      viChangeLog: https://downloads.haskell.org/~ghc/9.2.1-alpha1/docs/html/users_guide/9.2.1-notes.html
+      viChangeLog: https://downloads.haskell.org/~ghc/9.2.1-alpha2/docs/html/users_guide/index.html
      viSourceDL:
-        dlUri: https://downloads.haskell.org/~ghc/9.2.1-alpha1/ghc-9.2.0.20210331-src.tar.xz
-        dlSubdir: ghc-9.2.0.20210331
-        dlHash: 3ec8ec2fb77e14d68ac1c092f3e8605b6822e24f7e6dc7139dccf8feaf168699
+        dlUri: https://downloads.haskell.org/~ghc/9.2.1-alpha2/ghc-9.2.0.20210422-src.tar.xz
+        dlSubdir: ghc-9.2.0.20210422
+        dlHash: 69be189e6e7f8d51a9078ac8f177176bc5bff54edc8352974c50c1f0e110df27
      viPostRemove: *ghc-post-remove
      viArch:
        A_64:
          Linux_Debian:
-            '( >= 9 && < 10 )': &ghc-921-alpha1-64-deb9
-              dlUri: https://downloads.haskell.org/~ghc/9.2.1-alpha1/ghc-9.2.0.20210331-x86_64-deb9-linux.tar.xz
-              dlSubdir: ghc-9.2.0.20210331
-              dlHash: c13613cb6285a689c5b89c93fad5c6c0e95d66c8936338c44d92a1312f507006
-            '( >= 10 && < 11 )': &ghc-921-alpha1-64-deb10
-              dlUri: https://downloads.haskell.org/~ghc/9.2.1-alpha1/ghc-9.2.0.20210331-x86_64-deb10-linux.tar.xz
-              dlSubdir: ghc-9.2.0.20210331
-              dlHash: 2b2a0e2bad54d1a41440c093a199207b58ff314bea7edf73387916e9952d6a53
-            unknown_versioning: *ghc-921-alpha1-64-deb9
+            '( >= 9 && < 10 )': &ghc-921-alpha2-64-deb9
+              dlUri: https://downloads.haskell.org/~ghc/9.2.1-alpha2/ghc-9.2.0.20210422-x86_64-deb9-linux.tar.xz
+              dlSubdir: ghc-9.2.0.20210422
+              dlHash: 7262f3a230cd6945c588882e03941301877a9eb12e58c5975ad264596c2e12f2
+            '( >= 10 && < 11 )': &ghc-921-alpha2-64-deb10
+              dlUri: https://downloads.haskell.org/~ghc/9.2.1-alpha2/ghc-9.2.0.20210422-x86_64-deb10-linux.tar.xz
+              dlSubdir: ghc-9.2.0.20210422
+              dlHash: 6d36cd08576bdee7473fee66b4b8ceb72011983a7d5aa3ec587403815a73e37b
+            unknown_versioning: *ghc-921-alpha2-64-deb9
          Linux_Ubuntu:
-            unknown_versioning: &ghc-921-alpha1-64-fedora
-              dlUri: https://downloads.haskell.org/~ghc/9.2.1-alpha1/ghc-9.2.0.20210331-x86_64-fedora27-linux.tar.xz
-              dlSubdir: ghc-9.2.0.20210331
-              dlHash: c7e648ac313c268aaa3a9651b00650da6eb293abfe14e44f44da22a758c233e7
-            '( >= 16 && < 19 )': *ghc-921-alpha1-64-deb9
+            unknown_versioning: &ghc-921-alpha2-64-fedora
+              dlUri: https://downloads.haskell.org/~ghc/9.2.1-alpha2/ghc-9.2.0.20210422-x86_64-fedora27-linux.tar.xz
+              dlSubdir: ghc-9.2.0.20210422
+              dlHash: 95624192ff0982690bc9093632d6351fdc6f72e6df380b392449229c39a0354b
+            '( >= 16 && < 19 )': *ghc-921-alpha2-64-deb9
          Linux_Mint:
-            unknown_versioning: *ghc-921-alpha1-64-deb10
+            unknown_versioning: *ghc-921-alpha2-64-deb10
          Linux_Fedora:
-            '( >= 27 && < 28 )': *ghc-921-alpha1-64-fedora
-            unknown_versioning: *ghc-921-alpha1-64-fedora
+            '( >= 27 && < 28 )': *ghc-921-alpha2-64-fedora
+            unknown_versioning: *ghc-921-alpha2-64-fedora
          Linux_CentOS:
-            '( >= 7 && < 8 )': &ghc-921-alpha1-64-centos
-              dlUri: https://downloads.haskell.org/~ghc/9.2.1-alpha1/ghc-9.2.0.20210331-x86_64-centos7-linux.tar.xz
-              dlSubdir: ghc-9.2.0.20210331
-              dlHash: 50556cc42be665957f2bd8e5deeceb26e58e88badfa0c99a44117fda2d63200c
-            unknown_versioning: *ghc-921-alpha1-64-centos
+            '( >= 7 && < 8 )': &ghc-921-alpha2-64-centos
+              dlUri: https://downloads.haskell.org/~ghc/9.2.1-alpha2/ghc-9.2.0.20210422-x86_64-centos7-linux.tar.xz
+              dlSubdir: ghc-9.2.0.20210422
+              dlHash: dee4f158f2d59bfe97ec3f5773b6b31aa911f9b128a5e56eeefa2dccc754d295
+            unknown_versioning: *ghc-921-alpha2-64-centos
          Linux_RedHat:
-            unknown_versioning: *ghc-921-alpha1-64-centos
+            unknown_versioning: *ghc-921-alpha2-64-centos
          Linux_Alpine:
            unknown_versioning:
-              dlUri: https://downloads.haskell.org/~ghc/9.2.1-alpha1/ghc-9.2.0.20210331-x86_64-alpine3.10-linux-integer-simple.tar.xz
-              dlSubdir: ghc-9.2.0.20210331-x86_64-unknown-linux
-              dlHash: bab5f5d0ecd6522da372a9a0f0eeebbbecf0bd94788847aa3cd5bdb36682d48a
+              dlUri: https://downloads.haskell.org/~ghc/9.2.1-alpha2/ghc-9.2.0.20210422-x86_64-alpine3.10-linux-integer-simple.tar.xz
+              dlSubdir: ghc-9.2.0.20210422-x86_64-unknown-linux
+              dlHash: f61ae72925325ca7b316e40121e8d6bad94794016d3fa59bcbc8dbe116a7f13c
          Linux_AmazonLinux:
-            unknown_versioning: *ghc-921-alpha1-64-centos
+            unknown_versioning: *ghc-921-alpha2-64-centos
          Linux_UnknownLinux:
-            unknown_versioning: *ghc-921-alpha1-64-fedora
+            unknown_versioning: *ghc-921-alpha2-64-fedora
+          FreeBSD:
+            unknown_versioning:
+              dlUri: https://downloads.haskell.org/~ghc/9.2.1-alpha2/ghc-9.2.0.20210422-x86_64-unknown-freebsd.tar.xz
+              dlSubdir: ghc-9.2.0.20210422
+              dlHash: 195728e02398ea6154fe713b7782a0cae856eb0d9d90f5d09cd0cca610c985e2
          Darwin:
            unknown_versioning:
-              dlUri: https://downloads.haskell.org/~ghc/9.2.1-alpha1/ghc-9.2.0.20210331-x86_64-apple-darwin.tar.xz
-              dlSubdir: ghc-9.2.0.20210331
-              dlHash: cfd7d0479ce80607c11cf96fe25d4804783c6ebc623ca9adcb5436e3499c9c5b
+              dlUri: https://downloads.haskell.org/~ghc/9.2.1-alpha2/ghc-9.2.0.20210422-x86_64-apple-darwin.tar.xz
+              dlSubdir: ghc-9.2.0.20210422
+              dlHash: 8884c059f2b76e4c4309ff6bd7a7dde37663f751fd26220e9a2bcabb4d69a401
        A_32:
          Linux_Debian:
-            '( >= 9 && < 10 )': &ghc-921-alpha1-32-deb9
-              dlUri: https://downloads.haskell.org/~ghc/9.2.1-alpha1/ghc-9.2.0.20210331-i386-deb9-linux.tar.xz
-              dlSubdir: ghc-9.2.0.20210331
-              dlHash: 58ccac8e89e60b4261dfa8ca0e17d335b99f2a1fecb90322436cfea3bdce2240
-            unknown_versioning: *ghc-921-alpha1-32-deb9
+            '( >= 9 && < 10 )': &ghc-921-alpha2-32-deb9
+              dlUri: https://downloads.haskell.org/~ghc/9.2.1-alpha2/ghc-9.2.0.20210422-i386-deb9-linux.tar.xz
+              dlSubdir: ghc-9.2.0.20210422
+              dlHash: a378ec3fd31a9fa2a7134e98159e189362fe969f04031515616e9cc3182c861a
+            unknown_versioning: *ghc-921-alpha2-32-deb9
          Linux_Ubuntu:
-            unknown_versioning: *ghc-921-alpha1-32-deb9
+            unknown_versioning: *ghc-921-alpha2-32-deb9
          Linux_Mint:
-            unknown_versioning: *ghc-921-alpha1-32-deb9
+            unknown_versioning: *ghc-921-alpha2-32-deb9
          Linux_UnknownLinux:
-            unknown_versioning: *ghc-921-alpha1-32-deb9
+            unknown_versioning: *ghc-921-alpha2-32-deb9
        A_ARM64:
          Linux_UnknownLinux:
            unknown_versioning:
-              dlUri: https://downloads.haskell.org/~ghc/9.2.1-alpha1/ghc-9.2.0.20210331-aarch64-deb10-linux.tar.xz
-              dlSubdir: ghc-9.2.0.20210331
-              dlHash: df355e1ed34cf0fef11444299020041f03d6c67f6c5c342db1f76b71fd31e6fe
+              dlUri: https://downloads.haskell.org/~ghc/9.2.1-alpha2/ghc-9.2.0.20210422-aarch64-deb10-linux.tar.xz
+              dlSubdir: ghc-9.2.0.20210422
+              dlHash: fd2f4d0f6122f752aca396fe1a13e7d14d037dc45806bb0404a031eeeeb1994c
        A_ARM:
          Linux_UnknownLinux:
            unknown_versioning:
-              dlUri: https://downloads.haskell.org/~ghc/9.2.1-alpha1/ghc-9.2.0.20210331-armv7-deb10-linux.tar.xz
-              dlSubdir: ghc-9.2.0.20210331
-              dlHash: 2c5133fb83943371ad8556328db4acb9081271b7c77ceaf2b74817dd0de3b486
+              dlUri: https://downloads.haskell.org/~ghc/9.2.1-alpha2/ghc-9.2.0.20210422-armv7-deb10-linux.tar.xz
+              dlSubdir: ghc-9.2.0.20210422
+              dlHash: dab7d7785d6ccafb130526b666669fc974ba5c90fc9aaf2024f9c65bcbd097d3
  Cabal:
    2.4.1.0:
      viTags:
@@ -1755,13 +1761,11 @@ ghcupDownloads:
              dlHash: a1e2db664ec00e42a1e071a4181f6476f6e0bad321f1ddc0cf27831119f4c6d4
        A_32:
          Linux_UnknownLinux:
-            unknown_versioning:
-              dlUri: https://downloads.haskell.org/~cabal/cabal-install-3.4.0.0/cabal-install-3.4.0.0-i386-debian-9.tar.xz
-              dlHash: ef3750644a53f7b1fad141b2ad02d4c7a3b239ec0cbfa7f0528fb02c1dfcebce
+            unknown_versioning: &cabal-3400-32
+              dlUri: https://downloads.haskell.org/~ghcup/unofficial-bindists/cabal/3.4.0.0/cabal-install-3.4.0.0-i386-unknown-linux.tar.xz
+              dlHash: cc62a471e9e68a6a9933e54f75bf0cffae67a1d2220df1152ab887c38eb6bc8a
          Linux_Alpine:
-            unknown_versioning:
-              dlUri: https://downloads.haskell.org/ghcup/unofficial-bindists/cabal/3.4.0.0/cabal-install-3.4.0.0-i386-alpine-linux-musl.tar.gz
-              dlHash: 95adb65f3a72aa8d9ce83685bc06e1eee5b801f56e204e27e957e8a35abd9cf8
+            unknown_versioning: *cabal-3400-32
        A_ARM64:
          Linux_UnknownLinux:
            unknown_versioning:
@@ -1773,7 +1777,7 @@ ghcupDownloads:
              dlUri: https://downloads.haskell.org/~ghcup/unofficial-bindists/cabal/3.4.0.0/cabal-install-3.4.0.0-armv7-linux-bootstrapped.tar.xz
              dlHash: 16c0d1eaba24bed14f3e152970179a45d9f9bb5cc839b2c210ad06eb7d4826ed
  GHCup:
-    0.1.14:
+    0.1.14.1:
      viTags:
      - Recommended
      - Latest
@@ -1783,51 +1787,51 @@ ghcupDownloads:
        A_64:
          Linux_UnknownLinux:
            unknown_versioning: &ghcup-64
-              dlUri: https://downloads.haskell.org/~ghcup/0.1.14/x86_64-linux-ghcup-0.1.14
-              dlHash: e9b314d248f4d4604ce64cee1be7161c77c8940efd11986c9205779ec3b598dd
+              dlUri: https://downloads.haskell.org/~ghcup/0.1.14.1/x86_64-linux-ghcup-0.1.14.1
+              dlHash: 59e31b2ede3ed20f79dce0f8ba0a68b6fb25e5f00ba2d7243f6a8af68d979ff5
          Darwin:
            unknown_versioning:
-              dlUri: https://downloads.haskell.org/~ghcup/0.1.14/x86_64-apple-darwin-ghcup-0.1.14
-              dlHash: 69ede9db36c0ae631b679fceb87dd856d4753ee26f33610da37dd7a694809919
+              dlUri: https://downloads.haskell.org/~ghcup/0.1.14.1/x86_64-apple-darwin-ghcup-0.1.14.1
+              dlHash: 3e1dd173b3e7b5d90dcdece423c3ddd3efb4c83e964967b0fb574c9b7b2c44e1
          FreeBSD:
            unknown_versioning:
-              dlUri: https://downloads.haskell.org/~ghcup/0.1.14/x86_64-portbld-freebsd-ghcup-0.1.14
-              dlHash: 68b09404cf49061da539463f42f8ad67c9cef5c5d3f68a3c7c4f6760e8442bb9
+              dlUri: https://downloads.haskell.org/~ghcup/0.1.14.1/x86_64-portbld-freebsd-ghcup-0.1.14.1
+              dlHash: 89a70980d77888dae8b9fd0f05e7a7920f421bc3bb5192da8e73fd4e7b4cb86f
          Linux_Alpine:
            unknown_versioning: *ghcup-64
        A_32:
          Linux_UnknownLinux:
            unknown_versioning: &ghcup-32
-              dlUri: https://downloads.haskell.org/~ghcup/0.1.14/i386-linux-ghcup-0.1.14
-              dlHash: ecb1157f010d2421764c52ab0cdbbf9a5c3da555827172c7b904d5f3f96c80fa
+              dlUri: https://downloads.haskell.org/~ghcup/0.1.14.1/i386-linux-ghcup-0.1.14.1
+              dlHash: 610aac7c3be3ba3874c07b9cae5b2ca0da9a92bf381afc2597bd2dc9c70aae0c
          Linux_Alpine:
            unknown_versioning: *ghcup-32
        A_ARM64:
          Linux_UnknownLinux:
            unknown_versioning:
-              dlUri: https://downloads.haskell.org/~ghcup/0.1.14/aarch64-linux-ghcup-0.1.14
-              dlHash: 78a15f8a03917a89b67536af0993d7526d2722248a3a5cd8c500adffd7cd7691
+              dlUri: https://downloads.haskell.org/~ghcup/0.1.14.1/aarch64-linux-ghcup-0.1.14.1
+              dlHash: e9ae07b7d41ea03e6af9c1f3587f61287827c4e29478b6a5d46ea1ce5af4cee5
        A_ARM:
          Linux_UnknownLinux:
            unknown_versioning:
-              dlUri: https://downloads.haskell.org/~ghcup/0.1.14/armv7-linux-ghcup-0.1.14
-              dlHash: 5484dc9e16553c3d1707a9f83404c3c795dc01d01ef998cf173caf960abe793b
+              dlUri: https://downloads.haskell.org/~ghcup/0.1.14.1/armv7-linux-ghcup-0.1.14.1
+              dlHash: 646832030efbc0a848df24c08b5eb7507bd15d1c2eb95fea6d9d03890f3662be
  HLS:
-    1.0.0:
+    1.1.0:
      viTags:
        - Recommended
        - Latest
-      viChangeLog: https://github.com/haskell/haskell-language-server/blob/master/ChangeLog.md#100
+      viChangeLog: https://github.com/haskell/haskell-language-server/blob/master/ChangeLog.md#110
      viPostInstall: "This is just the server part of your LSP configuration. Consult the README on how to configure HLS, your project and your LSP client in your editor: https://github.com/haskell/haskell-language-server/blob/master/README.md"
      viArch:
        A_64:
          Linux_UnknownLinux:
            unknown_versioning: &hls-64
-              dlUri: https://github.com/haskell/haskell-language-server/releases/download/1.0.0/haskell-language-server-Linux-1.0.0.tar.gz
-              dlHash: 4fab18998c5f67118a26b75b059f3b3e2ad345b6325515a552d1a24cdf87ed3f
+              dlUri: https://github.com/haskell/haskell-language-server/releases/download/1.1.0/haskell-language-server-Linux-1.1.0.tar.gz
+              dlHash: 0f0dadb0e9a08273658f565fd71c636801959b954be2737f38f2a1aac522208f
          Darwin:
            unknown_versioning:
-              dlUri: https://github.com/haskell/haskell-language-server/releases/download/1.0.0/haskell-language-server-macOS-1.0.0.tar.gz
-              dlHash: 74e7624c889c0235f0b02d7e7f164d5eb95b611d584fc8602f0b3a099b73f8be
+              dlUri: https://github.com/haskell/haskell-language-server/releases/download/1.1.0/haskell-language-server-macOS-1.1.0.tar.gz
+              dlHash: 4e89b192e2f49637d772e974f2c17b16da067ecd5912575eaa542551de97681b
          Linux_Alpine:
            unknown_versioning: *hls-64
--- a/ghcup.cabal
+++ b/ghcup.cabal
@@ -15,12 +15,13 @@ description:

 category:        System
 build-type:      Simple
-extra-doc-files: CHANGELOG.md
-                 README.md
-                 HACKING.md
-                 RELEASING.md
-                 config.yaml
-                 ghcup-0.0.4.yaml
+extra-doc-files:
+  CHANGELOG.md
+  config.yaml
+  ghcup-0.0.4.yaml
+  HACKING.md
+  README.md
+  RELEASING.md

 source-repository head
  type:     git
@@ -96,6 +97,7 @@ library
    , concurrent-output     ^>=1.10.11
    , containers            ^>=0.6
    , cryptohash-sha256     ^>=0.11.101.0
+    , disk-free-space       ^>=0.1.0.1
    , generics-sop          ^>=0.5
    , haskus-utils-types    ^>=1.5
    , haskus-utils-variant  >=3.0        && <3.2
@@ -130,6 +132,7 @@ library
    , transformers          ^>=0.5
    , unix                  ^>=2.7
    , unix-bytestring       ^>=0.3
+    , unliftio-core         ^>=0.2.0.1
    , unordered-containers  ^>=0.2.10.0
    , uri-bytestring        ^>=0.3.2.2
    , utf8-string           ^>=1.0
--- a/lib/GHCup.hs
+++ b/lib/GHCup.hs
@@ -59,8 +59,11 @@ import           Data.ByteString                ( ByteString )
 import           Data.Either
 import           Data.List
 import           Data.Maybe
+import           Data.String                    ( fromString )
 import           Data.String.Interpolate
 import           Data.Text                      ( Text )
+import           Data.Time.Clock
+import           Data.Time.Format.ISO8601
 import           Data.Versions
 import           Data.Word8
 import           GHC.IO.Exception
@@ -77,6 +80,7 @@ import           System.IO.Error
 import           System.Posix.Env.ByteString    ( getEnvironment, getEnv )
 import           System.Posix.FilePath          ( getSearchPath, takeExtension )
 import           System.Posix.Files.ByteString
+import           Text.PrettyPrint.HughesPJClass ( prettyShow )
 import           Text.Regex.Posix

 import qualified Crypto.Hash.SHA256            as SHA256
@@ -86,6 +90,9 @@ import qualified Data.ByteString.Lazy          as BL
 import qualified Data.Map.Strict               as Map
 import qualified Data.Text                     as T
 import qualified Data.Text.Encoding            as E
+import qualified Text.Megaparsec               as MP
+import GHCup.Utils.MegaParsec
+import Control.Concurrent (threadDelay)



@@ -103,6 +110,7 @@ installGHCBindist :: ( MonadFail m
                     , MonadLogger m
                     , MonadResource m
                     , MonadIO m
+                     , MonadUnliftIO m
                     )
                  => DownloadInfo    -- ^ where/how to download
                  -> Version         -- ^ the version to install
@@ -158,6 +166,7 @@ installPackedGHC :: ( MonadMask m
                    , MonadThrow m
                    , MonadLogger m
                    , MonadIO m
+                    , MonadUnliftIO m
                    )
                 => Path Abs          -- ^ Path to the packed GHC bindist
                 -> Maybe TarDir      -- ^ Subdir of the archive
@@ -230,6 +239,7 @@ installGHCBin :: ( MonadFail m
                 , MonadLogger m
                 , MonadResource m
                 , MonadIO m
+                 , MonadUnliftIO m
                 )
              => GHCupDownloads  -- ^ the download info to look up the tarball from
              -> Version         -- ^ the version to install
@@ -262,6 +272,7 @@ installCabalBindist :: ( MonadMask m
                       , MonadLogger m
                       , MonadResource m
                       , MonadIO m
+                       , MonadUnliftIO m
                       , MonadFail m
                       )
                    => DownloadInfo
@@ -342,6 +353,7 @@ installCabalBin :: ( MonadMask m
                   , MonadLogger m
                   , MonadResource m
                   , MonadIO m
+                   , MonadUnliftIO m
                   , MonadFail m
                   )
                => GHCupDownloads
@@ -375,6 +387,7 @@ installHLSBindist :: ( MonadMask m
                     , MonadLogger m
                     , MonadResource m
                     , MonadIO m
+                     , MonadUnliftIO m
                     , MonadFail m
                     )
                  => DownloadInfo
@@ -464,6 +477,7 @@ installHLSBin :: ( MonadMask m
                 , MonadLogger m
                 , MonadResource m
                 , MonadIO m
+                 , MonadUnliftIO m
                 , MonadFail m
                 )
              => GHCupDownloads
@@ -1062,10 +1076,11 @@ compileGHC :: ( MonadMask m
              , MonadResource m
              , MonadLogger m
              , MonadIO m
+              , MonadUnliftIO m
              , MonadFail m
              )
           => GHCupDownloads
-           -> GHCTargetVersion           -- ^ version to install
+           -> Either GHCTargetVersion GitBranch          -- ^ version to install
           -> Either Version (Path Abs)  -- ^ version to bootstrap with
           -> Maybe Int                  -- ^ jobs
           -> Maybe (Path Abs)           -- ^ build config
@@ -1089,38 +1104,87 @@ compileGHC :: ( MonadMask m
 #endif
                 ]
                m
-                ()
-compileGHC dls tver bstrap jobs mbuildConfig patchdir aargs pfreq@PlatformRequest{..}
+                GHCTargetVersion
+compileGHC dls targetGhc bstrap jobs mbuildConfig patchdir aargs pfreq@PlatformRequest{..}
  = do
-    lift $ $(logDebug) [i|Requested to compile: #{tver} with #{bstrap}|]
+    (workdir, tmpUnpack, tver) <- case targetGhc of
+      -- unpack from version tarball
+      Left tver -> do
+        lift $ $(logDebug) [i|Requested to compile: #{tver} with #{bstrap}|]
+
+        -- download source tarball
+        dlInfo <-
+          preview (ix GHC % ix (tver ^. tvVersion) % 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)
+
+        pure (workdir, tmpUnpack, tver)
+
+      -- clone from git
+      Right GitBranch{..} -> do
+        tmpUnpack <- lift mkGhcupTmpDir
+        let git args = execLogged [s|git|] True ("--no-pager":args) [rel|git|] (Just tmpUnpack) Nothing
+        tver <- reThrowAll @_ @'[ProcessError] DownloadFailed $ do
+          let rep = fromMaybe "https://gitlab.haskell.org/ghc/ghc.git" repo
+          lift $ $(logInfo) [i|Fetching git repo #{rep} at ref #{ref} (this may take a while)|]
+          lEM $ git [ "init" ]
+          lEM $ git [ "remote"
+                    , "add"
+                    , "origin"
+                    , fromString rep ]
+
+          let fetch_args = 
+                    [ "fetch"
+                    , "--depth"
+                    , "1"
+                    , "--quiet"
+                    , "origin"
+                    , fromString ref ]
+          lEM $ git fetch_args
+
+          lEM $ git [ "checkout", "FETCH_HEAD" ]
+          lEM $ git [ "submodule", "update", "--init", "--depth", "1" ]
+          lEM $ execLogged "./boot" False [] [rel|ghc-bootstrap|] (Just tmpUnpack) Nothing
+          lEM $ execLogged "./configure" False [] [rel|ghc-bootstrap|] (Just tmpUnpack) Nothing
+          CapturedProcess {..} <- liftIO $ makeOut
+            ["show!", "--quiet", "VALUE=ProjectVersion" ] (Just tmpUnpack)
+          case _exitCode of
+            ExitSuccess -> throwEither . MP.parse ghcProjectVersion "" . decUTF8Safe $ _stdOut
+            ExitFailure c -> fail ("Could not figure out GHC project version. Exit code was: " <> show c <> ". Error was: " <> T.unpack (decUTF8Safe _stdErr))
+
+        void $ liftIO $ darwinNotarization _rPlatform tmpUnpack
+        lift $ $(logInfo) [i|Git version #{ref} corresponds to GHC version #{prettyVer tver}|]
+
+        pure (tmpUnpack, tmpUnpack, GHCTargetVersion Nothing tver)

    alreadyInstalled <- lift $ ghcInstalled tver
    alreadySet <- fmap (== Just tver) $ lift $ ghcSet (_tvTarget tver)
+    when alreadyInstalled $ do
+      lift $ $(logWarn) [i|GHC #{prettyShow tver} already installed. Will overwrite existing version.|]
+      lift $ $(logWarn)
+        "...waiting for 10 seconds before continuing, you can still abort..."
+      liftIO $ threadDelay 10000000 -- give the user a sec to intervene

-    -- download source tarball
-    dlInfo <-
-      preview (ix GHC % ix (tver ^. tvVersion) % viSourceDL % _Just) dls
-        ?? NoDownload
-    dl        <- liftE $ downloadCached dlInfo Nothing
-
-    -- unpack
-    tmpUnpack <- lift mkGhcupTmpDir
-    liftE $ unpackToDir tmpUnpack dl
-    void $ liftIO $ darwinNotarization _rPlatform tmpUnpack
+    ghcdir         <- lift $ ghcupGHCDir tver

    bghc <- case bstrap of
      Right g    -> pure $ Right g
      Left  bver -> Left <$> parseRel ("ghc-" <> verToBS bver)
-    workdir <- maybe (pure tmpUnpack)
-                     (liftE . intoSubdir tmpUnpack)
-                     (view dlSubdir dlInfo)
-    ghcdir         <- lift $ ghcupGHCDir tver

    (bindist, bmk) <- liftE $ runBuildAction
      tmpUnpack
      Nothing
      (do
-        b   <- compileBindist bghc ghcdir workdir
+        b <- compileBindist bghc tver workdir
        bmk <- liftIO $ readFileStrict (build_mk workdir)
        pure (b, bmk)
      )
@@ -1129,7 +1193,7 @@ compileGHC dls tver bstrap jobs mbuildConfig patchdir aargs pfreq@PlatformReques
      lift $ $(logInfo) [i|Deleting existing installation|]
      liftE $ rmGHCVer tver
    liftE $ installPackedGHC bindist
-                             (view dlSubdir dlInfo)
+                             (Just $ RegexDir "ghc-.*")
                             ghcdir
                             (tver ^. tvVersion)
                             pfreq
@@ -1141,21 +1205,23 @@ compileGHC dls tver bstrap jobs mbuildConfig patchdir aargs pfreq@PlatformReques
    -- restore
    when alreadySet $ liftE $ void $ setGHC tver SetGHCOnly

+    pure tver
+
 where
-  defaultConf = case _tvTarget tver of
-    Nothing -> [s|
-V=0
-BUILD_MAN = NO
-BUILD_SPHINX_HTML = NO
-BUILD_SPHINX_PDF = NO
-HADDOCK_DOCS = YES|]
-    Just _ -> [s|
+  defaultConf = case targetGhc of
+    Left (GHCTargetVersion (Just _) _) -> [s|
 V=0
 BUILD_MAN = NO
 BUILD_SPHINX_HTML = NO
 BUILD_SPHINX_PDF = NO
 HADDOCK_DOCS = NO
 Stage1Only = YES|]
+    _ -> [s|
+V=0
+BUILD_MAN = NO
+BUILD_SPHINX_HTML = NO
+BUILD_SPHINX_PDF = NO
+HADDOCK_DOCS = YES|]

  compileBindist :: ( MonadReader AppState m
                    , MonadThrow m
@@ -1165,13 +1231,13 @@ Stage1Only = YES|]
                    , MonadFail m
                    )
                 => Either (Path Rel) (Path Abs)
-                 -> Path Abs
+                 -> GHCTargetVersion
                 -> Path Abs
                 -> Excepts
                      '[FileDoesNotExistError, InvalidBuildConfig, PatchFailed, ProcessError, NotFoundInPATH, CopyError]
                      m
                      (Path Abs)  -- ^ output path of bindist
-  compileBindist bghc ghcdir workdir = do
+  compileBindist bghc tver workdir = do
    lift $ $(logInfo) [i|configuring build|]
    liftE checkBuildConfig

@@ -1181,31 +1247,28 @@ Stage1Only = YES|]

    cEnv <- liftIO getEnvironment

-    if
-      | _tvVersion tver >= [vver|8.8.0|] -> do
-        bghcPath <- case bghc of
-          Right ghc' -> pure ghc'
-          Left  bver -> do
-            spaths <- catMaybes . fmap parseAbs <$> liftIO getSearchPath
-            liftIO (searchPath spaths bver) !? NotFoundInPATH bver
+    if | _tvVersion tver >= [vver|8.8.0|] -> do
+          bghcPath <- case bghc of
+            Right ghc' -> pure ghc'
+            Left  bver -> do
+              spaths <- catMaybes . fmap parseAbs <$> liftIO getSearchPath
+              liftIO (searchPath spaths bver) !? NotFoundInPATH bver
+          lEM $ execLogged
+            "./configure"
+            False
+            (  maybe mempty
+                      (\x -> ["--target=" <> E.encodeUtf8 x])
+                      (_tvTarget tver)
+            ++ fmap E.encodeUtf8 aargs
+            )
+            [rel|ghc-conf|]
+            (Just workdir)
+            (Just (("GHC", toFilePath bghcPath) : cEnv))
+       | otherwise -> do
        lEM $ execLogged
          "./configure"
          False
-          (  ["--prefix=" <> toFilePath ghcdir]
-          ++ maybe mempty
-                    (\x -> ["--target=" <> E.encodeUtf8 x])
-                    (_tvTarget tver)
-          ++ fmap E.encodeUtf8 aargs
-          )
-          [rel|ghc-conf|]
-          (Just workdir)
-          (Just (("GHC", toFilePath bghcPath) : cEnv))
-      | otherwise -> do
-        lEM $ execLogged
-          "./configure"
-          False
-          (  [ "--prefix=" <> toFilePath ghcdir
-             , "--with-ghc=" <> either toFilePath toFilePath bghc
+          (  [ "--with-ghc=" <> either toFilePath toFilePath bghc
             ]
          ++ maybe mempty
                   (\x -> ["--target=" <> E.encodeUtf8 x])
@@ -1244,9 +1307,10 @@ Stage1Only = YES|]
      . B16.encode
      . SHA256.hashlazy
      $ c
+    cTime <- liftIO getCurrentTime
    tarName <-
      parseRel
-        [i|ghc-#{tVerToText tver}-#{pfReqToString pfreq}-#{cDigest}.tar#{takeExtension (toFilePath tar)}|]
+        [i|ghc-#{tVerToText tver}-#{pfReqToString pfreq}-#{iso8601Show cTime}-#{cDigest}.tar#{takeExtension (toFilePath tar)}|]
    let tarPath = cacheDir </> tarName
    handleIO (throwE . CopyError . show) $ liftIO $ copyFile (workdir </> tar)
                                                             tarPath
@@ -1272,12 +1336,12 @@ Stage1Only = YES|]
    let lines' = fmap T.strip . T.lines $ decUTF8Safe c

   -- for cross, we need Stage1Only
-    case _tvTarget tver of
-      Just _ -> when ("Stage1Only = YES" `notElem` lines') $ throwE
+    case targetGhc of
+      Left (GHCTargetVersion (Just _) _) -> when ("Stage1Only = YES" `notElem` lines') $ throwE
        (InvalidBuildConfig
          [s|Cross compiling needs to be a Stage1 build, add "Stage1Only = YES" to your config!|]
        )
-      Nothing -> pure ()
+      _ -> pure ()



@@ -1296,6 +1360,7 @@ upgradeGHCup :: ( MonadMask m
                , MonadThrow m
                , MonadResource m
                , MonadIO m
+                , MonadUnliftIO m
                )
             => GHCupDownloads
             -> Maybe (Path Abs)  -- ^ full file destination to write ghcup into
@@ -1369,4 +1434,3 @@ postGHCInstall ver@GHCTargetVersion {..} = do
    $ getMajorMinorV _tvVersion
  forM_ v' $ \(mj, mi) -> lift (getGHCForMajor mj mi _tvTarget)
    >>= mapM_ (\v -> liftE $ setGHC v SetGHC_XY)
-
--- a/lib/GHCup/Download.hs
+++ b/lib/GHCup/Download.hs
@@ -400,6 +400,7 @@ downloadCached :: ( MonadMask m
                  , MonadThrow m
                  , MonadLogger m
                  , MonadIO m
+                  , MonadUnliftIO m
                  , MonadReader AppState m
                  )
               => DownloadInfo
--- a/lib/GHCup/Errors.hs
+++ b/lib/GHCup/Errors.hs
@@ -24,6 +24,8 @@ import           GHCup.Utils.Prelude

 #if !defined(TAR)
 import           Codec.Archive
+#else
+import qualified Codec.Archive.Tar             as Tar
 #endif
 import           Control.Exception.Safe
 import           Data.ByteString                ( ByteString )
@@ -339,4 +341,14 @@ instance Pretty ArchiveResult where
  pPrint ArchiveRetry = text "Archive result: retry"
  pPrint ArchiveOk = text "Archive result: Ok"
  pPrint ArchiveEOF = text "Archive result: EOF"
+#else
+instance Pretty Tar.FormatError where
+  pPrint Tar.TruncatedArchive = text "Truncated archive"
+  pPrint Tar.ShortTrailer = text "Short trailer"
+  pPrint Tar.BadTrailer = text "Bad trailer"
+  pPrint Tar.TrailingJunk = text "Trailing junk"
+  pPrint Tar.ChecksumIncorrect = text "Checksum incorrect"
+  pPrint Tar.NotTarFormat = text "Not a tar format"
+  pPrint Tar.UnrecognisedTarFormat = text "Unrecognised tar format"
+  pPrint Tar.HeaderBadNumericEncoding = text "Header has bad numeric encoding"
 #endif
--- a/lib/GHCup/Types.hs
+++ b/lib/GHCup/Types.hs
@@ -379,6 +379,11 @@ data GHCTargetVersion = GHCTargetVersion
  }
  deriving (Ord, Eq, Show)

+data GitBranch = GitBranch
+  { ref  :: String
+  , repo :: Maybe String
+  }
+  deriving (Ord, Eq, Show)

 mkTVer :: Version -> GHCTargetVersion
 mkTVer = GHCTargetVersion Nothing
--- a/lib/GHCup/Utils.hs
+++ b/lib/GHCup/Utils.hs
@@ -187,7 +187,7 @@ rmMajorSymlinks tv@GHCTargetVersion{..} = do
    -----------------------------------


-- | Whethe the given GHC versin is installed.
+-- | Whether the given GHC versin is installed.
 ghcInstalled :: (MonadIO m, MonadReader AppState m, MonadThrow m) => GHCTargetVersion -> m Bool
 ghcInstalled ver = do
  ghcdir <- ghcupGHCDir ver
@@ -770,6 +770,15 @@ make args workdir = do
  let mymake = if has_gmake then "gmake" else "make"
  execLogged mymake True args [rel|ghc-make|] workdir Nothing

+makeOut :: [ByteString]
+        -> Maybe (Path Abs)
+        -> IO CapturedProcess
+makeOut args workdir = do
+  spaths    <- catMaybes . fmap parseAbs <$> liftIO getSearchPath
+  has_gmake <- isJust <$> liftIO (searchPath spaths [rel|gmake|])
+  let mymake = if has_gmake then [rel|gmake|] else [rel|make|]
+  liftIO $ executeOut mymake args workdir
+

 -- | Try to apply patches in order. Fails with 'PatchFailed'
 -- on first failure.
--- a/lib/GHCup/Utils/Dirs.hs
+++ b/lib/GHCup/Utils/Dirs.hs
@@ -3,6 +3,7 @@
 {-# LANGUAGE FlexibleContexts      #-}
 {-# LANGUAGE QuasiQuotes           #-}
 {-# LANGUAGE ViewPatterns          #-}
+{-# LANGUAGE TemplateHaskell       #-}

 {-|
 Module      : GHCup.Utils.Dirs
@@ -16,6 +17,7 @@ Portability : POSIX
 module GHCup.Utils.Dirs
  ( getDirs
  , ghcupConfigFile
+  , ghcupCacheDir
  , ghcupGHCBaseDir
  , ghcupGHCDir
  , mkGhcupTmpDir
@@ -35,11 +37,14 @@ import           GHCup.Utils.Prelude
 import           Control.Applicative
 import           Control.Exception.Safe
 import           Control.Monad
+import           Control.Monad.IO.Unlift
+import           Control.Monad.Logger
 import           Control.Monad.Reader
-import           Control.Monad.Trans.Resource
+import           Control.Monad.Trans.Resource hiding (throwM)
 import           Data.Bifunctor
 import           Data.ByteString                ( ByteString )
 import           Data.Maybe
+import           Data.String.Interpolate
 import           GHC.IO.Exception               ( IOErrorType(NoSuchThing) )
 import           Haskus.Utils.Variant.Excepts
 import           HPath
@@ -49,6 +54,7 @@ import           Prelude                 hiding ( abs
                                                , readFile
                                                , writeFile
                                                )
+import           System.DiskSpace                                                
 import           System.Posix.Env.ByteString    ( getEnv
                                                , getEnvDefault
                                                )
@@ -57,11 +63,13 @@ import           System.Posix.Temp.ByteString   ( mkdtemp )

 import qualified Data.ByteString.Lazy          as L
 import qualified Data.ByteString.UTF8          as UTF8
+import qualified Data.Text                     as T
 import qualified Data.Text.Encoding            as E
 import qualified Data.Yaml                     as Y
 import qualified System.Posix.FilePath         as FP
 import qualified System.Posix.User             as PU
 import qualified Text.Megaparsec               as MP
+import Control.Concurrent (threadDelay)



@@ -225,15 +233,31 @@ parseGHCupGHCDir (toFilePath -> f) = do
  throwEither $ MP.parse ghcTargetVerP "" fp


-mkGhcupTmpDir :: (MonadThrow m, MonadIO m) => m (Path Abs)
+mkGhcupTmpDir :: (MonadUnliftIO m, MonadLogger m, MonadCatch m, MonadThrow m, MonadIO m) => m (Path Abs)
 mkGhcupTmpDir = do
  tmpdir <- liftIO $ getEnvDefault "TMPDIR" "/tmp"
-  tmp    <- liftIO $ mkdtemp (tmpdir FP.</> "ghcup-")
+  let fp = T.unpack $ decUTF8Safe tmpdir
+
+  let minSpace = 5000 -- a rough guess, aight?
+  space <- handleIO (\_ -> pure Nothing) $ fmap Just $ liftIO $ getAvailSpace fp
+  when (maybe False (toBytes minSpace >) space) $ do
+    $(logWarn) [i|Possibly insufficient disk space on #{fp}. At least #{minSpace} MB are recommended, but only #{toMB (fromJust space)} are free. Consider freeing up disk space or setting TMPDIR env variable.|]
+    $(logWarn)
+      "...waiting for 10 seconds before continuing anyway, you can still abort..."
+    liftIO $ threadDelay 10000000 -- give the user a sec to intervene
+
+  tmp <- liftIO $ mkdtemp (tmpdir FP.</> "ghcup-")
  parseAbs tmp
+ where
+  toBytes mb = mb * 1024 * 1024
+  toMB b = show (truncate' (fromIntegral b / (1024 * 1024) :: Double) 2)
+  truncate' :: Double -> Int -> Double
+  truncate' x n = fromIntegral (floor (x * t) :: Integer) / t
+      where t = 10^n


-withGHCupTmpDir :: (MonadResource m, MonadThrow m, MonadIO m) => m (Path Abs)
-withGHCupTmpDir = snd <$> allocate mkGhcupTmpDir deleteDirRecursive
+withGHCupTmpDir :: (MonadUnliftIO m, MonadLogger m, MonadCatch m, MonadResource m, MonadThrow m, MonadIO m) => m (Path Abs)
+withGHCupTmpDir = snd <$> withRunInIO (\run -> run $ allocate (run mkGhcupTmpDir) deleteDirRecursive)



@@ -269,5 +293,3 @@ relativeSymlink (toFilePath -> p1) (toFilePath -> p2) =
        <> joinPath ("/" : drop (length common) d2)


-
-
--- a/lib/GHCup/Utils/File.hs
+++ b/lib/GHCup/Utils/File.hs
@@ -50,7 +50,7 @@ import           System.Posix.Directory.ByteString
 import           System.Posix.FD               as FD
 import           System.Posix.FilePath   hiding ( (</>) )
 import           System.Posix.Files.ByteString
-import           System.Posix.Foreign           ( oExcl )
+import           System.Posix.Foreign           ( oExcl, oAppend )
 import "unix"    System.Posix.IO.ByteString
                                         hiding ( openFd )
 import           System.Posix.Process           ( ProcessStatus(..) )
@@ -133,14 +133,14 @@ execLogged :: (MonadReader AppState m, MonadIO m, MonadThrow m)
           => ByteString       -- ^ thing to execute
           -> Bool             -- ^ whether to search PATH for the thing
           -> [ByteString]     -- ^ args for the thing
-           -> Path Rel         -- ^ log filename
+           -> Path Rel         -- ^ log filename (opened in append mode)
           -> Maybe (Path Abs) -- ^ optionally chdir into this
           -> Maybe [(ByteString, ByteString)] -- ^ optional environment
           -> m (Either ProcessError ())
 execLogged exe spath args lfile chdir env = do
  AppState { settings = Settings {..}, dirs = Dirs {..} } <- ask
  logfile       <- (logsDir </>) <$> parseRel (toFilePath lfile <> ".log")
-  liftIO $ bracket (createFile (toFilePath logfile) newFilePerms)
+  liftIO $ bracket (openFd (toFilePath logfile) WriteOnly [oAppend] (Just newFilePerms))
                   closeFd
                   (action verbose)
 where
--- a/lib/GHCup/Utils/Logger.hs
+++ b/lib/GHCup/Utils/Logger.hs
@@ -1,4 +1,5 @@
-{-# LANGUAGE FlexibleContexts      #-}
+{-# LANGUAGE FlexibleContexts #-}
+{-# LANGUAGE QuasiQuotes      #-}

 {-|
 Module      : GHCup.Utils.Logger
@@ -15,6 +16,8 @@ module GHCup.Utils.Logger where

 import           GHCup.Types
 import           GHCup.Utils
+import           GHCup.Utils.File
+import           GHCup.Utils.String.QQ

 import           Control.Monad
 import           Control.Monad.IO.Class
@@ -25,6 +28,7 @@ import           HPath.IO
 import           Prelude                 hiding ( appendFile )
 import           System.Console.Pretty
 import           System.IO.Error
+import           Text.Regex.Posix

 import qualified Data.ByteString               as B

@@ -64,12 +68,19 @@ myLoggerT LoggerConfig {..} loggingt = runLoggingT loggingt mylogger
    rawOutter outr


-initGHCupFileLogging :: (MonadIO m, MonadReader AppState m) => Path Rel -> m (Path Abs)
-initGHCupFileLogging context = do
+initGHCupFileLogging :: (MonadIO m, MonadReader AppState m) => m (Path Abs)
+initGHCupFileLogging = do
  AppState {dirs = Dirs {..}} <- ask
-  let logfile = logsDir </> context
+  let logfile = logsDir </> [rel|ghcup.log|]
  liftIO $ do
    createDirRecursive' logsDir
-    hideError doesNotExistErrorType $ deleteFile logfile
+    logFiles <- findFiles
+      logsDir
+      (makeRegexOpts compExtended
+                     execBlank
+                     ([s|^.*\.log$|] :: B.ByteString)
+      )
+    forM_ logFiles $ hideError doesNotExistErrorType . deleteFile . (logsDir </>)
+
    createRegularFile newFilePerms logfile
    pure logfile
--- a/lib/GHCup/Utils/MegaParsec.hs
+++ b/lib/GHCup/Utils/MegaParsec.hs
@@ -67,6 +67,15 @@ ghcTargetBinP t =
    <*> (MP.chunk t <* MP.eof)


+-- | Extracts the version from @ProjectVersion="8.10.5"@.
+ghcProjectVersion :: MP.Parsec Void Text Version
+ghcProjectVersion = do
+  _ <- MP.chunk "ProjectVersion=\""
+  ver <- parseUntil1 $ MP.chunk "\""
+  MP.setInput ver
+  version'
+
+
 -- | Extracts target triple and version from e.g.
 --   * armv7-unknown-linux-gnueabihf-8.8.3
 --   * armv7-unknown-linux-gnueabihf-8.8.3
Author	SHA1	Message	Date
Julian Ospald	5a86a28d67	Smarter logging	2021-04-29 14:47:30 +02:00
Julian Ospald	a905c6322c	Fix spelling	2021-04-29 14:47:22 +02:00
Julian Ospald	49ccadd470	Warn when overwriting current GHC due to compile	2021-04-29 14:46:45 +02:00
Julian Ospald	9f0ac0ee19	Allow to compile from git repo	2021-04-28 21:17:57 +02:00
Julian Ospald	7e0f839ff8	Fix cabal bindist on 32bit See https://github.com/haskell/cabal/issues/7313	2021-04-25 22:44:41 +02:00
Julian Ospald	1e9ee260e7	Raise minSpace to 5GB	2021-04-25 21:32:58 +02:00
Julian Ospald	0b7d447aaf	Satisfy hlint	2021-04-25 18:00:32 +02:00
Julian Ospald	16a9336d31	Fix missing pretty instance	2021-04-25 17:59:15 +02:00
Julian Ospald	7d13836fea	Warn when /tmp doesn't have 2500 or more of disk space	2021-04-25 17:25:40 +02:00
Julian Ospald	b645c4d57e	Add date to GHC bindist names created by ghcup	2021-04-24 21:51:43 +02:00
Julian Ospald	5db43cd908	Improve error printing in ghcup-gen	2021-04-24 21:51:06 +02:00
Julian Ospald	93cd421ca3	Add 9.1.1 alpha2	2021-04-23 09:43:45 +02:00
Julian Ospald	ec7130dac6	Add post-install msg to ghc-7.10.3 wrt no-pie, fixes #123	2021-04-17 19:53:18 +02:00
Julian Ospald	f2b8cc530c	Fix download URL	2021-04-13 23:58:49 +02:00
Julian Ospald	de765088d1	Merge remote-tracking branch 'origin/merge-requests/83'	2021-04-13 23:47:16 +02:00
jneira	e11188aa99	Update haskell-language-server to 1.1.0	2021-04-13 23:38:27 +02:00
Julian Ospald	0c6699c3c6	Allow to check ghcup binaries in validate-tarballs	2021-04-11 22:15:43 +02:00
Julian Ospald	c5858be6b8	Update ghcup binaries	2021-04-11 22:10:44 +02:00