Prepare upgrading to ghc9.4

hstreamdb · Nov 24, 2023 · 60a4776 · 60a4776
1 parent 1647f31
commit 60a4776
Show file tree

Hide file tree

Showing 6 changed files with 25 additions and 9 deletions.
diff --git a/common/base/HStream/Logger.hs b/common/base/HStream/Logger.hs
@@ -1,4 +1,5 @@
 {-# LANGUAGE BangPatterns         #-}
+{-# LANGUAGE CPP                  #-}
 {-# LANGUAGE GADTs                #-}
 {-# LANGUAGE MagicHash            #-}
 {-# LANGUAGE PatternSynonyms      #-}
@@ -60,7 +61,7 @@ import           Control.Exception              (finally)
 import           Control.Monad                  (forever, when)
 import           Data.IORef                     (IORef, atomicWriteIORef,
                                                  newIORef, readIORef)
-import           Foreign.C.Types                (CInt (..))
+import           Foreign.C.Types
 import           GHC.Conc.Sync                  (ThreadId (..), myThreadId)
 import           GHC.Exts                       (ThreadId#)
 import           GHC.Stack
@@ -409,4 +410,13 @@ logBylevel flushLevel level cstack s = do
 
 -------------------------------------------------------------------------------
 
+-- this cannot be capi, as GHC panics.
+#if __GLASGOW_HASKELL__ >= 904
+-- https://gitlab.haskell.org/ghc/ghc/-/merge_requests/6163
+foreign import ccall unsafe "rts_getThreadId" getThreadId :: ThreadId# -> CULLong
+#elif __GLASGOW_HASKELL__ >= 900
+-- https://gitlab.haskell.org/ghc/ghc/-/merge_requests/1254
+foreign import ccall unsafe "rts_getThreadId" getThreadId :: ThreadId# -> CLong
+#else
 foreign import ccall unsafe "rts_getThreadId" getThreadId :: ThreadId# -> CInt
+#endif
diff --git a/common/hstream/hstream-common.cabal b/common/hstream/hstream-common.cabal
@@ -94,7 +94,7 @@ library
     , hsc2hs:hsc2hs
 
   build-depends:
-    , aeson                 >=1.5   && <2.0 || ^>=2.0
+    , aeson                 >=1.5   && <2.0 || ^>=2.1
     , ansi-terminal
     , async
     , attoparsec

diff --git a/hstream-sql/hstream-sql.cabal b/hstream-sql/hstream-sql.cabal
@@ -135,7 +135,7 @@ library
     , rio
     , scientific
     , string-random
-    , text                  ^>=1.2
+    , text
     , time                  >=1.9.1 && <2
     , time-compat
     , unordered-containers

diff --git a/hstream-store/HStream/Store/Internal/LogDevice/LogConfigTypes.hs b/hstream-store/HStream/Store/Internal/LogDevice/LogConfigTypes.hs
@@ -29,6 +29,9 @@ import           GHC.Stack                                      (HasCallStack,
 import qualified Z.Data.CBytes                                  as CBytes
 import           Z.Data.CBytes                                  (CBytes)
 import qualified Z.Foreign                                      as Z
+#if __GLASGOW_HASKELL__ >= 904
+import           GHC.Exts                                       (ArrayArray# (ArrayArray#))
+#endif
 
 import           HStream.Foreign
 import qualified HStream.Store.Exception                        as E

diff --git a/hstream-store/HStream/Store/Internal/LogDevice/Writer.hs b/hstream-store/HStream/Store/Internal/LogDevice/Writer.hs
@@ -33,6 +33,9 @@ import           Z.Data.CBytes                  (CBytes)
 import qualified Z.Data.Vector                  as V
 import           Z.Data.Vector                  (Bytes)
 import qualified Z.Foreign                      as Z
+#if __GLASGOW_HASKELL__ >= 904
+import           GHC.Exts                       (ArrayArray# (ArrayArray#))
+#endif
 
 import qualified HStream.Store.Exception        as E
 import           HStream.Store.Internal.Foreign

diff --git a/hstream-store/hstream-store.cabal b/hstream-store/hstream-store.cabal
@@ -80,18 +80,18 @@ library
     HStream.Store.Stream
 
   build-depends:
-    , base                 >=4.13   && <5
-    , bytestring           >=0.10   && <0.12
+    , base                 >=4.13  && <5
+    , bytestring           >=0.10  && <0.12
     , cache                ^>=0.1
     , containers           ^>=0.6
     , data-default         ^>=0.7
-    , filepath             ^>=1.4.2
-    , ghc-prim             >=0.5    && <1.0
-    , hashable             >=1.3.5  && <1.5
+    , filepath
+    , ghc-prim             >=0.5   && <1.0
+    , hashable             >=1.3.5 && <1.5
     , hstream-common-base
     , primitive            ^>=0.7
     , text
-    , vector               >=0.12   && <0.14
+    , vector               >=0.12  && <0.14
     , vector-algorithms    ^>=0.9
     , Z-Data