Revert "haskell.packages: remove constraint on monoid-extras"

This reverts commit 52d69816b0f86c67844bfa34c22e86cdc187d074.

Unfortunately there is no way to update to monoid-extras 0.6 yet without
marking some packages as broken. The issue is that not all diagrams*
packages have had an update adding support for GHC 9.x yet (which would
also include monoid-extras 0.6 support). The only alternative to pinning
diagrams* and monoid-extras would be to have mismatched versions between
them which always causes issues with haskellPackages.diagrams.

Note that this commit re-introduces some build failures which are to be
fixed in a follow-up commit.

1 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 bbc5df3c696..d4a51216dc6 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -710,12 +710,17 @@ self: super: {
   force-layout = doJailbreak super.force-layout;
   size-based = doJailbreak super.size-based;
   dual-tree = doJailbreak super.dual-tree;
-  diagrams-cairo = doJailbreak super.diagrams-cairo;
   diagrams-core = doJailbreak super.diagrams-core;
   diagrams-postscript = doJailbreak super.diagrams-postscript;
   diagrams-svg = doJailbreak super.diagrams-svg;
   diagrams-contrib = doJailbreak super.diagrams-contrib;
-  diagrams-lib = doJailbreak super.diagrams-lib;
+  # Apply patch from master to add compat with optparse-applicative >= 0.16.
+  diagrams-lib = doJailbreak (appendPatch super.diagrams-lib
+    (pkgs.fetchpatch {
+      url = "https://github.com/diagrams/diagrams-lib/commit/4b9842c3e3d653be69af19778970337775e2404d.patch";
+      sha256 = "0xqvzh3ip9i0nv8xnh41afxki64r259pxq8ir1a4v99ggnldpjaa";
+      includes = [ "*/CmdLine.hs" ];
+    }));
   diagrams-rasterific = doJailbreak super.diagrams-rasterific;
 
   # https://github.com/danidiaz/streaming-eversion/issues/1
@@ -1802,6 +1807,10 @@ self: super: {
     passthru.updateScript = ../../../maintainers/scripts/haskell/update-cabal2nix-unstable.sh;
   };
 
+  # Too strict version bounds on base and optparse-applicative
+  # https://github.com/diagrams/diagrams-cairo/issues/77
+  diagrams-cairo = doJailbreak super.diagrams-cairo;
+
   # Too strict version bounds on base
   # https://github.com/gibiansky/IHaskell/issues/1217
   ihaskell-display = doJailbreak super.ihaskell-display;
@@ -1944,8 +1953,4 @@ EOT
     testTarget = "libarchive-test --test-options='-j1'";
   };
 
-  # 2021-06-03: Too strict bounds on monoid-extras
-  # https://github.com/xu-hao/namespace/issues/1
-  namespace = doJailbreak super.namespace;
-
 } // import ./configuration-tensorflow.nix {inherit pkgs haskellLib;} self super