From 7d3043e416469b8bc6679b8684c9efcebe61e1f6 Mon Sep 17 00:00:00 2001 From: Alexey Kuleshevich Date: Wed, 20 Mar 2019 23:31:02 +0300 Subject: [PATCH 001/108] Add massiv-scheduler to stackage --- build-constraints.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/build-constraints.yaml b/build-constraints.yaml index 9ab2361e..3986242c 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -3200,6 +3200,7 @@ packages: # - hip # lens 4.16 via diagrams/chart - massiv - massiv-io + - massiv-scheduler "Hans-Peter Deifel @hpdeifel": - hledger-iadd From e7220d2b1f43e07d56b3382e36ca5ef022bf70ce Mon Sep 17 00:00:00 2001 From: Simon Michael Date: Wed, 20 Mar 2019 16:25:12 -0700 Subject: [PATCH 002/108] hledger now has easytest upper bound --- build-constraints.yaml | 3 --- 1 file changed, 3 deletions(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index 9ab2361e..43844f5c 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -4491,9 +4491,6 @@ packages: - hunit-dejafu < 2.0.0.0 - tasty-dejafu < 2.0.0.0 - # https://github.com/simonmichael/hledger/issues/983 - - easytest < 0.3 - # end of packages # Package flags are applied to individual packages, and override the values of From 74f3a01e4a549223d54a6f775c992fa22385eba1 Mon Sep 17 00:00:00 2001 From: George Wilson Date: Thu, 21 Mar 2019 09:30:22 +1000 Subject: [PATCH 003/108] Re-add hw-hspec-hedgehog unskip tests and benchmarks for hw packages and sv --- build-constraints.yaml | 18 ++---------------- 1 file changed, 2 insertions(+), 16 deletions(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index 9ab2361e..15eb5c46 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -2817,10 +2817,10 @@ packages: - hw-eliasfano - hw-excess - hw-hedgehog - - hw-hspec-hedgehog < 0 # via hspec-2.7.0 + - hw-hspec-hedgehog - hw-int - hw-ip - - hw-fingertree < 0 # build failure with GHC 8.4 + - hw-fingertree - hw-fingertree-strict - hw-json - hw-mquery @@ -4743,13 +4743,6 @@ skipped-tests: - servant-swagger # via hspec-2.7.0 - streaming-cassava # via hspec-2.7.0 - vinyl # via hspec-2.7.0 - - arbor-lru-cache # via hw-hspec-hedgehog via hspec-2.7.0 - - asif # via hw-hspec-hedgehog via hspec-2.7.0 - - bits-extra # via hw-hspec-hedgehog via hspec-2.7.0 - - hw-dsv # via hw-hspec-hedgehog via hspec-2.7.0 - - hw-fingertree-strict # via hw-hspec-hedgehog via hspec-2.7.0 - - hw-mquery # via hw-hspec-hedgehog via hspec-2.7.0 - - hw-simd # via hw-hspec-hedgehog via hspec-2.7.0 # Blocked due to tests failing to compile for GHC 8.6 @@ -5308,7 +5301,6 @@ skipped-benchmarks: - binary-list - binary-tagged - bit-stream - - bits-extra - bitset-word8 - blake2 - broadcast-chan @@ -5346,11 +5338,6 @@ skipped-benchmarks: - http-link-header - http2 - human-readable-duration - - hw-conduit - - hw-dsv - - hw-prim - - hw-rankselect - - hw-simd - hweblib - hxt-regex-xmlschema - ilist @@ -5397,7 +5384,6 @@ skipped-benchmarks: - sourcemap - stache - stm-hamt - - sv - tar - tar-conduit - text-builder From a5868c0dec179f736c6ee297f9a62520680af178 Mon Sep 17 00:00:00 2001 From: George Wilson Date: Thu, 21 Mar 2019 10:50:55 +1000 Subject: [PATCH 004/108] Add hedgehog-fn --- build-constraints.yaml | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index 9ab2361e..e1b390a4 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -2843,6 +2843,7 @@ packages: - antiope-sqs "George Wilson @gwils": + - hedgehog-fn - sv - sv-cassava - sv-core @@ -4271,9 +4272,6 @@ packages: # https://github.com/commercialhaskell/stackage/issues/3967 - text-format - # Not sure how it got here but it seems to be fine - - hedgehog-fn - # Packages without maintainers that cause issues, # this is to prevent us from including them by accident. They can # be removed from this list if they are fixed. @@ -4709,7 +4707,6 @@ skipped-tests: - tasty-discover # via hedgehog - typerep-map # via hedgehog - wide-word # via hedgehog - - nonempty-containers # via hedgehog-fn - axel # via tasty-hedgehog - bsb-http-chunked # via tasty-hedgehog - focuslist # via tasty-hedgehog From 3b4b244327a49e63d1274fafaa13b5d050b7141a Mon Sep 17 00:00:00 2001 From: Mihai Maruseac Date: Wed, 20 Mar 2019 20:46:29 -0700 Subject: [PATCH 005/108] Revert "hledger now has easytest upper bound" --- build-constraints.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/build-constraints.yaml b/build-constraints.yaml index 43844f5c..9ab2361e 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -4491,6 +4491,9 @@ packages: - hunit-dejafu < 2.0.0.0 - tasty-dejafu < 2.0.0.0 + # https://github.com/simonmichael/hledger/issues/983 + - easytest < 0.3 + # end of packages # Package flags are applied to individual packages, and override the values of From ce73c0be5ebd58100fe6b7932b4a5bb0caa99e98 Mon Sep 17 00:00:00 2001 From: George Wilson Date: Thu, 21 Mar 2019 13:55:53 +1000 Subject: [PATCH 006/108] Re-add packages previously removed by [tasty-]hedgehog --- build-constraints.yaml | 29 ----------------------------- 1 file changed, 29 deletions(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index 2dbc59ba..0bbde3a7 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -4663,7 +4663,6 @@ skipped-tests: - text # QuickCheck-2.11.3 - text-short # tasty 1.1 - tree-diff # trifecta 2 - - validation # hedgehog 0.6 - vector # QuickCheck-2.11.3 - zlib # tasty-quickcheck, tasty-hunit, tasty - MissingH # testpack, quickcheck @@ -4690,34 +4689,6 @@ skipped-tests: - hw-rankselect-base # via hspec-2.6.0 - hw-streams # via hspec-2.6.0 - clay # via hspec-discover-2.6.0 - # another batch per removal of hedgehog - - axel # via hedgehog - - bsb-http-chunked # via hedgehog - - focuslist # via hedgehog - - hmatrix-backprop # via hedgehog - - hmatrix-vector-sized # via hedgehog - - hyraxAbif # via hedgehog - - loc # via hedgehog - - nonempty-containers # via hedgehog - - partial-semigroup # via hedgehog - - registry # via hedgehog - - relude # via hedgehog - - retry # via hedgehog - - rng-utils # via hedgehog - - summoner # via hedgehog - - tasty-discover # via hedgehog - - typerep-map # via hedgehog - - wide-word # via hedgehog - - axel # via tasty-hedgehog - - bsb-http-chunked # via tasty-hedgehog - - focuslist # via tasty-hedgehog - - nonempty-containers # via tasty-hedgehog - - registry # via tasty-hedgehog - - relude # via tasty-hedgehog - - retry # via tasty-hedgehog - - rng-utils # via tasty-hedgehog - - tasty-discover # via tasty-hedgehog - - typerep-map # via tasty-hedgehog # another batch for tasty 0.12 - cborg # via tasty-1.2 - ghc-prof # via tasty-1.2 From 65eae090189952a25f8593e9f4017be62867f61f Mon Sep 17 00:00:00 2001 From: George Wilson Date: Thu, 21 Mar 2019 14:18:09 +1000 Subject: [PATCH 007/108] Disable wide-word test suite --- build-constraints.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/build-constraints.yaml b/build-constraints.yaml index 0bbde3a7..29005603 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -4664,6 +4664,7 @@ skipped-tests: - text-short # tasty 1.1 - tree-diff # trifecta 2 - vector # QuickCheck-2.11.3 + - wide-word # via semirings - zlib # tasty-quickcheck, tasty-hunit, tasty - MissingH # testpack, quickcheck - DBFunctor # missing file test_options.csv From aa7ff117176006342a3e96f55efbb9560b558ac2 Mon Sep 17 00:00:00 2001 From: Mihai Maruseac Date: Wed, 20 Mar 2019 21:33:18 -0700 Subject: [PATCH 008/108] Remove duplicated skipped-tests for clay as they are already skipped below --- build-constraints.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index 29005603..37642fe5 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -4679,7 +4679,6 @@ skipped-tests: - pure-zlib # via QuickCheck-2.12.6.1 - antiope-s3 # via hspec-2.6.0 - cayley-client # via hspec-2.6.0 - - clay # via hspec-2.6.0 - codec-rpm # via hspec-2.6.0 - hw-balancedparens # via hspec-2.6.0 - hw-excess # via hspec-2.6.0 From acc0980d611ac110e0efc8ccc8ed0c498480dfda Mon Sep 17 00:00:00 2001 From: Mihai Maruseac Date: Wed, 20 Mar 2019 21:34:02 -0700 Subject: [PATCH 009/108] Keep tests skipped for focuslist as per #4436 comment --- build-constraints.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/build-constraints.yaml b/build-constraints.yaml index 37642fe5..bd4ff0f8 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -4689,6 +4689,7 @@ skipped-tests: - hw-rankselect-base # via hspec-2.6.0 - hw-streams # via hspec-2.6.0 - clay # via hspec-discover-2.6.0 + - focuslist # via genvalidity, see https://github.com/commercialhaskell/stackage/pull/4436#issuecomment-475110614 # another batch for tasty 0.12 - cborg # via tasty-1.2 - ghc-prof # via tasty-1.2 From 9d8057e491645829c5094a95adbef22dce99d9dd Mon Sep 17 00:00:00 2001 From: Mihai Maruseac Date: Wed, 20 Mar 2019 21:40:42 -0700 Subject: [PATCH 010/108] Reorder and remove duplicated skipped test sections --- build-constraints.yaml | 88 +++++++++++++++++++----------------------- 1 file changed, 40 insertions(+), 48 deletions(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index bd4ff0f8..e38a56d1 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -4633,87 +4633,79 @@ skipped-tests: # These can periodically be checked for updates; # just remove these lines and run `stackage-curator check' to verify. - Cabal # GHC 8.4 via base-orphans-0.7, base-orphans-0.7 + - DBFunctor # missing file test_options.csv + - MissingH # testpack, quickcheck - RSA # DRBG-0.5.5 via cipher-aes128-0.7.0.3 via Cabal-2.4 - aeson # QuickCheck-2.11.3, base-orphans-0.7, hashable-time + - antiope-s3 # via hspec-2.6.0 - atom-conduit - attoparsec # QuickCheck-2.11.3 - barrier # tasty 0.12 and tasty-hunit 0.10 - binary-parser # tasty-1.0.1.1, tasty-quickcheck-0.10, tasty-hunit-0.10.0.1 - blaze-markup # tasty 1.1 - cabal-install # tasty 1.1 + - cayley-client # via hspec-2.6.0 + - cborg # via tasty-1.2 + - clay # via hspec-discover-2.6.0 + - codec-rpm # via hspec-2.6.0 - colour # QuickCheck-2.11.3 - drawille # hspec 2.4 - ed25519 # QuickCheck, hlint and more - exact-pi # QuickCHeck 2.12, tasty-1.2 + - focuslist # via genvalidity, see https://github.com/commercialhaskell/stackage/pull/4436#issuecomment-475110614 + - ghc-prof # via tasty-1.2 - github # hspec-2.6.0, hspec-discover-2.6.0 - hackage-security # QuickCheck - haddock-library # base-compat-0.10.1, hspec-2.5.1 + - haskell-names # via tasty-1.2 - http-streams # via snap-server-1.1.0.0 - - indents # tasty 0.12 and tasty-hunit 0.10 - - ip # hspec 2.5 https://github.com/andrewthad/haskell-ip/issues/33 - - language-ecmascript # testing-feat 1.1.0.0 - - makefile # GHC 8.2 - - next-ref # hspec 2.3 - - partial-order # HUnit 1.6 - - serialise - - stb-image-redux # hspec 2.5 - - superbuffer # QuickCheck-2.11.3 - - tar # QuickCheck-2.11.3, tasty-quickcheck, base-4.11.1 - - test-framework # QuickCheck 2.10 - - text # QuickCheck-2.11.3 - - text-short # tasty 1.1 - - tree-diff # trifecta 2 - - vector # QuickCheck-2.11.3 - - wide-word # via semirings - - zlib # tasty-quickcheck, tasty-hunit, tasty - - MissingH # testpack, quickcheck - - DBFunctor # missing file test_options.csv - # A new swath of tests per QuickCheck 2.12, hspec-2.6 - - hw-balancedparens # via QuickCheck-2.12.6.1 + - hw-balancedparens # via QuickCheck-2.12.6.1, via hspec-2.6.0 - hw-bits # via QuickCheck-2.12.6.1 - - hw-excess # via QuickCheck-2.12.6.1 - - hw-prim # via QuickCheck-2.12.6.1 - - hw-rankselect # via QuickCheck-2.12.6.1 - - hw-rankselect-base # via QuickCheck-2.12.6.1 - - psqueues # via QuickCheck-2.12.6.1 - - pure-zlib # via QuickCheck-2.12.6.1 - - antiope-s3 # via hspec-2.6.0 - - cayley-client # via hspec-2.6.0 - - codec-rpm # via hspec-2.6.0 - - hw-balancedparens # via hspec-2.6.0 - - hw-excess # via hspec-2.6.0 + - hw-excess # via QuickCheck-2.12.6.1, via hspec-2.6.0 - hw-ip # via hspec-2.6.0 - hw-json # via hspec-2.6.0 - - hw-prim # via hspec-2.6.0 - - hw-rankselect # via hspec-2.6.0 - - hw-rankselect-base # via hspec-2.6.0 + - hw-prim # via QuickCheck-2.12.6.1, via hspec-2.6.0 + - hw-rankselect # via QuickCheck-2.12.6.1, via hspec-2.6.0 + - hw-rankselect-base # via QuickCheck-2.12.6.1, via hspec-2.6.0 - hw-streams # via hspec-2.6.0 - - clay # via hspec-discover-2.6.0 - - focuslist # via genvalidity, see https://github.com/commercialhaskell/stackage/pull/4436#issuecomment-475110614 - # another batch for tasty 0.12 - - cborg # via tasty-1.2 - - ghc-prof # via tasty-1.2 - - haskell-names # via tasty-1.2 + - indents # tasty 0.12 and tasty-hunit 0.10 - insert-ordered-containers # via tasty-1.2 + - 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 - - pandoc # via tasty-1.2 - - servant-docs # via tasty-1.2 - - sized-grid # via tasty-1.2 - - tdigest # via tasty-1.2 - - temporary-resourcet # via tasty-1.2 - - these # via tasty-1.2 + - makefile # GHC 8.2 - mmtf # via hspec-2.7.0 + - next-ref # hspec 2.3 + - pandoc # via tasty-1.2 + - partial-order # HUnit 1.6 + - psqueues # via QuickCheck-2.12.6.1 + - pure-zlib # via QuickCheck-2.12.6.1 - records-sop # via hspec-2.7.0 + - serialise - servant # via hspec-2.7.0 - servant-client # via hspec-2.7.0 - servant-client-core # via hspec-2.7.0 + - servant-docs # via tasty-1.2 - servant-foreign # via hspec-2.7.0 - servant-js # via hspec-2.7.0 - servant-server # via hspec-2.7.0 - servant-swagger # via hspec-2.7.0 + - sized-grid # via tasty-1.2 + - stb-image-redux # hspec 2.5 - streaming-cassava # via hspec-2.7.0 + - superbuffer # QuickCheck-2.11.3 + - tar # QuickCheck-2.11.3, tasty-quickcheck, base-4.11.1 + - tdigest # via tasty-1.2 + - temporary-resourcet # via tasty-1.2 + - test-framework # QuickCheck 2.10 + - text # QuickCheck-2.11.3 + - text-short # tasty 1.1 + - these # via tasty-1.2 + - tree-diff # trifecta 2 + - vector # QuickCheck-2.11.3 - vinyl # via hspec-2.7.0 - + - wide-word # via semirings + - zlib # tasty-quickcheck, tasty-hunit, tasty # Blocked due to tests failing to compile for GHC 8.6 - async-refresh From 7c9f2edb5c41d7b975bb01b80e0b383830f44d95 Mon Sep 17 00:00:00 2001 From: Mihai Maruseac Date: Thu, 21 Mar 2019 07:23:54 -0700 Subject: [PATCH 011/108] Try enable fast-builder --- build-constraints.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index e38a56d1..83f58f7e 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -2229,7 +2229,7 @@ packages: - fmt "Takano Akio tak@anoak.io @takano-akio": - - fast-builder < 0 # GHC 8.4 via base-4.11.0.0 + - fast-builder # 0 # GHC 8.4 via base-4.11.0.0 - filelock "Brian Lewis brian@lorf.org @bsl": From 89e468a7e236912f0832db9611b5a3c45a8fc15b Mon Sep 17 00:00:00 2001 From: Mihai Maruseac Date: Thu, 21 Mar 2019 07:32:23 -0700 Subject: [PATCH 012/108] fast-fuilder works --- build-constraints.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index 83f58f7e..422e71e5 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -2229,7 +2229,7 @@ packages: - fmt "Takano Akio tak@anoak.io @takano-akio": - - fast-builder # 0 # GHC 8.4 via base-4.11.0.0 + - fast-builder - filelock "Brian Lewis brian@lorf.org @bsl": From 49dc50b837a6c83e57b5dad548adc0f1d1cf58ca Mon Sep 17 00:00:00 2001 From: Mihai Maruseac Date: Thu, 21 Mar 2019 07:36:25 -0700 Subject: [PATCH 013/108] Try hspec-webdriver --- build-constraints.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index 422e71e5..8572ddb0 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -2082,7 +2082,7 @@ packages: "John Lenz @wuzzeb": # - yesod-static-angular # conduit 1.3, yesod 1.6 - - hspec-webdriver < 0 # https://bitbucket.org/wuzzeb/webdriver-utils/issues/9/hspec-webdriver-build-failure-with-ghc-84 + - hspec-webdriver # 0 # https://bitbucket.org/wuzzeb/webdriver-utils/issues/9/hspec-webdriver-build-failure-with-ghc-84 # - webdriver-angular # via hspec-webdriver "Sven Heyll @sheyll": From c3c51c03db03efb5b9355a9eaea0077facdb7853 Mon Sep 17 00:00:00 2001 From: Mihai Maruseac Date: Thu, 21 Mar 2019 07:38:36 -0700 Subject: [PATCH 014/108] hspec-webdriver still fials --- build-constraints.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index 8572ddb0..422e71e5 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -2082,7 +2082,7 @@ packages: "John Lenz @wuzzeb": # - yesod-static-angular # conduit 1.3, yesod 1.6 - - hspec-webdriver # 0 # https://bitbucket.org/wuzzeb/webdriver-utils/issues/9/hspec-webdriver-build-failure-with-ghc-84 + - hspec-webdriver < 0 # https://bitbucket.org/wuzzeb/webdriver-utils/issues/9/hspec-webdriver-build-failure-with-ghc-84 # - webdriver-angular # via hspec-webdriver "Sven Heyll @sheyll": From b37833ed6d18ee1aab11c8fe781ec604ed86f535 Mon Sep 17 00:00:00 2001 From: Neil Mitchell Date: Thu, 21 Mar 2019 14:52:29 +0000 Subject: [PATCH 015/108] Add record-hasfield package --- build-constraints.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/build-constraints.yaml b/build-constraints.yaml index 422e71e5..85a2b267 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -564,6 +564,7 @@ packages: - debug - record-dot-preprocessor - filepattern + - record-hasfield "Digital Asset ": - ghc-lib From c2dea9efc79a02209c0d8fbd70277273338e109e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Buckwalter?= Date: Thu, 21 Mar 2019 16:50:38 +0100 Subject: [PATCH 016/108] dimensional-1.3 now builds Apparently, my previous pull request (#4275) wasn't quite right. This is a second try. Here benchmarks are disabled due to a hackage metadata edit (https://github.com/bjornbm/dimensional/issues/207). --- build-constraints.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index 422e71e5..18548398 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -4328,7 +4328,6 @@ packages: - broadcast-chan < 0 - df1 < 0 - di-handle < 0 - - dimensional < 0 - exinst < 0 - extensible < 0 - gtk2hs-buildtools < 0 @@ -5236,6 +5235,7 @@ skipped-benchmarks: - binary-parsers # criterion 1.5 - buffer-builder # ghc 8.4 via json-builder build failure - cryptohash-sha512 # criterion 1.5 + - dimensional # base < 4.7, https://github.com/bjornbm/dimensional/issues/207 - ed25519 # Criterion - hw-balancedparens # criterion 1.5, https://github.com/commercialhaskell/stackage/issues/3880 - hw-rankselect-base # criterion 1.5, https://github.com/commercialhaskell/stackage/issues/3880 From 23e936a72528d3ca697df35e519e2e796bb1c2ab Mon Sep 17 00:00:00 2001 From: Kirill Zaborsky Date: Fri, 22 Mar 2019 14:58:21 +0300 Subject: [PATCH 017/108] Add missing dependency true-name --- build-constraints.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/build-constraints.yaml b/build-constraints.yaml index f0fac79e..1d748b6b 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -4203,6 +4203,7 @@ packages: - token-bucket - tonatona - transformers-base + - true-name - tuple-th - type-fun - type-hint From ca1733fa50ea843cb30f3ff7ae94c383b34db371 Mon Sep 17 00:00:00 2001 From: Travis Athougies Date: Fri, 22 Mar 2019 13:17:47 -0700 Subject: [PATCH 018/108] Add beam-mysql to stackage --- build-constraints.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/build-constraints.yaml b/build-constraints.yaml index 1d748b6b..bf2216b2 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -104,6 +104,7 @@ packages: - beam-migrate - beam-sqlite - beam-postgres + - beam-mysql "Fraser Murray Date: Fri, 22 Mar 2019 15:21:37 -0700 Subject: [PATCH 019/108] Upper bound grandfathered checkers (#4441) --- build-constraints.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/build-constraints.yaml b/build-constraints.yaml index 1d748b6b..93665f6b 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -4494,6 +4494,9 @@ packages: # https://github.com/simonmichael/hledger/issues/983 - easytest < 0.3 + # https://github.com/commercialhaskell/stackage/issues/4441 + - checkers < 0.5.0 + # end of packages # Package flags are applied to individual packages, and override the values of From 2c0ed3ffeeb8be6d10742e7f94fe7b6341f190ba Mon Sep 17 00:00:00 2001 From: Mihai Maruseac Date: Fri, 22 Mar 2019 15:22:16 -0700 Subject: [PATCH 020/108] Move brick and data-clist from removed to grandfathered --- build-constraints.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index 93665f6b..8698cd75 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -3859,6 +3859,8 @@ packages: - reanimate "Grandfathered dependencies": + - data-clist + - brick - Boolean - ChasingBottoms - Decimal @@ -4308,8 +4310,6 @@ packages: - hastache < 0 # GHC 8.4 via base-4.11.0.0 - attoparsec-time < 0 # GHC 8.4 via doctest-0.15.0 - syb-with-class < 0 # GHC 8.4 via template-haskell-2.13.0.0 - - data-clist - - brick - lens-labels < 0 # deprecated https://github.com/commercialhaskell/stackage/pull/4358 - proto-lens-combinators < 0 # deprecated https://github.com/commercialhaskell/stackage/pull/4358 From 59c59ecb603e4131686138dc712923fc0a099784 Mon Sep 17 00:00:00 2001 From: Mihai Maruseac Date: Fri, 22 Mar 2019 15:22:37 -0700 Subject: [PATCH 021/108] Sort the grandfathered deps list --- build-constraints.yaml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index 8698cd75..d814d0f7 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -3859,8 +3859,6 @@ packages: - reanimate "Grandfathered dependencies": - - data-clist - - brick - Boolean - ChasingBottoms - Decimal @@ -3884,10 +3882,10 @@ packages: - alsa-mixer - ansi-terminal - appar - - assoc - asn1-encoding - asn1-parse - asn1-types + - assoc - attoparsec - authenticate - auto-update @@ -3900,6 +3898,7 @@ packages: - blaze-builder - blaze-svg - blaze-textual + - brick - buffer-builder - byteable - bytestring-builder @@ -3952,6 +3951,7 @@ packages: - data-binary-ieee754 - data-bword - data-checked + - data-clist - data-default - data-default-class - data-default-instances-containers @@ -4037,13 +4037,13 @@ packages: - http-types - http2 - httpd-shed + - hw-json-simd - hw-string-parse - hxt - hxt-charproperties - hxt-http - hxt-regex-xmlschema - hxt-unicode - - hw-json-simd - iconv - ieee754 - infer-license From 29156aac61814fd3c688419224666c8f38005a6e Mon Sep 17 00:00:00 2001 From: Andrew Cowie Date: Sat, 23 Mar 2019 16:11:51 +1100 Subject: [PATCH 022/108] Add unbeliever package --- build-constraints.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/build-constraints.yaml b/build-constraints.yaml index a40992b4..f72a2cc1 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -2347,6 +2347,7 @@ packages: - http-common - http-streams - locators + - unbeliever "Sean Hunt Date: Sat, 23 Mar 2019 20:19:41 -0700 Subject: [PATCH 023/108] Upper bound concurrency due to #4443 --- build-constraints.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/build-constraints.yaml b/build-constraints.yaml index f72a2cc1..39000fa6 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -4499,6 +4499,9 @@ packages: # https://github.com/commercialhaskell/stackage/issues/4441 - checkers < 0.5.0 + # https://github.com/commercialhaskell/stackage/issues/4443 + - concurrency < 1.7 + # end of packages # Package flags are applied to individual packages, and override the values of From b3fc087dbfda5b7cb037d7ecf54f9074dc5a2f0e Mon Sep 17 00:00:00 2001 From: Alexey Zabelin Date: Sun, 24 Mar 2019 15:31:55 -0700 Subject: [PATCH 024/108] Remove upper bounds for dejafu and concurrency Closes #4373, #4443 --- build-constraints.yaml | 8 -------- 1 file changed, 8 deletions(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index 39000fa6..39e597c2 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -4488,20 +4488,12 @@ packages: - hsdev < 0.3.3.0 - network-bsd < 2.8.1.0 - # https://github.com/commercialhaskell/stackage/issues/4373 - - dejafu < 2.0.0.0 - - hunit-dejafu < 2.0.0.0 - - tasty-dejafu < 2.0.0.0 - # https://github.com/simonmichael/hledger/issues/983 - easytest < 0.3 # https://github.com/commercialhaskell/stackage/issues/4441 - checkers < 0.5.0 - # https://github.com/commercialhaskell/stackage/issues/4443 - - concurrency < 1.7 - # end of packages # Package flags are applied to individual packages, and override the values of From 988d51a7a5a18be26e616ee90e5d6c7390b9590f Mon Sep 17 00:00:00 2001 From: Alexey Zabelin Date: Mon, 25 Mar 2019 17:20:40 -0700 Subject: [PATCH 025/108] Add upper bounds for QuickCheck, #4444 --- build-constraints.yaml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/build-constraints.yaml b/build-constraints.yaml index 39e597c2..d467a73c 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -4494,6 +4494,10 @@ packages: # https://github.com/commercialhaskell/stackage/issues/4441 - checkers < 0.5.0 + # https://github.com/commercialhaskell/stackage/issues/4444 + - QuickCheck < 2.13 + - quickcheck-instances < 0.3.20 + # end of packages # Package flags are applied to individual packages, and override the values of From eea28bbb512df7b7f486c7924d1e86c927918275 Mon Sep 17 00:00:00 2001 From: Amit Levy Date: Mon, 25 Mar 2019 23:19:11 -0400 Subject: [PATCH 026/108] Add postgresql-orm package --- build-constraints.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/build-constraints.yaml b/build-constraints.yaml index d467a73c..b6d739a5 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -2666,6 +2666,7 @@ packages: - simple < 0 # GHC 8.4 via simple-templates - simple-templates < 0 # BuildFailureException Process exited with ExitFailure 1: ./Setup build - simple-session < 0 # GHC 8.4 via simple + - postgresql-orm "Sergey Astanin @astanin": # Stackage server uses Ubuntu 16.04 which ships libzip-1.0.1. From 1b92b50de1f9bf85b9ad8ed5427594a4e1107aa3 Mon Sep 17 00:00:00 2001 From: Alexey Zabelin Date: Tue, 26 Mar 2019 18:21:17 -0700 Subject: [PATCH 027/108] Add upper bound for dependent-sum, #4446 --- build-constraints.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/build-constraints.yaml b/build-constraints.yaml index b6d739a5..46d161a7 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -4499,6 +4499,9 @@ packages: - QuickCheck < 2.13 - quickcheck-instances < 0.3.20 + # https://github.com/commercialhaskell/stackage/issues/4446 + - dependent-sum < 0.5 + # end of packages # Package flags are applied to individual packages, and override the values of From cf5db573069399c7c1eec1512ebbc04dc2a2dae7 Mon Sep 17 00:00:00 2001 From: Alexey Kuleshevich Date: Wed, 27 Mar 2019 14:01:16 +0300 Subject: [PATCH 028/108] Package was renamed. Adding `scheduler` instread of `massiv-scheduler` --- build-constraints.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index 46d161a7..5685b71e 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -3205,7 +3205,7 @@ packages: # - hip # lens 4.16 via diagrams/chart - massiv - massiv-io - - massiv-scheduler + - scheduler "Hans-Peter Deifel @hpdeifel": - hledger-iadd From 5cef750863b130bb1abdd1d2db87489a73a140b6 Mon Sep 17 00:00:00 2001 From: Michael Snoyman Date: Wed, 27 Mar 2019 17:58:04 +0200 Subject: [PATCH 029/108] Extra upper bound for #4446 --- build-constraints.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/build-constraints.yaml b/build-constraints.yaml index 46d161a7..f696aafa 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -4501,6 +4501,7 @@ packages: # https://github.com/commercialhaskell/stackage/issues/4446 - dependent-sum < 0.5 + - typerep-map < 0.3.2 # end of packages From 8404361e5dbce18b486e944df5e4c42fda68daef Mon Sep 17 00:00:00 2001 From: Kirill Zaborsky Date: Fri, 29 Mar 2019 16:19:51 +0300 Subject: [PATCH 030/108] Add bounds on hspec packages because of QuickCheck bounds --- build-constraints.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/build-constraints.yaml b/build-constraints.yaml index 4f69bde3..bd9f14d9 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -4498,6 +4498,9 @@ packages: # https://github.com/commercialhaskell/stackage/issues/4444 - QuickCheck < 2.13 - quickcheck-instances < 0.3.20 + - hspec-core < 2.7.1 + - hspec < 2.7.1 + - hspec-discover < 2.7.1 # https://github.com/commercialhaskell/stackage/issues/4446 - dependent-sum < 0.5 From 049c3ea89d1157f4b537cdde9b79ddb388b9d6ce Mon Sep 17 00:00:00 2001 From: Alexey Zabelin Date: Fri, 29 Mar 2019 09:09:59 -0700 Subject: [PATCH 031/108] Expect test failure for record-dot-preprocessor, #4449 --- build-constraints.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/build-constraints.yaml b/build-constraints.yaml index bd9f14d9..f3f095ed 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -5091,6 +5091,7 @@ expected-test-failures: - yeshql-core # https://github.com/tdammers/yeshql/issues/6 - yeshql-hdbc # https://github.com/tdammers/yeshql/issues/6 - yesod-gitrev # https://github.com/DanBurton/yesod-gitrev/issues/5 + - record-dot-preprocessor # https://github.com/commercialhaskell/stackage/issues/4449 # Stackage upper bounds, re-enable these when their upper bound is removed From 69e8322c21c34d9c99db1fc8e6db93fca038c1c9 Mon Sep 17 00:00:00 2001 From: Alexey Zabelin Date: Fri, 29 Mar 2019 14:28:06 -0700 Subject: [PATCH 032/108] Enable tests for record-dot-preprocessor, #4449 --- build-constraints.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index f3f095ed..bd9f14d9 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -5091,7 +5091,6 @@ expected-test-failures: - yeshql-core # https://github.com/tdammers/yeshql/issues/6 - yeshql-hdbc # https://github.com/tdammers/yeshql/issues/6 - yesod-gitrev # https://github.com/DanBurton/yesod-gitrev/issues/5 - - record-dot-preprocessor # https://github.com/commercialhaskell/stackage/issues/4449 # Stackage upper bounds, re-enable these when their upper bound is removed From cc1f64a0d13d55eea5a0634cfab8706826d3a45d Mon Sep 17 00:00:00 2001 From: Alexey Zabelin Date: Fri, 29 Mar 2019 14:32:31 -0700 Subject: [PATCH 033/108] Revert 69e8322c21c34d9c99db1fc8e6db93fca038c1c9, #4449 --- build-constraints.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/build-constraints.yaml b/build-constraints.yaml index bd9f14d9..f3f095ed 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -5091,6 +5091,7 @@ expected-test-failures: - yeshql-core # https://github.com/tdammers/yeshql/issues/6 - yeshql-hdbc # https://github.com/tdammers/yeshql/issues/6 - yesod-gitrev # https://github.com/DanBurton/yesod-gitrev/issues/5 + - record-dot-preprocessor # https://github.com/commercialhaskell/stackage/issues/4449 # Stackage upper bounds, re-enable these when their upper bound is removed From 5c044925a7ca5af74c85f8c603ab5cb1d07afaef Mon Sep 17 00:00:00 2001 From: Alexey Zabelin Date: Mon, 1 Apr 2019 09:03:19 -0700 Subject: [PATCH 034/108] Add upper bound for hw-rankselect, #4450 --- build-constraints.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/build-constraints.yaml b/build-constraints.yaml index f3f095ed..0fab8ab8 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -4506,6 +4506,9 @@ packages: - dependent-sum < 0.5 - typerep-map < 0.3.2 + # https://github.com/commercialhaskell/stackage/issues/4450 + - hw-rankselect < 0.13 + # end of packages # Package flags are applied to individual packages, and override the values of From 09c099974731456accd15fa1ebe553c604f0e20c Mon Sep 17 00:00:00 2001 From: "(cdep)illabout" Date: Tue, 2 Apr 2019 13:43:10 +0900 Subject: [PATCH 035/108] Add password and password-instances packages This PR adds the `password` and `password-instances` packages to `build-constraints.yaml`. --- build-constraints.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/build-constraints.yaml b/build-constraints.yaml index 0fab8ab8..65ef71e5 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -2283,6 +2283,8 @@ packages: - hailgun-simple < 0 # via hailgun - natural-transformation # - opaleye-trans # product-profunctors 0.9 + - password + - password-instances - pretty-simple - read-env-var - servant-checked-exceptions < 0 # https://github.com/cdepillabout/servant-checked-exceptions/issues/29 From 0661ce39a715cfe1581ab8c7a785b973a7f5ee6f Mon Sep 17 00:00:00 2001 From: Chris Dornan Date: Tue, 2 Apr 2019 19:16:46 +0100 Subject: [PATCH 036/108] suspend tensors benchmarks and registry tests --- build-constraints.yaml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/build-constraints.yaml b/build-constraints.yaml index 0fab8ab8..2c75c50a 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -4762,6 +4762,7 @@ skipped-tests: - rakuten - rank1dynamic - rcu + - registry - rss-conduit - servant-blaze - servant-cassava @@ -5202,6 +5203,9 @@ expected-benchmark-failures: - lz4 # https://github.com/fpco/stackage/issues/3510 - xmlgen # https://github.com/skogsbaer/xmlgen/issues/6 + # https://github.com/commercialhaskell/stackage/issues/4452 + - tensors + # end of expected-benchmark-failures From d21e0a6c663befbd39ba1835b293868c55757483 Mon Sep 17 00:00:00 2001 From: Vitaly Bragilevsky Date: Wed, 3 Apr 2019 19:49:39 +0300 Subject: [PATCH 037/108] Re-enable Chart-diagrams --- build-constraints.yaml | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index 2c75c50a..e10d2f86 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -820,7 +820,7 @@ packages: - diagrams-gtk < 0 # via diagrams-cairo - diagrams-html5 < 0 # via lens-4.17 - diagrams-lib - - diagrams-postscript < 0 # via lens-4.17 + - diagrams-postscript - diagrams-rasterific - diagrams-solve - diagrams-svg @@ -3861,6 +3861,10 @@ packages: - reanimate-svg - reanimate + "Vitaly Bragilevsky @bravit": + - Chart + - Chart-diagrams + "Grandfathered dependencies": - Boolean - ChasingBottoms @@ -4295,7 +4299,6 @@ packages: "Removed packages": - gi-webkit2 < 0 # https://github.com/fpco/stackage/issues/3415 - PSQueue < 0 # build failure with GHC 8.4 (nowhere to report, it's ancient just let it die) - - Chart < 0 # build failure with GHC 8.4 https://github.com/timbod7/haskell-chart/issues/181 - json-builder < 0 # build failure with GHC 8.4 https://github.com/lpsmith/json-builder/issues/2 - type-combinators < 0 # build failure with GHC 8.4 https://github.com/kylcarte/type-combinators/issues/8 - HaXml < 0 # build failure with GHC 8.4 From 3499c4ad030b2481156b897729c4dba937b7c997 Mon Sep 17 00:00:00 2001 From: Chris Dornan Date: Wed, 3 Apr 2019 18:34:01 +0100 Subject: [PATCH 038/108] hw-rankselect-0.13.0.0 no longer contstrained (#4450) --- build-constraints.yaml | 3 --- 1 file changed, 3 deletions(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index 2c75c50a..df49ea8f 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -4506,9 +4506,6 @@ packages: - dependent-sum < 0.5 - typerep-map < 0.3.2 - # https://github.com/commercialhaskell/stackage/issues/4450 - - hw-rankselect < 0.13 - # end of packages # Package flags are applied to individual packages, and override the values of From 90d8ae0da44369622931e9721d246879ac1b5258 Mon Sep 17 00:00:00 2001 From: ChShersh Date: Thu, 4 Apr 2019 16:29:39 +0800 Subject: [PATCH 039/108] Add elm-street --- build-constraints.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/build-constraints.yaml b/build-constraints.yaml index df49ea8f..86aa14df 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -3453,6 +3453,9 @@ packages: - tomland - typerep-map + "Holmusk @arbus": + - elm-street + "Lorenz Moesenlechner @moesenle": - servant-websockets < 0 # https://github.com/moesenle/servant-websockets/issues/8 From 5262fd89440e5c521487a77b374ad56ffcfcdc69 Mon Sep 17 00:00:00 2001 From: Kirill Zaborsky Date: Fri, 5 Apr 2019 17:59:19 +0300 Subject: [PATCH 040/108] Add missing packages stackage-curator: Snapshot dependency graph contains errors: fib (not present) depended on by: - [ ] scheduler-1.1.0 (-any). Alexey Kuleshevich @lehins. @lehins. Used by: benchmark ghc-lib-parser (not present) depended on by: - [ ] ghc-lib-0.20190402 (==0.20190402). Digital Asset . @digital-asset. Used by: library --- build-constraints.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/build-constraints.yaml b/build-constraints.yaml index df49ea8f..c10d32c5 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -569,6 +569,7 @@ packages: "Digital Asset ": - ghc-lib + - ghc-lib-parser "Karl Ostmo @kostmo": - perfect-hash-generator @@ -3995,6 +3996,7 @@ packages: - fail - fast-logger - fast-math + - fib - file-embed - file-embed-lzma - filemanip From 16e5d82f9494c4f5a35db6bb7fbcd452a527f924 Mon Sep 17 00:00:00 2001 From: Matt Parsons Date: Fri, 5 Apr 2019 14:35:18 -0600 Subject: [PATCH 041/108] Add `persistent-qq` --- build-constraints.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/build-constraints.yaml b/build-constraints.yaml index df49ea8f..175970f7 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -2187,6 +2187,7 @@ packages: - servant-quickcheck < 0 - esqueleto - persistent-typed-db + - persistent-qq "Matthew Pickering @mpickering": - refact From f49e0b3ed4da5112e15178e41d2df800700ab987 Mon Sep 17 00:00:00 2001 From: Kirill Zaborsky Date: Tue, 19 Mar 2019 09:51:21 +0300 Subject: [PATCH 042/108] build.sh variant with the new curator version (and new Stack) --- automated/build-next.sh | 150 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 150 insertions(+) create mode 100755 automated/build-next.sh diff --git a/automated/build-next.sh b/automated/build-next.sh new file mode 100755 index 00000000..fd51f430 --- /dev/null +++ b/automated/build-next.sh @@ -0,0 +1,150 @@ +#!/usr/bin/env bash + +set -eu +x + +ROOT=$(cd $(dirname $0) ; pwd) +TARGET=$1 + +# For nightly-YYYY-MM-DD, tag should be nightly +# For lts-X.Y, tag should be ltsX +SHORTNAME=$(echo $TARGET | cut -d- -f 1) +if [ $SHORTNAME = "lts" ] +then + TAG=$(echo $TARGET | sed 's@^lts-\([0-9]*\)\.[0-9]*@lts\1@') +else + TAG=$SHORTNAME +fi + +IMAGE=commercialhaskell/stackage:$TAG + +CABAL_DIR=$ROOT/cabal +STACK_DIR=$ROOT/stack +GHC_DIR=$ROOT/ghc +DOT_STACKAGE_DIR=$ROOT/dot-stackage +WORKDIR=$ROOT/$TAG/work +# ssh key is used for committing snapshots (and their constraints) to Github +SSH_DIR=$ROOT/ssh +USERID=$(id -u) + +mkdir -p \ + "$CABAL_DIR" \ + "$STACK_DIR" \ + "$GHC_DIR" \ + "$DOT_STACKAGE_DIR" \ + "$WORKDIR" \ + "$SSH_DIR" + +GITCONFIG=$ROOT/gitconfig +cat >$GITCONFIG < Date: Mon, 8 Apr 2019 09:49:15 +0100 Subject: [PATCH 043/108] mime-mail-0.5.0 (#4463), add possibly, enum-text --- build-constraints.yaml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/build-constraints.yaml b/build-constraints.yaml index df49ea8f..2682dcd2 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -3322,6 +3322,8 @@ packages: - regex - regex-pcre-text - regex-with-pcre + - possibly + - enum-text "Elliot Cameron @3noch": [] @@ -4506,6 +4508,9 @@ packages: - dependent-sum < 0.5 - typerep-map < 0.3.2 + # https://github.com/commercialhaskell/stackage/issues/4463 + - mime-mail < 0.5.0 + # end of packages # Package flags are applied to individual packages, and override the values of From 44b407e785c6d7df5b8706452bf08ba286042caf Mon Sep 17 00:00:00 2001 From: Chris Dornan Date: Mon, 8 Apr 2019 11:45:49 +0100 Subject: [PATCH 044/108] hledger-lib and servant-static-th failing tests --- build-constraints.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/build-constraints.yaml b/build-constraints.yaml index 2682dcd2..5d6d07f0 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -5098,6 +5098,8 @@ expected-test-failures: - yeshql-hdbc # https://github.com/tdammers/yeshql/issues/6 - yesod-gitrev # https://github.com/DanBurton/yesod-gitrev/issues/5 - record-dot-preprocessor # https://github.com/commercialhaskell/stackage/issues/4449 + - hledger # https://github.com/commercialhaskell/stackage/issues/4464 + - servant-static-th # https://github.com/commercialhaskell/stackage/issues/4465 # Stackage upper bounds, re-enable these when their upper bound is removed From 65a8982e93da5f1c7adaa59cdc6c4053a12482c3 Mon Sep 17 00:00:00 2001 From: Chris Dornan Date: Mon, 8 Apr 2019 12:08:54 +0100 Subject: [PATCH 045/108] expect hledger-lib test failures (not hledger) --- build-constraints.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index 5d6d07f0..09f2e81e 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -5098,7 +5098,7 @@ expected-test-failures: - yeshql-hdbc # https://github.com/tdammers/yeshql/issues/6 - yesod-gitrev # https://github.com/DanBurton/yesod-gitrev/issues/5 - record-dot-preprocessor # https://github.com/commercialhaskell/stackage/issues/4449 - - hledger # https://github.com/commercialhaskell/stackage/issues/4464 + - hledger-lib # https://github.com/commercialhaskell/stackage/issues/4464 - servant-static-th # https://github.com/commercialhaskell/stackage/issues/4465 # Stackage upper bounds, re-enable these when their upper bound is removed From f763c1306eaa78eb70ebdc0b1fc8a2e1f14e444b Mon Sep 17 00:00:00 2001 From: Chris Dornan Date: Mon, 8 Apr 2019 12:18:39 +0100 Subject: [PATCH 046/108] fixes #4453 and fixes #4452 --- build-constraints.yaml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index 09f2e81e..8f8f576c 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -4764,7 +4764,6 @@ skipped-tests: - rakuten - rank1dynamic - rcu - - registry - rss-conduit - servant-blaze - servant-cassava @@ -5207,9 +5206,6 @@ expected-benchmark-failures: - lz4 # https://github.com/fpco/stackage/issues/3510 - xmlgen # https://github.com/skogsbaer/xmlgen/issues/6 - # https://github.com/commercialhaskell/stackage/issues/4452 - - tensors - # end of expected-benchmark-failures From af79fa36ce6f1b6cde2d937cd830e8053de07d21 Mon Sep 17 00:00:00 2001 From: Chris Dornan Date: Mon, 8 Apr 2019 12:22:22 +0100 Subject: [PATCH 047/108] fixes #4459 --- build-constraints.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index 8f8f576c..cc3f14de 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -1252,7 +1252,7 @@ packages: - partial-handler - postgresql-binary - slave-thread < 0 - - stm-containers < 0 + - stm-containers - refined < 0 # https://github.com/nikita-volkov/refined/issues/33 "Iustin Pop @iustin": From 3af743cde32757a12b2b12a1c5d90a710ab1c963 Mon Sep 17 00:00:00 2001 From: Dan Burton Date: Mon, 8 Apr 2019 15:30:16 -0400 Subject: [PATCH 048/108] Enable stm-hamt & primitive-extras --- build-constraints.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index cc3f14de..e967facb 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -4118,6 +4118,7 @@ packages: - prettyprinter-convert-ansi-wl-pprint - primes - primitive + - primitive-extras - process-extras - product-isomorphic - project-template @@ -4166,6 +4167,7 @@ packages: - stateref - statistics - stm-delay + - stm-hamt - storable-complex - store-core - streaming-cassava @@ -4325,9 +4327,7 @@ packages: - SCalendar < 0 - haskell-tools-builtin-refactorings < 0 - hpqtypes < 0 - - primitive-extras < 0 - ref-fd < 0 - - stm-hamt < 0 # failed to build - Fin < 0 From 4c7bfdecff7afbfc8af9a317446a9f8845a7e4e7 Mon Sep 17 00:00:00 2001 From: Dan Burton Date: Tue, 9 Apr 2019 00:16:52 -0400 Subject: [PATCH 049/108] Expect test failure for password per #4468 --- build-constraints.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/build-constraints.yaml b/build-constraints.yaml index f7b62ce0..0f9bce4c 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -5129,6 +5129,7 @@ expected-test-failures: - genvalidity-hspec # https://github.com/NorfairKing/validity/issues/55 - genvalidity-hspec-hashable # https://github.com/NorfairKing/validity/issues/55 - ghcid # Weird conflicts with sandboxingistributed/distributed-process-supervisor/issues/1 + - password # https://github.com/commercialhaskell/stackage/issues/4468 - pg-transact # https://github.com/jfischoff/pg-transact/issues/2 - postgresql-simple-queue # same issue as before, see also https://github.com/fpco/stackage/issues/2592 as that will fix both - rattletrap # OOM? https://github.com/fpco/stackage/issues/2232 From 218ecae8e9ec0a32aa9dda50a4896ab34aa7099f Mon Sep 17 00:00:00 2001 From: Dan Burton Date: Tue, 9 Apr 2019 10:18:14 -0400 Subject: [PATCH 050/108] Add constraint "cmark-gfm < 0.2.0" per #4469 --- build-constraints.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/build-constraints.yaml b/build-constraints.yaml index a2608734..0dfa6920 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -4522,6 +4522,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 From 6212cadf3a8541ced142a70a434e4fde97f09ef0 Mon Sep 17 00:00:00 2001 From: Dan Burton Date: Tue, 9 Apr 2019 10:25:44 -0400 Subject: [PATCH 051/108] Expect haddock failures for elm-street per #4470 --- build-constraints.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/build-constraints.yaml b/build-constraints.yaml index 0dfa6920..c7641399 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -5242,6 +5242,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 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 052/108] 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 053/108] 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 054/108] 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 3cfd749a8eba4e3867956de8d5cb963d0f9a8d8a Mon Sep 17 00:00:00 2001 From: Lukasz Szwed Date: Wed, 10 Apr 2019 10:33:32 +0100 Subject: [PATCH 055/108] Add amazonka-glue to build-constraints.yaml --- build-constraints.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/build-constraints.yaml b/build-constraints.yaml index c7641399..8e128d6c 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -1604,6 +1604,7 @@ packages: - amazonka-emr - amazonka-gamelift - amazonka-glacier + - amazonka-glue - amazonka-health - amazonka-iam - amazonka-importexport @@ -4439,6 +4440,7 @@ packages: - amazonka-emr < 0 # via amazonka-core - amazonka-gamelift < 0 # via amazonka-core - amazonka-glacier < 0 # via amazonka-core + - amazonka-glue < 0 # via amazonka-core - amazonka-health < 0 # via amazonka-core - amazonka-iam < 0 # via amazonka-core - amazonka-importexport < 0 # via amazonka-core 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 056/108] 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 5f358c6cc8f6278536256a7e251ed5096f341743 Mon Sep 17 00:00:00 2001 From: Dmitry Kovanikov Date: Wed, 10 Apr 2019 18:42:17 +0800 Subject: [PATCH 057/108] Add summoner --- build-constraints.yaml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index c7641399..753b55aa 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -3455,7 +3455,7 @@ packages: - first-class-patterns - relude - shellmet - - summoner < 0 + - summoner - tomland - typerep-map @@ -5058,7 +5058,6 @@ expected-test-failures: - crypto-pubkey # https://github.com/vincenthz/hs-crypto-pubkey/issues/23 - doctest-discover # 0.1.0.9 https://github.com/karun012/doctest-discover/issues/22 - graylog # 0.1.0.1 https://github.com/fpco/stackage/pull/1254 - - summoner # https://github.com/kowainik/summoner/issues/270 - tomland # https://github.com/kowainik/tomland/issues/141 # Assertion failures, these can be real bugs or just limitations From 5b8cac9fdf466746af6f50fea0d2d260ad5e517a Mon Sep 17 00:00:00 2001 From: Dan Burton Date: Wed, 10 Apr 2019 18:52:14 -0400 Subject: [PATCH 058/108] 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 From 2a3e9733f43fb59503e34ab9c51051add45fbe73 Mon Sep 17 00:00:00 2001 From: Dan Burton Date: Wed, 10 Apr 2019 19:03:33 -0400 Subject: [PATCH 059/108] Expect test failure per michalkonecny/mixed-types-num#3 --- build-constraints.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/build-constraints.yaml b/build-constraints.yaml index d01eef9c..a08456b7 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -5102,6 +5102,7 @@ expected-test-failures: - hspec-expectations-pretty-diff # GHC 8 issue not reported upstream since issue tracker disabled - hweblib # https://github.com/aycanirican/hweblib/issues/3 - libraft # https://github.com/commercialhaskell/stackage/issues/4337#issuecomment-462465921 + - mixed-types-num # https://github.com/michalkonecny/mixed-types-num/issues/3 - multiset # doctests require Glob, a hidden package - perf # https://github.com/fpco/stackage/pull/2859 - picosat # https://github.com/fpco/stackage/pull/2382 From fc411339bb5277ac584cb54ad72ed4ad4776e571 Mon Sep 17 00:00:00 2001 From: Dan Burton Date: Wed, 10 Apr 2019 20:14:47 -0400 Subject: [PATCH 060/108] re-enable ghc-compact & compact --- build-constraints.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index a08456b7..883b7dd0 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -522,7 +522,7 @@ packages: - say - unliftio-core - unliftio - - compact < 0 # ghc-compact + - compact - fsnotify - hinotify @@ -4023,6 +4023,7 @@ packages: - fingertree - fmlist - generic-arbitrary + - ghc-compact - ghc-paths - ghc-prof - gi-gdk @@ -4332,7 +4333,6 @@ packages: - prim-array < 0 # BuildFailureException Process exited with ExitFailure 1: ./Setup build - xxhash < 0 # BuildFailureException Process exited with ExitFailure 1: ./Setup build - Unique < 0 # GHC 8.4 via base-4.11.0.0 - - ghc-compact < 0 # GHC 8.4 via base-4.11.1.0 - hastache < 0 # GHC 8.4 via base-4.11.0.0 - attoparsec-time < 0 # GHC 8.4 via doctest-0.15.0 - syb-with-class < 0 # GHC 8.4 via template-haskell-2.13.0.0 From 691e9640568c8265d576d06f1e28ff5f5837be3c Mon Sep 17 00:00:00 2001 From: Dan Burton Date: Wed, 10 Apr 2019 20:47:52 -0400 Subject: [PATCH 061/108] Constrain Allure and LambdaHack per #4475 --- build-constraints.yaml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/build-constraints.yaml b/build-constraints.yaml index 883b7dd0..20355777 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -4534,6 +4534,10 @@ packages: # https://github.com/commercialhaskell/stackage/issues/4469 - cmark-gfm < 0.2.0 + # https://github.com/commercialhaskell/stackage/issues/4475 + - Allure < 0.9 + - LambdaHack < 0.9 + # end of packages # Package flags are applied to individual packages, and override the values of From ae60748d5753e8e88495014399a96bb70372853c Mon Sep 17 00:00:00 2001 From: Dan Burton Date: Wed, 10 Apr 2019 20:51:11 -0400 Subject: [PATCH 062/108] Expect tests to pass per michaelkonecny/mixed-types-num#3 --- build-constraints.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index 20355777..6adc576d 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -5106,7 +5106,6 @@ expected-test-failures: - hspec-expectations-pretty-diff # GHC 8 issue not reported upstream since issue tracker disabled - hweblib # https://github.com/aycanirican/hweblib/issues/3 - libraft # https://github.com/commercialhaskell/stackage/issues/4337#issuecomment-462465921 - - mixed-types-num # https://github.com/michalkonecny/mixed-types-num/issues/3 - multiset # doctests require Glob, a hidden package - perf # https://github.com/fpco/stackage/pull/2859 - picosat # https://github.com/fpco/stackage/pull/2382 From 17d95130088462c6b84a51af22123c8478cedfb7 Mon Sep 17 00:00:00 2001 From: Kirill Zaborsky Date: Thu, 7 Feb 2019 16:47:33 +0300 Subject: [PATCH 063/108] Use more correct pruning done in https://github.com/commercialhaskell/stack/pull/4547 --- etc/curator-2-check.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/etc/curator-2-check.sh b/etc/curator-2-check.sh index 82a8facc..6304db21 100755 --- a/etc/curator-2-check.sh +++ b/etc/curator-2-check.sh @@ -6,8 +6,8 @@ mkdir -p ~/.local/bin export PATH=$HOME/.local/bin:$PATH # Get new Stackage curator -CURATOR2=stackage-curator-2-90cf65bfddea4e8abb5bc68fe83d59a7f8766757 -wget "https://s3.amazonaws.com/www.snoyman.com/stackage-curator-2/$CURATOR2.bz2" +CURATOR2=stackage-curator-2-6ec4ac4ee5016e2ecd86af2abfa722b94d2a56c3 +wget "https://download.fpcomplete.com/stackage-curator-2/$CURATOR2.bz2" bunzip2 "$CURATOR2.bz2" chmod +x $CURATOR2 mv $CURATOR2 ~/.local/bin/stackage-curator-2 From b43549d05bf4960872965f1ad06d0f2b1b3db459 Mon Sep 17 00:00:00 2001 From: Kirill Zaborsky Date: Thu, 7 Feb 2019 17:41:52 +0300 Subject: [PATCH 064/108] Setup proper GHC to get boot libraries --- etc/curator-2-check.sh | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/etc/curator-2-check.sh b/etc/curator-2-check.sh index 6304db21..6e9369ee 100755 --- a/etc/curator-2-check.sh +++ b/etc/curator-2-check.sh @@ -2,6 +2,8 @@ set -euxo pipefail +export GHCVER=8.6.3 + mkdir -p ~/.local/bin export PATH=$HOME/.local/bin:$PATH @@ -12,9 +14,12 @@ bunzip2 "$CURATOR2.bz2" chmod +x $CURATOR2 mv $CURATOR2 ~/.local/bin/stackage-curator-2 +# Install GHC +stack setup $GHCVER + # New curator check stackage-curator-2 update && stackage-curator-2 constraints && stackage-curator-2 snapshotincomplete && stackage-curator-2 snapshot && - stackage-curator-2 checksnapshot + stack --resolver ghc-$GHCVER exec stackage-curator-2 checksnapshot From ca4015eaec3e0cf04eccba442cbaf9e4189ddf9e Mon Sep 17 00:00:00 2001 From: Kirill Zaborsky Date: Thu, 7 Feb 2019 18:10:41 +0300 Subject: [PATCH 065/108] Download and install Stack --- etc/curator-2-check.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/etc/curator-2-check.sh b/etc/curator-2-check.sh index 6e9369ee..abafaae6 100755 --- a/etc/curator-2-check.sh +++ b/etc/curator-2-check.sh @@ -4,8 +4,10 @@ set -euxo pipefail export GHCVER=8.6.3 +# Download and unpack the stack executable mkdir -p ~/.local/bin export PATH=$HOME/.local/bin:$PATH +curl -L https://www.stackage.org/stack/linux-x86_64 | tar xz --wildcards --strip-components=1 -C ~/.local/bin '*/stack' # Get new Stackage curator CURATOR2=stackage-curator-2-6ec4ac4ee5016e2ecd86af2abfa722b94d2a56c3 From bf0e69bee73c98ed656584a2885a8d3fbadd5c87 Mon Sep 17 00:00:00 2001 From: Kirill Zaborsky Date: Thu, 11 Apr 2019 16:40:31 +0300 Subject: [PATCH 066/108] Use GHC version defined in build-constraints.yaml --- etc/curator-2-check.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/etc/curator-2-check.sh b/etc/curator-2-check.sh index abafaae6..d9759b61 100755 --- a/etc/curator-2-check.sh +++ b/etc/curator-2-check.sh @@ -2,7 +2,8 @@ set -euxo pipefail -export GHCVER=8.6.3 +ETC=$(cd $(dirname $0) ; pwd) +export GHCVER=$(sed -n "s/^ghc-version: \"\(.*\)\"/\1/p" "$ETC/../build-constraints.yaml") # Download and unpack the stack executable mkdir -p ~/.local/bin From 7f50a181d4917b9fb9ee6d2847d6626d58c262f3 Mon Sep 17 00:00:00 2001 From: Kirill Zaborsky Date: Thu, 11 Apr 2019 16:41:08 +0300 Subject: [PATCH 067/108] Use newer Stack/curator versions --- automated/build-next.sh | 4 ++-- etc/curator-2-check.sh | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/automated/build-next.sh b/automated/build-next.sh index fd51f430..bc8e091c 100755 --- a/automated/build-next.sh +++ b/automated/build-next.sh @@ -61,7 +61,7 @@ BINDIR=$(cd $ROOT/bin ; pwd) ( cd $BINDIR rm -f stackage-curator stackage-curator-2*.bz2 -CURATOR2=stackage-curator-2-401883a889b06e0a2ac772fac7abcc743d5a00e2 +CURATOR2=stackage-curator-2-7e65b644121812d9a3a8b24d7130bb8865485f8f wget "https://download.fpcomplete.com/stackage-curator-2/$CURATOR2.bz2" bunzip2 "$CURATOR2.bz2" chmod +x $CURATOR2 @@ -90,7 +90,7 @@ fi ( cd $BINDIR rm -f stack stack-*.bz2 -STACK=stack-401883a889b06e0a2ac772fac7abcc743d5a00e2 +STACK=stack-7e65b644121812d9a3a8b24d7130bb8865485f8f wget "https://download.fpcomplete.com/stackage-curator-2/$STACK.bz2" bunzip2 "$STACK.bz2" chmod +x $STACK diff --git a/etc/curator-2-check.sh b/etc/curator-2-check.sh index d9759b61..a40874d1 100755 --- a/etc/curator-2-check.sh +++ b/etc/curator-2-check.sh @@ -11,7 +11,7 @@ export PATH=$HOME/.local/bin:$PATH curl -L https://www.stackage.org/stack/linux-x86_64 | tar xz --wildcards --strip-components=1 -C ~/.local/bin '*/stack' # Get new Stackage curator -CURATOR2=stackage-curator-2-6ec4ac4ee5016e2ecd86af2abfa722b94d2a56c3 +CURATOR2=stackage-curator-2-7e65b644121812d9a3a8b24d7130bb8865485f8f wget "https://download.fpcomplete.com/stackage-curator-2/$CURATOR2.bz2" bunzip2 "$CURATOR2.bz2" chmod +x $CURATOR2 From 77fa3278dff35f71914f0e91404331ea86ef6301 Mon Sep 17 00:00:00 2001 From: Daniel YU Date: Fri, 12 Apr 2019 10:52:27 +0800 Subject: [PATCH 068/108] add crc32c --- build-constraints.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/build-constraints.yaml b/build-constraints.yaml index 6adc576d..11d51bfe 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -3189,10 +3189,13 @@ packages: "Daniel YU ": - salak + - salak-yaml + - salak-toml - tensors - yam - yam-datasource - menshen + - crc32c "Tom Nielsen @glutamate": - plotlyhs From ab3829793d29d42ff6f3cec0d775c171d5321d71 Mon Sep 17 00:00:00 2001 From: Kirill Zaborsky Date: Fri, 12 Apr 2019 14:13:32 +0300 Subject: [PATCH 069/108] Hyphenated commands and target argument for constraints command --- etc/curator-2-check.sh | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/etc/curator-2-check.sh b/etc/curator-2-check.sh index a40874d1..beddaf39 100755 --- a/etc/curator-2-check.sh +++ b/etc/curator-2-check.sh @@ -20,9 +20,12 @@ mv $CURATOR2 ~/.local/bin/stackage-curator-2 # Install GHC stack setup $GHCVER +# curator's constraint command has target as a required parameter +# because of a different constraints handling in minor LTS version bumps +NIGHTLY="nightly-$(date +%Y-%m-%d)" # New curator check stackage-curator-2 update && - stackage-curator-2 constraints && - stackage-curator-2 snapshotincomplete && + stackage-curator-2 constraints --target=$NIGHTLY && + stackage-curator-2 snapshot-incomplete && stackage-curator-2 snapshot && - stack --resolver ghc-$GHCVER exec stackage-curator-2 checksnapshot + stack --resolver ghc-$GHCVER exec stackage-curator-2 check-snapshot From 170c460f5ab944f60a2ae847bee7634560989528 Mon Sep 17 00:00:00 2001 From: Kirill Zaborsky Date: Sat, 13 Apr 2019 17:18:33 +0300 Subject: [PATCH 070/108] Disable rio-0.1.9.0 breaking etc and Stack --- build-constraints.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/build-constraints.yaml b/build-constraints.yaml index 6adc576d..e52984e9 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -4538,6 +4538,9 @@ packages: - Allure < 0.9 - LambdaHack < 0.9 + # https://github.com/commercialhaskell/stackage/issues/4479 + - rio < 0.1.9.0 + # end of packages # Package flags are applied to individual packages, and override the values of From f7b8c9a5e448450d871c3dd14262feb43ce9bf06 Mon Sep 17 00:00:00 2001 From: Mikolaj Konarski Date: Sat, 13 Apr 2019 21:18:34 +0200 Subject: [PATCH 071/108] Drop unneeded constraints on LH and Allure (#4475) The issue is reported to be fixed and haddock problems are worked around in the new cabal files (as are the original issue problems, in fact). --- build-constraints.yaml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index 6adc576d..b5af9a56 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -4534,10 +4534,6 @@ packages: # https://github.com/commercialhaskell/stackage/issues/4469 - cmark-gfm < 0.2.0 - # https://github.com/commercialhaskell/stackage/issues/4475 - - Allure < 0.9 - - LambdaHack < 0.9 - # end of packages # Package flags are applied to individual packages, and override the values of From ee03f7b36ccb2b483ed91e3c2ded976d8a6bf448 Mon Sep 17 00:00:00 2001 From: Dan Burton Date: Sat, 13 Apr 2019 21:15:02 -0400 Subject: [PATCH 072/108] Expect test failure per AllureOfTheStars/Allure#96 --- build-constraints.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/build-constraints.yaml b/build-constraints.yaml index 2facccb9..d0d62840 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -5097,6 +5097,7 @@ expected-test-failures: - hpack-dhall # https://github.com/BlockScope/hpack-dhall/issues/25 # Compilation failures + - Allure # https://github.com/AllureOfTheStars/Allure/issues/96 - ListLike # No issue tracker, e-mail sent to maintainer - amazonka-core # https://github.com/brendanhay/amazonka/issues/397 - async-timer # https://github.com/mtesseract/async-timer/issues/8 From 90b525afc8d3215e4763a206799a90feb7ea5793 Mon Sep 17 00:00:00 2001 From: Akihito KIRISAKI Date: Sun, 14 Apr 2019 12:06:34 +0900 Subject: [PATCH 073/108] add caster --- build-constraints.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/build-constraints.yaml b/build-constraints.yaml index d0d62840..bbd1a25f 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -3885,6 +3885,9 @@ packages: - msgpack-aeson - int-cast + "Akihito Kirisaki @kirisaki": + - caster + "Grandfathered dependencies": - Boolean - ChasingBottoms From bf6fa497a313d00ff84543ea8381a9be5a959840 Mon Sep 17 00:00:00 2001 From: Dan Burton Date: Sun, 14 Apr 2019 19:05:44 -0400 Subject: [PATCH 074/108] Revert "Expect test failure per AllureOfTheStars/Allure#96" This reverts commit ee03f7b36ccb2b483ed91e3c2ded976d8a6bf448. --- build-constraints.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index d0d62840..2facccb9 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -5097,7 +5097,6 @@ expected-test-failures: - hpack-dhall # https://github.com/BlockScope/hpack-dhall/issues/25 # Compilation failures - - Allure # https://github.com/AllureOfTheStars/Allure/issues/96 - ListLike # No issue tracker, e-mail sent to maintainer - amazonka-core # https://github.com/brendanhay/amazonka/issues/397 - async-timer # https://github.com/mtesseract/async-timer/issues/8 From a5bfe089aef2f147c808d9c41202a29ee6d15453 Mon Sep 17 00:00:00 2001 From: Michael Snoyman Date: Mon, 15 Apr 2019 09:06:57 +0300 Subject: [PATCH 075/108] Newer convert program --- automated/new-stackage-format/convert.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/automated/new-stackage-format/convert.sh b/automated/new-stackage-format/convert.sh index 66460b37..87c21a69 100755 --- a/automated/new-stackage-format/convert.sh +++ b/automated/new-stackage-format/convert.sh @@ -4,7 +4,7 @@ set -eux if [[ ! -f convert ]] then - curl https://s3.amazonaws.com/michael.snoyman.com/convert-old-stackage-22f85f4829da949df601f2facf2d9b8c794232cf.bz2 > convert.bz2 + curl https://s3.amazonaws.com/www.snoyman.com/convert-old-stackage-f780174e2c84e4fb171f6526228d9243beb7fd71.bz2 > convert.bz2 chmod +x convert.bz2 bunzip2 convert.bz2 fi From 7306085d054f697e415adfcc9b94f66b27545539 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Tue, 16 Apr 2019 14:57:22 +0800 Subject: [PATCH 076/108] add fedora-img-dl, http-directory, xdg-userdirs --- build-constraints.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/build-constraints.yaml b/build-constraints.yaml index 60cd61d7..77e71b7a 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -1355,6 +1355,8 @@ packages: - cabal-rpm - fedora-dists - fedora-haskell-tools + - fedora-img-dl + - http-directory - rpmbuild-order - simple-cmd - simple-cmd-args @@ -1375,6 +1377,7 @@ packages: - vcswrapper < 0 # GHC 8.4 via base-4.11.0.0 - ShellCheck - binary-shared + - xdg-userdirs - codec-rpm - cpio-conduit From 44e9c58310a99ebde2630aca33000fc9af671201 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Tue, 16 Apr 2019 15:02:16 +0800 Subject: [PATCH 077/108] http-media < 0.8.0.0 (#4483) --- build-constraints.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/build-constraints.yaml b/build-constraints.yaml index 77e71b7a..3b479ed1 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -4546,6 +4546,8 @@ packages: # https://github.com/commercialhaskell/stackage/issues/4479 - rio < 0.1.9.0 + # https://github.com/commercialhaskell/stackage/issues/4483 + - http-media < 0.8.0.0 # end of packages # Package flags are applied to individual packages, and override the values of From 6d7863068c0fd675b9bdc1b32329a3ba14f1aec6 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Tue, 16 Apr 2019 15:07:11 +0800 Subject: [PATCH 078/108] hslogger < 1.3.0.0 (#4484) --- build-constraints.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/build-constraints.yaml b/build-constraints.yaml index 3b479ed1..1325b017 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -4548,6 +4548,9 @@ packages: # https://github.com/commercialhaskell/stackage/issues/4483 - http-media < 0.8.0.0 + + # https://github.com/commercialhaskell/stackage/issues/4484 + - hslogger < 1.3.0.0 # end of packages # Package flags are applied to individual packages, and override the values of From 0df184804da6bd107e043ca63e14470c0653caa2 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Tue, 16 Apr 2019 15:22:47 +0800 Subject: [PATCH 079/108] universe-* bounds for lattices-1.7.1.1 (#4485) --- build-constraints.yaml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/build-constraints.yaml b/build-constraints.yaml index 1325b017..a39a2a49 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -4551,6 +4551,10 @@ packages: # https://github.com/commercialhaskell/stackage/issues/4484 - hslogger < 1.3.0.0 + + # https://github.com/commercialhaskell/stackage/issues/4485 + - universe-base < 1.1 + - universe-reverse-instances < 1.1 # end of packages # Package flags are applied to individual packages, and override the values of From 55c28d10cc85ddc6b8390007d9c70a8f44c429f1 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Tue, 16 Apr 2019 15:25:56 +0800 Subject: [PATCH 080/108] 2 more universe-instance-* bounds (#4485) --- build-constraints.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/build-constraints.yaml b/build-constraints.yaml index a39a2a49..153a1ce0 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -4555,6 +4555,8 @@ packages: # https://github.com/commercialhaskell/stackage/issues/4485 - universe-base < 1.1 - universe-reverse-instances < 1.1 + - universe-instances-base < 1.1 + - universe-instances-trans < 1.1 # end of packages # Package flags are applied to individual packages, and override the values of From ae6185894df2a724efa9df10a8230e16a064d36d Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Tue, 16 Apr 2019 15:39:20 +0800 Subject: [PATCH 081/108] try adding universe and universe-instances-extended bounds too (#4485) --- build-constraints.yaml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index 153a1ce0..d2478988 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -4553,10 +4553,12 @@ packages: - hslogger < 1.3.0.0 # https://github.com/commercialhaskell/stackage/issues/4485 + - universe < 1.1 - universe-base < 1.1 - - universe-reverse-instances < 1.1 - universe-instances-base < 1.1 + - universe-instances-extended < 1.1 - universe-instances-trans < 1.1 + - universe-reverse-instances < 1.1 # end of packages # Package flags are applied to individual packages, and override the values of From d6b6f8814bf20cf013612f81388b8735b591389c Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Wed, 17 Apr 2019 16:43:55 +0800 Subject: [PATCH 082/108] drop universe* bounds (#4485); reenable universe & universe-instances-extended --- build-constraints.yaml | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index d2478988..76bc6c94 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -4378,7 +4378,6 @@ packages: - o-clock < 0 - teardown < 0 - typography-geometry < 0 - - universe-instances-extended < 0 # transitive dependencies of packages failing to build - butcher < 0 @@ -4391,7 +4390,6 @@ packages: - jvm < 0 - plot-light < 0 - rdf < 0 - - universe < 0 "Blocked per http-client-0.6": @@ -4551,14 +4549,6 @@ packages: # https://github.com/commercialhaskell/stackage/issues/4484 - hslogger < 1.3.0.0 - - # https://github.com/commercialhaskell/stackage/issues/4485 - - universe < 1.1 - - universe-base < 1.1 - - universe-instances-base < 1.1 - - universe-instances-extended < 1.1 - - universe-instances-trans < 1.1 - - universe-reverse-instances < 1.1 # end of packages # Package flags are applied to individual packages, and override the values of From 074199fa0af266baef5f20c62587d35268674330 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Wed, 17 Apr 2019 17:05:24 +0800 Subject: [PATCH 083/108] hide ghc-lib-parser MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit eg: src/Text/Heterocephalus.hs:71:1: error: Ambiguous module name ‘Language.Haskell.TH.Lib’: it was found in multiple packages: ghc-lib-parser-0.20190402 template-haskell-2.14.0.0 --- build-constraints.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/build-constraints.yaml b/build-constraints.yaml index 76bc6c94..d8b0493c 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -5688,6 +5688,7 @@ hide: - temporary-rc # conflicts with temporary - temporary-resourcet # conflicts with temporary - ghc-lib # per its own recommendation. conflicts with template-haskell +- ghc-lib-parser # also conflicts with template-haskell # Cryptonite deprecations - cipher-aes From 522f00757f8dd2eb59cd9aa57dd1510e5e2bf1d6 Mon Sep 17 00:00:00 2001 From: Kirill Zaborsky Date: Wed, 17 Apr 2019 13:18:33 +0300 Subject: [PATCH 084/108] Add missing universe-dependent-sum --- build-constraints.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/build-constraints.yaml b/build-constraints.yaml index d8b0493c..bd5b862c 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -1541,6 +1541,7 @@ packages: # Universe - universe - universe-base + - universe-dependent-sum - universe-instances-base - universe-instances-extended - universe-instances-trans From a22801207ac9876585625298d7206e03149a8242 Mon Sep 17 00:00:00 2001 From: Neil Mitchell Date: Wed, 17 Apr 2019 23:49:32 +0100 Subject: [PATCH 085/108] Add rattle --- build-constraints.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/build-constraints.yaml b/build-constraints.yaml index d8b0493c..7f0d23b6 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -566,6 +566,7 @@ packages: - record-dot-preprocessor - filepattern - record-hasfield + - rattle "Digital Asset ": - ghc-lib From c0b8969a3c622a9f797edd5bedcaf3614dafa610 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Thu, 18 Apr 2019 15:52:14 +0800 Subject: [PATCH 086/108] persistent-2.10 bounds (#4489) --- build-constraints.yaml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/build-constraints.yaml b/build-constraints.yaml index d8b0493c..baed0ef3 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -4549,6 +4549,12 @@ packages: # https://github.com/commercialhaskell/stackage/issues/4484 - hslogger < 1.3.0.0 + + # https://github.com/commercialhaskell/stackage/issues/4489 + - persistent < 2.10.0 + - persistent-mysql < 2.10.0 + - persistent-postgresql < 2.10.0 + - persistent-template < 2.7.0 # end of packages # Package flags are applied to individual packages, and override the values of From a99c9cc70748500223e6b50eeb6d250e66bde5cf Mon Sep 17 00:00:00 2001 From: Daniel YU Date: Fri, 19 Apr 2019 10:56:48 +0800 Subject: [PATCH 087/108] add yam-redis --- build-constraints.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/build-constraints.yaml b/build-constraints.yaml index f94e830a..d5fa909f 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -3199,6 +3199,7 @@ packages: - tensors - yam - yam-datasource + - yam-redis - menshen - crc32c From 480da2f9d15525a21c693f76f606e114666479bd Mon Sep 17 00:00:00 2001 From: Kirill Zaborsky Date: Fri, 19 Apr 2019 09:51:33 +0300 Subject: [PATCH 088/108] Add persistent-test missing dependency for persistent-sqlite --- build-constraints.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/build-constraints.yaml b/build-constraints.yaml index f94e830a..32fecff9 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -464,6 +464,7 @@ packages: - persistent-postgresql - persistent-sqlite - persistent-template + - persistent-test # - stackage-curator # http-conduit 2.3 via amazonka - store - wai-websockets From afc8ffd49b54632a03e1e1eaaa5e6bbbddfa4fbe Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Sat, 20 Apr 2019 00:25:50 +0800 Subject: [PATCH 089/108] persistent-sqlite < 2.10.0 (#4489, yesodweb/persistent#899) --- build-constraints.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/build-constraints.yaml b/build-constraints.yaml index f94e830a..078ad354 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -4557,6 +4557,7 @@ packages: - persistent-mysql < 2.10.0 - persistent-postgresql < 2.10.0 - persistent-template < 2.7.0 + - persistent-sqlite < 2.10.0 # end of packages # Package flags are applied to individual packages, and override the values of From 35264a83d790acf8bbd7f6e8154f1c2e74f8c57d Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Sat, 20 Apr 2019 02:09:57 +0800 Subject: [PATCH 090/108] allow rattle testsuite to fail (#4488) --- build-constraints.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/build-constraints.yaml b/build-constraints.yaml index 078ad354..d0dc322e 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -5065,6 +5065,7 @@ expected-test-failures: - postgresql-simple-queue - postgresql-typed # PostgreSQL - purescript # git 128 https://github.com/purescript/purescript/issues/2292 + - rattle # needs fsatrace - redis-io - rethinkdb - rethinkdb-client-driver From 7d06ffb844f42bb32987ab8e55573423db51ba1a Mon Sep 17 00:00:00 2001 From: Felix Paulusma Date: Fri, 19 Apr 2019 23:26:59 +0200 Subject: [PATCH 091/108] add safe-json --- build-constraints.yaml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/build-constraints.yaml b/build-constraints.yaml index 4087408f..b67be95b 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -3895,6 +3895,9 @@ packages: "Akihito Kirisaki @kirisaki": - caster + "Felix Paulusma @Vlix": + - safe-json + "Grandfathered dependencies": - Boolean - ChasingBottoms @@ -5096,6 +5099,7 @@ expected-test-failures: - doctest-discover # 0.1.0.9 https://github.com/karun012/doctest-discover/issues/22 - graylog # 0.1.0.1 https://github.com/fpco/stackage/pull/1254 - tomland # https://github.com/kowainik/tomland/issues/141 + - safe-json # 0.1.0 https://github.com/Vlix/safe-json/issues/1 # Assertion failures, these can be real bugs or just limitations # in the test cases. From 4833b55c019b126a2c333af6db726752e8522797 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Sat, 20 Apr 2019 02:10:43 +0800 Subject: [PATCH 092/108] format expected-test-failures comment on missing servers/env --- build-constraints.yaml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index b67be95b..53645b60 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -4999,9 +4999,8 @@ expected-test-failures: - zeromq4-patterns - zip - # Requires running servers, accounts, or a specific - # environment. These shouldn't be re-enabled unless we know a fix - # has been released. + # Requires running servers, accounts, or a specific environment. + # These shouldn't be re-enabled unless we know a fix has been released. - GLFW-b # X - HTF # Requires shell script and are incompatible with sandboxed package databases - HaRe # # Needs ~/.ghc-mod/cabal-helper https://github.com/fpco/stackage/pull/906 From a4ce9728e354e59df0edb264d62fe5a15dd2d3e1 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Sun, 21 Apr 2019 22:53:50 +0800 Subject: [PATCH 093/108] persistent does not build (#4492) --- build-constraints.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index 53645b60..bee054b7 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -464,7 +464,7 @@ packages: - persistent-postgresql - persistent-sqlite - persistent-template - - persistent-test + # - persistent-test # https://github.com/commercialhaskell/stackage/pull/4492 # - stackage-curator # http-conduit 2.3 via amazonka - store - wai-websockets From 1ed72b2f9ab72dba12a303e2ab7df24c90cdc8c4 Mon Sep 17 00:00:00 2001 From: Michael Snoyman Date: Mon, 22 Apr 2019 17:21:25 +0300 Subject: [PATCH 094/108] Upper bound on connection and socks for #4494 --- build-constraints.yaml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/build-constraints.yaml b/build-constraints.yaml index bee054b7..6cfe946f 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -4563,6 +4563,10 @@ packages: - persistent-postgresql < 2.10.0 - persistent-template < 2.7.0 - persistent-sqlite < 2.10.0 + + # https://github.com/commercialhaskell/stackage/issues/4494 + - connection < 0.3 + - socks < 0.6 # end of packages # Package flags are applied to individual packages, and override the values of From a837dcfe3f58da31830e9c05b41710926cdbdfa1 Mon Sep 17 00:00:00 2001 From: Michael Snoyman Date: Mon, 22 Apr 2019 17:23:38 +0300 Subject: [PATCH 095/108] Upper bound on haskell-lsp for #4495 --- build-constraints.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/build-constraints.yaml b/build-constraints.yaml index 6cfe946f..9ea26a81 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -4567,6 +4567,9 @@ packages: # https://github.com/commercialhaskell/stackage/issues/4494 - connection < 0.3 - socks < 0.6 + + # https://github.com/commercialhaskell/stackage/issues/4495 + - haskell-lsp < 0.10 # end of packages # Package flags are applied to individual packages, and override the values of From 6df391a5598d7e58ed78ff34a81cbfcb02511513 Mon Sep 17 00:00:00 2001 From: Michael Snoyman Date: Mon, 22 Apr 2019 17:34:44 +0300 Subject: [PATCH 096/108] Remove upper bound on haskell-lsp and close #4495 This reverts commit a837dcfe3f58da31830e9c05b41710926cdbdfa1. --- build-constraints.yaml | 3 --- 1 file changed, 3 deletions(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index 9ea26a81..6cfe946f 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -4567,9 +4567,6 @@ packages: # https://github.com/commercialhaskell/stackage/issues/4494 - connection < 0.3 - socks < 0.6 - - # https://github.com/commercialhaskell/stackage/issues/4495 - - haskell-lsp < 0.10 # end of packages # Package flags are applied to individual packages, and override the values of From cc4107eaf14379954020f56f620117a605625dfe Mon Sep 17 00:00:00 2001 From: Roel van Dijk Date: Tue, 23 Apr 2019 15:42:08 +0200 Subject: [PATCH 097/108] add terminal-progress-bar As requested by https://github.com/roelvandijk/terminal-progress-bar/issues/26 Seems to build fine with multiple GHC versions: https://matrix.hackage.haskell.org/#/package/terminal-progress-bar I have no problems with supporting this package now and in the future. --- build-constraints.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/build-constraints.yaml b/build-constraints.yaml index 6cfe946f..23c3e7c2 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -10,6 +10,9 @@ cabal-format-version: "2.4" # Constraints for brand new builds packages: + "Roel van Dijk @roelvandijk": + - terminal-progress-bar + "Marek Fajkus @turboMaCk": - wai-enforce-https From aa61a46341977cf8229a34ad1a86c80627deb613 Mon Sep 17 00:00:00 2001 From: Travis Whitaker Date: Tue, 23 Apr 2019 13:54:27 -0700 Subject: [PATCH 098/108] Fixup rdf. --- build-constraints.yaml | 2 -- 1 file changed, 2 deletions(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index 23c3e7c2..e231798b 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -4399,7 +4399,6 @@ packages: - geodetics < 0 - jvm < 0 - plot-light < 0 - - rdf < 0 "Blocked per http-client-0.6": @@ -5417,7 +5416,6 @@ skipped-benchmarks: - prometheus-client - ramus - rcu - - rdf - reinterpret-cast - rng-utils - sampling From 88db8c11b2a2542bf4a1b8dc46b5e2748a48b994 Mon Sep 17 00:00:00 2001 From: Oleg Grenrus Date: Thu, 25 Apr 2019 12:03:49 +0300 Subject: [PATCH 099/108] Remove myself as a maintainer --- build-constraints.yaml | 127 ++++++++++++++++++----------------------- 1 file changed, 55 insertions(+), 72 deletions(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index e231798b..0a47eb07 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -1480,78 +1480,6 @@ packages: "Jan Stolarek @jstolarek": - tasty-program - "Oleg Grenrus @phadej": - - aeson-compat - - aeson-extra - - base64-bytestring-type - - binary-orphans - - binary-tagged - - boring - - cabal-doctest - - crypt-sha512 - - dlist-nonempty - - edit-distance - - fin - - functor-classes-compat - - generics-sop-lens - - github - - insert-ordered-containers - - integer-logarithms - - JuicyPixels-scale-dct - - kleene - - lattices - - microstache - - OneTuple - - postgresql-simple-url - - range-set-list - - regex-applicative-text - - servant-dhall < 0 - - servant-swagger-ui - - servant-swagger-ui-core - - servant-swagger-ui-redoc - - servant-yaml - - singleton-bool - - spdx < 0 # needs QuickCheck 2.12 - - splitmix - - step-function - - tdigest - - these - - time-parsers - - tree-diff - - vec - - # scrive/log - - log < 0 # via log-elasticsearch - - log-base - - log-elasticsearch < 0 # via bloodhound - - log-postgres < 0 - - # Not a maintainer - - folds - - friendly-time - - hashable - - haxl - - monad-time - - packdeps < 0 - - recursion-schemes < 5.1.1.1 || > 5.1.1.1 - - unordered-containers - - # Regex packages by Chris Kuklewicz - - regex-base - - regex-compat - - regex-pcre - - regex-posix - - regex-tdfa - - # Universe - - universe - - universe-base - - universe-dependent-sum - - universe-instances-base - - universe-instances-extended - - universe-instances-trans - - universe-reverse-instances - "Abhinav Gupta @abhinav": - farmhash - pinch < 0 # BuildFailureException Process exited with ExitFailure 1: ./Setup build @@ -3914,14 +3842,18 @@ packages: - HTTP - HsOpenSSL - HsYAML + - JuicyPixels-scale-dct - ListLike - MemoTrie - NumInstances + - OneTuple - Only - ParsecTools - QuickCheck - RSA - X11 + - aeson-compat + - aeson-extra - alsa-mixer - ansi-terminal - appar @@ -3933,14 +3865,18 @@ packages: - authenticate - auto-update - base64-bytestring + - base64-bytestring-type - base64-string - bimap + - binary-orphans - binary-parser + - binary-tagged - bindings-DSL - bitarray - blaze-builder - blaze-svg - blaze-textual + - boring - brick - buffer-builder - byteable @@ -3949,6 +3885,7 @@ packages: - bytestring-tree-builder - bzlib - ca-province-codes + - cabal-doctest - call-stack - casing - cassava-megaparsec @@ -3977,6 +3914,7 @@ packages: - convertible - cookie - cpphs + - crypt-sha512 - crypto-api - crypto-api-tests - crypto-cipher-tests @@ -4018,12 +3956,14 @@ packages: - discount - dlist - dlist-instances + - dlist-nonempty - dotgen - double-conversion - dual-tree - easy-file - easytest - ed25519 + - edit-distance - enclosed-exceptions - entropy - erf @@ -4039,23 +3979,30 @@ packages: - file-embed - file-embed-lzma - filemanip + - fin - fingertree - fmlist + - friendly-time + - functor-classes-compat - generic-arbitrary + - generics-sop-lens - ghc-compact - ghc-paths - ghc-prof - gi-gdk - gi-gdkpixbuf - gi-pango + - github - groom - groups - hackage-security + - hashable - haskell-gi-overloading - haskell-lexer - haskell-lsp-types - haskell-src - haskell-src-exts + - haxl - heap - hex - hint @@ -4092,20 +4039,25 @@ packages: - iconv - ieee754 - infer-license + - insert-ordered-containers - inspection-testing + - integer-logarithms - io-streams-haproxy - ip - ixset-typed - json - json-alt + - kleene - language-haskell-extract - largeword + - lattices - lazy-csv - libyaml - lifted-async - lifted-base - loch-th - lockfree-queue + - log-base - logging-facade - lrucache - lzma @@ -4114,12 +4066,14 @@ packages: - math-functions - mersenne-random-pure64 - mfsolve + - microstache - mmap - mmorph - mockery - monad-control - monad-logger - monad-loops + - monad-time - monads-tf - mono-traversable-instances - mono-traversable-keys @@ -4153,6 +4107,7 @@ packages: - polyparse - postgresql-libpq - postgresql-simple + - postgresql-simple-url - pretty-hex - pretty-show - prettyprinter-convert-ansi-wl-pprint @@ -4170,10 +4125,18 @@ packages: - quickcheck-unicode - random - random-shuffle + - range-set-list - raw-strings-qq - readable - rebase + - recursion-schemes + - regex-applicative-text + - regex-base + - regex-compat + - regex-pcre - regex-pcre-builtin + - regex-posix + - regex-tdfa - regex-tdfa-text - relapse - relational-schemas @@ -4188,12 +4151,17 @@ packages: - securemem - serialise - servant-client-core + - servant-swagger-ui + - servant-swagger-ui-core + - servant-swagger-ui-redoc + - servant-yaml - setenv - shakespeare - shell-escape - silently - simple-reflect - simple-sendfile + - singleton-bool - singleton-nats - size-based - skein @@ -4202,10 +4170,12 @@ packages: - special-values - splice - split + - splitmix - sql-words - srcloc - stateref - statistics + - step-function - stm-delay - stm-hamt - storable-complex @@ -4223,6 +4193,7 @@ packages: - tabular - tar - tasty-th + - tdigest - temporary - temporary-rc - temporary-resourcet @@ -4244,27 +4215,39 @@ packages: - th-extras - th-lift-instances - th-utilities + - these - threads - thyme - time-locale-compat + - time-parsers - timeit - tls-session-manager - token-bucket - tonatona - transformers-base + - tree-diff - true-name - tuple-th - type-fun - type-hint - uglymemo - unbounded-delays + - universe + - universe-base + - universe-dependent-sum + - universe-instances-base + - universe-instances-extended + - universe-instances-trans + - universe-reverse-instances - unix-compat - unix-time + - unordered-containers - url - utf8-light - utf8-string - uuid-types - vault + - vec - vector - vector-algorithms - vector-binary-instances From 8999e29ad54278072377b1ebb04041755c94d486 Mon Sep 17 00:00:00 2001 From: Oleg Grenrus Date: Thu, 25 Apr 2019 12:10:21 +0300 Subject: [PATCH 100/108] Update servant packages --- build-constraints.yaml | 29 +++++++++++++++++------------ 1 file changed, 17 insertions(+), 12 deletions(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index e231798b..a166906f 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -1317,17 +1317,26 @@ packages: - alarmclock - bank-holidays-england - "Haskell Servant ": + "Haskell Servant ": - servant - - servant-client - - servant-docs - - servant-js - - servant-server - - servant-lucid - servant-blaze - - servant-foreign - - servant-mock - servant-cassava + - servant-client + - servant-client-core + - servant-conduit + - servant-docs + - servant-foreign + - servant-http-streams + - servant-js + - servant-lucid + - servant-machines + - servant-mock + - servant-multipart + - servant-pipes + - servant-server + - servant-swagger + - servant-swagger-ui + - servant-swagger-ui-core "Alexandr Ruchkin @mvoidex": - hformat @@ -1506,9 +1515,6 @@ packages: - range-set-list - regex-applicative-text - servant-dhall < 0 - - servant-swagger-ui - - servant-swagger-ui-core - - servant-swagger-ui-redoc - servant-yaml - singleton-bool - spdx < 0 # needs QuickCheck 2.12 @@ -2476,7 +2482,6 @@ packages: "Nickolay Kudasov @fizruk": - http-api-data - swagger2 - - servant-swagger - telegram-bot-simple < 0 # https://github.com/fizruk/telegram-bot-simple/issues/18 "Jared Tobin @jtobin": From c6ea64f008175af95f3911b04a063891d44bea53 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?F=C3=A9lix=20Sipma?= Date: Fri, 26 Apr 2019 13:57:24 +0200 Subject: [PATCH 101/108] HaskellNet-SSL 0.3.4.1 should compile fine with network-2.7.0.0 --- build-constraints.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index 6cfe946f..54672845 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -1351,7 +1351,7 @@ packages: "Leza M. Lutonda @lemol": - HaskellNet - - HaskellNet-SSL < 0 + - HaskellNet-SSL "Jens Petersen @juhp": - cabal-rpm From 54f0b932edfa887a71f71cc59fa01fa591766698 Mon Sep 17 00:00:00 2001 From: David Millar-Durrant Date: Fri, 26 Apr 2019 16:44:14 +0200 Subject: [PATCH 102/108] Added rope utf16 splay with permission --- build-constraints.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/build-constraints.yaml b/build-constraints.yaml index 2b204087..f619555c 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -3837,6 +3837,9 @@ packages: "Felix Paulusma @Vlix": - safe-json + "Olle Fredriksson @ollef": + - rope-utf16-splay + "Grandfathered dependencies": - Boolean - ChasingBottoms From d7dec74ede7155e2649e4ca4f5f44da1c41e8cf8 Mon Sep 17 00:00:00 2001 From: Vaibhav Sagar Date: Fri, 26 Apr 2019 15:36:03 -0400 Subject: [PATCH 103/108] Unblock `ihaskell` and `ghc-parser` I've just released new versions to Hackage that are compatible with LTS-13. --- build-constraints.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index 2b204087..9a686143 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -3556,8 +3556,8 @@ packages: - servant-exceptions < 0 # https://github.com/ch1bo/servant-exceptions/issues/9 "Vaibhav Sagar @vaibhavsagar": - - ihaskell < 0 - - ghc-parser < 0 + - ihaskell + - ghc-parser "Alexis Williams @typedrat": - stb-image-redux From 0d9527c18a1e4a70705b36899ac38c43c611cadd Mon Sep 17 00:00:00 2001 From: Adam Bergmark Date: Sat, 27 Apr 2019 16:38:57 +0200 Subject: [PATCH 104/108] network < 2.8.0.1 #4427 and disable lambdabot-core & lambdabot-irc-plugins --- build-constraints.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index 2b204087..30dab1cb 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -2329,8 +2329,8 @@ packages: - hsyslog - jailbreak-cabal - json-autotype - - lambdabot-core - - lambdabot-irc-plugins + - lambdabot-core < 0 + - lambdabot-irc-plugins < 0 - language-nix - logging-facade-syslog - MonadPrompt @@ -4514,7 +4514,7 @@ packages: "Stackage upper bounds": # https://github.com/commercialhaskell/stackage/issues/4427 - - network < 3.0.0.0 + - network < 2.8.0.1 - hsdev < 0.3.3.0 - network-bsd < 2.8.1.0 From e2f2130d570ca7df0acd73d6dd843a35b674fc1e Mon Sep 17 00:00:00 2001 From: Adam Bergmark Date: Sat, 27 Apr 2019 16:45:12 +0200 Subject: [PATCH 105/108] th-abstraction < 0.3.0.0 #4504 --- build-constraints.yaml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/build-constraints.yaml b/build-constraints.yaml index 30dab1cb..0cc71b58 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -4560,6 +4560,10 @@ packages: # https://github.com/commercialhaskell/stackage/issues/4494 - connection < 0.3 - socks < 0.6 + + # https://github.com/commercialhaskell/stackage/issues/4504 + - th-abstraction < 0.3.0.0 + # end of packages # Package flags are applied to individual packages, and override the values of From f45d2cbdb30b09373db0630dd32cb300225d15f9 Mon Sep 17 00:00:00 2001 From: Adam Bergmark Date: Sat, 27 Apr 2019 16:48:01 +0200 Subject: [PATCH 106/108] th-lift < 0.8 #4505 --- build-constraints.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/build-constraints.yaml b/build-constraints.yaml index 0cc71b58..d4b698df 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -4564,6 +4564,9 @@ packages: # https://github.com/commercialhaskell/stackage/issues/4504 - th-abstraction < 0.3.0.0 + # https://github.com/commercialhaskell/stackage/issues/4505 + - th-lift < 0.8 + # end of packages # Package flags are applied to individual packages, and override the values of From 27e5014b83b870fb5e898b277a1f8c62a390ca77 Mon Sep 17 00:00:00 2001 From: Adam Bergmark Date: Sun, 28 Apr 2019 12:45:20 +0200 Subject: [PATCH 107/108] port-uitls < 0.2.1.0 #4506 --- build-constraints.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/build-constraints.yaml b/build-constraints.yaml index dcf77641..5161e5c7 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -4570,6 +4570,9 @@ packages: # https://github.com/commercialhaskell/stackage/issues/4505 - th-lift < 0.8 + # https://github.com/commercialhaskell/stackage/issues/4506 + - port-utils < 0.2.1.0 + # end of packages # Package flags are applied to individual packages, and override the values of From 230efd97918b81eb043ea469a3e650f8f20cc6ee Mon Sep 17 00:00:00 2001 From: Adam Bergmark Date: Sun, 28 Apr 2019 19:18:42 +0200 Subject: [PATCH 108/108] Remove th-lift upper bound, closes #4505 --- build-constraints.yaml | 3 --- 1 file changed, 3 deletions(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index 5161e5c7..cb50b2b3 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -4567,9 +4567,6 @@ packages: # https://github.com/commercialhaskell/stackage/issues/4504 - th-abstraction < 0.3.0.0 - # https://github.com/commercialhaskell/stackage/issues/4505 - - th-lift < 0.8 - # https://github.com/commercialhaskell/stackage/issues/4506 - port-utils < 0.2.1.0