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/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 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/automated/build.sh b/automated/build.sh index 75ac1ea5..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 /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 diff --git a/build-constraints.yaml b/build-constraints.yaml index e9376e93..872a8c5e 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 @@ -92,7 +93,7 @@ packages: "Michael Snoyman michael@snoyman.com @snoyberg": - bzlib-conduit - cabal-install - - cabal-src + - mega-sdist - case-insensitive - classy-prelude-yesod - conduit-combinators @@ -159,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 @@ -202,7 +203,6 @@ packages: - extra - bake - ghcid - - pugixml - hexml "Alan Zimmerman @alanz": @@ -308,7 +308,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": @@ -385,7 +385,7 @@ packages: - zippers - fixed - half - - gl + # - gl BLOCKED directory 1.3 - lens-aeson - zlib-lens # - hyperloglog # bounds: approximate, binary, comonad @@ -416,7 +416,7 @@ packages: - BlogLiterately-diagrams - diagrams - diagrams-builder - - diagrams-haddock + # - diagrams-haddock # BLOCKED directory 1.3 via cautious-file - diagrams-cairo - diagrams-contrib - diagrams-core @@ -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 @@ -476,10 +475,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 @@ -527,10 +527,11 @@ packages: "Andrew Thaddeus Martin @andrewthad": - yesod-table - "Chris Allen bitemyapp": + "Chris Allen @bitemyapp": - machines-directory - machines-io - bloodhound + - esqueleto # bounds: persistent "Adam Bergmark @bergmark": - HUnit @@ -542,7 +543,7 @@ packages: - fay-text - fay-uri - feed - - snaplet-fay + # - snaplet-fay # BLOCKED directory 1.3 via heist and snap - time-compat - through-text @@ -579,7 +580,7 @@ packages: - FenwickTree - hPDB - hPDB-examples - - homplexity + # - homplexity # BLOCKED directory 1.3 - wordpass # - json-autotype # bounds: aeson 1.0, lens - posix-realtime @@ -737,7 +738,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 @@ -754,7 +755,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": @@ -811,7 +812,7 @@ packages: - data-accessor-mtl # - file-location # bounds: transformers - fuzzcheck - - haddock-api + # - haddock-api BLOCKED GHC 8.0.2 - here - hlibgit2 - gitlib-libgit2 @@ -922,9 +923,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 @@ -952,7 +953,7 @@ packages: "Jens Petersen @juhp": - cabal-rpm - - cabal-sort + # - cabal-sort # BLOCKED directory 1.3 - hslua # - idris # bounds: safe @@ -1730,6 +1731,7 @@ packages: - proxied - text-show - text-show-instances + - thread-local-storage "Kirill Zaborsky @qrilka": - xlsx @@ -1877,10 +1879,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,11 +1942,13 @@ packages: - titlecase "Mark Fine @markfine": - - postgresql-schema + [] + # - postgresql-schema # BLOCKED shelly GHC 8.0.2 # - sbp # build failure "Jinjing Wang @nfjinjing": - - moesocks + [] + # - moesocks # https://github.com/nfjinjing/moesocks/issues/1 "Gregory W. Schwartz @GregorySchwartz": # - fasta # via pipes-attoparsec @@ -2159,12 +2165,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 @@ -2277,7 +2284,8 @@ packages: - cmark - texmath - highlighting-kate - - pandoc-types + - skylighting + - pandoc-types < 1.19 # Accidental upload, see: https://github.com/fpco/stackage/issues/2223 - zip-archive - doctemplates - pandoc @@ -2480,7 +2488,7 @@ packages: "Cliff Harvey @BlackBrane": - ansigraph - - quantum-random + # - quantum-random # BLOCKED directory 1.3 "Tebello Thejane @tebello-thejane": - bitx-bitcoin @@ -2530,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 @@ -2568,11 +2576,16 @@ 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 - unlit - intro + - tasty-auto + - colorful-monoids "Taras Serduke @tserduke": - do-list @@ -2688,7 +2701,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 @@ -2696,6 +2709,14 @@ packages: "aiya000 @aiya000": - stack-type + "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 @@ -2748,26 +2769,21 @@ 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 - # https://github.com/fpco/stackage/issues/2197 - - brick < 0.16 - - # 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 # https://github.com/fpco/stackage/issues/2207 - xlsx-tabular < 0.2.1.1 + # https://github.com/fpco/stackage/issues/2229 + - hspec < 2.4 + - hspec-core < 2.4 + - hspec-discover < 2.4 + - hspec-smallcheck < 0.4.2 + # end of packages # Package flags are applied to individual packages, and override the values of @@ -2841,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 @@ -2960,6 +2982,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 @@ -3142,6 +3170,24 @@ 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 + + - vector-algorithms # http://hub.darcs.net/dolio/vector-algorithms/issue/9 + + - relational-query # 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 + + # Doctests require hidden Glob package + - multiset + - 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 @@ -3199,6 +3245,10 @@ expected-haddock-failures: - classy-prelude-yesod - hledger-web + # Runs out of memory + - stratosphere + - store + # end of expected-haddock-failures # Benchmarks which should not be built. Note that Stackage builds benchmarks but does not run them. 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