From da680abe28b4670231b20457ad2412c04bcecd49 Mon Sep 17 00:00:00 2001
From: Erik de Castro Lopo <erikd@mega-nerd.com>
Date: Thu, 5 Dec 2024 14:31:19 +1100
Subject: [PATCH] Support ghc-9.12

---
 cabal.project                         | 32 ++++++++++++++++++++++++++-
 cardano-prelude/cardano-prelude.cabal |  5 ++++-
 2 files changed, 35 insertions(+), 2 deletions(-)

diff --git a/cabal.project b/cabal.project
index b5f1528..483a26c 100644
--- a/cabal.project
+++ b/cabal.project
@@ -1,8 +1,38 @@
 -- See CONTRIBUTING for Nix commands you need to run if you change it:
-index-state: 2024-06-12T03:57:48Z
+index-state: 2024-11-07T03:32:13Z
 
 packages:
   cardano-prelude
   cardano-prelude-test
 
 test-show-details: direct
+
+allow-newer:
+  , aeson:time
+  , assoc:base
+  , async:base
+  , boring:base
+  , cborg:base
+  , data-fix:base
+  , generically:base
+  , hashable:base
+  , hsc2hs:base
+  , indexed-traversable:base
+  , indexed-traversable-instances:base
+  , integer-conversion:base
+  , integer-logarithms:base
+  , lifted-async:base
+  , OneTuple:base
+  , primitive:base
+  , quickcheck-instances:base
+  , scientific:base
+  , semialign:base
+  , splitmix:base
+  , text-iso8601:time
+  , text-short:base
+  , these:base
+  , time:base
+  , time-compat:base
+  , time-compat:time
+  , vector:base
+  , vector-stream:base
diff --git a/cardano-prelude/cardano-prelude.cabal b/cardano-prelude/cardano-prelude.cabal
index 592692a..bed6e8e 100644
--- a/cardano-prelude/cardano-prelude.cabal
+++ b/cardano-prelude/cardano-prelude.cabal
@@ -72,7 +72,10 @@ library
   c-sources:          cbits/hashset.c
                       cbits/worklist.c
                       cbits/closure_size.c
-  ghc-options:        -Wall
+
+                      -- -Wderiving-typeable was added in ghc-9.12. Disabling this warning
+                      -- should be disabled at some stage.
+  ghc-options:        -Wall -Wno-deriving-typeable
 
   cc-options:         -Wall