From 7bec1b95d185405824272cb3ecd2d73501a8d2b2 Mon Sep 17 00:00:00 2001
From: Joachim Breitner <mail@joachim-breitner.de>
Date: Sun, 15 Oct 2023 21:15:58 +0200
Subject: [PATCH] haskellPackages.cabal-plan-bounds: Unbreak on 9.6, add
 nomeata as maintainer

---
 pkgs/development/haskell-modules/configuration-ghc-9.6.x.nix  | 4 ++++
 .../haskell-modules/configuration-hackage2nix/main.yaml       | 3 ++-
 pkgs/development/haskell-modules/hackage-packages.nix         | 1 +
 3 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/haskell-modules/configuration-ghc-9.6.x.nix b/pkgs/development/haskell-modules/configuration-ghc-9.6.x.nix
index a23364a73149..981511df48f1 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-9.6.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-9.6.x.nix
@@ -80,6 +80,10 @@ self: super: {
   aeson = doJailbreak super.aeson;
   free = doJailbreak super.free;
 
+  # Because we bumped the version of base-compat above.^
+  cabal-plan = unmarkBroken super.cabal-plan;
+  cabal-plan-bounds = unmarkBroken super.cabal-plan-bounds;
+
   # Requires filepath >= 1.4.100.0 <=> GHC >= 9.6
   file-io = unmarkBroken super.file-io;
 
diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml
index 8f6af23747f3..7c327fbf5012 100644
--- a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml
@@ -325,11 +325,12 @@ package-maintainers:
   ncfavier:
     - lambdabot
   nomeata:
+    - cabal-plan-bounds
     - candid
     - leb128-cereal
-    - tasty-expected-failure
     - lhs2tex
     - rec-def
+    - tasty-expected-failure
   peti:
     - cabal2spec
     - funcmp
diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index 8d163fd8d22e..ec3e48a41972 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -57233,6 +57233,7 @@ self: {
        license = lib.licenses.bsd2;
        hydraPlatforms = lib.platforms.none;
        mainProgram = "cabal-plan-bounds";
+       maintainers = [ lib.maintainers.nomeata ];
      }) {};
 
   "cabal-progdeps" = callPackage