Update tools for ghc 9.10

tbidne · Nov 7, 2024 · 6ac9aa6 · 6ac9aa6
1 parent e294a6f
commit 6ac9aa6
Show file tree

Hide file tree

Showing 4 changed files with 58 additions and 30 deletions.
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -4,6 +4,7 @@ on:
   push:
     branches:
       - main
+      - ghc-9.10
 
   pull_request:
     branches:

diff --git a/README.md b/README.md
@@ -3,7 +3,7 @@
 # nix-hs-tools
 
 [![GitHub release (latest SemVer)](https://img.shields.io/github/v/tag/tbidne/nix-hs-tools?include_prereleases&sort=semver)](https://github.com/tbidne/nix-hs-tools/releases/)
-![haskell](https://img.shields.io/static/v1?label=&message=9.8&logo=haskell&logoColor=655889&labelColor=2f353e&color=655889)
+![haskell](https://img.shields.io/static/v1?label=&message=9.10&logo=haskell&logoColor=655889&labelColor=2f353e&color=655889)
 [![ci](http://img.shields.io/github/actions/workflow/status/tbidne/nix-hs-tools/ci.yaml?branch=main&logoColor=85c5e7&labelColor=2f353c)](https://github.com/tbidne/nix-hs-tools/actions/workflows/ci.yaml)
 [![MIT](https://img.shields.io/github/license/tbidne/nix-hs-tools?color=blue)](https://opensource.org/licenses/MIT)
 
@@ -16,20 +16,20 @@
 <div align="center">
 
 ###### Haskell Formatters
-[![Static Badge](https://img.shields.io/badge/cabal--fmt-0.1.11-orange)](#cabal-fmt)
-[![Static Badge](https://img.shields.io/badge/fourmolu-0.15.0.0-orange)](#fourmolu)
-[![Static Badge](https://img.shields.io/badge/ormolu-0.7.4.0-orange)](#ormolu)
+[![Static Badge](https://img.shields.io/badge/cabal--fmt-0.1.12-orange)](#cabal-fmt)
+[![Static Badge](https://img.shields.io/badge/fourmolu-0.16.2.0-orange)](#fourmolu)
+[![Static Badge](https://img.shields.io/badge/ormolu-0.7.7.0-orange)](#ormolu)
 [![Static Badge](https://img.shields.io/badge/stylish-0.14.6.0-orange)](#stylish)
 
 ###### Haskell Linters
 [![Static Badge](https://img.shields.io/badge/hlint-3.8-orange)](#hlint)
 
 ###### Haskell Miscellaneous
-[![Static Badge](https://img.shields.io/badge/cabal--plan-0.7.3.0-orange)](#cabal-plan)
+[![Static Badge](https://img.shields.io/badge/cabal--plan-0.7.4.0-orange)](#cabal-plan)
 [![Static Badge](https://img.shields.io/badge/hie-0.1.4.0-orange)](#hie)
 
 ###### Nix Formatters
-[![Static Badge](https://img.shields.io/badge/nixfmt-unstable--2024--03--01-orange)](#nixfmt)
+[![Static Badge](https://img.shields.io/badge/nixfmt-unstable--2024--08--16-orange)](#nixfmt)
 [![Static Badge](https://img.shields.io/badge/nixpkgs--fmt-1.3.0-orange)](#nixpkgs-fmt)
 
 </div>
@@ -274,4 +274,4 @@ nix run github:tbidne/nix-hs-tools#nixpkgs-fmt
 
 **Description:** Returns the version.
 
-**Usage:** `version`.
+**Usage:** `version`.
diff --git a/flake.lock b/flake.lock
diff --git a/flake.nix b/flake.nix
@@ -16,9 +16,42 @@
         let
           hlib = pkgs.haskell.lib;
 
-          ghcVers = "ghc981";
+          # FIXME: The following issues need to be resolved before we can release:
+          #
+          # - New hlint release
+          #   - See https://github.com/ndmitchell/hlint/issues/1613
+          #
+          # - cabal-plan is broken
+          #
+          # - New stylish release
+          #   - https://github.com/haskell/stylish-haskell/issues/479
+          #
+          ghcVers = "ghc9101";
           compiler = pkgs.haskell.packages."${ghcVers}".override {
-            overrides = final: prev: { stylish-haskell = prev.stylish-haskell_0_14_6_0; };
+            overrides = final: prev: {
+              # cabal-plan needs ansi-terminal > 1.0.2. Note that all of our
+              # haskell tools are OK with the default ansi-terminal, so make
+              # sure overriding this does not destory caching for other
+              # tools.
+              ansi-terminal = prev.ansi-terminal_1_1_1;
+              ansi-terminal-types = prev.ansi-terminal-types_1_1;
+
+              # NOTE: Disabling test failures as the suite current fails
+              # due to different call stack output (i.e. it probably
+              # doesn't matter to us).
+              call-stack = hlib.dontCheck prev.call-stack;
+
+              cabal-plan = prev.cabal-plan_0_7_4_0;
+              fourmolu = prev.fourmolu_0_16_2_0;
+              # FIXME: Need a newer version of hlint for GHC 9.10
+              # (presumably 3.10). Currently waiting for this to be released
+              # to hackage, then make it to nixpkgs...
+              #
+              #     https://github.com/ndmitchell/hlint/issues/1613
+              hlint = prev.hlint_3_8;
+              ormolu = prev.ormolu_0_7_7_0;
+              stylish-haskell = prev.stylish-haskell_0_14_6_0;
+            };
           };
 
           compilerPkgs = {