git.iko.soy/stackage
on master help sign in
Merge branch 'master' into ghc864
commit8d5b67ada11b03218340706ff137b2cb72f415f2 authorMichael Snoyman <michael@snoyman.com> dateWed 6 Mar 2019, 00:50 (8 years ago) parente364dd4d124d8f
2 files changed+8−5
compare with master
unifiedsplit
CURATORS.md+2−2 build-constraints.yaml+6−3
CURATORS.md+2−2
@@ -23,8 +23,8 @@ process works:
2323 * The [Travis job](https://github.com/commercialhaskell/stackage/blob/master/.travis.yml) performs these two steps to provide immediate feedback on pull requests
2424* Docker Hub [builds](https://github.com/commercialhaskell/stackage/blob/master/Dockerfile) a [Docker image](https://hub.docker.com/r/commercialhaskell/stackage/) for running builds
2525* 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)
26−* When a new Nightly build is completed, it is uploaded to [the nightly repo](https://github.com/fpco/stackage-nightly)
27−* 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)
26+* When a new Nightly build is completed, it is uploaded to [the nightly repo](https://github.com/commercialhaskell/stackage-nightly)
27+* 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)
2828* Cutting a new LTS major release is essentially just a Stackage Nightly that gets rebuilt and uploaded as an LTS
2929
3030## Pull requests
build-constraints.yaml+6−3
@@ -1157,8 +1157,8 @@ packages:
11571157 - wai-middleware-caching-lru < 0
11581158 - wai-middleware-caching-redis < 0 # GHC 8.4 via hedis
11591159 # not package maintainer
1160− - ekg < 0 # via aeson-1.4.0.0
1161− - ekg-json < 0 # via aeson-1.4.0.0
1160+ - ekg
1161+ - ekg-json
11621162
11631163 "Paul Rouse <pgr@doynton.org> @paul-rouse":
11641164 - mysql
@@ -2358,7 +2358,7 @@ packages:
23582358 - cabal2nix
23592359 - cabal2spec
23602360 - cgi
2361− - distribution-nixpkgs
2361+ - distribution-nixpkgs < 1.2 # https://github.com/commercialhaskell/stackage/issues/4406
23622362 - distribution-opensuse
23632363 - flexible-defaults
23642364 - funcmp
@@ -3843,6 +3843,9 @@ packages:
38433843 "Jan Path <jan@jpath.de> @janpath":
38443844 - smallcheck-series
38453845
3846+ "Taisuke Hikawa <23.prime.37@gmail.com> @23prime":
3847+ - oeis2
3848+
38463849 "Grandfathered dependencies":
38473850 - Boolean
38483851 - ChasingBottoms