fix build for ghc 9.8.1 (#386) (#387)

* fix build for ghc 9.8.1 (#386) * add information to changelog, fix some formatting and versioning (#386) * move info in changelog to a different section, add ghc 9.8.1 to github workflows (#386) * Apply suggestions from code review --------- Co-authored-by: Christian Berg <[email protected]> Co-authored-by: Matt von Hagen (Parsons) <[email protected]>
bitemyapp · Feb 9, 2024 · 30a5e80 · 30a5e80
1 parent f689e22
commit 30a5e80
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 4 deletions.
diff --git a/.github/workflows/haskell.yml b/.github/workflows/haskell.yml
@@ -32,8 +32,8 @@ jobs:
           --health-retries=3
     strategy:
       matrix:
-        cabal: ["3.8.1.0"]
-        ghc: ["8.6.5", "8.8.4", "8.10.4", "9.0.2", "9.2.2", "9.4.5", "9.6.2"]
+        cabal: ["3.10.2.1"]
+        ghc: ["8.6.5", "8.8.4", "8.10.4", "9.0.2", "9.2.2", "9.4.5", "9.6.2", "9.8.1"]
     env:
       CONFIG: "--enable-tests --enable-benchmarks "
     steps:

diff --git a/changelog.md b/changelog.md
@@ -1,3 +1,9 @@
+3.5.11.2
+========
+- @arguri
+    - [#387](https://github.com/bitemyapp/esqueleto/pull/387)
+        - Fix build for ghc 9.8.1 / template-haskell 2.18
+
 3.5.11.0
 ========
 - @9999years, @halogenandtoast

diff --git a/esqueleto.cabal b/esqueleto.cabal
@@ -2,7 +2,7 @@ cabal-version: 1.12
 
 name:           esqueleto
 
-version:        3.5.11.1
+version:        3.5.11.2
 synopsis:       Type-safe EDSL for SQL queries on persistent backends.
 description:    @esqueleto@ is a bare bones, type-safe EDSL for SQL queries that works with unmodified @persistent@ SQL backends.  Its language closely resembles SQL, so you don't have to learn new concepts, just new syntax, and it's fairly easy to predict the generated SQL and optimize it for your backend. Most kinds of errors committed when writing SQL are caught as compile-time errors---although it is possible to write type-checked @esqueleto@ queries that fail at runtime.
                 .

diff --git a/src/Database/Esqueleto/Record.hs b/src/Database/Esqueleto/Record.hs
@@ -214,7 +214,9 @@ data RecordInfo = RecordInfo
     -- cause problems, but it's easy to pass around so might as well.
     constraints :: Cxt
   , -- | The original record's type-variable-binders.
-#if MIN_VERSION_template_haskell(2,17,0)
+#if MIN_VERSION_template_haskell(2,21,0)
+    typeVarBinders :: [TyVarBndr BndrVis]
+#elif MIN_VERSION_template_haskell(2,17,0)
     typeVarBinders :: [TyVarBndr ()]
 #else
     typeVarBinders :: [TyVarBndr]