From 87a3b73f01aea8972fda16861542487467e3e0de Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Emilio=20L=C3=B3pez?= <emilio.lopez@trailofbits.com>
Date: Fri, 27 Dec 2024 13:06:12 +0100
Subject: [PATCH] Go back to building with GHC 9.6

---
 .github/scripts/install-libsecp256k1.sh |  2 +-
 .github/workflows/build.yml             |  4 ++--
 flake.lock                              |  6 +++---
 flake.nix                               | 17 +++++++----------
 hevm.cabal                              |  1 -
 5 files changed, 13 insertions(+), 17 deletions(-)

diff --git a/.github/scripts/install-libsecp256k1.sh b/.github/scripts/install-libsecp256k1.sh
index 63c06baaf..b19207433 100755
--- a/.github/scripts/install-libsecp256k1.sh
+++ b/.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"
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index f1277c9b8..5d7e5cace 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -109,10 +109,10 @@ jobs:
             openssl:p
             z3:p
             go:p
-      - uses: haskell-actions/setup@v2.7.0
+      - uses: haskell-actions/setup@v2.7.7
         id: setup
         with:
-          ghc-version: '9.8.2'
+          ghc-version: '9.6.5'
 
       - name: Extract GHC & Cabal paths
         run: |
diff --git a/flake.lock b/flake.lock
index fe2c96b4b..04c1e6bc6 100644
--- a/flake.lock
+++ b/flake.lock
@@ -120,11 +120,11 @@
     },
     "nixpkgs_2": {
       "locked": {
-        "lastModified": 1735176300,
-        "narHash": "sha256-9A+eCHj6GpxCG7FpGYm6PW1QvcKSPkO1oMMl6xDm33k=",
+        "lastModified": 1733229606,
+        "narHash": "sha256-FLYY5M0rpa5C2QAE3CKLYAM6TwbKicdRK6qNrSHlNrE=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "16e046229f3b4f53257973a5532bcbb72457d2f2",
+        "rev": "566e53c2ad750c84f6d31f9ccb9d00f823165550",
         "type": "github"
       },
       "original": {
diff --git a/flake.nix b/flake.nix
index a5cb6e512..2ba0ed875 100644
--- a/flake.nix
+++ b/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;
diff --git a/hevm.cabal b/hevm.cabal
index a3d6fbd26..2430b8349 100644
--- a/hevm.cabal
+++ b/hevm.cabal
@@ -83,7 +83,6 @@ common shared
     OverloadedStrings
     OverloadedLabels
     RecordWildCards
-    TypeAbstractions
     TypeFamilies
     ViewPatterns
     DataKinds