Allow to build with tar-bytestring on e.g. 32bit

.gitlab/script/ghcup_release.sh

@@ -17,7 +17,7 @@ ecabal update
 
 if [ "${OS}" = "LINUX" ] ; then
 	if [ "${BIT}" = "32" ] ; then
-		ecabal build -w ghc-${GHC_VERSION} --ghc-options='-split-sections -optl-static'
+		ecabal build -w ghc-${GHC_VERSION} --ghc-options='-split-sections -optl-static' -ftui -ftar
 	else
 		ecabal build -w ghc-${GHC_VERSION} --ghc-options='-split-sections -optl-static' -ftui
 	fi

app/ghcup/BrickMain.hs

@@ -1,3 +1,4 @@
+{-# LANGUAGE CPP               #-}
 {-# LANGUAGE DataKinds         #-}
 {-# LANGUAGE QuasiQuotes       #-}
 {-# LANGUAGE TypeApplications  #-}
@@ -19,7 +20,9 @@ import           Brick.Widgets.Border
 import           Brick.Widgets.Border.Style
 import           Brick.Widgets.Center
 import           Brick.Widgets.List
+#if !defined(TAR)
 import           Codec.Archive
+#endif
 import           Control.Exception.Safe
 import           Control.Monad.Logger
 import           Control.Monad.Reader
@@ -196,7 +199,23 @@ install' AppState {..} (_, ListResult {..}) = do
         . flip runReaderT settings
         . runResourceT
         . runE
-          @'[AlreadyInstalled, UnknownArchive, ArchiveResult, DistroNotFound, FileDoesNotExistError, CopyError, NoCompatibleArch, NoDownload, NotInstalled, NoCompatiblePlatform, BuildFailed, TagNotFound, DigestError, DownloadFailed, NoUpdate]
+          @'[AlreadyInstalled
+            , UnknownArchive
+#if !defined(TAR)
+            , ArchiveResult
+#endif
+            , DistroNotFound
+            , FileDoesNotExistError
+            , CopyError
+            , NoCompatibleArch
+            , NoDownload
+            , NotInstalled
+            , NoCompatiblePlatform
+            , BuildFailed
+            , TagNotFound
+            , DigestError
+            , DownloadFailed
+            , NoUpdate]
 
   (run $ do
       case lTool of

app/ghcup/Main.hs

@@ -28,7 +28,9 @@ import           GHCup.Utils.Prelude
 import           GHCup.Utils.String.QQ
 import           GHCup.Version
 
+#if !defined(TAR)
 import           Codec.Archive
+#endif
 import           Control.Exception.Safe
 #if !MIN_VERSION_base(4,13,0)
 import           Control.Monad.Fail             ( MonadFail )
@@ -909,7 +911,9 @@ Report bugs at <https://gitlab.haskell.org/haskell/ghcup-hs/issues>|]
                   . runE
                     @'[ AlreadyInstalled
                       , UnknownArchive
+#if !defined(TAR)
                       , ArchiveResult
+#endif
                       , DistroNotFound
                       , FileDoesNotExistError
                       , CopyError
@@ -969,7 +973,9 @@ Report bugs at <https://gitlab.haskell.org/haskell/ghcup-hs/issues>|]
                       , NotFoundInPATH
                       , PatchFailed
                       , UnknownArchive
+#if !defined(TAR)
                       , ArchiveResult
+#endif
                       ]
 
           let runCompileCabal =
@@ -989,7 +995,9 @@ Report bugs at <https://gitlab.haskell.org/haskell/ghcup-hs/issues>|]
                       , NotInstalled
                       , PatchFailed
                       , UnknownArchive
+#if !defined(TAR)
                       , ArchiveResult
+#endif
                       ]
 
           let runUpgrade =

ghcup.cabal

@@ -31,6 +31,11 @@ flag internal-downloader
   default:     False
   manual:      True
 
+flag tar
+  description: Use tar-bytestring instead of libarchive
+  default:     False
+  manual:      True
+
 common HsOpenSSL
   build-depends: HsOpenSSL >=0.11.4.18
 
@@ -169,6 +174,9 @@ common table-layout
 common template-haskell
   build-depends: template-haskell >=2.7
 
+common tar-bytestring
+  build-depends: tar-bytestring >=0.6.3.1
+
 common terminal-progress-bar
   build-depends: terminal-progress-bar >=0.4.1
 
@@ -253,7 +261,6 @@ library
     , hpath-filepath
     , hpath-io
     , hpath-posix
-    , libarchive
     , lzma
     , megaparsec
     , monad-logger
@@ -315,13 +322,21 @@ library
 
   if flag(internal-downloader)
     import:
-      , HsOpenSSL
+        HsOpenSSL
       , http-io-streams
       , io-streams
       , terminal-progress-bar
     exposed-modules: GHCup.Download.IOStreams
     cpp-options:     -DINTERNAL_DOWNLOADER
 
+  if flag(tar)
+    import:
+        tar-bytestring
+    cpp-options:     -DTAR
+  else
+    import:
+        libarchive
+
 executable ghcup
   import:
     config
@@ -331,7 +346,6 @@ executable ghcup
     , haskus-utils-variant
     , hpath
     , hpath-io
-    , libarchive
     , megaparsec
     , monad-logger
     , mtl
@@ -368,6 +382,12 @@ executable ghcup
     other-modules: BrickMain
     cpp-options:     -DBRICK
 
+  if flag(tar)
+    cpp-options:     -DTAR
+  else
+    import:
+        libarchive
+
 executable ghcup-gen
   import:
     config

lib/GHCup.hs

@@ -27,7 +27,9 @@ import           GHCup.Utils.String.QQ
 import           GHCup.Utils.Version.QQ
 import           GHCup.Version
 
+#if !defined(TAR)
 import           Codec.Archive                  ( ArchiveResult )
+#endif
 import           Control.Applicative
 import           Control.Exception.Safe
 import           Control.Monad
@@ -97,7 +99,9 @@ installGHCBin :: ( MonadFail m
                     , NoDownload
                     , NotInstalled
                     , UnknownArchive
+#if !defined(TAR)
                     , ArchiveResult
+#endif
                     ]
                    m
                    ()
@@ -167,7 +171,9 @@ installCabalBin :: ( MonadMask m
                       , NoDownload
                       , NotInstalled
                       , UnknownArchive
+#if !defined(TAR)
                       , ArchiveResult
+#endif
                       ]
                      m
                      ()
@@ -613,7 +619,9 @@ compileGHC :: ( MonadMask m
                  , NotFoundInPATH
                  , PatchFailed
                  , UnknownArchive
+#if !defined(TAR)
                  , ArchiveResult
+#endif
                  ]
                 m
                 ()
@@ -792,7 +800,9 @@ compileCabal :: ( MonadReader Settings m
                    , NotInstalled
                    , PatchFailed
                    , UnknownArchive
+#if !defined(TAR)
                    , ArchiveResult
+#endif
                    ]
                   m
                   ()

lib/GHCup/Utils.hs

@@ -24,7 +24,9 @@ import           GHCup.Utils.MegaParsec
 import           GHCup.Utils.Prelude
 import           GHCup.Utils.String.QQ
 
+#if !defined(TAR)
 import           Codec.Archive
+#endif
 import           Control.Applicative
 import           Control.Exception.Safe
 import           Control.Monad
@@ -59,13 +61,18 @@ import           System.Posix.Files.ByteString  ( readSymbolicLink )
 import           Text.Regex.Posix
 import           URI.ByteString
 
+#if defined(TAR)
+import qualified Codec.Archive.Tar             as Tar
+#endif
 import qualified Codec.Compression.BZip        as BZip
 import qualified Codec.Compression.GZip        as GZip
 import qualified Codec.Compression.Lzma        as Lzma
 import qualified Data.ByteString               as B
 import qualified Data.ByteString.Lazy          as BL
 import qualified Data.Map.Strict               as Map
+#if !defined(TAR)
 import qualified Data.Text                     as T
+#endif
 import qualified Data.Text.Encoding            as E
 import qualified Text.Megaparsec               as MP
 
@@ -312,17 +319,30 @@ getLatestGHCFor major' minor' dls = do
 unpackToDir :: (MonadLogger m, MonadIO m, MonadThrow m)
             => Path Abs       -- ^ destination dir
             -> Path Abs       -- ^ archive path
-            -> Excepts '[UnknownArchive, ArchiveResult] m ()
+            -> Excepts '[UnknownArchive
+#if !defined(TAR)
+                        , ArchiveResult
+#endif
+                        ] m ()
 unpackToDir dest av = do
   fp <- (decUTF8Safe . toFilePath) <$> basename av
   let dfp = decUTF8Safe . toFilePath $ dest
   lift $ $(logInfo) [i|Unpacking: #{fp} to #{dfp}|]
   fn <- toFilePath <$> basename av
 
+#if defined(TAR)
+  let untar :: MonadIO m => BL.ByteString -> Excepts '[] m ()
+      untar = liftIO . Tar.unpack (toFilePath dest) . Tar.read
+#else
   let untar :: MonadIO m => BL.ByteString -> Excepts '[ArchiveResult] m ()
       untar = lEM . liftIO . runArchiveM . unpackToDirLazy (T.unpack . decUTF8Safe . toFilePath $ dest)
+#endif
 
+#if defined(TAR)
+      rf :: MonadIO m => Path Abs -> Excepts '[] m BL.ByteString
+#else
       rf :: MonadIO m => Path Abs -> Excepts '[ArchiveResult] m BL.ByteString
+#endif
       rf = liftIO . readFile
 
   -- extract, depending on file extension