Go back to building with GHC 9.6

.github/scripts/install-libsecp256k1.sh

@@ -3,7 +3,7 @@ set -eux -o pipefail
 
 ## The following script builds and installs libsecp256k1 to ~/.local/lib
 
-INSTALL_VERSION=0.6.0
+INSTALL_VERSION=0.5.1
 
 if [[ "$(uname -s)" =~ ^MSYS_NT.* ]]; then
     echo "This script is only meant to run on Windows under MSYS2"

.github/workflows/build.yml

@@ -109,10 +109,10 @@ jobs:
             openssl:p
             z3:p
             go:p
-      - uses: haskell-actions/[email protected].0
+      - uses: haskell-actions/[email protected].7
         id: setup
         with:
-          ghc-version: '9.8.2'
+          ghc-version: '9.6.5'
 
       - name: Extract GHC & Cabal paths
         run: |

flake.nix

@@ -47,17 +47,14 @@
         }));
 
         hspkgs = ps :
-          ps.haskell.packages.ghc98.override {
+          ps.haskellPackages.override {
             overrides = hfinal: hprev: {
-              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;
+              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;
             };
           };
         hlib = pkgs.haskell.lib;

hevm.cabal

@@ -83,7 +83,6 @@ common shared
     OverloadedStrings
     OverloadedLabels
     RecordWildCards
-    TypeAbstractions
     TypeFamilies
     ViewPatterns
     DataKinds