chore: bump to GHC 9.6.2 (#1113)

hackworthltd · Aug 23, 2023 · 2c1206b · 2c1206b · github-actions · Aug 23, 2023
2 parents 2406c9a + aaebc1a
commit 2c1206b
Show file tree

Hide file tree

Showing 14 changed files with 54 additions and 26 deletions.
diff --git a/cabal.project b/cabal.project
@@ -24,17 +24,18 @@ package primer-api
 package primer-service
   test-options: "--size-cutoff=32768"
 
--- We need a newer version of Selda than what's been released to Hackage.
+-- We need a newer version of Selda than what's been released to
+-- Hackage, plus some GHC 9.6 fixes from a community fork.
 source-repository-package
   type: git
-  location: https://github.com/valderman/selda.git
-  tag: ab9619db13b93867d1a244441bb4de03d3e1dadb
+  location: https://github.com/guibou/selda
+  tag: 54c12169ce8cd46a7b3c698f65cea55e41a13fe6
   subdir: selda
-  --sha256: 0rdpazkhx6wfxlf6izg9xzxjr9wqywzqmk0c2a23qyfvih0ylj9z
+  --sha256: 0q8m8asmb83mpa3j3adlrhc446xif7gv6lql20gv05k33lmbjfhg
 
 source-repository-package
   type: git
-  location: https://github.com/valderman/selda.git
-  tag: ab9619db13b93867d1a244441bb4de03d3e1dadb
+  location: https://github.com/guibou/selda
+  tag: 54c12169ce8cd46a7b3c698f65cea55e41a13fe6
   subdir: selda-sqlite
-  --sha256: 0rdpazkhx6wfxlf6izg9xzxjr9wqywzqmk0c2a23qyfvih0ylj9z
+  --sha256: 0q8m8asmb83mpa3j3adlrhc446xif7gv6lql20gv05k33lmbjfhg
diff --git a/flake.lock b/flake.lock
diff --git a/flake.nix b/flake.nix
@@ -40,11 +40,11 @@
         in
         builtins.trace "Nix Primer version is ${v}" "git-${v}";
 
-      ghcVersion = "ghc945";
+      ghcVersion = "ghc962";
 
       # We must keep the weeder version in sync with the version of
       # GHC we're using.
-      weederVersion = "2.5.0";
+      weederVersion = "2.6.0";
 
       # Fourmolu updates often alter formatting arbitrarily, and we want to
       # have more control over this.
@@ -243,7 +243,9 @@
           // primerFlake.packages;
 
           checks = {
-            inherit weeder openapi-validate;
+            # Disabled, as it doesn't currently build with Nix.
+            #inherit weeder;
+            inherit openapi-validate;
             inherit primer-sqitch-test-sqlite;
           }
 
@@ -464,7 +466,8 @@
                     cabal = "latest";
                     hlint = "latest";
 
-                    weeder = weederVersion;
+                    # Disabled, as it doesn't currently build with Nix.
+                    #weeder = weederVersion;
 
                     fourmolu = fourmoluVersion;
 

diff --git a/primer-api/primer-api.cabal b/primer-api/primer-api.cabal
@@ -33,7 +33,7 @@ library
     -Wmissing-deriving-strategies -fhide-source-paths
 
   build-depends:
-    , base            >=4.12    && <4.18
+    , base            >=4.12    && <4.19
     , containers      >=0.6.0.1 && <0.7.0
     , deriving-aeson  >=0.2     && <0.3.0
     , extra           >=1.7.10  && <1.8.0

diff --git a/primer-api/src/Primer/API.hs b/primer-api/src/Primer/API.hs
@@ -5,6 +5,10 @@
 {-# LANGUAGE RecordWildCards #-}
 {-# LANGUAGE TypeFamilies #-}
 
+-- Temporary workaround for GHC 9.6:
+-- https://gitlab.haskell.org/ghc/ghc/-/issues/23143
+{-# OPTIONS -Wno-redundant-constraints #-}
+
 -- | The Primer API.
 --
 -- This module defines the Primer API, which is collection of

diff --git a/primer-api/test/Tests/Database.hs b/primer-api/test/Tests/Database.hs
@@ -1,5 +1,9 @@
 {-# LANGUAGE GeneralizedNewtypeDeriving #-}
 
+-- Temporary workaround for GHC 9.6:
+-- https://gitlab.haskell.org/ghc/ghc/-/issues/23143
+{-# OPTIONS -Wno-redundant-constraints #-}
+
 module Tests.Database where
 
 import Foreword

diff --git a/primer-benchmark/primer-benchmark.cabal b/primer-benchmark/primer-benchmark.cabal
@@ -41,7 +41,7 @@ library
   exposed-modules: Benchmarks
   build-depends:
     , aeson                            >=2.0      && <2.2
-    , base                             >=4.12     && <4.18
+    , base                             >=4.12     && <4.19
     , containers                       >=0.6.0.1  && <0.7.0
     , criterion                        ^>=1.6.0.0
     , deepseq                          ^>=1.4.6.1

diff --git a/primer-selda/primer-selda.cabal b/primer-selda/primer-selda.cabal
@@ -33,7 +33,7 @@ library
 
   build-depends:
     , aeson           >=2.0      && <2.2
-    , base            >=4.12     && <4.18
+    , base            >=4.12     && <4.19
     , bytestring      >=0.10.8.2 && <0.12.0
     , containers      >=0.6.0.1  && <0.7.0
     , logging-effect  ^>=1.4

diff --git a/primer-selda/src/Primer/Database/Selda/SQLite.hs b/primer-selda/src/Primer/Database/Selda/SQLite.hs
@@ -1,6 +1,10 @@
 {-# LANGUAGE OverloadedLabels #-}
 {-# LANGUAGE UndecidableInstances #-}
 
+-- Temporary workaround for GHC 9.6:
+-- https://gitlab.haskell.org/ghc/ghc/-/issues/23143
+{-# OPTIONS -Wno-redundant-constraints #-}
+
 module Primer.Database.Selda.SQLite (
   -- * The "Database.Selda.SQLite" database adapter.
   MonadSeldaSQLiteDb,

diff --git a/primer-service/primer-service.cabal b/primer-service/primer-service.cabal
@@ -40,7 +40,7 @@ library
 
   build-depends:
     , aeson                      >=2.0      && <2.2
-    , base                       >=4.12     && <4.18
+    , base                       >=4.12     && <4.19
     , containers                 >=0.6.0.1  && <0.7
     , deriving-aeson             >=0.2      && <0.3.0
     , exceptions                 >=0.10.4   && <0.11.0
@@ -103,7 +103,7 @@ executable primer-service
     , primer-api
     , primer-selda            ^>=0.7.2
     , primer-service
-    , prometheus-client       ^>=1.1.0
+    , prometheus-client       ^>=1.1.1
     , prometheus-metrics-ghc  ^>=1.0.1.2
     , stm
     , stm-containers

diff --git a/primer/primer.cabal b/primer/primer.cabal
@@ -106,7 +106,7 @@ library
   build-depends:
     , aeson                        >=2.0     && <2.2
     , assoc                        ^>=1.1
-    , base                         >=4.12    && <4.18
+    , base                         >=4.12    && <4.19
     , containers                   >=0.6.0.1 && <0.7.0
     , deriving-aeson               >=0.2     && <0.3.0
     , exceptions                   >=0.10.4  && <0.11.0

diff --git a/primer/src/Primer/App.hs b/primer/src/Primer/App.hs
@@ -6,6 +6,10 @@
 {-# LANGUAGE UndecidableInstances #-}
 {-# LANGUAGE ViewPatterns #-}
 
+-- Temporary workaround for GHC 9.6:
+-- https://gitlab.haskell.org/ghc/ghc/-/issues/23143
+{-# OPTIONS -Wno-redundant-constraints #-}
+
 -- This module defines the high level application functions.
 
 module Primer.App (

diff --git a/primer/src/Primer/Database.hs b/primer/src/Primer/Database.hs
@@ -1,6 +1,10 @@
 {-# LANGUAGE DuplicateRecordFields #-}
 {-# LANGUAGE OverloadedLabels #-}
 
+-- Temporary workaround for GHC 9.6:
+-- https://gitlab.haskell.org/ghc/ghc/-/issues/23143
+{-# OPTIONS -Wno-redundant-constraints #-}
+
 module Primer.Database (
   SessionId,
   -- 'SessionName' is abstract. Do not export its constructors.

diff --git a/primer/test/Tests/Database.hs b/primer/test/Tests/Database.hs
@@ -1,5 +1,9 @@
 {-# LANGUAGE GeneralizedNewtypeDeriving #-}
 
+-- Temporary workaround for GHC 9.6:
+-- https://gitlab.haskell.org/ghc/ghc/-/issues/23143
+{-# OPTIONS -Wno-redundant-constraints #-}
+
 module Tests.Database where
 
 import Foreword