Build echidna with GHC 9.8

crytic · Dec 5, 2024 · d7da6e4 · d7da6e4
1 parent 4a38578
commit d7da6e4
Show file tree

Hide file tree

Showing 6 changed files with 24 additions and 21 deletions.
diff --git a/flake.lock b/flake.lock
diff --git a/flake.nix b/flake.nix
@@ -38,22 +38,25 @@
         ncurses-static = pkgsStatic.ncurses.override { enableStatic = true; };
 
         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;
             };
           };
 
         hevm = pkgs: pkgs.lib.pipe ((hsPkgs pkgs).callCabal2nix "hevm" (pkgs.fetchFromGitHub {
           owner = "ethereum";
           repo = "hevm";
-          rev = "443c9040f6a8bde7d8b2cfafd99c0cb7dd7d049f";
-          sha256 = "sha256-IC/q+2SJoyDansmbTHXfkKFfnhmMy97G13aTPNOkR30=";
+          rev = "53bccde13eeb6712eb9bc1d99b53529614a33690";
+          sha256 = "sha256-sd7DEWz7hrs8AO+0juFz5S7Y5l/cWmQmullFeJH7FeE=";
         }) { secp256k1 = pkgs.secp256k1; })
         ([
           pkgs.haskell.lib.compose.dontCheck
@@ -65,7 +68,7 @@
             # FIXME: figure out solc situation, it conflicts with the one from
             # solc-select that is installed with slither, disable tests in the meantime
             haskell.lib.compose.dontCheck
-            (haskell.lib.compose.addTestToolDepends [ haskellPackages.hpack slither-analyzer solc ])
+            (haskell.lib.compose.addTestToolDepends [ (hsPkgs pkgs).hpack slither-analyzer solc ])
             (haskell.lib.compose.disableCabalFlag "static")
           ]);
 
@@ -148,17 +151,17 @@
         packages.echidna-redistributable = echidnaRedistributable;
 
         devShell = with pkgs;
-          haskellPackages.shellFor {
+          (hsPkgs pkgs).shellFor {
             packages = _: [ (echidna pkgs) ];
             shellHook = ''
               hpack
             '';
             buildInputs = [
               solc
               slither-analyzer
-              haskellPackages.hlint
-              haskellPackages.cabal-install
-              haskellPackages.haskell-language-server
+              (hsPkgs pkgs).hlint
+              (hsPkgs pkgs).cabal-install
+              (hsPkgs pkgs).haskell-language-server
             ];
             withHoogle = true;
           };

diff --git a/lib/Echidna/Campaign.hs b/lib/Echidna/Campaign.hs
@@ -48,7 +48,7 @@ import Echidna.Types.Config
 import Echidna.Types.Signature (FunctionName)
 import Echidna.Types.Test
 import Echidna.Types.Test qualified as Test
-import Echidna.Types.Tx (TxCall(..), Tx(..), call)
+import Echidna.Types.Tx (TxCall(..), Tx(..))
 import Echidna.Utility (getTimestamp)
 
 instance MonadThrow m => MonadThrow (RandT g m) where

diff --git a/lib/Echidna/Exec.hs b/lib/Echidna/Exec.hs
@@ -40,7 +40,7 @@ import Echidna.Types (ExecException(..), Gas, fromEVM, emptyAccount)
 import Echidna.Types.Config (Env(..), EConfig(..), UIConf(..), OperationMode(..), OutputFormat(Text))
 import Echidna.Types.Coverage (CoverageInfo)
 import Echidna.Types.Solidity (SolConf(..))
-import Echidna.Types.Tx (TxCall(..), Tx, TxResult(..), call, dst, initialTimestamp, initialBlockNumber, getResult)
+import Echidna.Types.Tx (TxCall(..), Tx(call, dst), TxResult(..), initialTimestamp, initialBlockNumber, getResult)
 import Echidna.Utility (getTimestamp, timePrefix)
 
 -- | Broad categories of execution failures: reversions, illegal operations, and ???.

diff --git a/src/test/Common.hs b/src/test/Common.hs
@@ -50,7 +50,7 @@ import Echidna.Types.Campaign
 import Echidna.Types.Signature (ContractName)
 import Echidna.Types.Solidity (SolConf(..))
 import Echidna.Types.Test
-import Echidna.Types.Tx (Tx(..), TxCall(..), call)
+import Echidna.Types.Tx (Tx(..), TxCall(..))
 import Echidna.Types.World (World(..))
 
 import EVM.Solidity (Contracts(..), BuildOutput(..), SolcContract(..))

diff --git a/stack.yaml b/stack.yaml
@@ -1,4 +1,4 @@
-resolver: lts-22.34
+resolver: nightly-2024-10-21
 
 packages:
 - '.'