GHC 9.10

.github/workflows/CI.yaml

@@ -12,7 +12,7 @@ jobs:
     name: Nix default
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - uses: cachix/install-nix-action@v19
       - run: nix build -L
       - run: nix develop -L -c echo "All good"
@@ -22,10 +22,11 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        ghc: [ ghc8107, ghc902, ghc927, ghc945, ghc962 ]
+        ghc: [ ghc910, ghc98, ghc96 ]
+        # GHC 9.4 and earlier have issues with the `unix` package that I don't feel like figuring out
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - uses: cachix/install-nix-action@v19
       - name: nix build
         run: nix build -L .#calligraphyFor.${{ matrix.ghc }}
@@ -39,12 +40,13 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        resolver: [ nightly, lts-20, lts-19, lts-18, lts-17, lts-16, lts-15 ]
-        os: [ macos-latest, ubuntu-latest ]
+        resolver: [ nightly, lts-23, lts-22, lts-21, lts-20, lts-19, lts-18, lts-17, lts-16, lts-15 ]
+        # macos-13 is a workaround for https://github.com/haskell-actions/setup/issues/77
+        os: [ macos-13, ubuntu-latest ]
     runs-on: ${{ matrix.os }}
     steps:
-      - uses: actions/checkout@v3
-      - uses: haskell/actions/setup@v2
+      - uses: actions/checkout@v4
+      - uses: haskell-actions/setup@v2
         with:
           enable-stack: true
       - run: stack init --resolver ${{ matrix.resolver }}
@@ -57,12 +59,12 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        ghc: [ '8.8.4', '8.10.7', '9.0.2', '9.2.7', '9.4.5', '9.6.2' ]
-        os: [ ubuntu-latest, macos-latest ]
+        ghc: [ '8.8.4', '8.10.7', '9.0.2', '9.2.8', '9.4.8', '9.6.6', '9.8.4', '9.10.1' ]
+        os: [ ubuntu-latest, macos-13 ]
     runs-on: ${{ matrix.os }}
     steps:
-      - uses: actions/checkout@v3
-      - uses: haskell/actions/setup@v2
+      - uses: actions/checkout@v4
+      - uses: haskell-actions/setup@v2
         with:
           ghc-version: ${{ matrix.ghc }}
       - uses: actions/cache@v3

CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## 0.1.7
+### [Added]
+- [#46] GHC 9.8, 9.10 support
+
 ## 0.1.6
 ### [Changed]
 - Internal change; partially undid the Prelude structure implemented in [#22] and [#27], since it was causing issues (see [#32])

calligraphy.cabal

@@ -1,14 +1,21 @@
 cabal-version:   2.4
 name:            calligraphy
-version:         0.1.6
+version:         0.1.7
 license:         BSD-3-Clause
 build-type:      Simple
 license-file:    LICENSE
 author:          Jonas Carpay
 maintainer:      Jonas Carpay <jonascarpay@gmail.com>
 copyright:       2022 Jonas Carpay
 tested-with:
-  GHC ==8.8.4 || ==8.10.7 || ==9.0.2 || ==9.2.7 || ==9.4.5 || ==9.6.2
+  GHC ==8.8.4
+   || ==8.10.7
+   || ==9.0.2
+   || ==9.2.8
+   || ==9.4.8
+   || ==9.6.6
+   || ==9.8.4
+   || ==9.10.1
 
 extra-doc-files:
   CHANGELOG.md

flake.nix

@@ -1,7 +1,7 @@
 {
   description = "calligraphy";
 
-  inputs.nixpkgs.url = "github:NixOS/nixpkgs/release-23.05";
+  inputs.nixpkgs.url = "github:NixOS/nixpkgs/release-24.11";
   inputs.flake-utils.url = "github:numtide/flake-utils";
 
   outputs = inputs:
@@ -22,12 +22,14 @@
         let
 
           per-compiler = f: pkgs.lib.genAttrs [
-            "ghc962"
-            "ghc945"
-            "ghc927"
-            "ghc902"
-            "ghc8107"
-            "ghc884"
+            "ghc910"
+            "ghc98"
+            "ghc96"
+            "ghc94"
+            "ghc92"
+            "ghc90"
+            "ghc810"
+            "ghc88"
           ]
             (ghc: f pkgs.haskell.packages.${ghc});
 

src/Calligraphy/Phases/Parse.hs

@@ -102,7 +102,7 @@
   rs
 
 ghcNameKey :: GHC.Name -> GHCKey
-ghcNameKey = GHCKey . GHC.getKey . GHC.nameUnique
+ghcNameKey = GHCKey . fromIntegral . GHC.getKey . GHC.nameUnique
 
 newtype ParsePhaseDebugInfo = ParsePhaseDebugInfo {modulesLexTrees :: [(String, LexTree Loc RawDecl)]}
 
@@ -226,11 +226,11 @@
 
     typeMap = resolveTypes typeArr
 
     ignoreNode nodeInfo = any ($ nodeInfo) [isInstanceNode, isTypeSignatureNode, isInlineNode, isMinimalNode, isDerivingNode]
 
     go :: GHC.HieAST GHC.TypeIndex -> State Collect ()
     go node@(GHC.Node _ _ children) =
       forT_ sourceInfo node $ \nodeInfo ->
         unless (ignoreNode nodeInfo) $ do
           Foldable.forM_ (M.toList $ GHC.nodeIdentifiers nodeInfo) $ \case
             (Right name, GHC.IdentifierDetails ty info) | not (isGenerated name) -> do