chore: upgrade to GHC 9.10.1

Note that Protolude upstream doesn't support GHC 9.10, so we use a (hopefully temporary) fork. Signed-off-by: Drew Hess <[email protected]>
hackworthltd · Jul 18, 2024 · e27bf64 · e27bf64
1 parent e7be104
commit e27bf64
Show file tree

Hide file tree

Showing 7 changed files with 15 additions and 17 deletions.
diff --git a/cabal.project b/cabal.project
@@ -30,17 +30,7 @@ haddock-quickjump:        True
 haddock-hyperlink-source: True
 haddock-internal:         True
 
-allow-newer:
-  , hedgehog-classes:hedgehog
-  , hedgehog-classes:pretty-show
-  , hedgehog:pretty-show
-  , logging-effect:base
-  , refined:base
-  , refined:deepseq
-  , refined:template-haskell
-  , refined:aeson
-  , these-skinny:base
-  , selda:bytestring
+allow-newer: all
 
 package *
   ghc-options: -fwrite-ide-info
@@ -58,6 +48,14 @@ if arch(wasm32)
   package tasty
     flags: -unix
 
+-- Protolude upstream doesn't support GHC 9.10, and appears to
+ -- be dormant.
+ source-repository-package
+   type: git
+   location: https://github.com/tomjaguarpaw/protolude
+   tag: 57ffd726d9685a862df8c9773f3eb09de2b89594
+   --sha256: 1z9z887s4f1wv0pv3njyd8h8zgr2ha89jyvaxz3k5k3rk6h2g1cp
+
 -- 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

diff --git a/flake.nix b/flake.nix
@@ -47,7 +47,7 @@
         in
         builtins.trace "Nix Primer version is ${v}" "git-${v}";
 
-      ghcVersion = "ghc982";
+      ghcVersion = "ghc9101";
 
       # We must keep the weeder version in sync with the version of
       # GHC we're using.

diff --git a/primer-api/primer-api.cabal b/primer-api/primer-api.cabal
@@ -34,7 +34,7 @@ library
     -Wmissing-deriving-strategies -fhide-source-paths
 
   build-depends:
-    , base            >=4.12    && <4.20
+    , base            >=4.12    && <4.21
     , 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-benchmark/primer-benchmark.cabal b/primer-benchmark/primer-benchmark.cabal
@@ -41,7 +41,7 @@ library
   exposed-modules: Benchmarks
   build-depends:
     , aeson                  >=2.0      && <2.3
-    , base                   >=4.12     && <4.20
+    , base                   >=4.12     && <4.21
     , containers             >=0.6.0.1  && <0.7.0
     , criterion              ^>=1.6.0.0
     , deepseq                ^>=1.5

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.3
-    , base            >=4.12     && <4.20
+    , base            >=4.12     && <4.21
     , bytestring      >=0.10.8.2 && <0.13
     , containers      >=0.6.0.1  && <0.7.0
     , logging-effect  ^>=1.4

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.3
-    , base                       >=4.12     && <4.20
+    , base                       >=4.12     && <4.21
     , containers                 >=0.6.0.1  && <0.8
     , deriving-aeson             >=0.2      && <0.3.0
     , exceptions                 >=0.10.4   && <0.11.0

diff --git a/primer/primer.cabal b/primer/primer.cabal
@@ -110,7 +110,7 @@ library
   build-depends:
     , aeson                        >=2.0      && <2.3
     , assoc                        ^>=1.1
-    , base                         >=4.12     && <4.20
+    , base                         >=4.12     && <4.21
     , base64-bytestring            ^>=1.2.1
     , containers                   >=0.6.0.1  && <0.7.0
     , deriving-aeson               >=0.2      && <0.3.0