From 67968c2093efb4e44eaec93f71e0dd6ffd17c198 Mon Sep 17 00:00:00 2001 From: Michael Snoyman Date: Tue, 1 Nov 2016 11:03:58 +0200 Subject: [PATCH 01/52] Use fpco/pid1 --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index c6886c39..e29818c3 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM ubuntu:16.04 +FROM fpco/pid1:16.04 ENV HOME /home/stackage ENV LANG en_US.UTF-8 From 9cc10f2e020e6de15e89b1b51cd19f2891437589 Mon Sep 17 00:00:00 2001 From: Chris Allen Date: Fri, 6 Jan 2017 16:30:24 -0600 Subject: [PATCH 02/52] Getting Esqueleto back in Stackage It's only compatible with Persistent 2.5 presently but want to get the ball rolling. --- build-constraints.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index 4bb2bb5a..a1659cbf 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -447,7 +447,6 @@ packages: "Felipe Lessa @meteficha": # - country-codes # bounds: tagsoup - # - esqueleto # bounds: persistent # - fb # bounds: aeson, http-conduit-2.2, hspec # - fb-persistent # bounds: persistent # via: fb # - mangopay # compilation failure against aeson @@ -531,6 +530,7 @@ packages: - machines-directory - machines-io - bloodhound + - esqueleto # bounds: persistent "Adam Bergmark @bergmark": - HUnit From 4fdf4c1d47cf4b295ec7f079f2c5e08f56a303d9 Mon Sep 17 00:00:00 2001 From: Neil Mitchell Date: Wed, 18 Jan 2017 22:59:20 +0000 Subject: [PATCH 03/52] Remove pugixml This library can segfault - see https://github.com/philopon/pugixml-hs/issues/5. It probably shouldn't be in Stackage, with the implied safety, until that is fixed. --- build-constraints.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index e9376e93..6935f605 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -202,7 +202,6 @@ packages: - extra - bake - ghcid - - pugixml - hexml "Alan Zimmerman @alanz": From 3fe8c10e84ba715fef327660bc2b9c2bb8748939 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Gr=C3=B6ber?= Date: Thu, 19 Jan 2017 21:02:34 +0100 Subject: [PATCH 04/52] Re-enable ghc-mod --- build-constraints.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index 6935f605..bacc9438 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -753,7 +753,7 @@ packages: # - system-canonicalpath # bounds: ghc, base # https://github.com/d12frosted/CanonicalPath/issues/5 "Daniel Gröber @DanielG": - # - ghc-mod # bounds: cabal-helper, extra, haskell-src-exts, optparse-applicative, pipes + - ghc-mod - cabal-helper "Yann Esposito yogsototh @yogsototh": From 6b2a94bd1983b0a15c58ffc40f3134dd787cc8e0 Mon Sep 17 00:00:00 2001 From: Mitsutoshi Aoe Date: Fri, 20 Jan 2017 16:11:22 +0900 Subject: [PATCH 05/52] Add viewprof --- build-constraints.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/build-constraints.yaml b/build-constraints.yaml index bacc9438..98e2d3bf 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -2695,6 +2695,9 @@ packages: "aiya000 @aiya000": - stack-type + "Mitsutoshi Aoe @maoe": + - viewprof + # If you stop maintaining a package you can move it here. # It will then be disabled if it starts causing problems. # See https://github.com/fpco/stackage/issues/1056 From a9979e2f11e55b5e46809cf08dd7ba51de3a80d3 Mon Sep 17 00:00:00 2001 From: Michael Snoyman Date: Fri, 20 Jan 2017 09:39:29 +0200 Subject: [PATCH 06/52] Upper bounds for #2220 --- build-constraints.yaml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/build-constraints.yaml b/build-constraints.yaml index bacc9438..7faa6e97 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -2767,6 +2767,10 @@ packages: # https://github.com/fpco/stackage/issues/2207 - xlsx-tabular < 0.2.1.1 + # https://github.com/fpco/stackage/issues/2220 + - genvalidity < 0.3 + - genvalidity-hspec < 0.3 + # end of packages # Package flags are applied to individual packages, and override the values of From 4f7ba8ebe8c30aaa51ddaede076ce72228866ad6 Mon Sep 17 00:00:00 2001 From: Michael Snoyman Date: Fri, 20 Jan 2017 09:46:36 +0200 Subject: [PATCH 07/52] Block hledger-ui and close #2197 --- build-constraints.yaml | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index 7faa6e97..53e2c138 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -722,7 +722,7 @@ packages: - darcs - hledger - hledger-lib - - hledger-ui + # - hledger-ui # BLOCKED brick 0.16 - hledger-web - hledger-api # - shelltestrunner # bounds: Diff, HUnit @@ -2755,9 +2755,6 @@ packages: # https://github.com/fpco/stackage/issues/2194 - vector < 0.12.0.0 - # https://github.com/fpco/stackage/issues/2197 - - brick < 0.16 - # https://github.com/fpco/stackage/issues/2205 - base-noprelude < 4.9.1.0 From 74120ad81215be454978f26c411293a25611dc50 Mon Sep 17 00:00:00 2001 From: Michael Snoyman Date: Fri, 20 Jan 2017 12:37:45 +0200 Subject: [PATCH 08/52] Remove upper bounds and close #2220 --- build-constraints.yaml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index 6811fc35..00ec4880 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -2767,10 +2767,6 @@ packages: # https://github.com/fpco/stackage/issues/2207 - xlsx-tabular < 0.2.1.1 - # https://github.com/fpco/stackage/issues/2220 - - genvalidity < 0.3 - - genvalidity-hspec < 0.3 - # end of packages # Package flags are applied to individual packages, and override the values of From d560ee4565f5c140d86ee48ce9616a0f17cc9d17 Mon Sep 17 00:00:00 2001 From: Simon Michael Date: Fri, 20 Jan 2017 08:55:42 -0800 Subject: [PATCH 09/52] re-enable hledger-ui 1.1.1 has been released, fixes #2197. --- build-constraints.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index 00ec4880..651cb37f 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -722,7 +722,7 @@ packages: - darcs - hledger - hledger-lib - # - hledger-ui # BLOCKED brick 0.16 + - hledger-ui - hledger-web - hledger-api # - shelltestrunner # bounds: Diff, HUnit From 2cf3b40353e3f0546c0fb4500e04928bffa135b9 Mon Sep 17 00:00:00 2001 From: Michael Snoyman Date: Sun, 22 Jan 2017 11:55:54 +0200 Subject: [PATCH 10/52] Upper bound for #2223 --- build-constraints.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/build-constraints.yaml b/build-constraints.yaml index 651cb37f..a8c83d5c 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -2767,6 +2767,9 @@ packages: # https://github.com/fpco/stackage/issues/2207 - xlsx-tabular < 0.2.1.1 + # https://github.com/fpco/stackage/issues/2223 + - pandoc-types < 1.19 + # end of packages # Package flags are applied to individual packages, and override the values of From f3bf4bd61057f13c6af8a74423579be860d167f1 Mon Sep 17 00:00:00 2001 From: Michael Snoyman Date: Sun, 22 Jan 2017 12:00:22 +0200 Subject: [PATCH 11/52] Add a niceness level of 15 for performing builds --- automated/build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/automated/build.sh b/automated/build.sh index 75ac1ea5..c70be3a3 100755 --- a/automated/build.sh +++ b/automated/build.sh @@ -121,7 +121,7 @@ docker run $ARGS_PREBUILD $IMAGE /bin/bash -c "stackage-curator check --plan-fil # Now do the actual build. We need to first set the owner of the home directory # correctly, so we run the command as root, change owner, and then use sudo to # switch back to the current user -docker run $ARGS_BUILD $IMAGE /bin/bash -c "chown $USER $HOME && exec sudo -E -u $USER env \"HOME=$HOME\" \"PATH=\$PATH\" stackage-curator make-bundle --plan-file $PLAN_FILE --docmap-file $DOCMAP_FILE --bundle-file $BUNDLE_FILE --target $TARGET" +docker run $ARGS_BUILD $IMAGE nice -n 15 /bin/bash -c "chown $USER $HOME && exec sudo -E -u $USER env \"HOME=$HOME\" \"PATH=\$PATH\" stackage-curator make-bundle --plan-file $PLAN_FILE --docmap-file $DOCMAP_FILE --bundle-file $BUNDLE_FILE --target $TARGET" # Make sure we actually need this snapshot. We used to perform this check # exclusively before building. Now we perform it after as well for the case of From 488fe34db4e6aa7b8148ed3fdc4a98db560c6790 Mon Sep 17 00:00:00 2001 From: Daniel Mendler Date: Sun, 22 Jan 2017 18:45:12 +0100 Subject: [PATCH 12/52] add writer-cps-morph, writer-cps-lens, writer-cps-full --- build-constraints.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/build-constraints.yaml b/build-constraints.yaml index a8c83d5c..1cacbcf4 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -2567,6 +2567,9 @@ packages: - quickcheck-special - writer-cps-mtl - writer-cps-transformers + - writer-cps-morph + - writer-cps-lens + - writer-cps-full - wl-pprint-annotated - wl-pprint-console - console-style From bfffb927e6d9cf40a8e39e42c5429dfb042c2333 Mon Sep 17 00:00:00 2001 From: Ryan Scott Date: Sun, 22 Jan 2017 19:09:04 -0500 Subject: [PATCH 13/52] Add thread-local-storage See https://github.com/rrnewton/thread-local-storage/issues/5 --- build-constraints.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/build-constraints.yaml b/build-constraints.yaml index 1cacbcf4..6850c070 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -1729,6 +1729,7 @@ packages: - proxied - text-show - text-show-instances + - thread-local-storage "Kirill Zaborsky @qrilka": - xlsx From 2dc54406ed7b1a471d7c6bd8ffc374edae9b7fbd Mon Sep 17 00:00:00 2001 From: Michael Snoyman Date: Mon, 23 Jan 2017 08:17:49 +0200 Subject: [PATCH 14/52] Add missing @ --- build-constraints.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index ec900831..9ccae5d8 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -525,7 +525,7 @@ packages: "Andrew Thaddeus Martin @andrewthad": - yesod-table - "Chris Allen bitemyapp": + "Chris Allen @bitemyapp": - machines-directory - machines-io - bloodhound From ff5c3ee3c9d32003e6599283f290b8a69bbfaa96 Mon Sep 17 00:00:00 2001 From: Michael Snoyman Date: Mon, 23 Jan 2017 15:45:56 +0200 Subject: [PATCH 15/52] GHC 8.0.2 (fixes #2205, fixes #2203) --- .travis.yml | 2 +- Dockerfile | 2 +- MAINTAINERS.md | 2 +- build-constraints.yaml | 58 ++++++++++++++++++++++++------------------ check | 2 +- debian-bootstrap.sh | 2 +- 6 files changed, 38 insertions(+), 30 deletions(-) diff --git a/.travis.yml b/.travis.yml index 6df6863c..e4d02f22 100644 --- a/.travis.yml +++ b/.travis.yml @@ -11,7 +11,7 @@ addons: - libgmp-dev env: -- GHCVER=8.0.1 +- GHCVER=8.0.2 install: # Download and unpack the stack executable diff --git a/Dockerfile b/Dockerfile index e29818c3..ad96d66b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,7 +2,7 @@ FROM fpco/pid1:16.04 ENV HOME /home/stackage ENV LANG en_US.UTF-8 -ENV PATH /opt/ghc/8.0.1/bin:/usr/sbin:/usr/bin:/sbin:/bin +ENV PATH /opt/ghc/8.0.2/bin:/usr/sbin:/usr/bin:/sbin:/bin ADD debian-bootstrap.sh /tmp/debian-bootstrap.sh RUN /tmp/debian-bootstrap.sh && rm /tmp/debian-bootstrap.sh diff --git a/MAINTAINERS.md b/MAINTAINERS.md index d358ed12..60c03d63 100644 --- a/MAINTAINERS.md +++ b/MAINTAINERS.md @@ -24,7 +24,7 @@ After doing that, send a pull request (with a commit message like "add foo-bar") If you want to make sure that the package builds against the newest versions of all dependecies you can do this: ``` $ cabal update -$ ghc --version # Should give v8.0.1 +$ ghc --version # Should give v8.0.2 $ cabal get PACKAGE-VERSION # e.g. aeson-0.11.2.1 $ cd PACKAGE-VERSION $ cabal sandbox init # Should give "Creating a new sandbox" and not "Using an existing sandbox". diff --git a/build-constraints.yaml b/build-constraints.yaml index 9ccae5d8..f450174b 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -92,7 +92,7 @@ packages: "Michael Snoyman michael@snoyman.com @snoyberg": - bzlib-conduit - cabal-install - - cabal-src + # - cabal-src BLOCKED shelly GHC 8.0.2 - case-insensitive - classy-prelude-yesod - conduit-combinators @@ -307,7 +307,7 @@ packages: - path - intero - weigh - - haskell-docs + # - haskell-docs # BLOCKED haddock-api GHC 8.0.2 # - structured-haskell-mode # bounds: haskell-src-exts # via: applicative-quoters "Alberto G. Corona @agocorona": @@ -384,7 +384,7 @@ packages: - zippers - fixed - half - - gl + # - gl BLOCKED directory 1.3 - lens-aeson - zlib-lens # - hyperloglog # bounds: approximate, binary, comonad @@ -415,7 +415,7 @@ packages: - BlogLiterately-diagrams - diagrams - diagrams-builder - - diagrams-haddock + # - diagrams-haddock # BLOCKED directory 1.3 via cautious-file - diagrams-cairo - diagrams-contrib - diagrams-core @@ -474,10 +474,11 @@ packages: - accelerate "Liam O'Connor @liamoc": + [] # - patches-vector # bounds: QuickCheck, edit-distance-vector, hspec # - composition-tree # bounds: QuickCheck # - dixi # bounds: aeson, lens, time, [...] - - latex-formulae-image + # - latex-formulae-image # BLOCKED directory 1.3 # - latex-formulae-pandoc # bounds: pandoc-types # - latex-formulae-hakyll # bounds: ghc, base # - agda-snippets # bounds: ghc, base @@ -541,7 +542,7 @@ packages: - fay-text - fay-uri - feed - - snaplet-fay + # - snaplet-fay # BLOCKED directory 1.3 via heist and snap - time-compat - through-text @@ -578,7 +579,7 @@ packages: - FenwickTree - hPDB - hPDB-examples - - homplexity + # - homplexity # BLOCKED directory 1.3 - wordpass # - json-autotype # bounds: aeson 1.0, lens - posix-realtime @@ -736,7 +737,7 @@ packages: # - al # FIXME temporary, figure out why it's not working with stackage-build - event - hid - - luminance + # - luminance # BLOCKED directory 1.3 # - luminance-samples # bounds: base - monad-journal # - msi-kb-backlit # bounds: ghc, base @@ -810,7 +811,7 @@ packages: - data-accessor-mtl # - file-location # bounds: transformers - fuzzcheck - - haddock-api + # - haddock-api BLOCKED GHC 8.0.2 - here - hlibgit2 - gitlib-libgit2 @@ -921,9 +922,9 @@ packages: - servant-cassava "Alexandr Ruchkin @mvoidex": - - hdocs + # - hdocs # BLOCKED haddock-api GHC 8.0.2 - hformat - - hsdev + # - hsdev # BLOCKED haddock-api GHC 8.0.2 - simple-log - text-region @@ -951,7 +952,7 @@ packages: "Jens Petersen @juhp": - cabal-rpm - - cabal-sort + # - cabal-sort # BLOCKED directory 1.3 - hslua # - idris # bounds: safe @@ -1877,10 +1878,12 @@ packages: - yi-snippet "Tobias Bexelius @tobbebex": - - GPipe + [] + # - GPipe # BLOCKED directory 1.3 via gl "Patrick Redmond @plredmond": - - GPipe-GLFW + [] + # - GPipe-GLFW # BLOCKED directory 1.3 via GPipe and gl # "Csaba Hruska @csabahruska": # - lambdacube-ir # bounds: aeson @@ -1938,7 +1941,8 @@ packages: - titlecase "Mark Fine @markfine": - - postgresql-schema + [] + # - postgresql-schema # BLOCKED shelly GHC 8.0.2 # - sbp # build failure "Jinjing Wang @nfjinjing": @@ -2159,12 +2163,13 @@ packages: "Jeremy Shaw @stepcut": - boomerang - - clckwrks - - clckwrks-cli - - clckwrks-plugin-page - - clckwrks-plugin-media - - clckwrks-theme-bootstrap - - hackage-whatsnew + # BLOCKED directory 1.3 + #- clckwrks + #- clckwrks-cli + #- clckwrks-plugin-page + #- clckwrks-plugin-media + #- clckwrks-theme-bootstrap + #- hackage-whatsnew - happstack-authenticate - happstack-clientsession - happstack-hsp @@ -2480,7 +2485,7 @@ packages: "Cliff Harvey @BlackBrane": - ansigraph - - quantum-random + # - quantum-random # BLOCKED directory 1.3 "Tebello Thejane @tebello-thejane": - bitx-bitcoin @@ -2762,9 +2767,6 @@ packages: # https://github.com/fpco/stackage/issues/2194 - vector < 0.12.0.0 - # https://github.com/fpco/stackage/issues/2205 - - base-noprelude < 4.9.1.0 - # https://github.com/fpco/stackage/issues/2206 - pretty-simple < 1.0.0.5 @@ -2966,6 +2968,12 @@ skipped-tests: - optparse-applicative # https://github.com/pcapriotti/optparse-applicative/issues/228 + # BLOCKED shelly GHC 8.0.2 + - c2hs + + # directory 1.3 + - machines + - xmlhtml # end of skipped-tests diff --git a/check b/check index c25c3c4a..bf7f91f6 100755 --- a/check +++ b/check @@ -3,4 +3,4 @@ # Convenience script for checking constraints locally cd `dirname $0` -exec stack exec --resolver ghc-8.0.1 stackage-curator check +exec stack exec --resolver ghc-8.0.2 stackage-curator check diff --git a/debian-bootstrap.sh b/debian-bootstrap.sh index abcdeddf..52c265bb 100755 --- a/debian-bootstrap.sh +++ b/debian-bootstrap.sh @@ -25,7 +25,7 @@ add-apt-repository -y ppa:marutter/rrutter #add-apt-repository -y ppa:openstack-ubuntu-testing/icehouse # Set the GHC version -GHCVER=8.0.1 +GHCVER=8.0.2 # Get Stack apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 575159689BEFB442 From 39b96c0a42df41c716ac8dda672aa8d09bc0f8c8 Mon Sep 17 00:00:00 2001 From: Michael Snoyman Date: Mon, 23 Jan 2017 16:24:54 +0200 Subject: [PATCH 16/52] Upper bound for #2228 --- build-constraints.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/build-constraints.yaml b/build-constraints.yaml index 9ccae5d8..5d2d0fd3 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -2774,6 +2774,9 @@ packages: # https://github.com/fpco/stackage/issues/2223 - pandoc-types < 1.19 + # https://github.com/fpco/stackage/issues/2228 + - streaming-commons < 0.1.17 + # end of packages # Package flags are applied to individual packages, and override the values of From 08bb2f53c3b39ec94fe25fea907b4c9d4cc27a76 Mon Sep 17 00:00:00 2001 From: Michael Snoyman Date: Tue, 24 Jan 2017 05:54:55 +0200 Subject: [PATCH 17/52] Remove upper bound and close #2228 This reverts commit 39b96c0a42df41c716ac8dda672aa8d09bc0f8c8. --- build-constraints.yaml | 3 --- 1 file changed, 3 deletions(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index ab5a5865..f450174b 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -2776,9 +2776,6 @@ packages: # https://github.com/fpco/stackage/issues/2223 - pandoc-types < 1.19 - # https://github.com/fpco/stackage/issues/2228 - - streaming-commons < 0.1.17 - # end of packages # Package flags are applied to individual packages, and override the values of From f4eba9d0b677ba9dd410d6cd73d0710a98f9c7c6 Mon Sep 17 00:00:00 2001 From: Michael Snoyman Date: Tue, 24 Jan 2017 12:46:38 +0200 Subject: [PATCH 18/52] Upper bound for #2229 --- build-constraints.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/build-constraints.yaml b/build-constraints.yaml index f450174b..120ce87b 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -2776,6 +2776,9 @@ packages: # https://github.com/fpco/stackage/issues/2223 - pandoc-types < 1.19 + # https://github.com/fpco/stackage/issues/2229 + - hspec < 2.4 + # end of packages # Package flags are applied to individual packages, and override the values of From 1edb1871aa98c0c453e0d639a5f7c5297b12a72c Mon Sep 17 00:00:00 2001 From: Michael Snoyman Date: Tue, 24 Jan 2017 13:00:12 +0200 Subject: [PATCH 19/52] Extra upper bounds for #2229 --- build-constraints.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/build-constraints.yaml b/build-constraints.yaml index 120ce87b..91117867 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -2778,6 +2778,8 @@ packages: # https://github.com/fpco/stackage/issues/2229 - hspec < 2.4 + - hspec-core < 2.4 + - hspec-discover < 2.4 # end of packages From f49c27b3aef330384ee96693e61769e51455a195 Mon Sep 17 00:00:00 2001 From: Daniel Mendler Date: Tue, 24 Jan 2017 15:15:23 +0100 Subject: [PATCH 20/52] add tasty-auto --- build-constraints.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/build-constraints.yaml b/build-constraints.yaml index 91117867..a49c2d91 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -2581,6 +2581,7 @@ packages: - console-style - unlit - intro + - tasty-auto "Taras Serduke @tserduke": - do-list From 46ff3720c6cbb78ec7c682303f3576815dabaed0 Mon Sep 17 00:00:00 2001 From: Michael Snoyman Date: Tue, 24 Jan 2017 16:51:00 +0200 Subject: [PATCH 21/52] Expect test failure joeyadams/haskell-stm-delay#5 --- build-constraints.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/build-constraints.yaml b/build-constraints.yaml index 91117867..c94ecd28 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -3161,6 +3161,8 @@ expected-test-failures: - yesod-auth-basic # https://github.com/creichert/yesod-auth-basic/issues/1 - folds # https://github.com/ekmett/folds/issues/12 + + - stm-delay # https://github.com/joeyadams/haskell-stm-delay/issues/5 # end of expected-test-failures # Benchmarks which are known not to build. Note that, currently we do not run From 083ee58fa97f5570e98a70dc258b408a8903029f Mon Sep 17 00:00:00 2001 From: Michael Snoyman Date: Tue, 24 Jan 2017 16:58:44 +0200 Subject: [PATCH 22/52] Expect test failure for vector-algorithms --- build-constraints.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/build-constraints.yaml b/build-constraints.yaml index c94ecd28..e23a2c20 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -3163,6 +3163,8 @@ expected-test-failures: - folds # https://github.com/ekmett/folds/issues/12 - stm-delay # https://github.com/joeyadams/haskell-stm-delay/issues/5 + + - vector-algorithms # http://hub.darcs.net/dolio/vector-algorithms/issue/9 # end of expected-test-failures # Benchmarks which are known not to build. Note that, currently we do not run From 07c9602865e1b1a850cdd1c16fb1dac28ecbbaf4 Mon Sep 17 00:00:00 2001 From: Michael Snoyman Date: Tue, 24 Jan 2017 17:01:06 +0200 Subject: [PATCH 23/52] Temporary block: alpheccar/hbayes#3 --- build-constraints.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index e23a2c20..fc8c75e1 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -70,7 +70,8 @@ packages: "alpheccar @alpheccar": - HPDF - - hbayes + # https://github.com/alpheccar/hbayes/issues/3 + # - hbayes "Dmitry Bogatov ": - once From 6fd4d09f3ab3c5f5a40dfbcaf1ab83512d203e2f Mon Sep 17 00:00:00 2001 From: Michael Snoyman Date: Tue, 24 Jan 2017 17:02:41 +0200 Subject: [PATCH 24/52] Expect test failure khibino/haskell-relational-record#51 --- build-constraints.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/build-constraints.yaml b/build-constraints.yaml index fc8c75e1..0f2ae5a7 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -3166,6 +3166,8 @@ expected-test-failures: - stm-delay # https://github.com/joeyadams/haskell-stm-delay/issues/5 - vector-algorithms # http://hub.darcs.net/dolio/vector-algorithms/issue/9 + + - relational-record # https://github.com/khibino/haskell-relational-record/issues/51 # end of expected-test-failures # Benchmarks which are known not to build. Note that, currently we do not run From 1aa01438a6f178492cd11400ff8cd0e6d5b6934d Mon Sep 17 00:00:00 2001 From: Michael Snoyman Date: Tue, 24 Jan 2017 18:37:01 +0200 Subject: [PATCH 25/52] Expect test failure nushio3/unicode-show#2 --- build-constraints.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/build-constraints.yaml b/build-constraints.yaml index 0f2ae5a7..02e91af6 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -3168,6 +3168,8 @@ expected-test-failures: - vector-algorithms # http://hub.darcs.net/dolio/vector-algorithms/issue/9 - relational-record # https://github.com/khibino/haskell-relational-record/issues/51 + + - unicode-show # https://github.com/nushio3/unicode-show/issues/2 # end of expected-test-failures # Benchmarks which are known not to build. Note that, currently we do not run From aa247ae4bf4e0f719b261d4a92aa26b71f04fc51 Mon Sep 17 00:00:00 2001 From: Michael Snoyman Date: Tue, 24 Jan 2017 18:53:52 +0200 Subject: [PATCH 26/52] Expect test failure alanz/ghc-exactprint#47 --- build-constraints.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/build-constraints.yaml b/build-constraints.yaml index 02e91af6..b9d9c336 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -3170,6 +3170,8 @@ expected-test-failures: - relational-record # https://github.com/khibino/haskell-relational-record/issues/51 - unicode-show # https://github.com/nushio3/unicode-show/issues/2 + + - ghc-exactprint # https://github.com/alanz/ghc-exactprint/issues/47 # end of expected-test-failures # Benchmarks which are known not to build. Note that, currently we do not run From efe971fe15308355d03d3dc31a4ee97b0cbdde3e Mon Sep 17 00:00:00 2001 From: Michael Snoyman Date: Tue, 24 Jan 2017 19:07:51 +0200 Subject: [PATCH 27/52] Expect doctest failures due to hidden Glob --- build-constraints.yaml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/build-constraints.yaml b/build-constraints.yaml index 4208ad57..5ed1bc31 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -3173,6 +3173,10 @@ expected-test-failures: - unicode-show # https://github.com/nushio3/unicode-show/issues/2 - ghc-exactprint # https://github.com/alanz/ghc-exactprint/issues/47 + + # Doctests require hidden Glob package + - multiset + - makefile # end of expected-test-failures # Benchmarks which are known not to build. Note that, currently we do not run From ca0f533a049d2d6f4b329bc687225c057d7c7199 Mon Sep 17 00:00:00 2001 From: Michael Snoyman Date: Tue, 24 Jan 2017 19:09:07 +0200 Subject: [PATCH 28/52] s/record/query --- build-constraints.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index 5ed1bc31..5c16471f 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -3168,7 +3168,7 @@ expected-test-failures: - vector-algorithms # http://hub.darcs.net/dolio/vector-algorithms/issue/9 - - relational-record # https://github.com/khibino/haskell-relational-record/issues/51 + - relational-query # https://github.com/khibino/haskell-relational-record/issues/51 - unicode-show # https://github.com/nushio3/unicode-show/issues/2 From efca7aac30b89e81a562267d85db33d4f760e7eb Mon Sep 17 00:00:00 2001 From: Michael Snoyman Date: Tue, 24 Jan 2017 19:10:37 +0200 Subject: [PATCH 29/52] Expect test failure chrisdone/path#54 --- build-constraints.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/build-constraints.yaml b/build-constraints.yaml index 5c16471f..cb40b303 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -3177,6 +3177,8 @@ expected-test-failures: # Doctests require hidden Glob package - multiset - makefile + + - path # https://github.com/chrisdone/path/issues/54 # end of expected-test-failures # Benchmarks which are known not to build. Note that, currently we do not run From 9c42bcdd9a8083a115df23f8352ae045b6685586 Mon Sep 17 00:00:00 2001 From: Michael Snoyman Date: Tue, 24 Jan 2017 21:21:41 +0200 Subject: [PATCH 30/52] Temporary block nfjinjing/moesocks#1 --- build-constraints.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index cb40b303..e5f3ff4f 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -1947,7 +1947,8 @@ packages: # - sbp # build failure "Jinjing Wang @nfjinjing": - - moesocks + [] + # - moesocks # https://github.com/nfjinjing/moesocks/issues/1 "Gregory W. Schwartz @GregorySchwartz": # - fasta # via pipes-attoparsec From b3495581201c0bc1e17036f6b95f23e197ab37d6 Mon Sep 17 00:00:00 2001 From: Michael Snoyman Date: Tue, 24 Jan 2017 21:23:44 +0200 Subject: [PATCH 31/52] Temporary block jonschoning/pinboard#3 --- build-constraints.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index e5f3ff4f..fa7a37d7 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -215,7 +215,8 @@ packages: - mandrill "Jon Schoning @jonschoning": - - pinboard + [] + # - pinboard # https://github.com/jonschoning/pinboard/issues/3 "Jasper Van der Jeugt @jaspervdj": - blaze-html From 7377fdc0fe133b8feead1dfd000efd60e884a0db Mon Sep 17 00:00:00 2001 From: Michael Snoyman Date: Tue, 24 Jan 2017 21:27:56 +0200 Subject: [PATCH 32/52] Temporary block alphaHeavy/consul-haskell#18 --- build-constraints.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index fa7a37d7..ce281143 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -160,7 +160,7 @@ packages: - quickcheck-assertions # - hackage-mirror # via: aws - - wai-middleware-consul + # - wai-middleware-consul # https://github.com/alphaHeavy/consul-haskell/issues/18 - wai-middleware-crowd - monad-logger-json - safe-exceptions From 9721eeb8dc716b3bc1a400a95043042a922179bd Mon Sep 17 00:00:00 2001 From: Michael Snoyman Date: Tue, 24 Jan 2017 21:30:51 +0200 Subject: [PATCH 33/52] stratosphere haddock may run out of memory --- build-constraints.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/build-constraints.yaml b/build-constraints.yaml index ce281143..1490844a 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -3238,6 +3238,9 @@ expected-haddock-failures: - classy-prelude-yesod - hledger-web + # Runs out of memory + - stratosphere + # end of expected-haddock-failures # Benchmarks which should not be built. Note that Stackage builds benchmarks but does not run them. From ac5788a981bc90adfb4355e7f78991d6463925a3 Mon Sep 17 00:00:00 2001 From: Michael Snoyman Date: Tue, 24 Jan 2017 22:12:24 +0200 Subject: [PATCH 34/52] Upper bound for #2231 --- build-constraints.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/build-constraints.yaml b/build-constraints.yaml index 1490844a..5e777268 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -2785,6 +2785,9 @@ packages: - hspec-core < 2.4 - hspec-discover < 2.4 + # https://github.com/fpco/stackage/issues/2231 + - vty < 5.15 + # end of packages # Package flags are applied to individual packages, and override the values of From 525d90e2d673e21ccc3abbd4fa8ec83460299268 Mon Sep 17 00:00:00 2001 From: Michael Snoyman Date: Wed, 25 Jan 2017 06:51:47 +0200 Subject: [PATCH 35/52] Fixes for #2232 --- build-constraints.yaml | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index 5e777268..15e547b8 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -109,7 +109,7 @@ packages: - persistent-postgresql - persistent-sqlite - persistent-template - - stackage-curator + # - stackage-curator FIXME Michael needs to reenable - stm-conduit - wai-websockets - warp-tls @@ -2538,9 +2538,9 @@ packages: "Dominic Orchard @dorchard": - array-memoize - - camfort + # - camfort # https://github.com/fpco/stackage/issues/2232 - codo-notation - - fortran-src + # - fortran-src # https://github.com/fpco/stackage/issues/2232 # - ixmonad # 0.57 Compilation failure https://github.com/fpco/stackage/pull/1710#issuecomment-235067168 - language-fortran @@ -3184,6 +3184,8 @@ expected-test-failures: - makefile - path # https://github.com/chrisdone/path/issues/54 + + - rattletrap # https://github.com/fpco/stackage/issues/2232 # end of expected-test-failures # Benchmarks which are known not to build. Note that, currently we do not run @@ -3243,6 +3245,7 @@ expected-haddock-failures: # Runs out of memory - stratosphere + - store # end of expected-haddock-failures From 4e59f519c0c10af98f4d331a7e4c3845ac2bd92a Mon Sep 17 00:00:00 2001 From: Michael Snoyman Date: Wed, 25 Jan 2017 06:56:38 +0200 Subject: [PATCH 36/52] Upper bound for #2233 --- build-constraints.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/build-constraints.yaml b/build-constraints.yaml index 15e547b8..51b1d557 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -2788,6 +2788,9 @@ packages: # https://github.com/fpco/stackage/issues/2231 - vty < 5.15 + # https://github.com/fpco/stackage/issues/2233 + - brick < 0.17 + # end of packages # Package flags are applied to individual packages, and override the values of From 1d3a0facc7e444d3f6ca54b257467ded95d51eb3 Mon Sep 17 00:00:00 2001 From: Michael Snoyman Date: Wed, 25 Jan 2017 07:05:18 +0200 Subject: [PATCH 37/52] Temporary block haskell-tools/haskell-tools#257 --- build-constraints.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index 51b1d557..c8821419 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -2700,7 +2700,7 @@ packages: - haskell-tools-demo - haskell-tools-cli - haskell-tools-daemon - - haskell-tools-debug + # - haskell-tools-debug # https://github.com/haskell-tools/haskell-tools/issues/257 "David Fisher @ddfisher": - socket-activation From 74905431227f9f94bc3ea734f921545f1431c7df Mon Sep 17 00:00:00 2001 From: Michael Snoyman Date: Wed, 25 Jan 2017 07:22:27 +0200 Subject: [PATCH 38/52] Limit jobs --- automated/build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/automated/build.sh b/automated/build.sh index c70be3a3..c5e78640 100755 --- a/automated/build.sh +++ b/automated/build.sh @@ -121,7 +121,7 @@ docker run $ARGS_PREBUILD $IMAGE /bin/bash -c "stackage-curator check --plan-fil # Now do the actual build. We need to first set the owner of the home directory # correctly, so we run the command as root, change owner, and then use sudo to # switch back to the current user -docker run $ARGS_BUILD $IMAGE nice -n 15 /bin/bash -c "chown $USER $HOME && exec sudo -E -u $USER env \"HOME=$HOME\" \"PATH=\$PATH\" stackage-curator make-bundle --plan-file $PLAN_FILE --docmap-file $DOCMAP_FILE --bundle-file $BUNDLE_FILE --target $TARGET" +docker run $ARGS_BUILD $IMAGE nice -n 15 /bin/bash -c "chown $USER $HOME && exec sudo -E -u $USER env \"HOME=$HOME\" \"PATH=\$PATH\" stackage-curator make-bundle --jobs 4 --plan-file $PLAN_FILE --docmap-file $DOCMAP_FILE --bundle-file $BUNDLE_FILE --target $TARGET" # Make sure we actually need this snapshot. We used to perform this check # exclusively before building. Now we perform it after as well for the case of From af8de33c794e6697b04f2b1767ad1b9fdc73b5a3 Mon Sep 17 00:00:00 2001 From: Michael Snoyman Date: Wed, 25 Jan 2017 07:22:43 +0200 Subject: [PATCH 39/52] Reenable stackage-curator --- build-constraints.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index c8821419..5b6c9528 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -109,7 +109,7 @@ packages: - persistent-postgresql - persistent-sqlite - persistent-template - # - stackage-curator FIXME Michael needs to reenable + - stackage-curator - stm-conduit - wai-websockets - warp-tls From 60a815846f344a0a60e0a2af143af76b88011f83 Mon Sep 17 00:00:00 2001 From: Jon Schoning Date: Tue, 24 Jan 2017 23:51:47 -0600 Subject: [PATCH 40/52] unblock pinboard --- build-constraints.yaml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index 5b6c9528..2a56b8dc 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -215,8 +215,7 @@ packages: - mandrill "Jon Schoning @jonschoning": - [] - # - pinboard # https://github.com/jonschoning/pinboard/issues/3 + - pinboard "Jasper Van der Jeugt @jaspervdj": - blaze-html From e123669be0c60977cb0ce6e13c582d9a0c17cff6 Mon Sep 17 00:00:00 2001 From: Luke Murphy Date: Wed, 25 Jan 2017 11:18:48 +0000 Subject: [PATCH 41/52] Add note about new GHC release. --- CURATORS.md | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/CURATORS.md b/CURATORS.md index 6579ee8b..6e3aa126 100644 --- a/CURATORS.md +++ b/CURATORS.md @@ -337,3 +337,24 @@ errors for builds, tests and benchmarks. 1. Add public ssh key to `~/.ssh/authorized_keys` on build server 2. Add to fpco/stackage project. + +## Dealing with a new GHC release + +As mentioned in the [GHC upgrade note], the major impact of a new GHC release +is on the packages that are causing upper bounds to be put in place. In order +to minimise out-of-date breakage and allow maintainers to have a solid chance +of getting their packages into the newest LTS, we try to do the following: + +Make an early announcement (in the form of a blog post, typically) of the new +GHC release on the nightly build and the planned deadline for the new LTS release. +Make it clear, that in the time coming up to this, we hope package maintainers +will upgrade their packages to allow for the new GHC release. + +We prefer to prune packages causing upper bounds constraints **after** the LTS +release to allow the maximum amount of packages to get into the newest LTS. + +After the first LTS release, the package pruning process may begin in order to +move forward with getting the latest versions of packages compatible with the +new GHC release. + +[GHC upgrade note]: https://github.com/fpco/stackage/blob/master/MAINTAINERS.md#upgrading-to-a-new-ghc-version From bb0eb73724c05155470bd930221a7384f7198a39 Mon Sep 17 00:00:00 2001 From: Michael Snoyman Date: Wed, 25 Jan 2017 14:02:33 +0200 Subject: [PATCH 42/52] Move pandoc-types upper bound to package itself and close #2223 --- build-constraints.yaml | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index 2a56b8dc..70fa28e9 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -2284,7 +2284,7 @@ packages: - cmark - texmath - highlighting-kate - - pandoc-types + - pandoc-types < 1.19 # Accidental upload, see: https://github.com/fpco/stackage/issues/2223 - zip-archive - doctemplates - pandoc @@ -2776,9 +2776,6 @@ packages: # https://github.com/fpco/stackage/issues/2207 - xlsx-tabular < 0.2.1.1 - # https://github.com/fpco/stackage/issues/2223 - - pandoc-types < 1.19 - # https://github.com/fpco/stackage/issues/2229 - hspec < 2.4 - hspec-core < 2.4 From 1dc290da206263ceac2c401045e10c8b6b031f35 Mon Sep 17 00:00:00 2001 From: Michael Snoyman Date: Wed, 25 Jan 2017 14:08:06 +0200 Subject: [PATCH 43/52] Switch from cabal-src to mega-sdist --- build-constraints.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index 70fa28e9..cd444087 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -93,7 +93,7 @@ packages: "Michael Snoyman michael@snoyman.com @snoyberg": - bzlib-conduit - cabal-install - # - cabal-src BLOCKED shelly GHC 8.0.2 + - mega-sdist - case-insensitive - classy-prelude-yesod - conduit-combinators From abee708f64b95fea227e31c0e6d90e2ce809e2ce Mon Sep 17 00:00:00 2001 From: John MacFarlane Date: Wed, 25 Jan 2017 17:00:59 +0100 Subject: [PATCH 44/52] Added skylighting (new dependency of pandoc). skylighting is a syntax highlighting library that will replace highlighting-kate for pandoc. I have not removed highlighting-kate, however, because it may be used by other packages, but it should be considered deprecated. --- build-constraints.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/build-constraints.yaml b/build-constraints.yaml index 1492bace..8ab46872 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -2198,6 +2198,7 @@ packages: - cmark - texmath - highlighting-kate + - skylighting - pandoc-types - zip-archive - doctemplates From 5b6ffc80ff50ec455f58b1075c8f2fe5c18ea576 Mon Sep 17 00:00:00 2001 From: Michael Snoyman Date: Wed, 25 Jan 2017 21:44:19 +0200 Subject: [PATCH 45/52] Remove upper bounds and close #2233 close #2231 --- build-constraints.yaml | 6 ------ 1 file changed, 6 deletions(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index f538476b..cbe54457 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -2782,12 +2782,6 @@ packages: - hspec-core < 2.4 - hspec-discover < 2.4 - # https://github.com/fpco/stackage/issues/2231 - - vty < 5.15 - - # https://github.com/fpco/stackage/issues/2233 - - brick < 0.17 - # end of packages # Package flags are applied to individual packages, and override the values of From f14cba89c4faab385bcfe5a85a9d5083f862d330 Mon Sep 17 00:00:00 2001 From: Daniel Mendler Date: Wed, 25 Jan 2017 23:24:19 +0100 Subject: [PATCH 46/52] add colorful-monoids --- build-constraints.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/build-constraints.yaml b/build-constraints.yaml index cbe54457..2550d988 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -2585,6 +2585,7 @@ packages: - unlit - intro - tasty-auto + - colorful-monoids "Taras Serduke @tserduke": - do-list From 944c18dd8a737a85d88090ed7045c35a6e473585 Mon Sep 17 00:00:00 2001 From: Michael Snoyman Date: Thu, 26 Jan 2017 08:11:59 +0200 Subject: [PATCH 47/52] Upper bound for #2237 --- build-constraints.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/build-constraints.yaml b/build-constraints.yaml index 2550d988..be0bf008 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -2783,6 +2783,9 @@ packages: - hspec-core < 2.4 - hspec-discover < 2.4 + # https://github.com/fpco/stackage/issues/2237 + - constraints < 0.9 + # end of packages # Package flags are applied to individual packages, and override the values of From 62649afe81ba8222faf8649ef41905e1f8a4a283 Mon Sep 17 00:00:00 2001 From: Michael Snoyman Date: Thu, 26 Jan 2017 08:12:22 +0200 Subject: [PATCH 48/52] Extra upper bound for #2229 --- build-constraints.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/build-constraints.yaml b/build-constraints.yaml index be0bf008..e0437bcc 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -2782,6 +2782,7 @@ packages: - hspec < 2.4 - hspec-core < 2.4 - hspec-discover < 2.4 + - hspec-smallcheck < 0.4.2 # https://github.com/fpco/stackage/issues/2237 - constraints < 0.9 From 9179bdceafb5e61d7a024e745a096a3740977620 Mon Sep 17 00:00:00 2001 From: Michael Snoyman Date: Thu, 26 Jan 2017 11:05:20 +0200 Subject: [PATCH 49/52] Remove upper bound and close #2237 This reverts commit 944c18dd8a737a85d88090ed7045c35a6e473585. --- build-constraints.yaml | 3 --- 1 file changed, 3 deletions(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index e0437bcc..7aa6a45b 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -2784,9 +2784,6 @@ packages: - hspec-discover < 2.4 - hspec-smallcheck < 0.4.2 - # https://github.com/fpco/stackage/issues/2237 - - constraints < 0.9 - # end of packages # Package flags are applied to individual packages, and override the values of From 2410f711928b6d98620538d900c34e09fb023c7f Mon Sep 17 00:00:00 2001 From: Michael Snoyman Date: Thu, 26 Jan 2017 11:10:35 +0200 Subject: [PATCH 50/52] Remove upper bound and close #2184 --- build-constraints.yaml | 5 ----- 1 file changed, 5 deletions(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index 7aa6a45b..28fac300 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -2764,11 +2764,6 @@ packages: # https://github.com/fpco/stackage/issues/2180 - MonadRandom < 0.5 - # https://github.com/fpco/stackage/issues/2184 - # https://github.com/ekmett/hashable-extras/pull/3 - - hashable < 1.2.5.0 - - intro < 0.1.0.3 - # https://github.com/fpco/stackage/issues/2194 - vector < 0.12.0.0 From 15e7267f41317f768d1d3ff783a330ef9de35a6e Mon Sep 17 00:00:00 2001 From: Dylan Simon Date: Thu, 26 Jan 2017 22:28:48 -0500 Subject: [PATCH 51/52] add postgresql-typed, invertible, ztail invertible has some optional dependencies outside stackage, which a stack.yaml disables the flags for. Not sure if this is the right way to deal with it. --- build-constraints.yaml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/build-constraints.yaml b/build-constraints.yaml index 28fac300..866fc76d 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -2712,6 +2712,11 @@ packages: "Mitsutoshi Aoe @maoe": - viewprof + "Dylan Simon @dylex": + - postgresql-typed + - invertible + - ztail + # If you stop maintaining a package you can move it here. # It will then be disabled if it starts causing problems. # See https://github.com/fpco/stackage/issues/1056 From 6ed05803edf5cf062dfe9be9f79105ee7298aa22 Mon Sep 17 00:00:00 2001 From: Dylan Simon Date: Thu, 26 Jan 2017 22:41:07 -0500 Subject: [PATCH 52/52] Add flags for invertible To disable optional dependencies not in stackage --- build-constraints.yaml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/build-constraints.yaml b/build-constraints.yaml index 866fc76d..872a8c5e 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -2857,6 +2857,12 @@ package-flags: ghc_7_7: false ghc_8_0: true + invertible: + TypeCompose: false + arrows: false + hlist: false + piso: false + # end of package-flags # Special configure options for individual packages