update ghc and fix the records error fr this time

ElaraLang · Oct 16, 2024 · 48c8980 · 48c8980
1 parent 2cd90df
commit 48c8980
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 33 deletions.
diff --git a/flake.lock b/flake.lock
diff --git a/flake.nix b/flake.nix
@@ -28,7 +28,7 @@
 
           autoWire = [ "packages" "apps" "checks" ]; # Wire all but the devShell
 
-          basePackages = pkgs.haskell.packages.ghc94;
+          basePackages = pkgs.haskell.packages.ghc98;
 
           devShell = {
             tools = hp: {
@@ -42,7 +42,7 @@
             # fourmolu.source = "0.11.0.0";
             hedgehog.source = "1.4";
             tasty-hedgehog.source = "1.4.0.2";
-
+            hlint.source = "3.8";
           };
 
           settings = {

diff --git a/src/JVM/Data/Abstract/Builder/Code.hs b/src/JVM/Data/Abstract/Builder/Code.hs
@@ -1,3 +1,4 @@
+{-# LANGUAGE DisambiguateRecordFields #-}
 {-# LANGUAGE LambdaCase #-}
 {-# LANGUAGE TemplateHaskell #-}
 
@@ -6,7 +7,7 @@ module JVM.Data.Abstract.Builder.Code where
 import Data.TypeMergingList (TypeMergingList)
 import Data.TypeMergingList qualified as TML
 import JVM.Data.Abstract.Builder.Label
-import JVM.Data.Abstract.ClassFile.Method hiding (code)
+import JVM.Data.Abstract.ClassFile.Method (CodeAttribute)
 import JVM.Data.Abstract.Instruction
 import Polysemy
 import Polysemy.State