git.iko.soy/stackage
on master help sign in
Merge branch 'master' into ghc864
8d5b67aMichael Snoyman
CURATORS.md+2−2
compare with master
unifiedsplit
@@ -23,8 +23,8 @@ process works:
23 * The [Travis job](https://github.com/commercialhaskell/stackage/blob/master/.travis.yml) performs these two steps to provide immediate feedback on pull requests
23 * The [Travis job](https://github.com/commercialhaskell/stackage/blob/master/.travis.yml) performs these two steps to provide immediate feedback on pull requests
24* Docker Hub [builds](https://github.com/commercialhaskell/stackage/blob/master/Dockerfile) a [Docker image](https://hub.docker.com/r/commercialhaskell/stackage/) for running builds
24* Docker Hub [builds](https://github.com/commercialhaskell/stackage/blob/master/Dockerfile) a [Docker image](https://hub.docker.com/r/commercialhaskell/stackage/) for running builds
25* 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)
25* 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)
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/fpco/lts-haskell)
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)
28* Cutting a new LTS major release is essentially just a Stackage Nightly that gets rebuilt and uploaded as an LTS
28* Cutting a new LTS major release is essentially just a Stackage Nightly that gets rebuilt and uploaded as an LTS
29
29
30## Pull requests
30## Pull requests
build-constraints.yaml+6−3
@@ -1157,8 +1157,8 @@ packages:
1157 - wai-middleware-caching-lru < 0
1157 - wai-middleware-caching-lru < 0
1158 - wai-middleware-caching-redis < 0 # GHC 8.4 via hedis
1158 - wai-middleware-caching-redis < 0 # GHC 8.4 via hedis
1159 # not package maintainer
1159 # not package maintainer
1160− - ekg < 0 # via aeson-1.4.0.0
1160+ - ekg
1161− - ekg-json < 0 # via aeson-1.4.0.0
1161+ - ekg-json
1162
1162
1163 "Paul Rouse <pgr@doynton.org> @paul-rouse":
1163 "Paul Rouse <pgr@doynton.org> @paul-rouse":
1164 - mysql
1164 - mysql
@@ -2358,7 +2358,7 @@ packages:
2358 - cabal2nix
2358 - cabal2nix
2359 - cabal2spec
2359 - cabal2spec
2360 - cgi
2360 - cgi
2361− - distribution-nixpkgs
2361+ - distribution-nixpkgs < 1.2 # https://github.com/commercialhaskell/stackage/issues/4406
2362 - distribution-opensuse
2362 - distribution-opensuse
2363 - flexible-defaults
2363 - flexible-defaults
2364 - funcmp
2364 - funcmp
@@ -3843,6 +3843,9 @@ packages:
3843 "Jan Path <jan@jpath.de> @janpath":
3843 "Jan Path <jan@jpath.de> @janpath":
3844 - smallcheck-series
3844 - smallcheck-series
3845
3845
3846+ "Taisuke Hikawa <23.prime.37@gmail.com> @23prime":
3847+ - oeis2
3848+
3846 "Grandfathered dependencies":
3849 "Grandfathered dependencies":
3847 - Boolean
3850 - Boolean
3848 - ChasingBottoms
3851 - ChasingBottoms