Bump GHC / Nix (#4)

* WIP

* Fix Diagnose errors

* Bump GHC version in GH actions

.github/workflows/lint-haskell.yml

@@ -14,7 +14,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4
-      - uses: mrkkrp/ormolu-action@v11
+      - uses: haskell-actions/run-ormolu@v14
         with:
           pattern: |
             llvm-calc/**/*.hs

.github/workflows/llvm-calc-haskell.yml

@@ -56,7 +56,7 @@ jobs:
 
       - uses: haskell-actions/setup@v2
         with:
-          ghc-version: '9.6.2'
+          ghc-version: '9.6.3'
           cabal-version: '3.10.1.0'
 
       - name: Test llvm-calc

cabal.project

@@ -5,7 +5,7 @@ packages:
   llvm-calc4/llvm-calc4.cabal,
   vendored/**/*.cabal
 
-with-compiler: ghc-9.6.2
+with-compiler: ghc-9.6.3
 
 package diagnose
   flags: +megaparsec-compat

flake.nix

@@ -11,31 +11,10 @@
       let
         pkgs = nixpkgs.legacyPackages.${system};
 
-        oldCompilerVersion = "ghc945";
-
-        # we are going to build ormolu and hlint with an old ghc that isn't
-        # broken
-        oldHaskell = pkgs.haskell // {
-          packages = pkgs.haskell.packages // {
-            "${oldCompilerVersion}" =
-              pkgs.haskell.packages."${oldCompilerVersion}".override {
-                overrides = self: super: {
-                  # On aarch64-darwin, this creates a cycle for some reason; didn't look too much into it.
-                  ghcid = pkgs.haskell.lib.dontCheck (pkgs.haskell.lib.overrideCabal super.ghcid (drv: { enableSeparateBinOutput = false; }));
-                  # has wrong version of unix-compat, so we ignore it
-                  shelly = pkgs.haskell.lib.doJailbreak super.shelly;
-                };
-
-              };
-          };
-        };
-
-        oldHaskellPackages = haskell.packages.${oldCompilerVersion};
-
         # current compiler version, ideally, we'll put everything here
         # eventually
 
-        compilerVersion = "ghc962";
+        compilerVersion = "ghc963";
 
         # fix things
         haskell = pkgs.haskell // {
@@ -72,9 +51,10 @@
 
         devShell = pkgs.mkShell {
           buildInputs = with haskellPackages; [
-            oldHaskellPackages.hlint
-            oldHaskellPackages.ormolu
-            ghcid
+            # hlint
+            # ormolu
+            # haskell-language-server # this simply does nothing atm
+            # ghcid
             cabal-fmt
             cabal-install
             ghc

llvm-calc/src/Calc/Repl.hs

@@ -43,9 +43,8 @@ repl = do
             Left bundle -> do
               Diag.printDiagnostic
                 Diag.stderr
-                True
-                True
-                4
+                Diag.WithUnicode
+                (Diag.TabSize 4)
                 Diag.defaultStyle
                 (fromErrorBundle bundle input)
               loop

llvm-calc2/src/Calc/Repl.hs

@@ -58,9 +58,8 @@ printDiagnostic :: (MonadIO m) => Diag.Diagnostic Text -> m ()
 printDiagnostic =
   Diag.printDiagnostic
     Diag.stderr
-    True
-    True
-    4
+    Diag.WithUnicode
+    (Diag.TabSize 4)
     Diag.defaultStyle
 
 -- | turn Megaparsec error + input into a Diagnostic

llvm-calc2/src/Calc/Typecheck/Error.hs

@@ -44,7 +44,7 @@ typeErrorDiagnostic ::
   Diag.Diagnostic Text
 typeErrorDiagnostic input e =
   let filename = "<repl>"
-      diag = Diag.addFile Diag.def filename (T.unpack input)
+      diag = Diag.addFile mempty filename (T.unpack input)
       report = case e of
         (PredicateIsNotBoolean _ foundType) ->
           Diag.Err