summary refs log tree commit diff
path: root/pkgs/development/haskell-modules/configuration-hackage2nix
diff options
context:
space:
mode:
authorsternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org>2021-06-22 12:34:01 +0200
committersternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org>2021-06-22 12:34:01 +0200
commit245b76099a90eea69220ffe41d659aa7b5228d70 (patch)
tree9a0d8d07f2611f38bbf476423f8c956a3c857151 /pkgs/development/haskell-modules/configuration-hackage2nix
parent35b0764e118e8de9b75b360938bd873456963cc9 (diff)
downloadnixpkgs-245b76099a90eea69220ffe41d659aa7b5228d70.tar
nixpkgs-245b76099a90eea69220ffe41d659aa7b5228d70.tar.gz
nixpkgs-245b76099a90eea69220ffe41d659aa7b5228d70.tar.bz2
nixpkgs-245b76099a90eea69220ffe41d659aa7b5228d70.tar.lz
nixpkgs-245b76099a90eea69220ffe41d659aa7b5228d70.tar.xz
nixpkgs-245b76099a90eea69220ffe41d659aa7b5228d70.tar.zst
nixpkgs-245b76099a90eea69220ffe41d659aa7b5228d70.zip
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…).
Diffstat (limited to 'pkgs/development/haskell-modules/configuration-hackage2nix')
-rw-r--r--pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml4
1 files changed, 4 insertions, 0 deletions
diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml
index 18d19eefda2..2bcee2b2774 100644
--- a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml
+++ b/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