Fix compile on ghc 9.4

smucclaw · Sep 20, 2023 · 1eb299b · 1eb299b
1 parent 318b710
commit 1eb299b
Show file tree

Hide file tree

Showing 6 changed files with 19 additions and 10 deletions.
diff --git a/.github/workflows/build-all-versions.yml b/.github/workflows/build-all-versions.yml
@@ -66,7 +66,7 @@ jobs:
     strategy:
       matrix:
         stack: ["latest"]
-        ghc: ["7.10.3","8.0.2", "8.2.2", "8.4.4", "8.6.5", "8.8.4", "8.10.7", "9.0.2"]
+        ghc: ["7.10.3","8.0.2", "8.2.2", "8.4.4", "8.6.5", "8.8.4", "8.10.7", "9.0.2", "9.2.8", "9.4.7"]
         # ghc: ["8.8.3"]
 
     steps:

diff --git a/src/runtime/haskell/Data/Binary/Builder.hs b/src/runtime/haskell/Data/Binary/Builder.hs
@@ -75,12 +75,12 @@ import qualified Data.ByteString.Internal as S
 
 #if defined(__GLASGOW_HASKELL__) && !defined(__HADDOCK__)
 import GHC.Base(Int(..),uncheckedShiftRL# )
-import GHC.Word (Word32(..),Word16(..),Word64(..))
+import GHC.Word
 
 #if MIN_VERSION_base(4,16,0)
 import GHC.Exts (wordToWord16#, word16ToWord#, wordToWord32#, word32ToWord#)
 #endif
-#if WORD_SIZE_IN_BITS < 64 && __GLASGOW_HASKELL__ >= 608
+#if WORD_SIZE_IN_BITS < 64 && (__GLASGOW_HASKELL__ >= 608)
 import GHC.Word (uncheckedShiftRL64#)
 #endif
 #endif
@@ -433,7 +433,7 @@ foreign import ccall unsafe "stg_uncheckedShiftRL64"
 #endif
 
 #else
-shiftr_w64 (W64# w) (I# i) = W64# (w `uncheckedShiftRL#` i)
+shiftr_w64 (W64# w) (I# i) = W64# (w `uncheckedShiftRL64#` i)
 #endif
 
 #else

diff --git a/src/runtime/haskell/Data/Binary/Get.hs b/src/runtime/haskell/Data/Binary/Get.hs
@@ -553,7 +553,7 @@ foreign import ccall unsafe "stg_uncheckedShiftL64"
 #endif
 
 #else
-shiftl_w64 (W64# w) (I# i) = W64# (w `uncheckedShiftL#` i)
+shiftl_w64 (W64# w) (I# i) = W64# (w `uncheckedShiftL64#` i)
 #endif
 
 #else

diff --git a/stack-ghc9.2.4.yaml → stack-ghc9.2.8.yaml b/stack-ghc9.2.4.yaml → stack-ghc9.2.8.yaml
@@ -1,4 +1,4 @@
-resolver: nightly-2022-09-30 # GHC-9.2.4
+resolver: lts-20.26 # GHC-9.2.8
 
 extra-deps:
 - multipart-0.2.0@sha256:b8770e3ff6089be4dd089a8250894b31287cca671f3d258190a505f9351fa8a9,1084

diff --git a/stack-ghc9.4.7.yaml b/stack-ghc9.4.7.yaml
@@ -0,0 +1,7 @@
+resolver: lts-21.12 # GHC-9.4.7
+
+extra-deps:
+- multipart-0.2.0@sha256:b8770e3ff6089be4dd089a8250894b31287cca671f3d258190a505f9351fa8a9,1084
+- cgi-3001.5.0.0@sha256:3d1193a328d5f627a021a0ef3927c1ae41dd341e32dba612fed52d0e3a6df056,2990
+
+allow-newer: true
diff --git a/stack.yaml b/stack.yaml
@@ -1,11 +1,13 @@
-# This default stack file is a copy of stack-ghc8.10.7.yaml
+# This default stack file is a copy of stack-ghc9.4.7.yaml
 # But committing a symlink can be problematic on Windows, so it's a real copy.
 # See: https://github.com/GrammaticalFramework/gf-core/pull/106
-resolver: lts-18.27 # ghc 8.10.7
+resolver: lts-21.12
 
 extra-deps:
-- network-2.6.3.6
-- httpd-shed-0.4.0.3
+- multipart-0.2.0@sha256:b8770e3ff6089be4dd089a8250894b31287cca671f3d258190a505f9351fa8a9,1084
+- cgi-3001.5.0.0@sha256:3d1193a328d5f627a021a0ef3927c1ae41dd341e32dba612fed52d0e3a6df056,2990
+
+allow-newer: true
 
 # flags:
 #   gf: