Allow building with GHC 9.12

ku-fpg · Dec 28, 2024 · 05540af · 05540af
1 parent 7530e3b
commit 05540af
Show file tree

Hide file tree

Showing 5 changed files with 42 additions and 14 deletions.
diff --git a/.github/workflows/haskell-ci.yml b/.github/workflows/haskell-ci.yml
@@ -28,6 +28,11 @@ jobs:
     strategy:
       matrix:
         include:
+          - compiler: ghc-9.12.1
+            compilerKind: ghc
+            compilerVersion: 9.12.1
+            setup-method: ghcup
+            allow-failure: false
           - compiler: ghc-9.10.1
             compilerKind: ghc
             compilerVersion: 9.10.1
@@ -217,6 +222,15 @@ jobs:
           if [ $((HCNUMVER >= 80200)) -ne 0 ] ; then echo "package wiki-suite" >> cabal.project ; fi
           if [ $((HCNUMVER >= 80200)) -ne 0 ] ; then echo "    ghc-options: -Werror=missing-methods" >> cabal.project ; fi
           cat >> cabal.project <<EOF
+          allow-newer: aeson:ghc-prim
+          allow-newer: aeson:template-haskell
+          allow-newer: indexed-traversable:base
+          allow-newer: indexed-traversable-instances:base
+          allow-newer: integer-conversion:base
+          allow-newer: semialign:base
+          allow-newer: these:base
+          allow-newer: uuid-types:template-haskell
+
           package blank-canvas-examples
             flags: +examples
           EOF

diff --git a/blank-canvas.cabal b/blank-canvas.cabal
@@ -53,6 +53,7 @@ tested-with:         GHC == 8.0.2
                    , GHC == 9.6.6
                    , GHC == 9.8.4
                    , GHC == 9.10.1
+                   , GHC == 9.12.1
 data-files:
     static/index.html
     static/jquery.js
@@ -81,7 +82,7 @@ Library
   default-language:    Haskell2010
   build-depends:       aeson                 >= 1.4.4   && < 2.3,
                        base64-bytestring     >= 1.0     && < 1.3,
-                       base                  >= 4.9     && < 4.21,
+                       base                  >= 4.9     && < 4.22,
                        base-compat-batteries >= 0.10    && < 0.15,
                        bytestring            >= 0.10    && < 0.13,
                        colour                >= 2.2     && < 2.4,

diff --git a/cabal.project b/cabal.project
@@ -4,3 +4,14 @@ packages: .
 
 package blank-canvas-examples
   flags: +examples
+
+-- TODO: Remove this once the ecosystem has caught up with GHC 9.12
+allow-newer:
+  aeson:ghc-prim,
+  aeson:template-haskell,
+  indexed-traversable:base,
+  indexed-traversable-instances:base,
+  integer-conversion:base,
+  semialign:base,
+  these:base,
+  uuid-types:template-haskell
diff --git a/examples/blank-canvas-examples.cabal b/examples/blank-canvas-examples.cabal
@@ -25,6 +25,7 @@ tested-with:         GHC == 8.0.2
                    , GHC == 9.6.6
                    , GHC == 9.8.4
                    , GHC == 9.10.1
+                   , GHC == 9.12.1
 data-files:
     static/data/dataURL.txt
     images/cursor.png
@@ -47,7 +48,7 @@ executable blank-canvas-example-trivial
   else
     buildable:         False
   main-is:             Main.hs
-  build-depends:       base         >= 4.9 && < 4.21,
+  build-depends:       base         >= 4.9 && < 4.22,
                        blank-canvas
   hs-source-dirs:      trivial
   default-language:    Haskell2010
@@ -60,7 +61,7 @@ executable blank-canvas-example-html5canvastutorial
     buildable:         False
   main-is:             Main.hs
   other-modules:       Paths_blank_canvas_examples
-  build-depends:       base                  >= 4.9   && < 4.21,
+  build-depends:       base                  >= 4.9   && < 4.22,
                        base-compat-batteries >= 0.10  && < 0.15,
                        blank-canvas,
                        text                  >= 1.1   && < 2.2
@@ -74,7 +75,7 @@ executable blank-canvas-example-keyread
   else
     buildable:         False
   main-is:             Main.hs
-  build-depends:       base                  >= 4.9  && < 4.21,
+  build-depends:       base                  >= 4.9  && < 4.22,
                        base-compat-batteries >= 0.10 && < 0.15,
                        blank-canvas,
                        text                  >= 1.1  && < 2.2
@@ -88,7 +89,7 @@ executable blank-canvas-example-rotate-square
   else
     buildable:         False
   main-is:             Main.hs
-  build-depends:       base         >= 4.9 && < 4.21,
+  build-depends:       base         >= 4.9 && < 4.22,
                        blank-canvas
   hs-source-dirs:      rotate-square
   default-language:    Haskell2010
@@ -100,7 +101,7 @@ executable blank-canvas-example-splat
   else
     buildable:         False
   main-is:             Main.hs
-  build-depends:       base         >= 4.9 && < 4.21,
+  build-depends:       base         >= 4.9 && < 4.22,
                        blank-canvas
   hs-source-dirs:      splat
   default-language:    Haskell2010
@@ -112,7 +113,7 @@ executable blank-canvas-example-square
   else
     buildable:         False
   main-is:             Main.hs
-  build-depends:       base         >= 4.9 && < 4.21,
+  build-depends:       base         >= 4.9 && < 4.22,
                        blank-canvas
   hs-source-dirs:      square
   default-language:    Haskell2010
@@ -124,7 +125,7 @@ executable blank-canvas-example-text
   else
     buildable:         False
   main-is:             Main.hs
-  build-depends:       base                  >= 4.9  && < 4.21,
+  build-depends:       base                  >= 4.9  && < 4.22,
                        base-compat-batteries >= 0.10 && < 0.15,
                        blank-canvas,
                        text                  >= 1.1  && < 2.2
@@ -138,7 +139,7 @@ executable blank-canvas-example-tictactoe
   else
     buildable:         False
   main-is:             Main.hs
-  build-depends:       base         >= 4.9 && < 4.21,
+  build-depends:       base         >= 4.9 && < 4.22,
                        blank-canvas,
                        containers   >= 0.5 && < 0.8,
                        text         >= 1.1 && < 2.2
@@ -153,7 +154,7 @@ executable blank-canvas-example-bounce
   else
     buildable:         False
   main-is:             Main.hs
-  build-depends:       base         >= 4.9 && < 4.21,
+  build-depends:       base         >= 4.9 && < 4.22,
                        blank-canvas,
                        streams      >= 0.1,
                        text         >= 1.1 && < 2.2
@@ -168,7 +169,7 @@ executable blank-canvas-example-audio
     buildable:         False
   main-is:             Main.hs
   other-modules:       Paths_blank_canvas_examples
-  build-depends:       base         >= 4.9 && < 4.21,
+  build-depends:       base         >= 4.9 && < 4.22,
                        blank-canvas
   hs-source-dirs:      audio
   default-language:    Haskell2010
@@ -181,7 +182,7 @@ executable blank-canvas-example-cursor
     buildable:         False
   main-is:             Main.hs
   other-modules:       Paths_blank_canvas_examples
-  build-depends:       base                  >= 4.9  && < 4.21,
+  build-depends:       base                  >= 4.9  && < 4.22,
                        base-compat-batteries >= 0.10 && < 0.15,
                        blank-canvas,
                        keys                  >= 3.10,

diff --git a/wiki-suite/wiki-suite.cabal b/wiki-suite/wiki-suite.cabal
@@ -20,11 +20,12 @@ tested-with:         GHC == 8.0.2
                    , GHC == 9.6.6
                    , GHC == 9.8.4
                    , GHC == 9.10.1
+                   , GHC == 9.12.1
 data-files:          images/Haskell.jpg
                      images/House.jpg
 
 executable wiki-suite
-    build-depends:    base                  >= 4.9  && < 4.21,
+    build-depends:    base                  >= 4.9  && < 4.22,
                       base-compat-batteries >= 0.10 && < 0.15,
                       blank-canvas,
                       containers            >= 0.5  && < 0.8,
@@ -34,7 +35,7 @@ executable wiki-suite
                       stm                   >= 2.2  && < 2.6,
                       streams               >= 0.1,
                       text                  >= 1.1  && < 2.2,
-                      time                  >= 1.4  && < 1.13,
+                      time                  >= 1.4  && < 1.15,
                       unix                  >= 2.7  && < 2.9,
                       vector                >= 0.10 && < 0.14