diff options
author | sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org> | 2021-06-22 12:34:01 +0200 |
---|---|---|
committer | sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org> | 2021-06-22 12:34:01 +0200 |
commit | 245b76099a90eea69220ffe41d659aa7b5228d70 (patch) | |
tree | 9a0d8d07f2611f38bbf476423f8c956a3c857151 /pkgs/development/haskell-modules/configuration-common.nix | |
parent | 35b0764e118e8de9b75b360938bd873456963cc9 (diff) | |
download | nixpkgs-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-common.nix')
-rw-r--r-- | pkgs/development/haskell-modules/configuration-common.nix | 18 |
1 files changed, 5 insertions, 13 deletions
diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 49d5f995808..7f0c1fb2ceb 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/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; |