From 2f5108b2b8d9ab49468acadb593c9971b3361c76 Mon Sep 17 00:00:00 2001 From: 23prime <23.prime.37@gmail.com> Date: Tue, 5 Mar 2019 23:03:42 +0900 Subject: [PATCH 1/4] Add oeis2 --- build-constraints.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/build-constraints.yaml b/build-constraints.yaml index 8eaeaa0b..cf404a6a 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -3843,6 +3843,9 @@ packages: "Jan Path @janpath": - smallcheck-series + "Taisuke Hikawa <23.prime.37@gmail.com> @23prime": + - oeis2 + "Grandfathered dependencies": - Boolean - ChasingBottoms From d54891f82cd3a1d5974aecd7985f547fe337e0cf Mon Sep 17 00:00:00 2001 From: Kirill Zaborsky Date: Tue, 5 Mar 2019 17:55:48 +0300 Subject: [PATCH 2/4] Fix snapshot repository URLs They were moved from fpco organization to commercialhaskell --- CURATORS.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CURATORS.md b/CURATORS.md index f3937e87..0ac5ca24 100644 --- a/CURATORS.md +++ b/CURATORS.md @@ -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 From deabf552054f6eb7dfd30e1db201d75ed155dd49 Mon Sep 17 00:00:00 2001 From: Dan Burton Date: Tue, 5 Mar 2019 15:55:35 -0500 Subject: [PATCH 3/4] Restore ekg and ekg-json --- build-constraints.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index 9fc73c37..b572d563 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -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 @paul-rouse": - mysql From 0ab4738413454c7d747878227e1a05d350082c13 Mon Sep 17 00:00:00 2001 From: Michael Snoyman Date: Wed, 6 Mar 2019 00:38:42 +0200 Subject: [PATCH 4/4] Upper bound on distribution-nixpkgs for #4406 --- build-constraints.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index 9fc73c37..d8f826fd 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -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