From 95e52be4d093e5a194aceaab52af7d2fe7558857 Mon Sep 17 00:00:00 2001 From: 2mol <1773075+2mol@users.noreply.github.com> Date: Tue, 9 Apr 2019 17:28:34 +0200 Subject: [PATCH 1/5] add msgpack --- build-constraints.yaml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index c7641399..77f259fe 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -3874,6 +3874,10 @@ packages: - Chart - Chart-diagrams + "Juri Chomé @2mol": + - msgpack + - msgpack-rpc + "Grandfathered dependencies": - Boolean - ChasingBottoms @@ -4522,9 +4526,6 @@ packages: # https://github.com/commercialhaskell/stackage/issues/4463 - mime-mail < 0.5.0 - # https://github.com/commercialhaskell/stackage/issues/4469 - - cmark-gfm < 0.2.0 - # end of packages # Package flags are applied to individual packages, and override the values of @@ -5242,7 +5243,6 @@ expected-haddock-failures: # "Compilation" errors - MemoTrie # https://github.com/conal/MemoTrie/issues/10 - classy-prelude-yesod - - elm-street # https://github.com/commercialhaskell/stackage/issues/4470 - haddock-library # https://github.com/fpco/stackage/issues/3236 - ghc-lib # https://github.com/commercialhaskell/stackage/issues/4377 From 9e4580c210234acf274851a7fde23dc4012635a6 Mon Sep 17 00:00:00 2001 From: 2mol <1773075+2mol@users.noreply.github.com> Date: Tue, 9 Apr 2019 17:35:04 +0200 Subject: [PATCH 2/5] add msgpack --- build-constraints.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/build-constraints.yaml b/build-constraints.yaml index 77f259fe..cf795d63 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -3877,6 +3877,8 @@ packages: "Juri Chomé @2mol": - msgpack - msgpack-rpc + - msgpack-idl + - msgpack-aeson "Grandfathered dependencies": - Boolean From d8179f39b77f7dd4084534657d4777477ab67699 Mon Sep 17 00:00:00 2001 From: 2mol <1773075+2mol@users.noreply.github.com> Date: Wed, 10 Apr 2019 10:22:16 +0200 Subject: [PATCH 3/5] add msgpack --- build-constraints.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index cf795d63..6a91221d 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -3877,7 +3877,6 @@ packages: "Juri Chomé @2mol": - msgpack - msgpack-rpc - - msgpack-idl - msgpack-aeson "Grandfathered dependencies": From 25aff62b67db62d8963790c09da930ded3998e5e Mon Sep 17 00:00:00 2001 From: 2mol <1773075+2mol@users.noreply.github.com> Date: Wed, 10 Apr 2019 11:34:35 +0200 Subject: [PATCH 4/5] add msgpack --- build-constraints.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/build-constraints.yaml b/build-constraints.yaml index 6a91221d..94bdcff9 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -3878,6 +3878,7 @@ packages: - msgpack - msgpack-rpc - msgpack-aeson + - int-cast "Grandfathered dependencies": - Boolean From 5b8cac9fdf466746af6f50fea0d2d260ad5e517a Mon Sep 17 00:00:00 2001 From: Dan Burton Date: Wed, 10 Apr 2019 18:52:14 -0400 Subject: [PATCH 5/5] Tweaks restoring stuff on master & making the build plan pass --- build-constraints.yaml | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index e9ed5ec7..d01eef9c 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -3877,7 +3877,8 @@ packages: "Juri Chomé @2mol": - msgpack - - msgpack-rpc + # - msgpack-rpc # https://github.com/commercialhaskell/stackage/pull/4471 + # - msgpack-idl # https://github.com/commercialhaskell/stackage/pull/4471 - msgpack-aeson - int-cast @@ -4530,6 +4531,9 @@ packages: # https://github.com/commercialhaskell/stackage/issues/4463 - mime-mail < 0.5.0 + # https://github.com/commercialhaskell/stackage/issues/4469 + - cmark-gfm < 0.2.0 + # end of packages # Package flags are applied to individual packages, and override the values of @@ -4707,6 +4711,7 @@ skipped-tests: - hw-streams # via hspec-2.6.0 - indents # tasty 0.12 and tasty-hunit 0.10 - insert-ordered-containers # via tasty-1.2 + - int-cast # QuickCheck 2.12 - ip # hspec 2.5 https://github.com/andrewthad/haskell-ip/issues/33 - language-ecmascript # testing-feat 1.1.0.0 - lattices # via tasty-1.2 @@ -5246,6 +5251,7 @@ expected-haddock-failures: # "Compilation" errors - MemoTrie # https://github.com/conal/MemoTrie/issues/10 - classy-prelude-yesod + - elm-street # https://github.com/commercialhaskell/stackage/issues/4470 - haddock-library # https://github.com/fpco/stackage/issues/3236 - ghc-lib # https://github.com/commercialhaskell/stackage/issues/4377