chore: upgrade to GHC 9.10.1

Note that Protolude upstream doesn't support GHC 9.10, so we use a (hopefully temporary) fork. Temporary workarounds required: * Disable `hlint`: ndmitchell/hlint#1594 * Disable `cabal-fmt`: input-output-hk/haskell.nix#2205 Signed-off-by: Drew Hess <[email protected]>
hackworthltd · Jul 18, 2024 · 226069b · 226069b
1 parent e7be104
commit 226069b
Show file tree

Hide file tree

Showing 9 changed files with 57 additions and 46 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/docs/haskell-style-guide.md b/docs/haskell-style-guide.md
@@ -100,7 +100,7 @@ import Foreword
 * We can't make promises on backward compatibility with GHC releases older than the one we're currently using to develop the project, but we won't break compatibility arbitrarily.
 * We will make a best-effort attempt to test all supported GHC versions in CI.
 * As a general rule, we would like to avoid CPP-style conditional compilation, except as a last resort.
-* We expect the 1.0 release of the project to have a minimum requirement of at least [GHC `9.6.1`](https://www.haskell.org/ghc/download_ghc_9_6_1.html), as we want to take advantage of that version's support for [JavaScript](https://ghc.gitlab.haskell.org/ghc/doc/users_guide/javascript.html) and [WebAssembly](https://ghc.gitlab.haskell.org/ghc/doc/users_guide/wasm.html?highlight=wasm) targets.
+* We expect the 1.0 release of the project to have a minimum requirement of at least [GHC `9.10.1`](https://www.haskell.org/ghc/download_ghc_9_6_1.html), as we want to take advantage of that version's support for [JavaScript](https://ghc.gitlab.haskell.org/ghc/doc/users_guide/javascript.html) and [WebAssembly](https://ghc.gitlab.haskell.org/ghc/doc/users_guide/wasm.html?highlight=wasm) targets.
 * We do not plan to support Haskell implementations other than GHC.
 
 ## Spelling & grammar

diff --git a/flake.lock b/flake.lock
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.
@@ -62,7 +62,7 @@
         inputs.self.overlays.default
       ];
 
-      # cabal-fmt needs an override for GHC 9.8.1.
+      # cabal-fmt needs an override for GHC > 9.8.1.
       cabal-fmt-override = {
         version = "latest";
         cabalProject = ''
@@ -299,30 +299,40 @@
               ];
 
               haskellNixTools = pkgs.haskell-nix.tools ghcVersion {
-                hlint = "latest";
+                # Disabled for GHC 9.10.
+                # https://github.com/ndmitchell/hlint/pull/1594
+                #hlint = "latest";
                 fourmolu = fourmoluVersion;
-                cabal-fmt = cabal-fmt-override;
+
+                # Disabled for GHC 9.10.
+                # https://github.com/input-output-hk/haskell.nix/issues/2205
+                #cabal-fmt = cabal-fmt-override;
               };
             in
             {
               projectRootFile = "flake.nix";
 
-              programs.hlint = {
-                enable = true;
-                package = haskellNixTools.hlint;
-              };
-              programs.cabal-fmt = {
-                enable = true;
-                package = haskellNixTools.cabal-fmt;
-              };
+              # Disabled for GHC 9.10.
+              # programs.hlint = {
+              #   enable = true;
+              #   package = haskellNixTools.hlint;
+              # };
+
+              # Disabled for GHC 9.10.
+              # programs.cabal-fmt = {
+              #   enable = true;
+              #   package = haskellNixTools.cabal-fmt;
+              # };
               programs.fourmolu = {
                 enable = true;
                 package = haskellNixTools.fourmolu;
               };
               programs.nixpkgs-fmt.enable = true;
               programs.shellcheck.enable = true;
 
-              settings.formatter.hlint.excludes = haskellExcludes;
+              # Disabled for GHC 9.10.
+              #settings.formatter.hlint.excludes = haskellExcludes;
+
               settings.formatter.fourmolu.excludes = haskellExcludes;
             };
 
@@ -337,8 +347,8 @@
             wasm = pkgs.mkShell {
               packages = with inputs.ghc-wasm.packages.${system};
                 [
-                  wasm32-wasi-ghc-9_8
-                  wasm32-wasi-cabal-9_8
+                  wasm32-wasi-ghc-9_10
+                  wasm32-wasi-cabal-9_10
                   wasmtime
 
                   pkgs.gnumake
@@ -481,14 +491,17 @@
                     implicit-hie = "latest";
 
                     cabal = "latest";
-                    hlint = "latest";
+
+                    # Disabled for GHC 9.10.
+                    #hlint = "latest";
 
                     # Disabled, as it doesn't currently build with Nix.
                     #weeder = weederVersion;
 
                     fourmolu = fourmoluVersion;
 
-                    cabal-fmt = cabal-fmt-override;
+                    # Disabled for GHC 9.10.
+                    #cabal-fmt = cabal-fmt-override;
 
                     #TODO Explicitly requiring tasty-discover shouldn't be necessary - see the commented-out `build-tool-depends` in primer.cabal.
                     tasty-discover = "latest";

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