Build hevm with GHC 9.8

ethereum · Dec 5, 2024 · 34cecc7 · 34cecc7
1 parent 8c95cb8
commit 34cecc7
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 15 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -106,7 +106,7 @@ jobs:
       - uses: haskell-actions/setup@v2.7.0
         id: setup
         with:
-          ghc-version: '9.6.5'
+          ghc-version: '9.8.2'
 
       - name: Extract GHC & Cabal paths
         run: |

diff --git a/flake.lock b/flake.lock
diff --git a/flake.nix b/flake.nix
@@ -47,14 +47,17 @@
         }));
 
         hspkgs = ps :
-          ps.haskellPackages.override {
+          ps.haskell.packages.ghc98.override {
             overrides = hfinal: hprev: {
-              with-utf8 =
-                if (with ps.stdenv; hostPlatform.isDarwin && hostPlatform.isx86)
-                then ps.haskell.lib.compose.overrideCabal (_ : { extraLibraries = [ps.libiconv]; }) hprev.with-utf8
-                else hprev.with-utf8;
-              # TODO: temporary fix for static build which is still on 9.4
-              witch = ps.haskell.lib.doJailbreak hprev.witch;
+              with-utf8 = ps.haskell.lib.compose.overrideCabal (drv: {
+                version = "1.1.0.0";
+                src = pkgs.fetchFromGitHub {
+                  owner = "serokell";
+                  repo = "haskell-with-utf8";
+                  rev = "cf6e31475da3d9f54439650a70170819daa35f54";
+                  sha256 = "sha256-hxUiZbbcA6RvrVgGk4Vbt/rZT6wnBF3bfYbbQflzQ24=";
+                };
+              }) hprev.with-utf8;
             };
           };
         hlib = pkgs.haskell.lib;

diff --git a/hevm.cabal b/hevm.cabal
@@ -146,7 +146,7 @@ library
     containers                        >= 0.6.0 && < 0.7,
     transformers                      >= 0.5 && < 0.7,
     tree-view                         >= 0.5 && < 0.6,
-    aeson                             >= 2.0.0 && < 2.2,
+    aeson                             >= 2.0.0 && < 2.3,
     bytestring                        >= 0.11.3.1 && < 0.12,
     scientific                        >= 0.3.6 && < 0.4,
     binary                            >= 0.8.6 && < 0.9,
@@ -231,12 +231,10 @@ common test-base
     base,
     containers,
     directory,
-    extra,
     bytestring,
     filemanip,
     filepath,
     hevm,
-    here,
     mtl,
     process,
     tasty,
@@ -284,6 +282,8 @@ test-suite test
     base16,
     binary,
     data-dword,
+    extra,
+    here,
     time,
     regex
 

diff --git a/src/EVM/Format.hs b/src/EVM/Format.hs
@@ -38,7 +38,7 @@ import EVM (traceForest, traceForest', traceContext, cheatCode)
 import EVM.ABI (getAbiSeq, parseTypeName, AbiValue(..), AbiType(..), SolError(..), Indexed(..), Event(..))
 import EVM.Dapp (DappContext(..), DappInfo(..), findSrc, showTraceLocation)
 import EVM.Expr qualified as Expr
-import EVM.Solidity (SolcContract(..), Method(..), contractName, abiMap)
+import EVM.Solidity (SolcContract(..), Method(..))
 import EVM.Types
 
 import Control.Arrow ((>>>))