Make this buildable again

cabal.project

@@ -14,3 +14,8 @@ source-repository-package
   type: git
   location: https://github.com/composewell/streamly
   tag: b8178cd08f7fc8180e4de83bde4b239cb0cfb31c
+
+source-repository-package
+  type: git
+  location: https://github.com/hasufell/tar-bytestring
+  tag: c774ebdbc75d514648c8d4993abd188103182513

cabal.project.freeze

@@ -0,0 +1,169 @@
+constraints: any.Cabal ==2.4.0.1,
+             any.HUnit ==1.6.0.0,
+             any.HsOpenSSL ==0.11.4.17,
+             HsOpenSSL -fast-bignum -homebrew-openssl -macports-openssl -old-locale,
+             any.IfElse ==0.85,
+             any.QuickCheck ==2.13.2,
+             QuickCheck +templatehaskell,
+             any.StateVar ==1.2,
+             any.abstract-deque ==0.3,
+             abstract-deque -usecas,
+             any.aeson ==1.4.6.0,
+             aeson -bytestring-builder -cffi -developer -fast,
+             any.ansi-terminal ==0.10.3,
+             ansi-terminal -example,
+             any.array ==0.5.3.0,
+             any.ascii-string ==1.0.1.4,
+             any.async ==2.2.2,
+             async -bench,
+             any.atomic-primops ==0.8.3,
+             atomic-primops -debug,
+             any.attoparsec ==0.13.2.3,
+             attoparsec -developer,
+             any.base ==4.12.0.0,
+             any.base-compat ==0.11.1,
+             any.base-orphans ==0.8.2,
+             any.base-prelude ==1.3,
+             any.base64-bytestring ==1.0.0.3,
+             any.basement ==0.0.11,
+             any.bifunctors ==5.5.7,
+             bifunctors +semigroups +tagged,
+             any.binary ==0.8.6.0,
+             any.blaze-builder ==0.4.1.0,
+             any.bytestring ==0.10.8.2,
+             any.bytestring-builder ==0.10.8.2.0,
+             bytestring-builder +bytestring_has_builder,
+             any.cabal-doctest ==1.0.8,
+             any.call-stack ==0.2.0,
+             any.case-insensitive ==1.2.1.0,
+             any.cereal ==0.5.8.1,
+             cereal -bytestring-builder,
+             any.clock ==0.8,
+             clock -llvm,
+             any.colour ==2.3.5,
+             any.comonad ==5.0.6,
+             comonad +containers +distributive +test-doctests,
+             any.containers ==0.6.0.1,
+             any.contravariant ==1.5.2,
+             contravariant +semigroups +statevar +tagged,
+             any.data-default-class ==0.1.2.0,
+             any.deepseq ==1.4.4.0,
+             any.deferred-folds ==0.9.10.1,
+             any.directory ==1.3.3.0,
+             any.distributive ==0.6.1,
+             distributive +semigroups +tagged,
+             any.dlist ==0.8.0.7,
+             any.exceptions ==0.10.4,
+             exceptions +transformers-0-4,
+             any.filepath ==1.4.2.1,
+             any.focus ==1.0.1.3,
+             any.foldl ==1.4.6,
+             any.gauge ==0.2.5,
+             gauge +analysis,
+             any.generics-sop ==0.5.0.0,
+             any.ghc-boot-th ==8.6.5,
+             any.ghc-prim ==0.5.3,
+             any.hashable ==1.3.0.0,
+             hashable -examples +integer-gmp +sse2 -sse41,
+             any.heaps ==0.3.6.1,
+             any.hpath ==0.11.0,
+             any.hpath-directory ==0.13.1,
+             any.hpath-filepath ==0.10.4,
+             any.hpath-io ==0.13.1,
+             any.hpath-posix ==0.13.1,
+             any.hsc2hs ==0.68.6,
+             hsc2hs -in-ghc-tree,
+             any.hspec ==2.7.1,
+             any.hspec-core ==2.7.1,
+             any.hspec-discover ==2.7.1,
+             any.hspec-expectations ==0.8.2,
+             any.http-io-streams ==0.1.0.0,
+             any.indexed-profunctors ==0.1,
+             any.integer-gmp ==1.0.2.0,
+             any.integer-logarithms ==1.0.3,
+             integer-logarithms -check-bounds +integer-gmp,
+             any.io-streams ==1.5.1.0,
+             io-streams -nointeractivetests,
+             any.language-bash ==0.9.0,
+             any.list-t ==1.0.4,
+             any.lockfree-queue ==0.2.3.1,
+             any.math-functions ==0.3.3.0,
+             math-functions +system-erf +system-expm1,
+             any.megaparsec ==8.0.0,
+             megaparsec -dev,
+             any.mmorph ==1.1.3,
+             any.monad-control ==1.0.2.3,
+             any.mtl ==2.2.2,
+             any.mwc-random ==0.14.0.0,
+             any.network ==2.8.0.1,
+             any.network-uri ==2.6.2.0,
+             any.openssl-streams ==1.2.2.0,
+             any.optics ==0.2,
+             any.optics-core ==0.2,
+             any.optics-extra ==0.2,
+             any.optics-th ==0.2,
+             any.parsec ==3.1.13.0,
+             any.parser-combinators ==1.2.1,
+             parser-combinators -dev,
+             any.pretty ==1.1.3.6,
+             any.prettyprinter ==1.6.0,
+             prettyprinter -buildreadme,
+             any.primitive ==0.7.0.0,
+             any.primitive-extras ==0.8,
+             any.primitive-unlifted ==0.1.3.0,
+             any.process ==1.6.5.0,
+             any.profunctors ==5.5.1,
+             any.quickcheck-io ==0.2.0,
+             any.random ==1.1,
+             any.rts ==1.0,
+             any.safe-exceptions ==0.1.7.0,
+             any.scientific ==0.3.6.2,
+             scientific -bytestring-builder -integer-simple,
+             any.semigroupoids ==5.3.4,
+             semigroupoids +comonad +containers +contravariant +distributive +doctests +tagged +unordered-containers,
+             any.semigroups ==0.19.1,
+             semigroups +binary +bytestring -bytestring-builder +containers +deepseq +hashable +tagged +template-haskell +text +transformers +unordered-containers,
+             any.setenv ==0.1.1.3,
+             any.sop-core ==0.5.0.0,
+             any.splitmix ==0.0.3,
+             splitmix -optimised-mixer +random,
+             any.stm ==2.5.0.0,
+             streamly -debug -dev -examples -examples-sdl -has-llvm -inspection -no-charts -no-fusion -streamk,
+             any.streamly-bytestring ==0.1.0.1,
+             any.strict-base ==0.4.0.0,
+             any.tagged ==0.8.6,
+             tagged +deepseq +transformers,
+             any.tar-bytestring ==0.6.1.2,
+             any.template-haskell ==2.14.0.0,
+             any.text ==1.2.3.1,
+             any.text-icu ==0.7.0.1,
+             any.text-short ==0.1.3,
+             text-short -asserts,
+             any.tf-random ==0.5,
+             any.th-abstraction ==0.3.2.0,
+             any.time ==1.8.0.2,
+             any.time-compat ==1.9.2.2,
+             time-compat -old-locale,
+             any.transformers ==0.5.6.2,
+             any.transformers-base ==0.4.5.2,
+             transformers-base +orphaninstances,
+             any.transformers-compat ==0.6.5,
+             transformers-compat -five +five-three -four +generic-deriving +mtl -three -two,
+             any.typed-process ==0.2.6.0,
+             any.unix ==2.7.2.2,
+             any.unix-bytestring ==0.3.7.3,
+             any.unliftio-core ==0.1.2.0,
+             any.unordered-containers ==0.2.10.0,
+             unordered-containers -debug,
+             any.url ==2.1.3,
+             any.utf8-string ==1.0.1.1,
+             any.uuid-types ==1.0.3,
+             any.vector ==0.12.1.2,
+             vector +boundschecks -internalchecks -unsafechecks -wall,
+             any.vector-builder ==0.3.8,
+             any.vector-th-unbox ==0.2.1.7,
+             any.versions ==3.5.3,
+             any.word8 ==0.1.3,
+             any.zlib ==0.6.2.1,
+             zlib -non-blocking-ffi -pkg-config,
+             any.zlib-bindings ==0.1.1.5

ghcup.cabal

@@ -28,9 +28,10 @@ common base { build-depends: base >= 4.12 && < 5 }
 common bytestring { build-depends: bytestring >= 0.10 }
 common containers { build-depends: containers >= 0.6 }
 common generics-sop { build-depends: generics-sop >= 0.5 }
-common hpath { build-depends: hpath >= 0.10.1 }
+common hpath { build-depends: hpath >= 0.11 }
-common hpath-filepath { build-depends: hpath-filepath >= 0.10 }
+common hpath-filepath { build-depends: hpath-filepath >= 0.10.3 }
-common hpath-io { build-depends: hpath-io >= 0.10.1 }
+common hpath-io { build-depends: hpath-io >= 0.13.1 }
+common hpath-posix { build-depends: hpath-posix >= 0.11.1 }
 common http-io-streams { build-depends: http-io-streams >= 0.1 }
 common io-streams { build-depends: io-streams >= 1.5 }
 common language-bash { build-depends: language-bash >= 0.9 }
@@ -80,6 +81,7 @@ library
                      , hpath
                      , hpath-filepath
                      , hpath-io
+                     , hpath-posix
                      , http-io-streams
                      , io-streams
                      , language-bash

lib/GHCup.hs

@@ -49,7 +49,7 @@ import           System.Posix.Temp.ByteString
 import "unix"    System.Posix.IO.ByteString
                                          hiding ( fdWrite )
 import           System.Posix.FD               as FD
-import           System.Posix.Directory.Foreign ( oTrunc )
+import           System.Posix.Foreign           ( oTrunc )
 import qualified Data.ByteString               as B
 import           OpenSSL                        ( withOpenSSL )
 import qualified Data.ByteString.Char8         as C

lib/GHCup/File.hs

@@ -17,7 +17,7 @@ import           Control.Monad
 import           Control.Exception.Safe
 import           Data.Functor
 import           System.Posix.Files.ByteString
-import           System.Posix.Directory.Foreign ( oExcl )
+import           System.Posix.Foreign           ( oExcl )
 import           System.IO
 import "unix"    System.Posix.IO.ByteString
                                          hiding ( openFd )
@@ -149,8 +149,5 @@ captureOutStreams action =
 
 -- | Create a new regular file in write-only mode. The file must not exist.
 createRegularFileFd :: FileMode -> Path b -> IO Fd
-createRegularFileFd fm dest = FD.openFd
+createRegularFileFd fm dest =
-  (toFilePath dest)
+  FD.openFd (toFilePath dest) WriteOnly [oExcl] (Just fm)
-  WriteOnly
-  [oExcl]
-  (Just fm)

lib/GHCup/Prelude.hs

@@ -74,6 +74,3 @@ handleIO' :: IOErrorType -> (IOException -> IO ()) -> IO () -> IO ()
 handleIO' err handler =
   handleIO (\e -> if err == ioeGetErrorType e then handler e else ioError e)
 
-hideError :: IOErrorType -> IO () -> IO ()
-hideError err = handleIO (\e -> if err == ioeGetErrorType e then pure () else ioError e)
-