diff --git a/cabal.project b/cabal.project
index b822bcd0df..c24636bfe4 100644
--- a/cabal.project
+++ b/cabal.project
@@ -36,3 +36,10 @@ import: ./asserts.cabal
 if(os(windows))
   constraints:
     bitvec -simd
+
+-- Workaround for a haskell.nix bug around pre-installed libraries. Might be
+-- fixed by https://github.com/input-output-hk/haskell.nix/pull/2218.
+extra-packages: Cabal
+if os(windows)
+  constraints: time ^>=1.14
+  allow-newer: *:time
diff --git a/flake.lock b/flake.lock
index a3fffbd26d..fa8b0f59e8 100644
--- a/flake.lock
+++ b/flake.lock
@@ -36,17 +36,17 @@
     "blst": {
       "flake": false,
       "locked": {
-        "lastModified": 1691598027,
-        "narHash": "sha256-oqljy+ZXJAXEB/fJtmB8rlAr4UXM+Z2OkDa20gpILNA=",
+        "lastModified": 1656163412,
+        "narHash": "sha256-xero1aTe2v4IhWIJaEDUsVDOfE77dOV5zKeHWntHogY=",
         "owner": "supranational",
         "repo": "blst",
-        "rev": "3dd0f804b1819e5d03fb22ca2e6fac105932043a",
+        "rev": "03b5124029979755c752eec45f3c29674b558446",
         "type": "github"
       },
       "original": {
         "owner": "supranational",
-        "ref": "v0.3.11",
         "repo": "blst",
+        "rev": "03b5124029979755c752eec45f3c29674b558446",
         "type": "github"
       }
     },
@@ -137,11 +137,11 @@
     "flake-compat": {
       "flake": false,
       "locked": {
-        "lastModified": 1717312683,
-        "narHash": "sha256-FrlieJH50AuvagamEvWMIE6D2OAnERuDboFDYAED/dE=",
+        "lastModified": 1688025799,
+        "narHash": "sha256-ktpB4dRtnksm9F5WawoIkEneh1nrEvuxb5lJFt1iOyw=",
         "owner": "nix-community",
         "repo": "flake-compat",
-        "rev": "38fd3954cf65ce6faf3d0d45cd26059e059f07ea",
+        "rev": "8bf105319d44f6b9f0d764efa4fdef9f1cc9ba1c",
         "type": "github"
       },
       "original": {
@@ -172,11 +172,11 @@
         "systems": "systems"
       },
       "locked": {
-        "lastModified": 1710146030,
-        "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=",
+        "lastModified": 1701680307,
+        "narHash": "sha256-kAuep2h5ajznlPMD9rnQyffWG8EM/C73lejGofXvdM8=",
         "owner": "numtide",
         "repo": "flake-utils",
-        "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a",
+        "rev": "4022d587cbbfd70fe950c1e2083a02621806a725",
         "type": "github"
       },
       "original": {
@@ -258,11 +258,11 @@
     "hackageNix": {
       "flake": false,
       "locked": {
-        "lastModified": 1718325660,
-        "narHash": "sha256-Nzou/Pms5lNPlpRMMN49wl0VREh2AUyGjU/3tvzUJsI=",
+        "lastModified": 1717374384,
+        "narHash": "sha256-YD87yUa2RkcR4Cno49rvHqshdwijQyni4stTKMt1HME=",
         "owner": "input-output-hk",
         "repo": "hackage.nix",
-        "rev": "f48a13817ec60a7156a3e762f14131dc7b72b871",
+        "rev": "114e46a1de6c13d9dd2974aa076ea97d4557544f",
         "type": "github"
       },
       "original": {
@@ -313,16 +313,15 @@
         "stackage": "stackage"
       },
       "locked": {
-        "lastModified": 1717504902,
-        "narHash": "sha256-Lures468w/2a71m7NG14ZvaCsvJKUmd60zwT0EMUZpE=",
+        "lastModified": 1718701646,
+        "narHash": "sha256-068rEjRFuasfvuapoPrzrfm+b6kHGeOmFyrEwg92eBU=",
         "owner": "input-output-hk",
         "repo": "haskell.nix",
-        "rev": "f28764647ea6ce8f603ab49c803e8679675ca080",
+        "rev": "c019b636f237668d8bbd52c5729732bc0e4f887c",
         "type": "github"
       },
       "original": {
         "owner": "input-output-hk",
-        "ref": "static-nix-tools",
         "repo": "haskell.nix",
         "type": "github"
       }
@@ -529,11 +528,11 @@
         "sodium": "sodium"
       },
       "locked": {
-        "lastModified": 1715898223,
-        "narHash": "sha256-G1LFsvP53twrqaC1FVard/6rjJJ3oitnpJ1E+mTZDGM=",
+        "lastModified": 1702362799,
+        "narHash": "sha256-cU8cZXNuo5GRwrSvWqdaqoW5tJ2HWwDEOvWwIVPDPmo=",
         "owner": "input-output-hk",
         "repo": "iohk-nix",
-        "rev": "29f19cd41dc593cf17bbc24194e34e7c20889fc9",
+        "rev": "b426fb9e0b109a9d1dd2e1476f9e0bd8bb715142",
         "type": "github"
       },
       "original": {
@@ -826,11 +825,11 @@
     "stackage": {
       "flake": false,
       "locked": {
-        "lastModified": 1717459882,
-        "narHash": "sha256-KkogutfO+ZGCBKnStbJLFkrlGWFNwuDYW0jNOnZd/3U=",
+        "lastModified": 1716942040,
+        "narHash": "sha256-YxHXqVGGHTy0PkVExdK9z6zHAJbGEd/9rwZdV+RaAU4=",
         "owner": "input-output-hk",
         "repo": "stackage.nix",
-        "rev": "a0b8231cc70a9079e7340c08d8b5e6cba8cf593c",
+        "rev": "686ed0e27db02a273ed04aa41788cc787052b706",
         "type": "github"
       },
       "original": {
diff --git a/flake.nix b/flake.nix
index 14a8271cec..7271d7ee70 100644
--- a/flake.nix
+++ b/flake.nix
@@ -12,9 +12,7 @@
     nixpkgs.follows = "haskellNix/nixpkgs-unstable";
     flake-utils.url = "github:numtide/flake-utils";
     haskellNix = {
-      # temporarily use the static-nix-tools branch until it's merged to work
-      # aroundt he Cabal build issues.
-      url = "github:input-output-hk/haskell.nix/static-nix-tools";
+      url = "github:input-output-hk/haskell.nix";
       inputs.hackage.follows = "hackageNix";
     };
     hackageNix = {