From 70d4352c0f42bd01c3d9c33cbf394f8613bf467b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Facundo=20Dom=C3=ADnguez?= Date: Wed, 11 Jul 2018 16:28:19 -0300 Subject: [PATCH 1/2] Add back inline-java and related packages. --- build-constraints.yaml | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index 6b2272d1..eb4f4208 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -1870,13 +1870,14 @@ packages: - cassette < 0 # build failure with GHC 8.4 - choice - distributed-closure - - inline-java < 0 # GHC 8.4 via ghc-8.4.1 + - inline-java - inline-r < 0 # GHC 8.4 via inline-c - # - jni # GHC 8.4 via inline-c - # - jvm # GHC 8.4 via inline-c - - jvm-streaming < 0 # GHC 8.4 via inline-java + - jni + - jvm + - jvm-batching + - jvm-streaming - H < 0 # GHC 8.4 via inline-r - - sparkle < 0 # GHC 8.4 via inline-java + - sparkle - th-lift "Christopher Reichert @creichert": From 85b83d52d974d2f53909f60c5d0f59a17da10fdf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Facundo=20Dom=C3=ADnguez?= Date: Wed, 11 Jul 2018 17:59:04 -0300 Subject: [PATCH 2/2] Remove duplicate entry for jvm-batching. --- build-constraints.yaml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index eb4f4208..541c8099 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -1874,7 +1874,6 @@ packages: - inline-r < 0 # GHC 8.4 via inline-c - jni - jvm - - jvm-batching - jvm-streaming - H < 0 # GHC 8.4 via inline-r - sparkle @@ -2319,7 +2318,7 @@ packages: - distributed-process-tests < 0 # GHC 8.4 via distributed-process - distributed-static - inline-c - - jvm-batching < 0 # GHC 8.4 via inline-java + - jvm-batching - network-transport - network-transport-tests - network-transport-tcp < 0 # BuildFailureException Process exited with ExitFailure 1: dist/build/TestTCP/TestTCP