From debde0dfbe2713721d52e64f5eef48bd600e96be Mon Sep 17 00:00:00 2001
From: DavHau <hsngrmpf+github@gmail.com>
Date: Mon, 18 Jul 2022 15:40:54 +0200
Subject: [PATCH] haskellPackages: unbreak autodocodec, autdocodec-yaml,
 cabal2json

---
 pkgs/development/haskell-modules/configuration-common.nix  | 4 ++++
 .../haskell-modules/configuration-ghc-8.10.x.nix           | 7 +++++++
 .../haskell-modules/configuration-hackage2nix/broken.yaml  | 2 --
 pkgs/development/haskell-modules/hackage-packages.nix      | 4 ----
 4 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 50c88622c46bc..aebf93ddf0cc9 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -2586,6 +2586,10 @@ self: super: {
   # https://github.com/klapaucius/vector-hashtables/issues/11
   vector-hashtables = doJailbreak super.vector-hashtables;
 
+  autodocodec-yaml = super.autodocodec-yaml.override {
+    safe-coloured-text = super.safe-coloured-text_0_2_0_1;
+  };
+
 } // import ./configuration-tensorflow.nix {inherit pkgs haskellLib;} self super // (let
   # We need to build purescript with these dependencies and thus also its reverse
   # dependencies to avoid version mismatches in their dependency closure.
diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix
index 48972849cf6aa..5ebc8d3855c05 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix
@@ -139,4 +139,11 @@ self: super: {
   # Not possible to build in the main GHC 9.0 package set
   # https://github.com/awakesecurity/spectacle/issues/49
   spectacle = doDistribute (markUnbroken super.spectacle);
+
+  # missing test dependency, because cabal2nix interprets cabal file with ghc-9
+  autodocodec = addBuildDepends [ self.doctest ] super.autodocodec;
+
+  # Enabling the test suite triggers a dependency hell.
+  # This override will likely be obsolete starting with Stackage LTS 20
+  cabal2json = dontCheck super.cabal2json;
 }
diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml
index 4e968b09d85df..e926dac171e87 100644
--- a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml
@@ -262,7 +262,6 @@ broken-packages:
   - authenticate-ldap
   - authinfo-hs
   - auto
-  - autodocodec-yaml
   - autom
   - autonix-deps
   - autopack
@@ -523,7 +522,6 @@ broken-packages:
   - cabal2doap
   - cabal2ebuild
   - cabal2ghci
-  - cabal2json
   - cabal-audit
   - cabal-auto-expose
   - cabal-bundle-clib
diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index 17164e19532de..f9500d5d3e00e 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -37430,8 +37430,6 @@ self: {
        ];
        description = "Autodocodec interpreters for yaml";
        license = lib.licenses.mit;
-       hydraPlatforms = lib.platforms.none;
-       broken = true;
      }) {};
 
   "autoexporter" = callPackage
@@ -52204,9 +52202,7 @@ self: {
        testToolDepends = [ sydtest-discover ];
        description = "Turn a .cabal file into a .json file";
        license = lib.licenses.mit;
-       hydraPlatforms = lib.platforms.none;
        mainProgram = "cabal2json";
-       broken = true;
      }) {};
 
   "cabal2nix" = callPackage