From 07c0401be850641fd94f1d1ffd81fa51217f5140 Mon Sep 17 00:00:00 2001 From: John Ky Date: Fri, 28 Sep 2018 08:29:26 +1000 Subject: [PATCH 01/21] Add new package hw-conduit-merges --- build-constraints.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/build-constraints.yaml b/build-constraints.yaml index 1d98dc52..97bfb9ba 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -2685,6 +2685,7 @@ packages: - hw-balancedparens - hw-bits - hw-conduit + - hw-conduit-merges - hw-diagnostics - hw-dsv - hw-eliasfano From a02196de09166134c916818c2f489b63b3c01a77 Mon Sep 17 00:00:00 2001 From: Mihai Maruseac Date: Sun, 30 Sep 2018 08:46:05 -0700 Subject: [PATCH 02/21] Update reason for blocking avers-api (#4005) --- build-constraints.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index 97bfb9ba..cd36b3ed 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -1306,7 +1306,7 @@ packages: "Tomas Carnecky @wereHamster": - avers - # - avers-api # cryptonite 0.25 + # - avers-api # avers, GHC 8.6 # - avers-server # cryptonite 0.25 - css-syntax # - etcd # https://github.com/wereHamster/etcd-hs/issues/5 From 040baf620fca87ea66e770dc6526679f97169442 Mon Sep 17 00:00:00 2001 From: Judah Jacobson Date: Mon, 1 Oct 2018 07:43:17 -0700 Subject: [PATCH 03/21] Add haskeline. It builds fine with ghc-8.6.1, and it was in previous LTS's with no issues, and so i'm not sure why it was removed in the ghc-8.6 nightlies. Might be something to do with being distributed with GHC, but not being a core package from Stackage's perspective. In either case, adding it explicitly seems like the right thing to do long-term. --- build-constraints.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/build-constraints.yaml b/build-constraints.yaml index cd36b3ed..ca2bcfbd 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -3189,6 +3189,7 @@ packages: - tensorflow-test - pier-core - pier + - haskeline "Christof Schramm ": - mnist-idx From 9bf0b5c07bc373f9279787cd2e2df6b213358d5b Mon Sep 17 00:00:00 2001 From: Ryan Scott Date: Mon, 1 Oct 2018 11:50:38 -0400 Subject: [PATCH 04/21] Re-enable singletons tests `singletons-2.5` features a significantly revamped test suite that makes fewer assumptions about what is on one's `PATH`, so Stackage should be able to run the tests with no issues now. --- build-constraints.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index cd36b3ed..bd91d491 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -5006,7 +5006,6 @@ expected-test-failures: - serialport # "The tests need two serial ports as command line arguments" https://github.com/jputcu/serialport/issues/30 - serversession-backend-redis # redis - shake # Needs ghc on $PATH with some installed haskell packages - - singletons # Needs ghc on $PATH with som installed haskell packages - stack # https://github.com/fpco/stackage/issues/3707 - stripe-http-streams # https://github.com/fpco/stackage/issues/2945, needs Stripe account - users-persistent # sqlite From 55ad0713e0e4dabc35cf9d3322c62e9e41f12d42 Mon Sep 17 00:00:00 2001 From: Moritz Kiefer Date: Mon, 1 Oct 2018 17:56:56 +0200 Subject: [PATCH 05/21] Fully remove llvm-hs from 8.6 build failures Previously, I accidentally only removed the < 0 constraint instead of the full line. --- build-constraints.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index cd36b3ed..f8a7a7eb 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -4462,7 +4462,6 @@ packages: - jni < 0 - large-hashable < 0 - libmpd < 0 - - llvm-hs - llvm-hs-pretty < 0 - matrix-static < 0 - med-module < 0 From b32257c191f36c792d14b72446b3e5f1b6a57364 Mon Sep 17 00:00:00 2001 From: Emmanuel Touzery Date: Mon, 1 Oct 2018 18:34:23 +0200 Subject: [PATCH 06/21] restore hsexif & app-settings, they now support ghc 8.6 --- build-constraints.yaml | 2 -- 1 file changed, 2 deletions(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index cd36b3ed..ff63d407 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -3807,7 +3807,6 @@ packages: - antiope-s3 < 0 - antiope-sns < 0 - antiope-sqs < 0 - - app-settings < 0 - apply-refact < 0 - approximate < 0 - arrow-list < 0 @@ -4045,7 +4044,6 @@ packages: - hpqtypes < 0 - hquantlib < 0 - hsebaysdk < 0 - - hsexif < 0 - hslua < 0 - hslua-aeson < 0 - hslua-module-text < 0 From 22ca17022f8d0140fb5ce399298766d9389c3d50 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Laurent=20P=2E=20Ren=C3=A9=20de=20Cotret?= Date: Mon, 1 Oct 2018 14:37:23 -0400 Subject: [PATCH 07/21] Add pandoc-pyplot to stackage pandoc-pyplot is a Pandoc filter that can generate figures from Python code blocks using Matplotlib. Version 1.0.0.0 builds correctly using resolver `nightly-2018-10-01`. --- build-constraints.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/build-constraints.yaml b/build-constraints.yaml index cd36b3ed..7b6bea44 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -8,6 +8,9 @@ cabal-format-version: "2.2" # Constraints for brand new builds packages: + "Laurent P. René de Cotret @LaurentRDC": + - pandoc-pyplot + "Andrew Newman @andrewfnewman": - geojson From ae566aaf3171d2621bb0bb0ea847720904e02c57 Mon Sep 17 00:00:00 2001 From: Lysxia Date: Mon, 1 Oct 2018 14:42:52 -0400 Subject: [PATCH 08/21] Reenable first-class-families and generic-random --- build-constraints.yaml | 2 -- 1 file changed, 2 deletions(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index cd36b3ed..154766f3 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -3963,7 +3963,6 @@ packages: - fswatch < 0 - gdax < 0 - generic-aeson < 0 - - generic-random < 0 - generic-xmlpickler < 0 - generics-eot < 0 - ghc-parser < 0 @@ -4454,7 +4453,6 @@ packages: - exinst < 0 - extensible < 0 - fgl < 0 - - first-class-families < 0 - gtk2hs-buildtools < 0 - hdevtools < 0 - histogram-fill < 0 From b7b4a3e638dae3b914efae54adc05d237f7e99dc Mon Sep 17 00:00:00 2001 From: Will Sewell Date: Tue, 2 Oct 2018 00:33:31 +0100 Subject: [PATCH 09/21] re-add memory --- build-constraints.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index cd36b3ed..3c7fe484 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -4132,7 +4132,6 @@ packages: - massiv-io < 0 - mbug < 0 - mega-sdist < 0 - - memory < 0 - messagepack < 0 - messagepack-rpc < 0 - microformats2-parser < 0 From 2b0e4a27bb8d80c50ab392236d9ef82f13b33fe4 Mon Sep 17 00:00:00 2001 From: Justin Le Date: Mon, 1 Oct 2018 17:07:06 -0700 Subject: [PATCH 10/21] add back in fixed typelits-witnesses --- build-constraints.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index cd36b3ed..e92b6507 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -4471,7 +4471,6 @@ packages: - o-clock < 0 - stm-stats < 0 - teardown < 0 - - typelits-witnesses < 0 - typenums < 0 - typography-geometry < 0 - universe-instances-extended < 0 From b6967607c645d0beab6ad79390b86a5201c70916 Mon Sep 17 00:00:00 2001 From: Will Sewell Date: Tue, 2 Oct 2018 13:37:39 +0100 Subject: [PATCH 11/21] Add mime-types --- build-constraints.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/build-constraints.yaml b/build-constraints.yaml index 1d2abb63..49a91a89 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -387,6 +387,7 @@ packages: - markdown - mime-mail - mime-mail-ses + - mime-types - network-conduit-tls - persistent - persistent-mysql From 6b8e69cb49a41ffb2dd36b1b27ef987b8fe1a492 Mon Sep 17 00:00:00 2001 From: Justus Adam Date: Tue, 2 Oct 2018 14:50:42 +0200 Subject: [PATCH 12/21] Added the exit codes library --- build-constraints.yaml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index 1d2abb63..e6a09225 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -10,7 +10,7 @@ packages: "Laurent P. René de Cotret @LaurentRDC": - pandoc-pyplot - + "Andrew Newman @andrewfnewman": - geojson @@ -2571,6 +2571,7 @@ packages: # - marvin # https://github.com/JustusAdam/marvin/issues/22 - marvin-interpolate - mustache + - exit-codes <= 1.0.0 "Cindy Wang @CindyLinz": - NoTrace < 0 # GHC 8.4 via base-4.11.0.0 @@ -3617,7 +3618,7 @@ packages: "asakamirai @asakamirai": - kazura-queue - + "Eric Torreborre @etorreborre": - registry From fa36b1c426a2e6c739500862cb1c4c4a2f89b431 Mon Sep 17 00:00:00 2001 From: "Trevor L. McDonell" Date: Tue, 2 Oct 2018 17:43:47 +0200 Subject: [PATCH 13/21] unblock cuda packages --- build-constraints.yaml | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index 1d2abb63..f7e1eb1f 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -803,11 +803,12 @@ packages: - colour-accelerate < 0 # GHC 8.4 via base-4.11.0.0 - lens-accelerate < 0 # GHC 8.4 via base-4.11.0.0 - mwc-random-accelerate < 0 # GHC 8.4 via accelerate - - cuda < 0 # build failure with GHC 8.4 - - cublas < 0 # build failure with GHC 8.4 - - cusparse < 0 # build failure with GHC 8.4 - - cusolver < 0 # build failure with GHC 8.4 - - nvvm < 0 # build failure with GHC 8.4 + - cuda + - cufft + - cublas + - cusparse + - cusolver + - nvvm - wide-word "Dan Burton @DanBurton": From 6d54752a259fccc5716608630b7dece817872bdc Mon Sep 17 00:00:00 2001 From: "Trevor L. McDonell" Date: Tue, 2 Oct 2018 17:51:47 +0200 Subject: [PATCH 14/21] update to cuda-10 --- Dockerfile | 6 +++--- debian-bootstrap.sh | 7 ++++--- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/Dockerfile b/Dockerfile index f37e09ae..cf8c7ccc 100644 --- a/Dockerfile +++ b/Dockerfile @@ -4,9 +4,9 @@ ENV HOME /home/stackage ENV LANG en_US.UTF-8 # NOTE: also update debian-bootstrap.sh when cuda version changes -ENV PATH /usr/local/cuda-8.0/bin:/opt/ghc/8.6.1/bin:/usr/sbin:/usr/bin:/sbin:/bin -ENV CUDA_PATH /usr/local/cuda-8.0 -ENV LD_LIBRARY_PATH=/usr/local/cuda-8.0/lib64:/usr/local/cuda-8.0/nvvm/lib64 +ENV PATH /usr/local/cuda-10.0/bin:/opt/ghc/8.6.1/bin:/usr/sbin:/usr/bin:/sbin:/bin +ENV CUDA_PATH /usr/local/cuda-10.0 +ENV LD_LIBRARY_PATH=/usr/local/cuda-10.0/lib64:/usr/local/cuda-10.0/nvvm/lib64 ADD debian-bootstrap.sh /tmp/debian-bootstrap.sh RUN /tmp/debian-bootstrap.sh && rm /tmp/debian-bootstrap.sh diff --git a/debian-bootstrap.sh b/debian-bootstrap.sh index 308becc8..842bcaf4 100755 --- a/debian-bootstrap.sh +++ b/debian-bootstrap.sh @@ -268,12 +268,13 @@ cd /tmp \ # NOTE: also update Dockerfile when cuda version changes # Install CUDA toolkit # The current version can be found at: https://developer.nvidia.com/cuda-downloads -CUDA_PKG=8.0.61-1 # update this on new version -CUDA_VER=${CUDA_PKG:0:3} -CUDA_APT=${CUDA_VER/./-} +CUDA_PKG=10.0.130-1 +CUDA_VER=10.0 +CUDA_APT=10-0 pushd /tmp \ && wget https://developer.download.nvidia.com/compute/cuda/repos/ubuntu1604/x86_64/cuda-repo-ubuntu1604_${CUDA_PKG}_amd64.deb \ + && apt-key adv --fetch-keys http://developer.download.nvidia.com/compute/cuda/repos/ubuntu1604/x86_64/7fa2af80.pub \ && dpkg -i cuda-repo-ubuntu1604_${CUDA_PKG}_amd64.deb \ && apt-get update -qq \ && apt-get install -y cuda-drivers cuda-core-${CUDA_APT} cuda-cudart-dev-${CUDA_APT} cuda-cufft-dev-${CUDA_APT} cuda-cublas-dev-${CUDA_APT} cuda-cusparse-dev-${CUDA_APT} cuda-cusolver-dev-${CUDA_APT} \ From 604d6f8c01414dd2337421c8e738694f3ae09ece Mon Sep 17 00:00:00 2001 From: Vincent Berthoux Date: Tue, 2 Oct 2018 20:50:36 +0200 Subject: [PATCH 15/21] Bring back JuicyPixels/FontyFruity/Rasterific in nightly --- build-constraints.yaml | 3 --- 1 file changed, 3 deletions(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index 49a91a89..5d0ff5c0 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -3685,7 +3685,6 @@ packages: - Allure < 0 - DAV < 0 - DRBG < 0 - - FontyFruity < 0 - HTF < 0 - HTTP < 0 - HaTeX < 0 @@ -3694,7 +3693,6 @@ packages: - HaskellNet-SSL < 0 - IPv6Addr < 0 - IPv6DB < 0 - - JuicyPixels < 0 - JuicyPixels-extra < 0 - JuicyPixels-scale-dct < 0 - LambdaHack < 0 @@ -3703,7 +3701,6 @@ packages: - Network-NineP < 0 - QuasiText < 0 - RSA < 0 - - Rasterific < 0 - RefSerialize < 0 - SCalendar < 0 - ShellCheck < 0 From 2e211c95df1484a731b475a72fa28e519219ebef Mon Sep 17 00:00:00 2001 From: Justus Adam Date: Tue, 2 Oct 2018 22:04:39 +0200 Subject: [PATCH 16/21] Fixed the bounds for exit-codes --- build-constraints.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index e6a09225..46f4c7d0 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -2571,7 +2571,7 @@ packages: # - marvin # https://github.com/JustusAdam/marvin/issues/22 - marvin-interpolate - mustache - - exit-codes <= 1.0.0 + - exit-codes >= 1.0.0 "Cindy Wang @CindyLinz": - NoTrace < 0 # GHC 8.4 via base-4.11.0.0 From c9e60741c77e97be2a7b4e8513f2da6f687ab3c8 Mon Sep 17 00:00:00 2001 From: Will Sewell Date: Wed, 3 Oct 2018 12:22:16 +0100 Subject: [PATCH 17/21] add tasty-kat --- build-constraints.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/build-constraints.yaml b/build-constraints.yaml index 49a91a89..d6b3149f 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -588,6 +588,7 @@ packages: - pem - siphash - socks + - tasty-kat - tls - tls-debug - vhd < 0 # BuildFailureException Process exited with ExitFailure 1: ./Setup build From e1f227c8279ecd4206c1be25e767fd451b1e3316 Mon Sep 17 00:00:00 2001 From: Will Sewell Date: Wed, 3 Oct 2018 12:28:51 +0100 Subject: [PATCH 18/21] re-add http-client --- build-constraints.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index 49a91a89..0d88c794 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -4056,7 +4056,6 @@ packages: - hspec-wai-json < 0 - hsx-jmacro < 0 - hsyslog-udp < 0 - - http-client < 0 - http-client-openssl < 0 - http-client-tls < 0 - http-conduit < 0 From aef59d78964a7dc7ca3672fdc2d14c8151402b5d Mon Sep 17 00:00:00 2001 From: Jeremy Huffman Date: Wed, 3 Oct 2018 08:18:41 -0400 Subject: [PATCH 19/21] reenable higher-leveldb tests --- build-constraints.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index 41a0b471..0609a33f 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -4753,7 +4753,6 @@ skipped-tests: - github-types - graph-core - hexml-lens - - higher-leveldb - hspec-core - inflections - inline-r From ea6ff0c63de95d77182d5d7f58d15b2b39de42a0 Mon Sep 17 00:00:00 2001 From: Will Sewell Date: Wed, 3 Oct 2018 13:42:23 +0100 Subject: [PATCH 20/21] re-add benchpress --- build-constraints.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index 41a0b471..9379ba3b 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -3832,7 +3832,6 @@ packages: - beam-migrate < 0 - beam-sqlite < 0 - bench < 0 - - benchpress < 0 - bhoogle < 0 - binary-orphans < 0 - bins < 0 From c01a3e8eef770badcc6247e2f01242e6f15a461a Mon Sep 17 00:00:00 2001 From: "Trevor L. McDonell" Date: Wed, 3 Oct 2018 15:44:23 +0200 Subject: [PATCH 21/21] unblock repa* --- build-constraints.yaml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index 41a0b471..1efa8348 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -793,8 +793,8 @@ packages: - accelerate-llvm-ptx < 0 # GHC 8.4 via base-4.11.0.0 - accelerate-examples < 0 # GHC 8.4 via accelerate - repa - - repa-algorithms < 0 # GHC 8.4 via repa - - repa-io < 0 # GHC 8.4 via repa + - repa-algorithms + - repa-io - gloss - gloss-accelerate < 0 # GHC 8.4 via base-4.11.0.0 - gloss-algorithms < 0 # GHC 8.4 via base-4.11.0.0 @@ -4239,7 +4239,6 @@ packages: - rebase < 0 - ref-fd < 0 - registry < 0 - - repa < 0 - repline < 0 - req < 0 - req-conduit < 0