flake: update inputs, fix build with GHC 9.10

.github/workflows/build.yml

@@ -128,7 +128,7 @@ jobs:
       - uses: haskell-actions/setup@v2.7.7
         id: setup
         with:
-          ghc-version: '9.8.4'
+          ghc-version: '9.10.3'
 
       - name: Extract GHC & Cabal paths
         run: |

.github/workflows/check-dependencies.yml

@@ -21,7 +21,7 @@ jobs:
       - name: lookup nix versions
         id: nixpkgs
         run: |
-          NIXPKGS_REV="$(jq -r '.nodes.nixpkgs_2.locked.rev' < flake.lock)"
+          NIXPKGS_REV="$(jq -r '.nodes.nixpkgs.locked.rev' < flake.lock)"
           VERSIONS="$(nix eval -I "nixpkgs=https://github.com/NixOS/nixpkgs/archive/$NIXPKGS_REV.tar.gz" --impure --json \
                       --expr 'let pkgs = (import <nixpkgs> {}); in { "secp256k1" = pkgs.secp256k1.version; "ff" = pkgs.libff.version; }')"
           LIBFF_REV="$(jq .ff -r <<<"$VERSIONS")"

cabal.project

@@ -3,3 +3,7 @@ packages: .
 -- work around windows build failure
 -- https://github.com/kazu-yamamoto/crypton-certificate/issues/27
 constraints: crypton-x509-store <1.6.13 || >1.6.13
+
+-- allow newer base on aeson-optics
+-- https://github.com/phadej/aeson-optics/issues/20
+allow-newer: aeson-optics:base

flake.nix

@@ -4,7 +4,11 @@
   inputs = {
     flake-utils.url = "github:numtide/flake-utils";
     nixpkgs.url = "github:nixos/nixpkgs/nixpkgs-unstable";
-    foundry.url = "github:shazow/foundry.nix/stable";
+    foundry = {
+      url = "github:shazow/foundry.nix/stable";
+      inputs.nixpkgs.follows = "nixpkgs";
+      inputs.flake-utils.follows = "flake-utils";
+    };
     solidity = {
       url = "github:argotorg/solidity/fd3a22656ebe9c91a96ebd846ab7699b5f2e053c";
       flake = false;
@@ -15,11 +19,13 @@
     };
     empty-smt-solver = {
       url = "github:msooseth/empty-smt-solver/74bd120fdb730fde8e44243305e669e5e8a3e02a";
-      flake = true;
+      inputs.nixpkgs.follows = "nixpkgs";
+      inputs.flake-utils.follows = "flake-utils";
     };
     solc-pkgs = {
       url = "github:hellwolf/solc.nix";
       inputs.nixpkgs.follows = "nixpkgs";
+      inputs.flake-utils.follows = "flake-utils";
     };
   };
 
@@ -28,8 +34,10 @@
       let
         pkgs = (import nixpkgs {
           inherit system;
-          overlays = [solc-pkgs.overlay];
-          config = { allowBroken = true; };
+          overlays = [
+            foundry.overlay
+            solc-pkgs.overlay
+          ];
         });
         execution-spec-tests-fixtures = pkgs.stdenv.mkDerivation {
           name = "execution-spec-tests-fixtures";
@@ -48,7 +56,7 @@
         solc = (solc-pkgs.mkDefault pkgs pkgs.solc_0_8_31);
         testDeps = [
           solc
-          foundry.defaultPackage.${system}
+          pkgs.foundry-bin
           pkgs.go-ethereum
           pkgs.z3
           pkgs.cvc5
@@ -60,17 +68,7 @@
           configureFlags = attrs.configureFlags ++ [ "--enable-static" ];
         }));
 
-        hspkgs = ps :
-          ps.haskellPackages.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;
-            };
-          };
+        hspkgs = ps: ps.haskell.packages.ghc912;
         hlib = pkgs.haskell.lib;
 
         # base hevm derivation.