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 01/43] 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 02/43] 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 03/43] 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 04/43] 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 From b0ac72676319eb425ea6fd4d19055a340623a03f Mon Sep 17 00:00:00 2001 From: Michael Snoyman Date: Wed, 6 Mar 2019 00:52:55 +0200 Subject: [PATCH 05/43] Block three packages with transformers upper bounds and close #4408 --- build-constraints.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index b90d5b06..8b587a32 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -2096,7 +2096,7 @@ packages: - range "Vladislav Zavialov @int-index": - - transformers-lift + - transformers-lift < 0 # transformers https://github.com/commercialhaskell/stackage/issues/4408 - union - named - inj @@ -2173,7 +2173,7 @@ packages: - xlsx "Matt Parsons @parsonsmatt": - - monad-logger-prefix + - monad-logger-prefix < 0 # trasnformers https://github.com/commercialhaskell/stackage/issues/4408 - monad-metrics < 0 # - ekg-cloudwatch # http-conduit 2.3 via amazonka - smtp-mail @@ -2745,7 +2745,7 @@ packages: - binary-bits "Alex McLean @yaxu": - - tidal + - tidal < 0 # transformers https://github.com/commercialhaskell/stackage/issues/4408 - hosc "Kei Hibino @khibino": From 5b6644919d55e8136bc59a03852b2865de97258f Mon Sep 17 00:00:00 2001 From: Brent Yorgey Date: Tue, 5 Mar 2019 20:22:00 -0600 Subject: [PATCH 06/43] Reinstate palette Reinstate the palette package, which has been updated since it was removed. --- build-constraints.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index 8b587a32..83144c6e 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -1420,7 +1420,7 @@ packages: - bcrypt "Jeffrey Rosenbluth @jeffreyrosenbluth": - - palette < 0 + - palette - diagrams-canvas - svg-builder From 49cdf204f745f09aaddbdf3873a8d9d700946684 Mon Sep 17 00:00:00 2001 From: Michael Snoyman Date: Wed, 6 Mar 2019 04:48:31 +0000 Subject: [PATCH 07/43] Install GHC via Stack PPA does not yet include GHC 8.6.4 --- Dockerfile | 4 +++- debian-bootstrap.sh | 29 ++++++++++++++--------------- 2 files changed, 17 insertions(+), 16 deletions(-) diff --git a/Dockerfile b/Dockerfile index 408a8fc9..ca89e46b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,9 +2,11 @@ FROM fpco/pid1:18.04 ENV HOME /home/stackage ENV LANG en_US.UTF-8 +ENV GHCVER 8.6.4 +ENV GHCDIR /home/stackage/.stack/programs/x86_64-linux/ghc-$GHCVER # NOTE: also update debian-bootstrap.sh when cuda version changes -ENV PATH /usr/local/cuda-10.0/bin:/opt/ghc/8.6.4/bin:/usr/sbin:/usr/bin:/sbin:/bin +ENV PATH /usr/local/cuda-10.0/bin:/home/stackage/.stack/programs/x86_64-linux/ghc-$GHCVER:/usr/sbin:/usr/bin:/sbin:/bin ENV CUDA_PATH /usr/local/cuda-10.0 ADD debian-bootstrap.sh /tmp/debian-bootstrap.sh diff --git a/debian-bootstrap.sh b/debian-bootstrap.sh index 6b90ed36..33d7aba8 100755 --- a/debian-bootstrap.sh +++ b/debian-bootstrap.sh @@ -10,13 +10,21 @@ # instructions, see: # http://www.stackage.org/install -set -exu +set -exuo pipefail mkdir -p /home/stackage export LANG=C.UTF-8 export DEBIAN_FRONTEND=noninteractive +# Get curl +apt-get update +apt-get install -y curl + +# Get Stack and GHC +curl -sSL https://get.haskellstack.org/ | sh -s - -d /usr/bin +stack setup --resolver ghc-$GHCVER + apt-get update apt-get install -y \ @@ -146,11 +154,6 @@ apt-get install -y \ zlib1g-dev \ zsh -GHCVER=8.6.4 - -add-apt-repository ppa:hvr/ghc -y -apt-get install -y ghc-$GHCVER ghc-$GHCVER-dyn ghc-$GHCVER-htmldocs ghc-$GHCVER-prof - # odbc curl https://packages.microsoft.com/keys/microsoft.asc | apt-key add - curl https://packages.microsoft.com/config/debian/9/prod.list > /etc/apt/sources.list.d/mssql-release.list @@ -159,11 +162,6 @@ ACCEPT_EULA=Y apt-get install msodbcsql17 -y locale-gen en_US.UTF-8 -curl -sSL https://get.haskellstack.org/ | sh - -# Put documentation where we expect it -mv /opt/ghc/$GHCVER/share/doc/ghc-$GHCVER/ /opt/ghc/$GHCVER/share/doc/ghc - # llvm-7.0 for llvm-hs (separate since it needs wget) wget -O - http://apt.llvm.org/llvm-snapshot.gpg.key | apt-key add - \ && add-apt-repository "deb http://apt.llvm.org/bionic/ llvm-toolchain-bionic-7 main" \ @@ -258,10 +256,6 @@ apt-add-repository multiverse \ export CLANG_PURE_LLVM_LIB_DIR=/usr/lib/llvm-6.0/lib; export CLANG_PURE_LLVM_INCLUDE_DIR=/usr/lib/llvm-6.0/include; -# finally run: -ldconfig -# EOF: don't build anything below this line - # protoc, for proto-lens-combinators test suite # Instructions from: https://google.github.io/proto-lens/installing-protoc.html PROTOC_ZIP=protoc-3.3.0-linux-x86_64.zip @@ -278,3 +272,8 @@ echo /usr/lib/jvm/java-8-openjdk-amd64/jre/lib/amd64/server > /etc/ld.so.conf.d/ echo /usr/lib/llvm-3.7/lib > /etc/ld.so.conf.d/llvm.conf ldconfig +# EOF: don't build anything below this line + +# Cleanup +apt-get clean +rm -rf /var/lib/apt/lists/* From 93583d611e1228bd9a2f0ac939e1a834f4ce993b Mon Sep 17 00:00:00 2001 From: Michael Snoyman Date: Wed, 6 Mar 2019 04:55:31 +0000 Subject: [PATCH 08/43] Fix PATH --- Dockerfile | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index ca89e46b..0b6189c7 100644 --- a/Dockerfile +++ b/Dockerfile @@ -3,10 +3,9 @@ FROM fpco/pid1:18.04 ENV HOME /home/stackage ENV LANG en_US.UTF-8 ENV GHCVER 8.6.4 -ENV GHCDIR /home/stackage/.stack/programs/x86_64-linux/ghc-$GHCVER # NOTE: also update debian-bootstrap.sh when cuda version changes -ENV PATH /usr/local/cuda-10.0/bin:/home/stackage/.stack/programs/x86_64-linux/ghc-$GHCVER:/usr/sbin:/usr/bin:/sbin:/bin +ENV PATH /home/stackage/.stack/programs/x86_64-linux/ghc-$GHCVER/bin:/usr/local/cuda-10.0/bin:/usr/sbin:/usr/bin:/sbin:/bin ENV CUDA_PATH /usr/local/cuda-10.0 ADD debian-bootstrap.sh /tmp/debian-bootstrap.sh From 0f8d80c7357797e5ed74ba06177eea3de3a26699 Mon Sep 17 00:00:00 2001 From: Michael Snoyman Date: Wed, 6 Mar 2019 12:49:08 +0200 Subject: [PATCH 09/43] Block refined nikita-volkov/refined#33 --- build-constraints.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index 83144c6e..e0351344 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -1248,7 +1248,7 @@ packages: - postgresql-binary - slave-thread < 0 - stm-containers < 0 - - refined + - refined < 0 # https://github.com/nikita-volkov/refined/issues/33 "Iustin Pop @iustin": - prefix-units From 6b9faa08cfedc54a9b236a95411cfb4f6410fedd Mon Sep 17 00:00:00 2001 From: Michael Snoyman Date: Wed, 6 Mar 2019 12:49:20 +0200 Subject: [PATCH 10/43] Block packages for minad/writer-cps-mtl#3 --- build-constraints.yaml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index e0351344..f85f2ddb 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -3045,17 +3045,17 @@ packages: "Daniel Mendler @minad": - quickcheck-special - - writer-cps-mtl + - writer-cps-mtl < 0 # https://github.com/minad/writer-cps-mtl/issues/3 - writer-cps-transformers - writer-cps-morph - - writer-cps-lens - - writer-cps-full - - writer-cps-exceptions + - writer-cps-lens < 0 # writer-cps-mtl + - writer-cps-full < 0 # writer-cps-mtl + - writer-cps-exceptions < 0 # https://github.com/minad/writer-cps-mtl/issues/3 - wl-pprint-annotated - wl-pprint-console - console-style - unlit - - intro + - intro < 0 # writer-cps-mtl - tasty-stats < 0 - colorful-monoids - ihs From 894cce0e9a6a558c1d95acac45d974d583e43949 Mon Sep 17 00:00:00 2001 From: Michael Snoyman Date: Wed, 6 Mar 2019 12:52:07 +0200 Subject: [PATCH 11/43] Extra blocked package due to refined --- build-constraints.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index f85f2ddb..29d89222 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -2036,7 +2036,7 @@ packages: - conduit-parse - dublincore-xml-conduit - euler-tour-tree < 0 # GHC 8.4 via base-4.11.0.0 - - opml-conduit + - opml-conduit < 0 # refined - rss-conduit < 0 - timerep - xml-conduit-parse From 410d45cc74ae7b435709186d835e8f6505751367 Mon Sep 17 00:00:00 2001 From: Michael Snoyman Date: Wed, 6 Mar 2019 16:03:28 +0200 Subject: [PATCH 12/43] Remove upper bound on distribution-nixpkgs and close #4406 --- build-constraints.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index 29d89222..c2a2f196 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -2358,7 +2358,7 @@ packages: - cabal2nix - cabal2spec - cgi - - distribution-nixpkgs < 1.2 # https://github.com/commercialhaskell/stackage/issues/4406 + - distribution-nixpkgs - distribution-opensuse - flexible-defaults - funcmp From 9d87a866045c32dfc600450fe255def186623dcf Mon Sep 17 00:00:00 2001 From: Michael Snoyman Date: Thu, 7 Mar 2019 03:51:04 +0200 Subject: [PATCH 13/43] Upper bound for simonmichael/hledger#983 --- build-constraints.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/build-constraints.yaml b/build-constraints.yaml index c2a2f196..28485481 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -4481,6 +4481,9 @@ packages: - hunit-dejafu < 2.0.0.0 - tasty-dejafu < 2.0.0.0 + # https://github.com/simonmichael/hledger/issues/983 + - easytest < 0.3 + # end of packages # Package flags are applied to individual packages, and override the values of From e0ffbbc4fa55648a025dd49c69be2baf3831f797 Mon Sep 17 00:00:00 2001 From: Daniel Mendler Date: Thu, 7 Mar 2019 15:22:29 +0100 Subject: [PATCH 14/43] Reenable pkgs depending on writer-cps-transformers Issue is fixed https://github.com/minad/writer-cps-mtl/issues/3 --- build-constraints.yaml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index 28485481..cbbb7c4d 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -3045,17 +3045,17 @@ packages: "Daniel Mendler @minad": - quickcheck-special - - writer-cps-mtl < 0 # https://github.com/minad/writer-cps-mtl/issues/3 + - writer-cps-mtl - writer-cps-transformers - writer-cps-morph - - writer-cps-lens < 0 # writer-cps-mtl - - writer-cps-full < 0 # writer-cps-mtl - - writer-cps-exceptions < 0 # https://github.com/minad/writer-cps-mtl/issues/3 + - writer-cps-lens + - writer-cps-full + - writer-cps-exceptions - wl-pprint-annotated - wl-pprint-console - console-style - unlit - - intro < 0 # writer-cps-mtl + - intro - tasty-stats < 0 - colorful-monoids - ihs From 3f85a640baae5c1144dac2bb44adb5173001945e Mon Sep 17 00:00:00 2001 From: Michael Snoyman Date: Fri, 8 Mar 2019 06:05:34 +0200 Subject: [PATCH 15/43] Block more writer-cps packages See: * https://github.com/louispan/writer-cps-morph/issues/2 * https://github.com/louispan/writer-cps-lens/issues/2 --- build-constraints.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index cbbb7c4d..e4d94c92 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -3047,9 +3047,9 @@ packages: - quickcheck-special - writer-cps-mtl - writer-cps-transformers - - writer-cps-morph - - writer-cps-lens - - writer-cps-full + - writer-cps-morph < 0 # https://github.com/louispan/writer-cps-morph/issues/2 + - writer-cps-lens < 0 # https://github.com/louispan/writer-cps-lens/issues/2 + - writer-cps-full < 0 - writer-cps-exceptions - wl-pprint-annotated - wl-pprint-console From 196248a531f5ccd39873f1c5b6830d5478900298 Mon Sep 17 00:00:00 2001 From: Michael Snoyman Date: Fri, 8 Mar 2019 06:06:04 +0200 Subject: [PATCH 16/43] Upper bounds on validity for NorfairKing/validity#62 --- build-constraints.yaml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index e4d94c92..243abff3 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -3545,11 +3545,11 @@ packages: - gym-http-api "Tom Sydney Kerckhove @NorfairKing": - - genvalidity - - genvalidity-aeson - - genvalidity-bytestring - - genvalidity-containers - - genvalidity-hspec + - genvalidity < 0.8 # https://github.com/NorfairKing/validity/issues/62 + - genvalidity-aeson < 0.3 + - genvalidity-bytestring < 0.5 + - genvalidity-containers < 0.6 + - genvalidity-hspec < 0.7 - genvalidity-hspec-aeson - genvalidity-hspec-binary - genvalidity-hspec-cereal @@ -3560,7 +3560,7 @@ packages: - genvalidity-scientific - genvalidity-text - genvalidity-time - - genvalidity-unordered-containers + - genvalidity-unordered-containers < 0.3 - genvalidity-uuid - genvalidity-vector - validity From 2f2c384b64303fb375c420dbd094e861cf6413de Mon Sep 17 00:00:00 2001 From: Michael Snoyman Date: Fri, 8 Mar 2019 06:09:50 +0200 Subject: [PATCH 17/43] Another genvalidity upper bound --- build-constraints.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index 243abff3..e285044d 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -3558,7 +3558,7 @@ packages: - genvalidity-path - genvalidity-property - genvalidity-scientific - - genvalidity-text + - genvalidity-text < 0.6 - genvalidity-time - genvalidity-unordered-containers < 0.3 - genvalidity-uuid From 517a023281f17507aaa64ebefd67efe247fe5225 Mon Sep 17 00:00:00 2001 From: Michael Snoyman Date: Fri, 8 Mar 2019 06:29:33 +0200 Subject: [PATCH 18/43] Hopefully last genvalidity upper bound --- build-constraints.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index e285044d..5b1f4ef2 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -3550,7 +3550,7 @@ packages: - genvalidity-bytestring < 0.5 - genvalidity-containers < 0.6 - genvalidity-hspec < 0.7 - - genvalidity-hspec-aeson + - genvalidity-hspec-aeson < 0.3.1 - genvalidity-hspec-binary - genvalidity-hspec-cereal - genvalidity-hspec-hashable From fd428f3e0cf042a8c30efe3966244179940e4bcb Mon Sep 17 00:00:00 2001 From: Michael Snoyman Date: Fri, 8 Mar 2019 12:27:49 +0200 Subject: [PATCH 19/43] Remove upper bounds NorfairKing/validity#62 --- build-constraints.yaml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index 5b1f4ef2..e4d94c92 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -3545,12 +3545,12 @@ packages: - gym-http-api "Tom Sydney Kerckhove @NorfairKing": - - genvalidity < 0.8 # https://github.com/NorfairKing/validity/issues/62 - - genvalidity-aeson < 0.3 - - genvalidity-bytestring < 0.5 - - genvalidity-containers < 0.6 - - genvalidity-hspec < 0.7 - - genvalidity-hspec-aeson < 0.3.1 + - genvalidity + - genvalidity-aeson + - genvalidity-bytestring + - genvalidity-containers + - genvalidity-hspec + - genvalidity-hspec-aeson - genvalidity-hspec-binary - genvalidity-hspec-cereal - genvalidity-hspec-hashable @@ -3558,9 +3558,9 @@ packages: - genvalidity-path - genvalidity-property - genvalidity-scientific - - genvalidity-text < 0.6 + - genvalidity-text - genvalidity-time - - genvalidity-unordered-containers < 0.3 + - genvalidity-unordered-containers - genvalidity-uuid - genvalidity-vector - validity From 324a659ca2a36d5729d9573fd3f88733c4912783 Mon Sep 17 00:00:00 2001 From: Michael Snoyman Date: Fri, 8 Mar 2019 12:31:21 +0200 Subject: [PATCH 20/43] Add back servant-auth-client --- build-constraints.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index e4d94c92..31191a49 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -3638,7 +3638,7 @@ packages: - pretty-sop - servant-auth - servant-auth-server - - servant-auth-client < 0 # https://github.com/haskell-servant/servant-auth/issues/144 + - servant-auth-client - servant-auth-swagger - servant-auth-docs - servant-elm From 072ee3897ee66e6051adc6e807ff52fad391d072 Mon Sep 17 00:00:00 2001 From: quxbar Date: Sat, 9 Mar 2019 17:23:45 +0100 Subject: [PATCH 21/43] add chronos-bench --- build-constraints.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/build-constraints.yaml b/build-constraints.yaml index 31191a49..39ed86f6 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -143,6 +143,7 @@ packages: "Florian Knupfer @knupfer": - type-of-html - type-of-html-static + - chronos-bench "Mikolaj Konarski @Mikolaj": - sdl2-ttf From b14c5240f511adff0dd9ba6cf0c70beffea6a2e0 Mon Sep 17 00:00:00 2001 From: David Himmelstrup Date: Sun, 10 Mar 2019 07:16:42 +0100 Subject: [PATCH 22/43] add reanimate-svg --- build-constraints.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/build-constraints.yaml b/build-constraints.yaml index 39ed86f6..b58d2531 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -3846,6 +3846,9 @@ packages: "Taisuke Hikawa <23.prime.37@gmail.com> @23prime": - oeis2 + + "David Himmelstrup @lemmih": + - reanimate-svg "Grandfathered dependencies": - Boolean From fac75c554f1be93b51c862be3161083db7245431 Mon Sep 17 00:00:00 2001 From: Alexander Vershilov Date: Sun, 10 Mar 2019 11:58:02 +0300 Subject: [PATCH 23/43] put back inline-r. --- build-constraints.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index b58d2531..82528330 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -2002,11 +2002,11 @@ packages: - choice - distributed-closure - inline-java < 0 - - inline-r < 0 # https://github.com/commercialhaskell/stackage/issues/4216 + - inline-r - jni - jvm - jvm-streaming < 0 - - H < 0 # via inline-r + - H - sparkle < 0 - th-lift From d9fa33f8bfe1dc128c890a823fb034c9d1ae0dff Mon Sep 17 00:00:00 2001 From: Sebastian Witte Date: Sun, 10 Mar 2019 17:50:31 +0100 Subject: [PATCH 24/43] Re-add messagepack --- build-constraints.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index b58d2531..bc821381 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -979,7 +979,7 @@ packages: - servant-subscriber < 0 # build failure with servant 0.14: https://github.com/eskimor/servant-subscriber/issues/17 "Rodrigo Setti @rodrigosetti": - - messagepack < 0 + - messagepack - messagepack-rpc < 0 "Boris Lykah @lykahb": From 8091e4f644e4d5186e944df004b498af3f221fc2 Mon Sep 17 00:00:00 2001 From: Sebastian Witte Date: Mon, 11 Mar 2019 16:22:43 +0100 Subject: [PATCH 25/43] Re-add nvim-hs, nvim-hs-contrib --- build-constraints.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index bc821381..ed1a7f4f 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -3367,8 +3367,8 @@ packages: - katip-scalyr-scribe < 0 # via katip "Sebastian Witte @saep": - - nvim-hs < 0 - - nvim-hs-contrib < 0 + - nvim-hs + - nvim-hs-contrib # - nvim-hs-ghcid "Sam Protas @SamProtas": From e99bbd1bc8e813bf4be9599996570b1233ba5ce2 Mon Sep 17 00:00:00 2001 From: David Himmelstrup Date: Tue, 12 Mar 2019 08:25:20 +0100 Subject: [PATCH 26/43] Add reanimate --- build-constraints.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/build-constraints.yaml b/build-constraints.yaml index ed1a7f4f..1aa364c4 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -3849,6 +3849,7 @@ packages: "David Himmelstrup @lemmih": - reanimate-svg + - reanimate "Grandfathered dependencies": - Boolean From 1fbf015086e5588fe0a8df00f18bd9305823edd6 Mon Sep 17 00:00:00 2001 From: Mihai Maruseac Date: Tue, 12 Mar 2019 07:13:41 -0700 Subject: [PATCH 27/43] Revert "Add reanimate" --- build-constraints.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index 1aa364c4..ed1a7f4f 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -3849,7 +3849,6 @@ packages: "David Himmelstrup @lemmih": - reanimate-svg - - reanimate "Grandfathered dependencies": - Boolean From b4901357d832a9fdb78632f51553a25e6f42f986 Mon Sep 17 00:00:00 2001 From: David Himmelstrup Date: Tue, 12 Mar 2019 16:39:25 +0100 Subject: [PATCH 28/43] Add reanimate 0.1.4.1 should fix the dependency issue. --- build-constraints.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/build-constraints.yaml b/build-constraints.yaml index ed1a7f4f..1aa364c4 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -3849,6 +3849,7 @@ packages: "David Himmelstrup @lemmih": - reanimate-svg + - reanimate "Grandfathered dependencies": - Boolean From f54f5fee1a1be24a7c3adb8e72f3455f93a2b4dc Mon Sep 17 00:00:00 2001 From: Mihai Maruseac Date: Tue, 12 Mar 2019 16:23:49 -0700 Subject: [PATCH 29/43] Test --- build-constraints.yaml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index ed1a7f4f..698909e5 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -2002,13 +2002,14 @@ packages: - choice - distributed-closure - inline-java < 0 - - inline-r < 0 # https://github.com/commercialhaskell/stackage/issues/4216 + - inline-r # 0 # https://github.com/commercialhaskell/stackage/issues/4216 - jni - jvm - jvm-streaming < 0 - - H < 0 # via inline-r + - H # 0 # via inline-r - sparkle < 0 - th-lift + - reanimate "Christopher Reichert @creichert": - bencode From d879062fb0a1a5b0626a1d75ac425ad42378fa9a Mon Sep 17 00:00:00 2001 From: Mihai Maruseac Date: Tue, 12 Mar 2019 16:45:27 -0700 Subject: [PATCH 30/43] Undo test --- build-constraints.yaml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index 698909e5..ed1a7f4f 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -2002,14 +2002,13 @@ packages: - choice - distributed-closure - inline-java < 0 - - inline-r # 0 # https://github.com/commercialhaskell/stackage/issues/4216 + - inline-r < 0 # https://github.com/commercialhaskell/stackage/issues/4216 - jni - jvm - jvm-streaming < 0 - - H # 0 # via inline-r + - H < 0 # via inline-r - sparkle < 0 - th-lift - - reanimate "Christopher Reichert @creichert": - bencode From c742f235bcd07106d17349470d11ab9e91892930 Mon Sep 17 00:00:00 2001 From: Justin Le Date: Thu, 14 Mar 2019 18:13:30 -0700 Subject: [PATCH 31/43] Add list-witnesses to stackage --- build-constraints.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/build-constraints.yaml b/build-constraints.yaml index fa046079..c1fde214 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -1958,6 +1958,7 @@ packages: - hmatrix-backprop - hmatrix-vector-sized - lens-typelevel + - list-witnesses - nonempty-containers - one-liner-instances - prompt From bd50d55c909ec3fe487cabd00d852a963e61ab0e Mon Sep 17 00:00:00 2001 From: Mihai Maruseac Date: Thu, 14 Mar 2019 20:58:54 -0700 Subject: [PATCH 32/43] Remove trailing whitespace --- build-constraints.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index c1fde214..369e824d 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -3847,7 +3847,7 @@ packages: "Taisuke Hikawa <23.prime.37@gmail.com> @23prime": - oeis2 - + "David Himmelstrup @lemmih": - reanimate-svg - reanimate From 2d87fa09a252a554286e7d5e07fc52cfc03ccea2 Mon Sep 17 00:00:00 2001 From: Neil Mitchell Date: Fri, 15 Mar 2019 16:15:00 +0000 Subject: [PATCH 33/43] Add js-dgtable to constraints --- build-constraints.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/build-constraints.yaml b/build-constraints.yaml index 369e824d..cbdc572a 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -554,6 +554,7 @@ packages: - nsis - js-jquery - js-flot + - js-dgtable - extra - ghcid - hexml From 4321db250b947de95b18b40700b8141a78f2e996 Mon Sep 17 00:00:00 2001 From: Matt Parsons Date: Fri, 15 Mar 2019 20:25:52 -0600 Subject: [PATCH 34/43] Add persistent-typed-db, restore other packages esqueleto, monad-logger-prefix, liboath-hs, and monad-metrics have all been updated to be compliant with stackage nightly. --- build-constraints.yaml | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index cbdc572a..6a2795d6 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -2176,13 +2176,14 @@ packages: - xlsx "Matt Parsons @parsonsmatt": - - monad-logger-prefix < 0 # trasnformers https://github.com/commercialhaskell/stackage/issues/4408 - - monad-metrics < 0 + - monad-logger-prefix + - monad-metrics # - ekg-cloudwatch # http-conduit 2.3 via amazonka - smtp-mail - - liboath-hs < 0 # GHC 8.4 via inline-c + - liboath-hs - servant-quickcheck < 0 - - esqueleto < 0 # https://github.com/bitemyapp/esqueleto/issues/115 + - esqueleto + - persistent-typed-db "Matthew Pickering @mpickering": - refact From 3f245a1e6a97ad1f7865302c0c1fba38fb6491f1 Mon Sep 17 00:00:00 2001 From: Mihai Maruseac Date: Sat, 16 Mar 2019 09:06:07 -0700 Subject: [PATCH 35/43] No more esqueleto haddock failures --- build-constraints.yaml | 3 --- 1 file changed, 3 deletions(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index 6a2795d6..e3224c1b 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -5256,9 +5256,6 @@ expected-haddock-failures: - bins - emd - hmatrix-backprop - - # https://github.com/haskell/haddock/issues/979 - - esqueleto # end of expected-haddock-failures # For packages with haddock issues From 3bef94f39fe802806ae75f517a4edeacacd83a24 Mon Sep 17 00:00:00 2001 From: Mihai Maruseac Date: Sat, 16 Mar 2019 15:53:26 -0700 Subject: [PATCH 36/43] Test skipped-haddocks --- build-constraints.yaml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index e3224c1b..2609666d 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -5260,10 +5260,10 @@ expected-haddock-failures: # For packages with haddock issues skipped-haddocks: -- approximate -- invertible -- modular # https://github.com/haskell/haddock/issues/900 -- sparkle # Java function failures tweag/sparkle#144 +# approximate +# invertible +# modular # https://github.com/haskell/haddock/issues/900 +# sparkle # Java function failures tweag/sparkle#144 # end of skipped-haddocks # Benchmarks which should not be built. Note that Stackage builds benchmarks but does not run them. From 480ad26b0c67db67ec3791536f3200c763d5edd6 Mon Sep 17 00:00:00 2001 From: Mihai Maruseac Date: Sat, 16 Mar 2019 16:06:58 -0700 Subject: [PATCH 37/43] Keep modular and sparkle --- build-constraints.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index 2609666d..8252be98 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -5262,8 +5262,8 @@ expected-haddock-failures: skipped-haddocks: # approximate # invertible -# modular # https://github.com/haskell/haddock/issues/900 -# sparkle # Java function failures tweag/sparkle#144 +- modular # https://github.com/haskell/haddock/issues/900 +- sparkle # Java function failures tweag/sparkle#144 # end of skipped-haddocks # Benchmarks which should not be built. Note that Stackage builds benchmarks but does not run them. From 235cc704a74c76e0bbe7ab32cac062af8b95ea24 Mon Sep 17 00:00:00 2001 From: Mihai Maruseac Date: Sun, 17 Mar 2019 07:50:38 -0700 Subject: [PATCH 38/43] Approximate and invertible work --- build-constraints.yaml | 2 -- 1 file changed, 2 deletions(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index 8252be98..c545d2ba 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -5260,8 +5260,6 @@ expected-haddock-failures: # For packages with haddock issues skipped-haddocks: -# approximate -# invertible - modular # https://github.com/haskell/haddock/issues/900 - sparkle # Java function failures tweag/sparkle#144 # end of skipped-haddocks From b10be798e0b480b41729ea7a75e771990f04befd Mon Sep 17 00:00:00 2001 From: Kirill Zaborsky Date: Sun, 17 Mar 2019 21:48:28 +0300 Subject: [PATCH 39/43] Wait for a new release of exp-pairs Library author doesn't want to make a release yet --- build-constraints.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/build-constraints.yaml b/build-constraints.yaml index c545d2ba..73c09a8a 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -5626,6 +5626,7 @@ tell-me-when-its-released: - hoopl-3.10.2.2 # reenable tests, https://github.com/haskell/hoopl/issues/50 - point-octree-0.5.5.3 # re-enable test and then we can resolve https://github.com/fpco/lts-haskell/issues/27 - yarr-1.4.0.2 # Re-enable package https://github.com/fpco/stackage/issues/1876 +- exp-pairs-0.2.0.0 # remove from expected-test-failures, https://github.com/Bodigrim/exp-pairs/issues/16 # Packages which should be hidden after registering, to avoid module name # conflicts. This is intended for at least two use cases: From 045527f93820d27db1d33b02bd6a3398d14dab1c Mon Sep 17 00:00:00 2001 From: Mihai Maruseac Date: Sun, 17 Mar 2019 12:34:13 -0700 Subject: [PATCH 40/43] Update network dependencies and issue (#4312 -> #4427) --- build-constraints.yaml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index c545d2ba..6fdfda27 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -4480,9 +4480,10 @@ packages: - Win32 == 2.6.1.0 "Stackage upper bounds": - # https://github.com/commercialhaskell/stackage/issues/4312 + # https://github.com/commercialhaskell/stackage/issues/4427 - network < 3.0.0.0 - - hsdev < 0.3.3 + - hsdev < 0.3.3.0 + - network-bsd < 2.8.1.0 # https://github.com/commercialhaskell/stackage/issues/4373 - dejafu < 2.0.0.0 From 3b96d3f936f94c564db5c5c209fbeb9ecebb28a1 Mon Sep 17 00:00:00 2001 From: Andrei Barbu Date: Sun, 17 Mar 2019 19:22:13 -0400 Subject: [PATCH 41/43] resurrect matplotlib --- build-constraints.yaml | 2 +- debian-bootstrap.sh | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index 6fdfda27..068524b1 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -3274,7 +3274,7 @@ packages: "Andrei Barbu @abarbu": - nondeterminism - csp - - matplotlib < 0 # BuildFailureException Process exited with ExitFailure 1: ./Setup build + - matplotlib "mackeyrms @mackeyrms": - tsv2csv diff --git a/debian-bootstrap.sh b/debian-bootstrap.sh index 33d7aba8..bdd8f27d 100755 --- a/debian-bootstrap.sh +++ b/debian-bootstrap.sh @@ -32,6 +32,7 @@ apt-get install -y \ build-essential \ cmake \ curl \ + dvipng \ freeglut3-dev \ freetds-dev \ fsharp \ @@ -141,11 +142,13 @@ apt-get install -y \ python3-matplotlib \ python3-numpy \ python3-pip \ + python3-scipy \ r-base \ r-base-dev \ ruby-dev \ software-properties-common \ sudo \ + texlive \ unixodbc-dev \ wget \ xclip \ From 062dedf65353a1e96e1699fe1feb4576ee69ccf2 Mon Sep 17 00:00:00 2001 From: Travis Athougies Date: Mon, 18 Mar 2019 11:11:29 -0700 Subject: [PATCH 42/43] Re-enable beam packages --- build-constraints.yaml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index 84d1b46a..67733d1b 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -100,9 +100,10 @@ packages: - geodetics "Travis Athougies @tathougies": - - beam-core < 0 - - beam-migrate < 0 - - beam-sqlite < 0 + - beam-core + - beam-migrate + - beam-sqlite + - beam-postgres "Fraser Murray Date: Mon, 18 Mar 2019 20:03:54 -0700 Subject: [PATCH 43/43] Expect failure on beam-postgres (#4429) --- build-constraints.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/build-constraints.yaml b/build-constraints.yaml index 67733d1b..258651b1 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -4983,6 +4983,7 @@ expected-test-failures: - accelerate-bignum # CUDA GPU - amqp - aws # AWS Credentials + - beam-postgres # requires Postgress instance - bindings-GLFW # Expects running X server - bitcoin-api - bitcoin-api-extra