From cda998ae53782ad44790b9aa938e0d432caee55c Mon Sep 17 00:00:00 2001 From: Simon Jakobi Date: Tue, 20 Mar 2018 14:46:27 +0100 Subject: [PATCH 1/4] Re-add snap-server --- build-constraints.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index 9ce46583..cf24fb71 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -3804,7 +3804,6 @@ packages: - web-routes-th < 0 # GHC 8.4 via template-haskell-2.13.0.0 # missed by first wave - - snap-server < 0 # GHC 8.4 via base-4.11.0.0 - Frames < 0 # GHC 8.4 via base-4.11.0.0 - cryptohash-md5 < 0 # GHC 8.4 via base-4.11.0.0 - cryptohash-sha1 < 0 # GHC 8.4 via base-4.11.0.0 From a741578e3a004afe7725ce82c33c6f3fd0c7c5c9 Mon Sep 17 00:00:00 2001 From: Simon Jakobi Date: Tue, 20 Mar 2018 14:53:53 +0100 Subject: [PATCH 2/4] Re-add threads and threads-extras --- build-constraints.yaml | 3 --- 1 file changed, 3 deletions(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index cf24fb71..4e70c3b0 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -3568,7 +3568,6 @@ packages: - jmacro < 0 # GHC 8.4 via wl-pprint-text - yesod-auth-fb < 0 # GHC 8.4 via yesod-fb - xturtle < 0 # GHC 8.4 via yjsvg - - threads < 0 # GHC 8.4 via concurrent-extra - hindent < 0 # GHC 8.4 via descriptive - wai-middleware-crowd < 0 # GHC 8.4 via http-reverse-proxy - distributed-process < 0 # GHC 8.4 via network-transport-tcp @@ -3592,7 +3591,6 @@ packages: - hedis < 0 # GHC 8.4 via slave-thread - distributed-process-monad-control < 0 # GHC 8.4 via distributed-process - distributed-process-tests < 0 # GHC 8.4 via distributed-process - - threads-extras < 0 # GHC 8.4 via threads # transitive failures, gen 3 - persistent-redis < 0 # GHC 8.4 via hedis @@ -4637,7 +4635,6 @@ expected-test-failures: - sourcemap # https://github.com/chrisdone/sourcemap/issues/3 - text-icu # https://github.com/bos/text-icu/issues/32 - text-ldap # https://github.com/khibino/haskell-text-ldap/issues/1 - - threads - thyme # https://github.com/liyang/thyme/issues/50 - tls # https://github.com/vincenthz/hs-tls/issues/247 - unicode-transforms # https://github.com/harendra-kumar/unicode-transforms/issues/15 From 9f738428eef5829dc0ea9c85b332cbf91c6232b0 Mon Sep 17 00:00:00 2001 From: Simon Jakobi Date: Tue, 20 Mar 2018 15:07:44 +0100 Subject: [PATCH 3/4] Unblock concurrent-extra --- build-constraints.yaml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index 4e70c3b0..cd0abdd6 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -131,7 +131,7 @@ packages: - calendar-recycling - combinatorial - comfort-graph - - concurrent-split + - /ent-split - cutter - data-accessor - data-accessor-mtl @@ -3453,7 +3453,6 @@ packages: - attoparsec-uri < 0 # DependencyFailed (PackageName "attoparsec-ip") - binary-tagged < 0 # BuildFailureException Process exited with ExitFailure 1: ./Setup build - cli < 0 # BuildFailureException Process exited with ExitFailure 1: ./Setup build - - concurrent-extra < 0 # BuildFailureException Process exited with ExitFailure 1: dist/build/test-concurrent-extra/test-concurrent-extra - crackNum < 0 # BuildFailureException Process exited with ExitFailure 1: ./Setup build - descriptive < 0 # BuildFailureException Process exited with ExitFailure 1: ./Setup build - git < 0 # BuildFailureException Process exited with ExitFailure 1: ./Setup build From 3d83e696deabbcde9f8a2b94675f85d2e89cfeb5 Mon Sep 17 00:00:00 2001 From: Simon Jakobi Date: Tue, 20 Mar 2018 15:13:11 +0100 Subject: [PATCH 4/4] Fix mangled package name --- build-constraints.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index cd0abdd6..937f7695 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -131,7 +131,7 @@ packages: - calendar-recycling - combinatorial - comfort-graph - - /ent-split + - concurrent-split - cutter - data-accessor - data-accessor-mtl