From 34004d39b3c0be48f459019b92befaf17b59135c Mon Sep 17 00:00:00 2001 From: Yoshikuni Jujo Date: Tue, 20 Mar 2018 10:47:16 +0900 Subject: [PATCH 01/10] Re-enable papillon #3390 --- build-constraints.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index 9ce46583..c0418476 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -3792,7 +3792,6 @@ packages: - haskell-tools-refactor < 0 # GHC 8.4 via template-haskell-2.13.0.0 - modern-uri < 0 # GHC 8.4 via template-haskell-2.13.0.0 - monad-mock < 0 # GHC 8.4 via template-haskell-2.13.0.0 - - papillon < 0 # GHC 8.4 via template-haskell-2.13.0.0 - rank2classes < 0 # GHC 8.4 via template-haskell-2.13.0.0 - servant-swagger-ui < 0 # GHC 8.4 via template-haskell-2.13.0.0 - stache < 0 # GHC 8.4 via template-haskell-2.13.0.0 From d7c23b0b4abbfccf960a26d73ab904a9220cc94a Mon Sep 17 00:00:00 2001 From: Gabriel Gonzalez Date: Mon, 19 Mar 2018 19:52:46 -0700 Subject: [PATCH 02/10] Restore `morte` `morte` no longer depends on `text-format` --- build-constraints.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index 9ce46583..b6d742d1 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -3550,7 +3550,6 @@ packages: - Spock < 0 # GHC 8.4 via reroute - simple < 0 # GHC 8.4 via simple-templates - mbtiles < 0 # GHC 8.4 via sqlite-simple - - morte < 0 # GHC 8.4 via text-format - redis-io < 0 # GHC 8.4 via tinylog - axiom < 0 # GHC 8.4 via transient - transient-universe < 0 # GHC 8.4 via transient From 012b3f2a50e8308f6fc8665f132acfcfefac1576 Mon Sep 17 00:00:00 2001 From: Yoshikuni Jujo Date: Tue, 20 Mar 2018 15:27:26 +0900 Subject: [PATCH 03/10] Add X11-xft library --- build-constraints.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/build-constraints.yaml b/build-constraints.yaml index c0418476..66173447 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -2491,6 +2491,7 @@ packages: - io-machine - yjsvg - x11-xim + - X11-xft - Imlib - xturtle - gluturtle From cda998ae53782ad44790b9aa938e0d432caee55c Mon Sep 17 00:00:00 2001 From: Simon Jakobi Date: Tue, 20 Mar 2018 14:46:27 +0100 Subject: [PATCH 04/10] 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 05/10] 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 06/10] 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 07/10] 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 From faa480667292eccc4099ffacb272f303cea79176 Mon Sep 17 00:00:00 2001 From: Dan Burton Date: Tue, 20 Mar 2018 07:37:32 -0700 Subject: [PATCH 08/10] Unblock ekg and revdeps --- build-constraints.yaml | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index 937f7695..8bc7d69b 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -3654,10 +3654,6 @@ packages: - css-syntax < 0 # GHC 8.4 via base-4.11.0.0 - dictionaries < 0 # GHC 8.4 via base-4.11.0.0 - doctest-driver-gen < 0 # GHC 8.4 via base-4.11.0.0 - - ekg < 0 # GHC 8.4 via base-4.11.0.0 - - ekg-core < 0 # GHC 8.4 via base-4.11.0.0 - - ekg-json < 0 # GHC 8.4 via base-4.11.0.0 - - ekg-statsd < 0 # GHC 8.4 via base-4.11.0.0 - ekg-wai < 0 # GHC 8.4 via base-4.11.0.0 - ether < 0 # GHC 8.4 via base-4.11.0.0 - euler-tour-tree < 0 # GHC 8.4 via base-4.11.0.0 @@ -3836,9 +3832,6 @@ packages: - flow < 0 # GHC 8.4 via doctest-0.15.0 - hasmin < 0 # GHC 8.4 via doctest-0.15.0 - turtle < 0 # GHC 8.4 via doctest-0.15.0 - - eventstore < 0 # GHC 8.4 via ekg-core - - monad-metrics < 0 # GHC 8.4 via ekg-core - - wai-middleware-metrics < 0 # GHC 8.4 via ekg-core - uuid < 0 # GHC 8.4 via entropy-0.4.1.1 - download < 0 # GHC 8.4 via feed - json-schema < 0 # GHC 8.4 via generic-aeson @@ -3960,7 +3953,6 @@ packages: - servant-websockets < 0 # GHC 8.4 via servant-server - hledger-api < 0 # GHC 8.4 via servant-swagger - pandoc < 0 # GHC 8.4 via skylighting-0.7.1 - - websockets-snap < 0 # GHC 8.4 via snap-server - mmark-cli < 0 # GHC 8.4 via stache - pipes-text < 0 # GHC 8.4 via streaming-commons-0.2.0.0 - highjson-swagger < 0 # GHC 8.4 via swagger2 @@ -4090,7 +4082,9 @@ packages: - lambdabot-irc-plugins < 0 # GHC 8.4 via lambdabot-core # trans deps, rediscovered. - # (none yet) + - websockets-snap < 0 # GHC 8.4 via snap-server-1.1.0.0 + - eventstore < 0 # GHC 8.4 via text-format + - eventstore < 0 # GHC 8.4 via uuid "GHC upper bounds": @@ -4285,7 +4279,7 @@ skipped-tests: - stb-image-redux # hspec 2.5 - weigh # ghc 8.4 via bytestring-trie # https://github.com/fpco/weigh/issues/17 - wreq # ghc 8.4 via uuid - - http-streams # ghc 8.4 via snap-server + - http-streams # via snap-server-1.1.0.0 - enclosed-exceptions # hangs with ghc 8.4 https://github.com/jcristovao/enclosed-exceptions/issues/12 - HTTP # conduit-extra 1.3 - colour # QuickCheck-2.11.3 @@ -4780,7 +4774,6 @@ skipped-benchmarks: # ghc 8.4 outdated dependencies - buffer-builder # ghc 8.4 via json-builder build failure - http2 # ghc 8.4 via hashtables - - log # ghc 8.4 via ekg via base-4.11.0.0 - psqueues # ghc 8.4 via PSQueue build failure # Transitive outdated dependencies From cc27339fefcd8938b079e0dd424740df1d07ce0c Mon Sep 17 00:00:00 2001 From: Dan Burton Date: Tue, 20 Mar 2018 07:52:18 -0700 Subject: [PATCH 09/10] Expect test failure for concurrent-extra per basvandijk/concurrent-extra#12 --- build-constraints.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/build-constraints.yaml b/build-constraints.yaml index 8bc7d69b..992598c8 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -4447,6 +4447,7 @@ skipped-tests: expected-test-failures: # GHC 8.4 + - concurrent-extra # https://github.com/basvandijk/concurrent-extra/issues/12 - doctest # https://github.com/sol/doctest/issues/198 - transformers-compat # https://github.com/ekmett/transformers-compat/issues/32 From ccdd62699eb9b1b04f1e61a05221b53f38105ef0 Mon Sep 17 00:00:00 2001 From: Paul Rouse Date: Tue, 20 Mar 2018 15:55:43 +0000 Subject: [PATCH 10/10] Re-enable mysql in nightly Version 0.1.5, just released to hackage, builds against nightly-2018-03-20 without any errors or warnings, so I think it should be OK! --- build-constraints.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index 992598c8..33241270 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -3404,7 +3404,6 @@ packages: - ini < 0 # BuildFailureException Process exited with ExitFailure 1: ./Setup build - lame < 0 # DependencyFailed (PackageName "htaglib") - loch-th < 0 # BuildFailureException Process exited with ExitFailure 1: ./Setup build - - mysql < 0 # BuildFailureException Process exited with ExitFailure 1: ./Setup build - ochintin-daicho < 0 # DependencyFailed (PackageName "bookkeeping") - pred-set < 0 # DependencyFailed (PackageName "HSet") - simple-log < 0 # DependencyFailed (PackageName "hformat")