haskellPackages: clean up diagrams-related overrides

haskellPackages.dual-tree: downgrade to 0.2.2.1

Since the resolution of the following issues, we can remove a lot of
jailbreaks:

* https://github.com/diagrams/diagrams-core/issues/112
* https://github.com/diagrams/diagrams-cairo/issues/77
* https://github.com/diagrams/diagrams-rasterific/issues/63

Some we need to keep since the base 4.15 compatibility updates were
sometimes bundled with adjustments for monoid-extras 0.6 / diagrams-*
1.5 which we can't yet update to.

Downgrade dual-tree since 2.2.3.0 requires monoid-extras 0.6 (although
it seemed to compile with 0.5…).

pkgs/development/haskell-modules/configuration-common.nix

@@ -706,20 +706,14 @@ self: super: {
   # The tests spuriously fail
   libmpd = dontCheck super.libmpd;
 
-  # 2021-03-12: All of this libraries have to restrictive upper bounds
-  # https://github.com/diagrams/diagrams-core/issues/112
-  # https://github.com/diagrams/diagrams-cairo/issues/77
-  # https://github.com/diagrams/diagrams-rasterific/issues/63
-  # https://github.com/diagrams/diagrams-cairo/issues/77
-  active = doJailbreak super.active;
-  statestack = doJailbreak super.statestack;
-  force-layout = doJailbreak super.force-layout;
+  # Too strict bounds on template-haskell (doesn't allow 2.16)
+  # For 2.17 support: https://github.com/JonasDuregard/sized-functors/pull/10
   size-based = doJailbreak super.size-based;
+
+  # Remove as soon as we update to monoid-extras 0.6 and unpin these packages
   dual-tree = doJailbreak super.dual-tree;
   diagrams-core = doJailbreak super.diagrams-core;
-  diagrams-postscript = doJailbreak super.diagrams-postscript;
-  diagrams-svg = doJailbreak super.diagrams-svg;
-  diagrams-contrib = doJailbreak super.diagrams-contrib;
+
   # Apply patch from master to add compat with optparse-applicative >= 0.16.
   # We unfortunately can't upgrade to 1.4.4 which includes this patch yet
   # since it would require monoid-extras 0.6 which breaks other diagrams libs.
@@ -729,8 +723,6 @@ self: super: {
       sha256 = "0xqvzh3ip9i0nv8xnh41afxki64r259pxq8ir1a4v99ggnldpjaa";
       includes = [ "*/CmdLine.hs" ];
     }));
-  diagrams-rasterific = doJailbreak super.diagrams-rasterific;
-  diagrams-cairo = doJailbreak super.diagrams-cairo;
 
   # https://github.com/diagrams/diagrams-solve/issues/4
   diagrams-solve = dontCheck super.diagrams-solve;

pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml

@@ -78,7 +78,11 @@ default-package-overrides:
   # until we can do a full migration, see
   # https://github.com/diagrams/diagrams-core/issues/115
   # We can keep this pin at most until base 4.15
+  # Since the monoid-extras adjustment was combined with
+  # a major release in some cases, we need to wait for
+  # diagrams 1.5 to be released.
   - monoid-extras < 0.6
+  - dual-tree < 0.2.3.0
   - diagrams-core < 1.5.0
   - diagrams-lib < 1.4.4
   # 2021-06-05: remove once pandoc 2.14 is in stackage

pkgs/development/haskell-modules/hackage-packages.nix

@@ -80001,6 +80001,24 @@ self: {
      }) {};
 
   "dual-tree" = callPackage
+    ({ mkDerivation, base, monoid-extras, newtype-generics, QuickCheck
+     , semigroups, testing-feat
+     }:
+     mkDerivation {
+       pname = "dual-tree";
+       version = "0.2.2.1";
+       sha256 = "17kdfnf0df0z5pkiifxrlmyd1xd7hjjaazd2kzyajl0gd00vbszx";
+       libraryHaskellDepends = [
+         base monoid-extras newtype-generics semigroups
+       ];
+       testHaskellDepends = [
+         base monoid-extras QuickCheck semigroups testing-feat
+       ];
+       description = "Rose trees with cached and accumulating monoidal annotations";
+       license = lib.licenses.bsd3;
+     }) {};
+
+  "dual-tree_0_2_3_0" = callPackage
     ({ mkDerivation, base, monoid-extras, newtype-generics, QuickCheck
      , semigroups, testing-feat
      }:
@@ -80016,6 +80034,7 @@ self: {
        ];
        description = "Rose trees with cached and accumulating monoidal annotations";
        license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "dualizer" = callPackage