Update to GHC 9.4

crytic · Oct 19, 2023 · efde735 · efde735
1 parent 31c187b
commit efde735
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 17 deletions.
diff --git a/flake.lock b/flake.lock
diff --git a/flake.nix b/flake.nix
@@ -1,6 +1,6 @@
 {
   inputs = {
-    nixpkgs.url = "github:NixOS/nixpkgs";
+    nixpkgs.url = "github:NixOS/nixpkgs/nixpkgs-unstable";
     flake-utils.url = "github:numtide/flake-utils";
     flake-compat = {
       url = "github:edolstra/flake-compat";
@@ -46,12 +46,15 @@
             sha256 = "sha256-H6oURBGoQWSOuPhBB+UKg2UarVzXgv1tmfDBLnOtdhU=";
         }) { secp256k1 = pkgs.secp256k1; });
 
-        echidna = with pkgs; lib.pipe
+        # FIXME: figure out solc situation, it conflicts with the one from
+        # solc-select that is installed with slither, disable tests in the meantime
+        echidna = pkgs.haskell.lib.dontCheck (
+          with pkgs; lib.pipe
           (haskellPackages.callCabal2nix "echidna" ./. { inherit hevm; })
           [
             (haskell.lib.compose.addTestToolDepends [ haskellPackages.hpack slither-analyzer solc ])
             (haskell.lib.compose.disableCabalFlag "static")
-          ];
+          ]);
       in rec {
         packages.echidna = echidna;
         packages.default = echidna;

diff --git a/lib/Echidna/UI.hs b/lib/Echidna/UI.hs
@@ -131,7 +131,7 @@ ui vm world dict initialCorpus = do
           , now = now
           , fetchedContracts = mempty
           , fetchedSlots = mempty
-          , fetchedDialog = B.dialog (Just " Fetched contracts/slots ") Nothing 80
+          , fetchedDialog = B.dialog (Just $ str " Fetched contracts/slots ") Nothing 80
           , displayFetchedDialog = False
           , workerEvents = mempty
           , corpusSize = 0

diff --git a/lib/Echidna/UI/Widgets.hs b/lib/Echidna/UI/Widgets.hs
@@ -4,7 +4,7 @@ module Echidna.UI.Widgets where
 
 #ifdef INTERACTIVE_UI
 
-import Brick
+import Brick hiding (style)
 import Brick.AttrMap qualified as A
 import Brick.Widgets.Border
 import Brick.Widgets.Center
@@ -43,7 +43,7 @@ data UIState = UIState
   , now :: LocalTime
   , fetchedContracts :: Map Addr (Maybe Contract)
   , fetchedSlots :: Map Addr (Map W256 (Maybe W256))
-  , fetchedDialog :: B.Dialog ()
+  , fetchedDialog :: B.Dialog () Name
   , displayFetchedDialog :: Bool
 
   , workerEvents :: Seq (Int, LocalTime, CampaignEvent)
@@ -222,7 +222,7 @@ perfWidget uiState =
 ppSeed :: [WorkerState] -> String
 ppSeed campaigns = show (head campaigns).genDict.defSeed
 
-fetchedDialogWidget :: UIState -> Widget n
+fetchedDialogWidget :: UIState -> Widget Name
 fetchedDialogWidget uiState =
   B.renderDialog uiState.fetchedDialog $ padLeftRight 1 $
     foldl (<=>) emptyWidget (Map.mapWithKey renderContract uiState.fetchedContracts)

diff --git a/stack.yaml b/stack.yaml
@@ -1,4 +1,4 @@
-resolver: lts-20.17
+resolver: lts-21.3
 
 packages:
 - '.'