From 71e607ff63b4783a2e8f822c56bec7ec1bb5bc09 Mon Sep 17 00:00:00 2001
From: Erik de Castro Lopo <erikd@mega-nerd.com>
Date: Mon, 3 Feb 2025 09:50:23 +1100
Subject: [PATCH 1/2] cabal.project: Remove un-needed allow-newers

---
 cabal.project | 15 +++------------
 1 file changed, 3 insertions(+), 12 deletions(-)

diff --git a/cabal.project b/cabal.project
index 103dedf4e..6533698da 100644
--- a/cabal.project
+++ b/cabal.project
@@ -10,7 +10,7 @@ repository cardano-haskell-packages
     d4a35cd3121aa00d18544bb0ac01c3e1691d618f462c46129271bccf39f7e8ee
 
 -- The hackage index-state
-index-state: 2025-01-14T23:25:37Z
+index-state: 2025-01-19T19:57:14Z
 index-state: cardano-haskell-packages 2025-01-13T22:30:16Z
 packages:
   base-deriving-via
@@ -41,20 +41,11 @@ package bitvec
 
 if impl(ghc >=9.12)
   allow-newer:
-    -- Stuck on `cabal-3.14` issues and maintainer difficulties
-    -- https://github.com/haskell/aeson/issues/1124
-    -- Stuck on `cabal-3.14` and unresponsive maintainers
-    -- https://github.com/well-typed/cborg/pull/339
-    -- Fix blocked by aeson
-    -- https://github.com/haskellari/microstache/issues/43
-    -- Difficult maintainer
-    -- https://github.com/haskellari/tree-diff/issues/97
-    , aeson:ghc-prim
-    , aeson:template-haskell
+    -- treediff: Difficult maintainer https://github.com/haskellari/tree-diff/issues/97
+    -- cborg/serialise: Stuck on `cabal-3.14` and unresponsive maintainers https://github.com/well-typed/cborg/pull/339
     , cborg:base
     , cborg:ghc-prim
     , serialise:base
     , serialise:ghc-prim
-    , microstache:base
     , tree-diff:base
     , tree-diff:time

From b45b49061279e03ac81663bc8bdaa94e69c5ecb5 Mon Sep 17 00:00:00 2001
From: Erik de Castro Lopo <erikd@mega-nerd.com>
Date: Mon, 3 Feb 2025 10:49:31 +1100
Subject: [PATCH 2/2] Nix updates

---
 flake.lock | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/flake.lock b/flake.lock
index 12f43f2ea..b3076e860 100644
--- a/flake.lock
+++ b/flake.lock
@@ -3,11 +3,11 @@
     "CHaP": {
       "flake": false,
       "locked": {
-        "lastModified": 1736275302,
-        "narHash": "sha256-rUXIAtCmP44vpxminC00k5qfU76KeeO5wlhk1nT+Mgc=",
+        "lastModified": 1738397760,
+        "narHash": "sha256-YpxxJDM8CJ7W8a/avBJFV8UHJexfz7BltG8v0YJMOqg=",
         "owner": "intersectmbo",
         "repo": "cardano-haskell-packages",
-        "rev": "4ac2b3efc59049f4d28e789fd3448d2f96a3c4fe",
+        "rev": "6ff0fedb79e02d7fcc4309238c233a80c90a0564",
         "type": "github"
       },
       "original": {
@@ -226,11 +226,11 @@
     "hackageNix": {
       "flake": false,
       "locked": {
-        "lastModified": 1736296111,
-        "narHash": "sha256-NDmsrxEfokMpik2p9JAyCLUIYRrzTWM0wxv0YzK3Gj8=",
+        "lastModified": 1738456201,
+        "narHash": "sha256-QYVqXJk9ojbtzOAQ9QxlMlpnS/jQ5uKPkC1bx0+1haA=",
         "owner": "input-output-hk",
         "repo": "hackage.nix",
-        "rev": "122f125c1f5c5a92e5d7af0097e03acabb4064ca",
+        "rev": "c4c57c22c4bec55a46f9f9ceb7362c5c93e55897",
         "type": "github"
       },
       "original": {