diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index c0faf5f27c0..ab96dde17d5 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -1798,4 +1798,8 @@ self: super: {
     passthru.updateScript = ../../../maintainers/scripts/haskell/update-cabal2nix-latest.sh;
   };
 
+  # Too strict version bounds on base and optparse-applicative
+  # https://github.com/diagrams/diagrams-cairo/issues/77
+  diagrams-cairo = doJailbreak super.diagrams-cairo;
+
 } // import ./configuration-tensorflow.nix {inherit pkgs haskellLib;} self super
diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
index d73d56baee8..17d18182337 100644
--- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
@@ -4103,7 +4103,6 @@ broken-packages:
   - Chart-simple
   - chart-svg
   - chart-svg-various
-  - Chart-tests
   - chart-unit
   - charter
   - chatty-text
@@ -4792,7 +4791,6 @@ broken-packages:
   - diagrams-boolean
   - diagrams-braille
   - diagrams-builder
-  - diagrams-cairo
   - diagrams-canvas
   - diagrams-graphviz
   - diagrams-gtk
@@ -6567,7 +6565,6 @@ broken-packages:
   - hidden-char
   - hie-core
   - hieraclus
-  - hierarchical-clustering-diagrams
   - hierarchical-exceptions
   - hierarchical-spectral-clustering
   - hierarchy
@@ -11874,7 +11871,6 @@ broken-packages:
   - yesod-lucid
   - yesod-mangopay
   - yesod-markdown
-  - yesod-media-simple
   - yesod-page-cursor
   - yesod-paginate
   - yesod-pagination