Merge branch 'master' into ghc864

This commit is contained in:
Michael Snoyman 2019-03-06 00:50:29 +02:00
commit 8d5b67ada1
No known key found for this signature in database
GPG Key ID: A048E8C057E86876
2 changed files with 8 additions and 5 deletions

View File

@ -23,8 +23,8 @@ process works:
* The [Travis job](https://github.com/commercialhaskell/stackage/blob/master/.travis.yml) performs these two steps to provide immediate feedback on pull requests
* Docker Hub [builds](https://github.com/commercialhaskell/stackage/blob/master/Dockerfile) a [Docker image](https://hub.docker.com/r/commercialhaskell/stackage/) for running builds
* The stackage-build server (described below) is able to run automated builds using the [build.sh script](https://github.com/commercialhaskell/stackage/blob/master/automated/build.sh)
* When a new Nightly build is completed, it is uploaded to [the nightly repo](https://github.com/fpco/stackage-nightly)
* Once a week, we run an LTS minor bump. Instead of using build-constraints.yaml, that job takes the previous LTS release, turns it into constraints, and then bumps the version numbers to the latest on Hackage, in accordance with the version bounds in the build plan. This plans are uploaded to [the LTS repo](https://github.com/fpco/lts-haskell)
* When a new Nightly build is completed, it is uploaded to [the nightly repo](https://github.com/commercialhaskell/stackage-nightly)
* Once a week, we run an LTS minor bump. Instead of using build-constraints.yaml, that job takes the previous LTS release, turns it into constraints, and then bumps the version numbers to the latest on Hackage, in accordance with the version bounds in the build plan. This plans are uploaded to [the LTS repo](https://github.com/commercialhaskell/lts-haskell)
* Cutting a new LTS major release is essentially just a Stackage Nightly that gets rebuilt and uploaded as an LTS
## Pull requests

View File

@ -1157,8 +1157,8 @@ packages:
- wai-middleware-caching-lru < 0
- wai-middleware-caching-redis < 0 # GHC 8.4 via hedis
# not package maintainer
- ekg < 0 # via aeson-1.4.0.0
- ekg-json < 0 # via aeson-1.4.0.0
- ekg
- ekg-json
"Paul Rouse <pgr@doynton.org> @paul-rouse":
- mysql
@ -2358,7 +2358,7 @@ packages:
- cabal2nix
- cabal2spec
- cgi
- distribution-nixpkgs
- distribution-nixpkgs < 1.2 # https://github.com/commercialhaskell/stackage/issues/4406
- distribution-opensuse
- flexible-defaults
- funcmp
@ -3843,6 +3843,9 @@ packages:
"Jan Path <jan@jpath.de> @janpath":
- smallcheck-series
"Taisuke Hikawa <23.prime.37@gmail.com> @23prime":
- oeis2
"Grandfathered dependencies":
- Boolean
- ChasingBottoms