haskellPackages: unbreak autodocodec, autdocodec-yaml, cabal2json

NixOS · Jul 18, 2022 · debde0d · debde0d
1 parent 91bb48a
commit debde0d
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 6 deletions.
diff --git 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
@@ -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
@@ -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