From c2c43b63faa10dda8135107a23199ac43037e96c Mon Sep 17 00:00:00 2001 From: David Himmelstrup Date: Wed, 10 Mar 2021 11:48:37 +0800 Subject: [PATCH 01/33] Re-enable hgeometry and hgeometry-combinatorial --- build-constraints.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index 89f8bbe7..247e5d5e 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -4283,8 +4283,8 @@ packages: - earcut - vector-circular # required by reanimate as of 0.4.2.0 - - hgeometry < 0 # via vector-0.12.2.0 https://github.com/commercialhaskell/stackage/issues/5886 - - hgeometry-combinatorial < 0 # via vector-0.12.2.0 https://github.com/commercialhaskell/stackage/issues/5886 + - hgeometry # via vector-0.12.2.0 https://github.com/commercialhaskell/stackage/issues/5886 + - hgeometry-combinatorial # via vector-0.12.2.0 https://github.com/commercialhaskell/stackage/issues/5886 - approximate-equality # required by hgeometry-combinatorial - type-level-natural-number # required by approximate-equality From 16da92afb93ab52f18c72ddd37183ca0660585e5 Mon Sep 17 00:00:00 2001 From: David Himmelstrup Date: Mon, 15 Mar 2021 22:01:44 +0800 Subject: [PATCH 02/33] Remove unnecessary comments. Co-authored-by: Adam Bergmark --- build-constraints.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index 247e5d5e..875ab184 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -4283,8 +4283,8 @@ packages: - earcut - vector-circular # required by reanimate as of 0.4.2.0 - - hgeometry # via vector-0.12.2.0 https://github.com/commercialhaskell/stackage/issues/5886 - - hgeometry-combinatorial # via vector-0.12.2.0 https://github.com/commercialhaskell/stackage/issues/5886 + - hgeometry + - hgeometry-combinatorial - approximate-equality # required by hgeometry-combinatorial - type-level-natural-number # required by approximate-equality From 402bb78cdf0fab8592e049a262f02758f4165c56 Mon Sep 17 00:00:00 2001 From: David Himmelstrup Date: Mon, 15 Mar 2021 22:04:10 +0800 Subject: [PATCH 03/33] Set flags for hgeometry. --- build-constraints.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/build-constraints.yaml b/build-constraints.yaml index 875ab184..54910ae4 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -6891,6 +6891,8 @@ packages: # Package flags are applied to individual packages, and override the values of # global-flags package-flags: + hgeometry: + planargraph: false # Won't be required by version 0.13 QuickCheck: old-random: true pathtype: From 46472b08a6c33a60dd12ac187ed5bf0c1fd43464 Mon Sep 17 00:00:00 2001 From: David Himmelstrup Date: Mon, 15 Mar 2021 22:05:23 +0800 Subject: [PATCH 04/33] Re-enable reanimate and reanimate-sag. --- build-constraints.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index 54910ae4..5ed8c17a 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -4278,8 +4278,8 @@ packages: "David Himmelstrup @lemmih": - chiphunk - - reanimate-svg < 0 # via reanimate - - reanimate < 0 # via hgeometry & hgeometry-combinatorial + - reanimate-svg + - reanimate - earcut - vector-circular # required by reanimate as of 0.4.2.0 From 53b2cc346818fc80225512ef6c18ab2bf708dd21 Mon Sep 17 00:00:00 2001 From: David Himmelstrup Date: Wed, 7 Apr 2021 09:36:00 +0800 Subject: [PATCH 05/33] Add lower bound for hgeometry. --- build-constraints.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index 5ed8c17a..3319619d 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -4283,7 +4283,7 @@ packages: - earcut - vector-circular # required by reanimate as of 0.4.2.0 - - hgeometry + - hgeometry >= 0.12.0.2 - hgeometry-combinatorial - approximate-equality # required by hgeometry-combinatorial - type-level-natural-number # required by approximate-equality From ef317fb87e9fed06fdbc1d5cf874b0cf738eb21d Mon Sep 17 00:00:00 2001 From: Brandon Chinn Date: Thu, 3 Jun 2021 18:47:56 -0700 Subject: [PATCH 06/33] Re-enable persistent-mtl --- build-constraints.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index 237edf11..4a40624f 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -5979,7 +5979,6 @@ expected-test-failures: - kawhi # https://github.com/commercialhaskell/stackage/issues/4512 - loopbreaker # https://github.com/polysemy-research/loopbreaker/issues/10 - nettle # https://github.com/stbuehler/haskell-nettle/issues/10 - - persistent-mtl # https://github.com/commercialhaskell/stackage/issues/6036 - persistent-sqlite # https://github.com/yesodweb/persistent/issues/989 - haskell-src-exts # https://github.com/commercialhaskell/stackage/issues/5151 - simple-vec3 # https://github.com/commercialhaskell/stackage/pull/5410 From 2c56eab82f769131115c516078879bd92c2bff85 Mon Sep 17 00:00:00 2001 From: Yoshikuni Jujo Date: Mon, 7 Jun 2021 17:20:00 +0900 Subject: [PATCH 07/33] add union-angle --- build-constraints.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/build-constraints.yaml b/build-constraints.yaml index 237edf11..4c7aedb8 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -3093,6 +3093,7 @@ packages: - ranged-list - c-enum - c-struct + - union-angle "Jan Gerlinger @JanGe": - irc-dcc < 0 From ad56196701fc7a31538545ad9fdbdd796d7e5486 Mon Sep 17 00:00:00 2001 From: Dan Burton Date: Mon, 7 Jun 2021 18:46:38 -0400 Subject: [PATCH 08/33] shuffle constraints, closes #5667 and 5524 --- build-constraints.yaml | 53 +++++++++++++++++++----------------------- 1 file changed, 24 insertions(+), 29 deletions(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index 237edf11..765220ad 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -1631,6 +1631,7 @@ packages: - servant-machines - servant-mock < 0 # ghc 8.10 via servant - servant-multipart + - servant-multipart-api - servant-pipes - servant-server - servant-swagger @@ -2592,6 +2593,10 @@ packages: - yi-rope # needed for opentelemetry - ghc-trace-events # @maoe + - jsonifier # @nikita-volkov + - ptr-poker # @nikita-volkov + - rerebase # @nikita-volkov + - numeric-limits # Lennart Augustsson "Tobias Bexelius @tobbebex": - GPipe < 0 # GHC 8.4 via base-4.11.0.0 @@ -3127,10 +3132,10 @@ packages: - hw-hspec-hedgehog - hw-int - hw-ip - - hw-json + - hw-json < 0 # dlist 1.0 - hw-json-simple-cursor - hw-json-standard-cursor - - hw-mquery + - hw-mquery < 0 # dlist 1.0 - hw-packed-vector - hw-parser - hw-prim @@ -3508,8 +3513,8 @@ packages: - rawstring-qm "Daniel YU ": - - salak - - salak-yaml + - salak < 0 # dlist 1.0 + - salak-yaml < 0 # salak - salak-toml < 0 # via tomland - tensors - menshen < 0 # via regex-tdfa-1.3.0 @@ -3694,11 +3699,11 @@ packages: - tasty-lua "Judah Jacobson @judah": - - proto-lens-protobuf-types - - proto-lens-protoc - - proto-lens-runtime - - proto-lens-setup - - proto-lens + - proto-lens-protobuf-types < 0 # proto-lens + - proto-lens-protoc < 0 # proto-lens + - proto-lens-runtime < 0 # proto-lens + - proto-lens-setup < 0 # proto-lens-protoc + - proto-lens < 0 # profunctors 5.6 # disabled due to QuickCheck < 2.14 # - proto-lens-arbitrary - proto-lens-optparse < 0 # optparse-applicative 0.16.1 @@ -4044,16 +4049,16 @@ packages: - aeson-with - binary-instances - comonad-extras - - composite-aeson - - composite-aeson-path - - composite-aeson-refined - - composite-aeson-throw - - composite-base - - composite-binary - - composite-ekg - - composite-hashable - - composite-tuple - - composite-xstep + - composite-aeson < 0 # profunctors 5.6 + - composite-aeson-path < 0 # composite-aeson + - composite-aeson-refined < 0 # composite-aeson + - composite-aeson-throw < 0 # composite-aeson + - composite-base < 0 # profunctors 5.6 + - composite-binary < 0 # composite-base + - composite-ekg < 0 # composite-base + - composite-hashable < 0 # composite-base + - composite-tuple < 0 # composite-base + - composite-xstep < 0 # composite-base - ixset-typed-binary-instance - ixset-typed-conversions - ixset-typed-hashable-instance @@ -4896,7 +4901,6 @@ packages: - relapse - relational-schemas - relude < 1 # cabal version/parsing issue: https://github.com/commercialhaskell/stackage/issues/5921 - - rerebase - resolv - resource-pool - resourcet @@ -5119,11 +5123,6 @@ packages: # https://github.com/commercialhaskell/stackage/issues/6013 - path < 0.8 - # https://github.com/commercialhaskell/stackage/issues/5524 - - dlist < 1.0 - - rebase < 1.7 - - rerebase < 1.7 - # https://github.com/commercialhaskell/stackage/issues/5598 - base64-bytestring < 1.2 @@ -5133,10 +5132,6 @@ packages: # https://github.com/commercialhaskell/stackage/issues/5666 - generic-deriving < 1.14 - # https://github.com/commercialhaskell/stackage/issues/5667 - - profunctors < 5.6 - - free < 5.1.6 - # https://github.com/commercialhaskell/stackage/issues/5686 - formatting < 7 From 1074f248f3269e3a9b573ebdd86abaee0a7468e5 Mon Sep 17 00:00:00 2001 From: Dan Burton Date: Tue, 8 Jun 2021 13:38:35 -0400 Subject: [PATCH 09/33] expect poly tests to fail --- build-constraints.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/build-constraints.yaml b/build-constraints.yaml index 765220ad..67e72365 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -6156,6 +6156,8 @@ expected-test-failures: - sbv + - poly + # end of expected-test-failures # Benchmarks which are known not to build. Note that, currently we do not run From 0d5893a589e28b1f3aed4cdd8aa0623db67588ab Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Fri, 11 Jun 2021 01:08:24 +0800 Subject: [PATCH 10/33] try re-enabling dl-fedora testsuite --- build-constraints.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index 67e72365..b1e2ffcd 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -5983,7 +5983,6 @@ expected-test-failures: - character-cases # https://github.com/aiya000/hs-character-cases/issues/3 - lz4-frame-conduit # https://github.com/nh2/lz4-frame-conduit/issues/3 - dhall-yaml # https://github.com/commercialhaskell/stackage/issues/5640 - - dl-fedora # https://github.com/commercialhaskell/stackage/issues/5977 - fakedata # random 1.2 # Assertion failures due to module name ambiguity From 764f40c2f555acd0fe0582192ee3a1a33e29ae3e Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Fri, 11 Jun 2021 01:23:04 +0800 Subject: [PATCH 11/33] switch nightly to 8.10.5 I believe this is really enough: maybe GHCVER can be removed from the dockerfile? --- build-constraints.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index b1e2ffcd..a938c3c9 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -1,6 +1,6 @@ ghc-major-version: "8.10" # new curator is supposed to use exact GHC version -ghc-version: "8.10.4" +ghc-version: "8.10.5" # This affects which version of the Cabal file format we allow. We # should ensure that this is always no greater than the version From b0c8d0de15196a2bde639cb1378f5dc6afd7e461 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Fri, 11 Jun 2021 01:45:21 +0800 Subject: [PATCH 12/33] bump dockerfile to 8.10.5 too --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index b330e2ac..145ad54b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,7 +2,7 @@ FROM fpco/pid1:18.04 ENV HOME /home/stackage ENV LANG en_US.UTF-8 -ENV GHCVER 8.10.4 +ENV GHCVER 8.10.5 # NOTE: also update debian-bootstrap.sh when cuda version changes ENV PATH /home/stackage/.stack/programs/x86_64-linux/ghc-$GHCVER/bin:/usr/local/cuda-10.0/bin:/usr/sbin:/usr/bin:/sbin:/bin From f255a1bcfffbf7ec9ca01f8bc25ef81b3f4c48ff Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Fri, 11 Jun 2021 12:02:05 +0800 Subject: [PATCH 13/33] crypto-enigma disallow ghc-8.10.5 base (orome/crypto-enigma-hs#34) --- build-constraints.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index a938c3c9..b9fc4e56 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -3550,7 +3550,7 @@ packages: - hledger-iadd "Roy Levien @orome": - - crypto-enigma + - crypto-enigma < 0 # https://github.com/orome/crypto-enigma-hs/issues/34 "Boldizsár Németh @nboldi": - instance-control From c8b4128db58322073ddb05a411855742587ec135 Mon Sep 17 00:00:00 2001 From: orome Date: Fri, 11 Jun 2021 11:27:23 -0400 Subject: [PATCH 14/33] Build constraints fixed for crypto-enigma --- build-constraints.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index b9fc4e56..a938c3c9 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -3550,7 +3550,7 @@ packages: - hledger-iadd "Roy Levien @orome": - - crypto-enigma < 0 # https://github.com/orome/crypto-enigma-hs/issues/34 + - crypto-enigma "Boldizsár Németh @nboldi": - instance-control From 215b055a51a2e53a739e78892759ff774572197f Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Sat, 12 Jun 2021 10:38:11 +0800 Subject: [PATCH 15/33] revert "versions < 5.0": closes #5982 --- build-constraints.yaml | 3 --- 1 file changed, 3 deletions(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index 7640eddc..23a334f9 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -5212,9 +5212,6 @@ packages: # https://github.com/commercialhaskell/stackage/issues/5975 - singleton-bool < 0.1.6 - # https://github.com/commercialhaskell/stackage/issues/5982 - - versions < 5.0 - # https://github.com/commercialhaskell/stackage/issues/5983 - yesod-form < 1.7 From 766f6f990d85b0b996659a40f54fb73e5545a569 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Sat, 12 Jun 2021 13:33:13 +0800 Subject: [PATCH 16/33] allow mwc-random-0.15: drop mcmc and stm-hamt (plus smt-containers) (#5557) add mersenne-random dep dschrempf/mcmc#1 and nikita-volkov/stm-hamt#2 --- build-constraints.yaml | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index 23a334f9..37e00754 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -1489,8 +1489,8 @@ packages: - tracing-control < 0 # https://github.com/commercialhaskell/stackage/issues/5948 - primitive-extras - primitive-unlifted < 0.2 - - stm-hamt - - stm-containers + - stm-hamt < 0 # mwc-random-0.15 https://github.com/nikita-volkov/stm-hamt/pull/2 + - stm-containers < 0 # stm-hamt - stm-lifted - monad-primitive - mwc-random-monad @@ -4486,7 +4486,7 @@ packages: - slynx - tlynx - elynx - - mcmc + - mcmc < 0 # mwc-random-0.15 https://github.com/dschrempf/mcmc/issues/1 - dirichlet - circular @@ -4824,6 +4824,7 @@ packages: - managed - math-functions - membrain + - mersenne-random - mersenne-random-pure64 - mfsolve - microstache @@ -4838,7 +4839,7 @@ packages: - mono-traversable-instances - mono-traversable-keys - multiset - - mwc-random < 0.15.0.0 # https://github.com/commercialhaskell/stackage/issues/5557 + - mwc-random - names-th - nanospec - nettle From 383ded60d40404eccda96ede40411a43a9112e69 Mon Sep 17 00:00:00 2001 From: Dominik Schrempf Date: Sat, 12 Jun 2021 18:01:01 +0200 Subject: [PATCH 17/33] re-enable mcmc see https://github.com/commercialhaskell/stackage/issues/5557 and https://github.com/dschrempf/mcmc/issues/1 --- build-constraints.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index 37e00754..2e3020b5 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -4486,7 +4486,7 @@ packages: - slynx - tlynx - elynx - - mcmc < 0 # mwc-random-0.15 https://github.com/dschrempf/mcmc/issues/1 + - mcmc - dirichlet - circular From c1df04c5610e2a9c4268a26e75afed875682d680 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Sun, 13 Jun 2021 13:02:26 +0800 Subject: [PATCH 18/33] bump doctest upperbound from 0.17 to 0.18 (#5574) --- build-constraints.yaml | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index 37e00754..071f6a25 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -1048,7 +1048,7 @@ packages: - hspec-wai-json - aeson-qq - interpolate - - doctest < 0.17 # https://github.com/commercialhaskell/stackage/issues/5574 + - doctest < 0.18 # https://github.com/commercialhaskell/stackage/issues/5574 - base-compat "Mario Blazevic @blamario": @@ -5802,6 +5802,14 @@ skipped-tests: # was in expected test failures, but seems we may have to skip entirely for unknown reasons, previously: https://github.com/clash-lang/clash-compiler/issues/1622 - clash-prelude + # doctest-0.17: https://github.com/commercialhaskell/stackage/issues/5574 + - asif + - email-validate + - polysemy + - polysemy-plugin + - servant-auth-docs + - shortcut-links + # end of skipped-tests # Tests listed in expected-test-failures configure correctly but may fail to run From 2763b09ce92b8eae558ced7383801bd82a971c2d Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Sun, 13 Jun 2021 13:19:24 +0800 Subject: [PATCH 19/33] drop generic-deriving < 1.14 bound (closes #5666) --- build-constraints.yaml | 3 --- 1 file changed, 3 deletions(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index b4238b1f..aa43c880 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -5131,9 +5131,6 @@ packages: # https://github.com/commercialhaskell/stackage/issues/5633 - language-c < 0.9 - # https://github.com/commercialhaskell/stackage/issues/5666 - - generic-deriving < 1.14 - # https://github.com/commercialhaskell/stackage/issues/5686 - formatting < 7 From db57dcb6f2c2eb8ad85379d06e7fa04bcedf1d74 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Sun, 13 Jun 2021 13:22:47 +0800 Subject: [PATCH 20/33] allow formatting 7, dropping webby (closes #5686) --- build-constraints.yaml | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index aa43c880..28d7d9b7 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -3610,7 +3610,7 @@ packages: "Aditya Manthramurthy @donatello": - minio-hs - - webby + - webby < 0 # formatting-7 "ncaq @ncaq": - debug-trace-var @@ -5131,9 +5131,6 @@ packages: # https://github.com/commercialhaskell/stackage/issues/5633 - language-c < 0.9 - # https://github.com/commercialhaskell/stackage/issues/5686 - - formatting < 7 - # https://github.com/commercialhaskell/stackage/issues/5747 - http-client < 0.7 - http-client-openssl < 0.3.3 From ccf7b8afcd01f17992b65dfb9412588cad9cba0c Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Sun, 13 Jun 2021 13:25:05 +0800 Subject: [PATCH 21/33] drop 'X11 < 1.10' (closes #6057) --- build-constraints.yaml | 3 --- 1 file changed, 3 deletions(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index 28d7d9b7..9ff226ea 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -5241,9 +5241,6 @@ packages: # (doctest < 0.17) - numhask < 0.8.0.0 - # https://github.com/commercialhaskell/stackage/issues/6057 - - X11 < 1.10 - # end of packages # Package flags are applied to individual packages, and override the values of From ee448d53b1883f7363b1d6253a9818e0e0f549f2 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Sun, 13 Jun 2021 13:34:28 +0800 Subject: [PATCH 22/33] allow clock-0.8, dropping clock-extras (closes #5836) --- build-constraints.yaml | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index 9ff226ea..2c68add2 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -3464,7 +3464,7 @@ packages: - tce-conf "Jonathan Fischoff @jfischoff": - - clock-extras + - clock-extras < 0 # clock-0.8 - postgres-options - tmp-postgres - pg-transact @@ -5136,9 +5136,6 @@ packages: - http-client-openssl < 0.3.3 - req < 3.9.1 - # https://github.com/commercialhaskell/stackage/issues/5836 - - clock < 0.8.2 - # https://github.com/commercialhaskell/stackage/issues/5864 - parser-combinators < 1.3.0 - parser-combinators-tests < 1.3.0 From b2a1ea3238b76b436d51be011154c8b56cbb2e09 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Sun, 13 Jun 2021 14:02:02 +0800 Subject: [PATCH 23/33] drop monoid-subclasses 1.1 upperbound (closes #5900) --- build-constraints.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index 2c68add2..9717a4d1 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -1054,7 +1054,7 @@ packages: "Mario Blazevic @blamario": - monad-parallel - monad-coroutine - - monoid-subclasses < 1.1 # https://github.com/commercialhaskell/stackage/issues/5900 + - monoid-subclasses - rank2classes - input-parsers - incremental-parser From de4c3e6873a7a82ab382e608030e376cd88945dd Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Sun, 13 Jun 2021 14:42:01 +0800 Subject: [PATCH 24/33] allow haskell-gi-base-0.25 (closes #5962) - add gi-module - drop gi-cairo-connector and gi-cairo-render (cohomology/gi-cairo-render#6) - drop gtk-sni-tray (@IvanMalison) --- build-constraints.yaml | 28 ++++------------------------ 1 file changed, 4 insertions(+), 24 deletions(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index 9717a4d1..77a0bd69 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -3234,6 +3234,7 @@ packages: - gi-graphene - gi-gtk < 4 - gi-gtk-hs + - gi-gmodule - gi-pango - gi-xlib - gi-harfbuzz @@ -4345,9 +4346,9 @@ packages: "Ivan Malison @IvanMalison": - ConfigFile < 0 # random 1.2 - dbus-hslogger - - gi-cairo-connector - - gi-cairo-render - - gtk-sni-tray + - gi-cairo-connector < 0 # haskell-gi-base-0.25 + - gi-cairo-render < 0 # haskell-gi-base-0.25 + - gtk-sni-tray < 0 # gi-cairo-connector & gi-cairo-render - gtk-strut - rate-limit - status-notifier-item @@ -5146,7 +5147,6 @@ packages: # https://github.com/commercialhaskell/stackage/issues/5911 - lens < 5 - # https://github.com/commercialhaskell/stackage/issues/5878 - hashable < 1.3.1.0 - mmark < 0.0.7.3 @@ -5181,26 +5181,6 @@ packages: # https://github.com/commercialhaskell/stackage/issues/5959 - attoparsec < 0.14.1 - # https://github.com/commercialhaskell/stackage/issues/5962 - - haskell-gi-base < 0.25 - - haskell-gi < 0.25 - - gi-atk < 2.0.23 - - gi-cairo < 1.0.25 - - gi-dbusmenu < 0.4.9 - - gi-dbusmenugtk3 < 0.4.10 - - gi-gdk < 3.0.24 - - gi-gdkpixbuf < 2.0.25 - - gi-gdkx11 < 3.0.11 - - gi-gio < 2.0.28 - - gi-glib < 2.0.25 - - gi-gobject < 2.0.26 - - gi-graphene < 1.0.3 - - gi-gtk < 3.0.37 - - gi-gtk-hs < 0.3.10 - - gi-harfbuzz < 0.0.4 - - gi-pango < 1.0.24 - - gi-xlib <2.0.10 - # https://github.com/commercialhaskell/stackage/issues/5975 - singleton-bool < 0.1.6 From 9d919849925a0abe35d92b32c9fd6d6635809aec Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Sun, 13 Jun 2021 14:47:05 +0800 Subject: [PATCH 25/33] drop tasty-hedgehog upperbound (closes #5973) --- build-constraints.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index 77a0bd69..572ab206 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -3153,7 +3153,7 @@ packages: - sv < 0 # via base-4.13.0.0 - sv-cassava < 0 # via sv-core - sv-core < 0 # via base-4.13.0.0 - - tasty-hedgehog < 1.1.0.0 # https://github.com/commercialhaskell/stackage/issues/5973 + - tasty-hedgehog "Ismail Mustafa @ismailmustafa": - handwriting < 0 From 189c7dc8988d8cdb9b3f08e5781bbf62bdf3803b Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Sun, 13 Jun 2021 15:19:20 +0800 Subject: [PATCH 26/33] allow cryptonite-0.29 (closes #6006) disable avers --- build-constraints.yaml | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index 572ab206..6874e1a6 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -1741,7 +1741,7 @@ packages: - xmlbf < 0 # MonadFail "Tomas Carnecky @wereHamster": - - avers + - avers < 0 # cryptonite-0.29 - avers-api < 0 # via servant - avers-server < 0 # via servant-server - css-syntax @@ -5187,9 +5187,6 @@ packages: # https://github.com/commercialhaskell/stackage/issues/5983 - yesod-form < 1.7 - # https://github.com/commercialhaskell/stackage/issues/6006 - - cryptonite < 0.29 - # https://github.com/commercialhaskell/stackage/issues/6007 - memory < 0.16 From f0401cfd9b5ea6066d96b743b0e8ed07b990d8f3 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Sun, 13 Jun 2021 16:32:47 +0800 Subject: [PATCH 27/33] allow yesod-form-1.7 (closes #5983) hledger-web was revised --- build-constraints.yaml | 3 --- 1 file changed, 3 deletions(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index 6874e1a6..c3115dd4 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -5184,9 +5184,6 @@ packages: # https://github.com/commercialhaskell/stackage/issues/5975 - singleton-bool < 0.1.6 - # https://github.com/commercialhaskell/stackage/issues/5983 - - yesod-form < 1.7 - # https://github.com/commercialhaskell/stackage/issues/6007 - memory < 0.16 From d48f5346795bb0a83219b55aafec1b867ae63047 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Sun, 13 Jun 2021 17:00:50 +0800 Subject: [PATCH 28/33] unlock pandoc-2.14 etc and haddock-library-1.10 closes: #6053 #6012 #6042 #5890 basically it was "blocked by itself" --- build-constraints.yaml | 22 +++++++--------------- 1 file changed, 7 insertions(+), 15 deletions(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index 40e03cf0..89d32421 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -2998,13 +2998,14 @@ packages: - doclayout - doctemplates - emojis - - pandoc < 2.14 # https://github.com/commercialhaskell/stackage/issues/6053 + - pandoc - citeproc - - commonmark < 0.2 - - commonmark-extensions < 0.2.1 - - commonmark-pandoc < 0.2.1 + - commonmark + - commonmark-extensions + - commonmark-pandoc + - unicode-collation - HsYAML-aeson - - ipynb #< 0 # via aeson-diff + - ipynb "Karun Ramakrishnan @karun012": - doctest-discover @@ -3758,7 +3759,7 @@ packages: - conduit-zstd "Alex Biehl @alexbiehl": - - haddock-library < 1.10 # https://github.com/commercialhaskell/stackage/issues/5890 + - haddock-library - http-client-openssl "Steven Vandevelde @icidasset": @@ -4088,8 +4089,6 @@ packages: - servant-elm # ghc 8.10 via servant - systemd - - "Andre Van Der Merwe @andrevdm": - bhoogle < 0 - hyraxAbif < 0 # ghc 8.10 @@ -5198,16 +5197,9 @@ packages: - tasty-hspec < 1.1.7 # 1.1.7 re-exports cause breaks? - hspec-junit-formatter < 1.0.1.0 # https://github.com/commercialhaskell/stackage/issues/6024 - # https://github.com/commercialhaskell/stackage/issues/6012 - - texmath < 0.12.3 - - citeproc < 0.4 - # https://github.com/commercialhaskell/stackage/issues/6020 - call-stack < 0.4.0 - # https://github.com/commercialhaskell/stackage/issues/6042 - - jira-wiki-markup < 1.4 - # https://github.com/commercialhaskell/stackage/issues/5574 # (doctest < 0.17) - numhask < 0.8.0.0 From 4efa3461826f6975b1c5181cd290729888036c07 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Sun, 13 Jun 2021 17:11:40 +0800 Subject: [PATCH 29/33] allow path-0.8 (closes #6013) --- build-constraints.yaml | 3 --- 1 file changed, 3 deletions(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index 89d32421..db206e7b 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -5122,9 +5122,6 @@ packages: - network < 3.1.2.0 - dbus < 1.2.18 - # https://github.com/commercialhaskell/stackage/issues/6013 - - path < 0.8 - # https://github.com/commercialhaskell/stackage/issues/5598 - base64-bytestring < 1.2 From bc00d0f342778a23180e78a5a5cbf1cb63cad02d Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Sun, 13 Jun 2021 17:45:54 +0800 Subject: [PATCH 30/33] revert Nightly from 8.10.5 to 8.10.4 due to doctest fallout This reverts commit 764f40c2f555acd0fe0582192ee3a1a33e29ae3e See https://gitlab.haskell.org/ghc/ghc/-/issues/19763 about the missing RTS symbol --- Dockerfile | 2 +- build-constraints.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 145ad54b..b330e2ac 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,7 +2,7 @@ FROM fpco/pid1:18.04 ENV HOME /home/stackage ENV LANG en_US.UTF-8 -ENV GHCVER 8.10.5 +ENV GHCVER 8.10.4 # NOTE: also update debian-bootstrap.sh when cuda version changes ENV PATH /home/stackage/.stack/programs/x86_64-linux/ghc-$GHCVER/bin:/usr/local/cuda-10.0/bin:/usr/sbin:/usr/bin:/sbin:/bin diff --git a/build-constraints.yaml b/build-constraints.yaml index db206e7b..8bb8ae6a 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -1,6 +1,6 @@ ghc-major-version: "8.10" # new curator is supposed to use exact GHC version -ghc-version: "8.10.5" +ghc-version: "8.10.4" # This affects which version of the Cabal file format we allow. We # should ensure that this is always no greater than the version From e953c296faf20e88b518fb07d514bdd21140489c Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Sun, 13 Jun 2021 18:45:51 +0800 Subject: [PATCH 31/33] update disabled juhp packages --- build-constraints.yaml | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index 8bb8ae6a..989e0e44 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -1693,8 +1693,8 @@ packages: - simple-cmd-args - async-pool - - darcs < 0 - # - idris # aeson https://github.com/idris-lang/Idris-dev/issues/4493 + - darcs < 0 # constraints and cryptonite + # - idris # Cabal and aeson https://github.com/idris-lang/Idris-dev/issues/4493 - libffi - xmonad-contrib - cairo < 0 @@ -1710,10 +1710,6 @@ packages: - ShellCheck - binary-shared - xdg-userdirs - - - codec-rpm < 0 # via cpio-conduit - - cpio-conduit < 0 # https://github.com/commercialhaskell/stackage/issues/5948 - # please take these - cryptohash-md5 - cryptohash-sha1 From 78f3487e0e9ee7a057948d03aced5f8fbf86a72e Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Sun, 13 Jun 2021 19:07:51 +0800 Subject: [PATCH 32/33] Revert "allow yesod-form-1.7 (closes #5983)" This reverts commit f0401cfd9b5ea6066d96b743b0e8ed07b990d8f3. Stackage isn't seeing the hledger-web revision yet Maybe because the nightly script was not running? --- build-constraints.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/build-constraints.yaml b/build-constraints.yaml index 989e0e44..488607f4 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -5176,6 +5176,9 @@ packages: # https://github.com/commercialhaskell/stackage/issues/5975 - singleton-bool < 0.1.6 + # https://github.com/commercialhaskell/stackage/issues/5983 + - yesod-form < 1.7 + # https://github.com/commercialhaskell/stackage/issues/6007 - memory < 0.16 From f32beb82b0175d8a306618b01c93e9be2194d62d Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Sun, 13 Jun 2021 19:26:15 +0800 Subject: [PATCH 33/33] Revert "Set flags for hgeometry." This reverts commit 402bb78cdf0fab8592e049a262f02758f4165c56. no planargraph flag currently --- build-constraints.yaml | 2 -- 1 file changed, 2 deletions(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index 488607f4..cc253dad 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -5205,8 +5205,6 @@ packages: # Package flags are applied to individual packages, and override the values of # global-flags package-flags: - hgeometry: - planargraph: false # Won't be required by version 0.13 QuickCheck: old-random: false pathtype: