diff --git a/.github/scripts/install-libsecp256k1.sh b/.github/scripts/install-libsecp256k1.sh
index 295a9619c..25ae4b49e 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.3.0
+INSTALL_VERSION=0.3.2
 
 if [[ "$(uname -s)" =~ ^MSYS_NT.* ]]; then
     echo "This script is only meant to run on Windows under MSYS2"
diff --git a/flake.lock b/flake.lock
index 303e7bca9..d302bc03c 100644
--- a/flake.lock
+++ b/flake.lock
@@ -34,12 +34,15 @@
       }
     },
     "flake-utils": {
+      "inputs": {
+        "systems": "systems"
+      },
       "locked": {
-        "lastModified": 1678901627,
-        "narHash": "sha256-U02riOqrKKzwjsxc/400XnElV+UtPUQWpANPlyazjH0=",
+        "lastModified": 1681202837,
+        "narHash": "sha256-H+Rh19JDwRtpVPAWp64F+rlEtxUWBAQW28eAi3SRSzg=",
         "owner": "numtide",
         "repo": "flake-utils",
-        "rev": "93a2b84fc4b70d9e089d029deacc3583435c2ed6",
+        "rev": "cfacdce06f30d2b68473a46042957675eebb3401",
         "type": "github"
       },
       "original": {
@@ -69,11 +72,11 @@
         "nixpkgs": "nixpkgs"
       },
       "locked": {
-        "lastModified": 1677921223,
-        "narHash": "sha256-TsrPW+VfLu19dYm4uuAaM9LLHm30iZiyW1+0mbFgwbk=",
+        "lastModified": 1683191603,
+        "narHash": "sha256-KdSKdwz3+VJQIHc8sCDwPo2OQtPs5jbxwrLXseHLlfc=",
         "owner": "shazow",
         "repo": "foundry.nix",
-        "rev": "79df1481c10789570c40749a4c8f8aada16f2eea",
+        "rev": "5a53423b983f623420733f62c01fa69d1f4cdda9",
         "type": "github"
       },
       "original": {
@@ -97,29 +100,13 @@
         "type": "indirect"
       }
     },
-    "nixpkgs-solc": {
-      "locked": {
-        "lastModified": 1672059513,
-        "narHash": "sha256-4R7lESB3biVNyE6rXkjw3mhowzg4zTQgZElM4/dRUv8=",
-        "owner": "nixos",
-        "repo": "nixpkgs",
-        "rev": "1b71def42b74811323de2df52f180b795ec506fc",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nixos",
-        "repo": "nixpkgs",
-        "rev": "1b71def42b74811323de2df52f180b795ec506fc",
-        "type": "github"
-      }
-    },
     "nixpkgs_2": {
       "locked": {
-        "lastModified": 1679402239,
-        "narHash": "sha256-xJLprGQf4v0cKNtWaI2tMvn+tuYir3yNAFd41CWNgAw=",
+        "lastModified": 1685010270,
+        "narHash": "sha256-szQuu3p4FcO38Sh/EKwHlyOeXuSyZWUIwu8onxP/Y1U=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "9cc171df4617329f2c776fefe3ee83f1a0ffa046",
+        "rev": "832deaa0483b1aa392b41b26cacbddfea047e15e",
         "type": "github"
       },
       "original": {
@@ -135,7 +122,6 @@
         "flake-utils": "flake-utils",
         "foundry": "foundry",
         "nixpkgs": "nixpkgs_2",
-        "nixpkgs-solc": "nixpkgs-solc",
         "solidity": "solidity"
       }
     },
@@ -155,6 +141,21 @@
         "rev": "1c8745c54a239d20b6fb0f79a8bd2628d779b27e",
         "type": "github"
       }
+    },
+    "systems": {
+      "locked": {
+        "lastModified": 1681028828,
+        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
+        "owner": "nix-systems",
+        "repo": "default",
+        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-systems",
+        "repo": "default",
+        "type": "github"
+      }
     }
   },
   "root": "root",
diff --git a/flake.nix b/flake.nix
index 235f99696..b9a158764 100644
--- a/flake.nix
+++ b/flake.nix
@@ -4,8 +4,6 @@
   inputs = {
     flake-utils.url = "github:numtide/flake-utils";
     nixpkgs.url = "github:nixos/nixpkgs";
-    # nixpkgs with working solc
-    nixpkgs-solc.url = "github:nixos/nixpkgs/1b71def42b74811323de2df52f180b795ec506fc";
     foundry.url = "github:shazow/foundry.nix/monthly";
     flake-compat = {
       url = "github:edolstra/flake-compat";
@@ -21,14 +19,13 @@
     };
   };
 
-  outputs = { self, nixpkgs, nixpkgs-solc, flake-utils, solidity, ethereum-tests, foundry, ... }:
+  outputs = { self, nixpkgs, flake-utils, solidity, ethereum-tests, foundry, ... }:
     flake-utils.lib.eachDefaultSystem (system:
       let
         pkgs = nixpkgs.legacyPackages.${system};
-        solc' = nixpkgs-solc.legacyPackages.${system}.solc;
         testDeps = with pkgs; [
           go-ethereum
-          solc'
+          solc
           z3
           cvc5
           git
@@ -70,7 +67,7 @@
           ]).overrideAttrs(final: prev: {
             HEVM_SOLIDITY_REPO = solidity;
             HEVM_ETHEREUM_TESTS_REPO = ethereum-tests;
-            DAPP_SOLC = "${solc'}/bin/solc";
+            DAPP_SOLC = "${pkgs.solc}/bin/solc";
           });
 
         # wrapped binary for use on systems with nix available. ensures all
@@ -81,7 +78,7 @@
           buildInputs = [ makeWrapper ];
           postBuild = ''
             wrapProgram $out/bin/hevm \
-              --prefix PATH : "${lib.makeBinPath ([ bash coreutils git solc' z3 cvc5 ])}"
+              --prefix PATH : "${lib.makeBinPath ([ bash coreutils git solc z3 cvc5 ])}"
           '';
         };
 
@@ -157,7 +154,7 @@
             # NOTE: hacks for bugged cabal new-repl
             LD_LIBRARY_PATH = libraryPath;
             HEVM_SOLIDITY_REPO = solidity;
-            DAPP_SOLC = "${solc'}/bin/solc";
+            DAPP_SOLC = "${pkgs.solc}/bin/solc";
             HEVM_ETHEREUM_TESTS_REPO = ethereum-tests;
             shellHook = lib.optionalString stdenv.isDarwin ''
               export DYLD_LIBRARY_PATH="${libraryPath}";
diff --git a/test/EVM/Test/Tracing.hs b/test/EVM/Test/Tracing.hs
index 8b11ec35a..5b47066a1 100644
--- a/test/EVM/Test/Tracing.hs
+++ b/test/EVM/Test/Tracing.hs
@@ -120,7 +120,6 @@ data EVMToolOutput =
   EVMToolOutput
     { output :: ByteStringS
     , gasUsed :: W256
-    , time :: Integer
     } deriving (Generic, Show)
 
 instance JSON.FromJSON EVMToolOutput