From bb2e4838328ac79e93e2d95ff81d7bfe8023226e Mon Sep 17 00:00:00 2001 From: bravit Date: Sun, 19 Jan 2020 13:11:09 +0300 Subject: [PATCH 1/4] Enable bunch of diagrams-* packages --- build-constraints.yaml | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index ed29fbf8..0a50abbf 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -359,7 +359,7 @@ packages: - lazyio - markov-chain - midi - - midi-music-box < 0 # via diagrams-lib + - midi-music-box - mbox-utility - med-module < 0 # compilation failure - monoid-transformer @@ -924,21 +924,21 @@ packages: "Brent Yorgey @byorgey": - active < 0 # via base-4.13.0.0 - - diagrams < 0 # via diagrams-contrib - - diagrams-builder < 0 # via lens-4.17 + - diagrams + - diagrams-builder - diagrams-cairo < 0 # via lens-4.17 - diagrams-canvas < 0 # via lens-4.17 - - diagrams-contrib < 0 # via base-4.13.0.0 - - diagrams-core < 0 # via base-4.13.0.0 & lens-4.18.1 + - diagrams-contrib + - diagrams-core - diagrams-gtk < 0 # via diagrams-cairo - diagrams-html5 < 0 # via lens-4.17 - - diagrams-lib < 0 # via base-4.13.0.0 - - diagrams-postscript < 0 # via base-4.13.0.0 & lens-4.18.1 - - diagrams-rasterific < 0 # via base-4.13.0.0 & lens-4.18.1 & optparse-applicative-0.15.1.0 - - diagrams-solve < 0 # via base-4.13.0.0 - - diagrams-svg < 0 # via base-4.13.0.0 & lens-4.18.1 & optparse-applicative-0.15.1.0 - - force-layout < 0 # via base-4.13.0.0 - - SVGFonts < 0 # via diagrams-core + - diagrams-lib + - diagrams-postscript + - diagrams-rasterific + - diagrams-solve + - diagrams-svg + - force-layout + - SVGFonts - haxr < 0 # GHC 8.4 via HaXml - MonadRandom - monoid-extras < 0 # via base-4.13.0.0 @@ -1566,7 +1566,7 @@ packages: "Jeffrey Rosenbluth @jeffreyrosenbluth": - palette < 0 # via base-4.13.0.0 - diagrams-canvas - - svg-builder < 0 # via base-4.13.0.0 + - svg-builder "Gabríel Arthúr Pétursson @polarina": - sdl2 @@ -4011,7 +4011,7 @@ packages: "Vitaly Bragilevsky @bravit": - Chart - - Chart-diagrams < 0 # via diagrams-core & diagrams-lib & diagrams-postscript & diagrams-svg & svg-builder + - Chart-diagrams "Juri Chomé @2mol": - msgpack < 0 # via base-4.13.0.0 From 98cd8a6a01153e570d1a4daa830e5e7d1c792df4 Mon Sep 17 00:00:00 2001 From: bravit Date: Sun, 19 Jan 2020 13:31:47 +0300 Subject: [PATCH 2/4] fix deps --- build-constraints.yaml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index 0a50abbf..cef34446 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -359,7 +359,7 @@ packages: - lazyio - markov-chain - midi - - midi-music-box + - midi-music-box < 0 # via diagrams-lib - mbox-utility - med-module < 0 # compilation failure - monoid-transformer @@ -923,9 +923,9 @@ packages: - rank2classes < 0 # via template-haskell-2.15.0.0 "Brent Yorgey @byorgey": - - active < 0 # via base-4.13.0.0 + - active - diagrams - - diagrams-builder + - diagrams-builder < 0 # via lens-4.17 - diagrams-cairo < 0 # via lens-4.17 - diagrams-canvas < 0 # via lens-4.17 - diagrams-contrib @@ -941,7 +941,7 @@ packages: - SVGFonts - haxr < 0 # GHC 8.4 via HaXml - MonadRandom - - monoid-extras < 0 # via base-4.13.0.0 + - monoid-extras "Vincent Berthoux @Twinside": - JuicyPixels @@ -1158,7 +1158,7 @@ packages: - hweblib "Joachim Breitner @nomeata": - - circle-packing < 0 # via base-4.13.0.0 + - circle-packing - haskell-spacegoo < 0 # MonadFail - tasty-expected-failure @@ -1893,7 +1893,7 @@ packages: - gloss-rendering < 0 # @benl23x5 # via base-4.13.0.0 - gpolyline # @fegu - postgresql-simple-migration < 0 # via time-1.9.3 # @ameingast - - statestack < 0 # via base-4.13.0.0 # @diagrams + - statestack < 0 "Marios Titas @redneb": - HsOpenSSL-x509-system < 0 # via HsOpenSSL @@ -4208,7 +4208,7 @@ packages: - dlist-instances - dlist-nonempty - double-conversion - - dual-tree < 0 # via base-4.13.0.0 + - dual-tree - easy-file - easytest < 0 # via hedgehog-1 - ed25519 From ea00a6859aa516fef22e68bb6b109f126a83d20c Mon Sep 17 00:00:00 2001 From: bravit Date: Sun, 19 Jan 2020 13:44:07 +0300 Subject: [PATCH 3/4] more deps fixes --- build-constraints.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index cef34446..15dc22a1 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -1893,7 +1893,7 @@ packages: - gloss-rendering < 0 # @benl23x5 # via base-4.13.0.0 - gpolyline # @fegu - postgresql-simple-migration < 0 # via time-1.9.3 # @ameingast - - statestack < 0 + - statestack "Marios Titas @redneb": - HsOpenSSL-x509-system < 0 # via HsOpenSSL @@ -4417,7 +4417,7 @@ packages: - simple-reflect - simple-sendfile - singleton-bool - - size-based < 0 # via template-haskell-2.15.0.0 + - size-based < 0 - skein - skylighting-core - snap-core < 0 # via test-framework @@ -4457,7 +4457,7 @@ packages: - test-framework-quickcheck2 - test-framework-smallcheck - test-framework-th - - testing-feat < 0 # via size-based + - testing-feat - testing-type-modifiers - text-builder - text-icu From fe1d1f2f4ec119b4a072a13f52e464d2b9c8b420 Mon Sep 17 00:00:00 2001 From: bravit Date: Sun, 19 Jan 2020 13:51:41 +0300 Subject: [PATCH 4/4] enable size-based --- build-constraints.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index 15dc22a1..4a979d03 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -4417,7 +4417,7 @@ packages: - simple-reflect - simple-sendfile - singleton-bool - - size-based < 0 + - size-based - skein - skylighting-core - snap-core < 0 # via test-framework