git.iko.soy/stackage
on master help sign in
Merge remote-tracking branch 'origin/master' into nightly
0f77747Adam Bergmark
Dockerfile+3−3
compare with master
unifiedsplit
@@ -4,9 +4,9 @@ ENV HOME /home/stackage
4ENV LANG en_US.UTF-8
4ENV LANG en_US.UTF-8
5
5
6# NOTE: also update debian-bootstrap.sh when cuda version changes
6# NOTE: also update debian-bootstrap.sh when cuda version changes
7−ENV PATH /usr/local/cuda-8.0/bin:/opt/ghc/8.6.1/bin:/usr/sbin:/usr/bin:/sbin:/bin
7+ENV PATH /usr/local/cuda-10.0/bin:/opt/ghc/8.6.1/bin:/usr/sbin:/usr/bin:/sbin:/bin
8−ENV CUDA_PATH /usr/local/cuda-8.0
8+ENV CUDA_PATH /usr/local/cuda-10.0
9−ENV LD_LIBRARY_PATH=/usr/local/cuda-8.0/lib64:/usr/local/cuda-8.0/nvvm/lib64
9+ENV LD_LIBRARY_PATH=/usr/local/cuda-10.0/lib64:/usr/local/cuda-10.0/nvvm/lib64
10
10
11ADD debian-bootstrap.sh /tmp/debian-bootstrap.sh
11ADD debian-bootstrap.sh /tmp/debian-bootstrap.sh
12RUN /tmp/debian-bootstrap.sh && rm /tmp/debian-bootstrap.sh
12RUN /tmp/debian-bootstrap.sh && rm /tmp/debian-bootstrap.sh
build-constraints.yaml+18−24
@@ -8,6 +8,9 @@ cabal-format-version: "2.2"
8# Constraints for brand new builds
8# Constraints for brand new builds
9packages:
9packages:
10
10
11+ "Laurent P. René de Cotret <laurent.decotret@outlook.com> @LaurentRDC":
12+ - pandoc-pyplot
13+
11 "Andrew Newman <andrewfnewman@gmail.com> @andrewfnewman":
14 "Andrew Newman <andrewfnewman@gmail.com> @andrewfnewman":
12 - geojson
15 - geojson
13
16
@@ -384,6 +387,7 @@ packages:
384 - markdown
387 - markdown
385 - mime-mail
388 - mime-mail
386 - mime-mail-ses
389 - mime-mail-ses
390+ - mime-types
387 - network-conduit-tls
391 - network-conduit-tls
388 - persistent
392 - persistent
389 - persistent-mysql
393 - persistent-mysql
@@ -584,6 +588,7 @@ packages:
584 - pem
588 - pem
585 - siphash
589 - siphash
586 - socks
590 - socks
591+ - tasty-kat
587 - tls
592 - tls
588 - tls-debug
593 - tls-debug
589 - vhd < 0 # BuildFailureException Process exited with ExitFailure 1: ./Setup build
594 - vhd < 0 # BuildFailureException Process exited with ExitFailure 1: ./Setup build
@@ -789,8 +794,8 @@ packages:
789 - accelerate-llvm-ptx < 0 # GHC 8.4 via base-4.11.0.0
794 - accelerate-llvm-ptx < 0 # GHC 8.4 via base-4.11.0.0
790 - accelerate-examples < 0 # GHC 8.4 via accelerate
795 - accelerate-examples < 0 # GHC 8.4 via accelerate
791 - repa
796 - repa
792− - repa-algorithms < 0 # GHC 8.4 via repa
797+ - repa-algorithms
793− - repa-io < 0 # GHC 8.4 via repa
798+ - repa-io
794 - gloss
799 - gloss
795 - gloss-accelerate < 0 # GHC 8.4 via base-4.11.0.0
800 - gloss-accelerate < 0 # GHC 8.4 via base-4.11.0.0
796 - gloss-algorithms < 0 # GHC 8.4 via base-4.11.0.0
801 - gloss-algorithms < 0 # GHC 8.4 via base-4.11.0.0
@@ -800,11 +805,12 @@ packages:
800 - colour-accelerate < 0 # GHC 8.4 via base-4.11.0.0
805 - colour-accelerate < 0 # GHC 8.4 via base-4.11.0.0
801 - lens-accelerate < 0 # GHC 8.4 via base-4.11.0.0
806 - lens-accelerate < 0 # GHC 8.4 via base-4.11.0.0
802 - mwc-random-accelerate < 0 # GHC 8.4 via accelerate
807 - mwc-random-accelerate < 0 # GHC 8.4 via accelerate
803− - cuda < 0 # build failure with GHC 8.4
808+ - cuda
804− - cublas < 0 # build failure with GHC 8.4
809+ - cufft
810+ - cublas
805− - cusparse < 0 # build failure with GHC 8.4
811+ - cusparse
806− - cusolver < 0 # build failure with GHC 8.4
812+ - cusolver
807− - nvvm < 0 # build failure with GHC 8.4
813+ - nvvm
808 - wide-word
814 - wide-word
809
815
810 "Dan Burton <danburton.email@gmail.com> @DanBurton":
816 "Dan Burton <danburton.email@gmail.com> @DanBurton":
@@ -1306,7 +1312,7 @@ packages:
1306
1312
1307 "Tomas Carnecky @wereHamster":
1313 "Tomas Carnecky @wereHamster":
1308 - avers
1314 - avers
1309− # - avers-api # cryptonite 0.25
1315+ # - avers-api # avers, GHC 8.6
1310 # - avers-server # cryptonite 0.25
1316 # - avers-server # cryptonite 0.25
1311 - css-syntax
1317 - css-syntax
1312 # - etcd # https://github.com/wereHamster/etcd-hs/issues/5
1318 # - etcd # https://github.com/wereHamster/etcd-hs/issues/5
@@ -2568,6 +2574,7 @@ packages:
2568 # - marvin # https://github.com/JustusAdam/marvin/issues/22
2574 # - marvin # https://github.com/JustusAdam/marvin/issues/22
2569 - marvin-interpolate
2575 - marvin-interpolate
2570 - mustache
2576 - mustache
2577+ - exit-codes >= 1.0.0
2571
2578
2572 "Cindy Wang <cindylinz@gmail.com> @CindyLinz":
2579 "Cindy Wang <cindylinz@gmail.com> @CindyLinz":
2573 - NoTrace < 0 # GHC 8.4 via base-4.11.0.0
2580 - NoTrace < 0 # GHC 8.4 via base-4.11.0.0
@@ -2685,6 +2692,7 @@ packages:
2685 - hw-balancedparens
2692 - hw-balancedparens
2686 - hw-bits
2693 - hw-bits
2687 - hw-conduit
2694 - hw-conduit
2695+ - hw-conduit-merges
2688 - hw-diagnostics
2696 - hw-diagnostics
2689 - hw-dsv
2697 - hw-dsv
2690 - hw-eliasfano
2698 - hw-eliasfano
@@ -3188,6 +3196,7 @@ packages:
3188 - tensorflow-test
3196 - tensorflow-test
3189 - pier-core
3197 - pier-core
3190 - pier
3198 - pier
3199+ - haskeline
3191
3200
3192 "Christof Schramm <christof.schramm@campus.lmu.de>":
3201 "Christof Schramm <christof.schramm@campus.lmu.de>":
3193 - mnist-idx
3202 - mnist-idx
@@ -3612,7 +3621,7 @@ packages:
3612
3621
3613 "asakamirai <asakamirai_hackage@towanowa.net> @asakamirai":
3622 "asakamirai <asakamirai_hackage@towanowa.net> @asakamirai":
3614 - kazura-queue
3623 - kazura-queue
3615−
3624+
3616 "Eric Torreborre <etorreborre@yahoo.com> @etorreborre":
3625 "Eric Torreborre <etorreborre@yahoo.com> @etorreborre":
3617 - registry
3626 - registry
3618
3627
@@ -3679,7 +3688,6 @@ packages:
3679 - Allure < 0
3688 - Allure < 0
3680 - DAV < 0
3689 - DAV < 0
3681 - DRBG < 0
3690 - DRBG < 0
3682− - FontyFruity < 0
3683 - HTF < 0
3691 - HTF < 0
3684 - HTTP < 0
3692 - HTTP < 0
3685 - HaTeX < 0
3693 - HaTeX < 0
@@ -3688,7 +3696,6 @@ packages:
3688 - HaskellNet-SSL < 0
3696 - HaskellNet-SSL < 0
3689 - IPv6Addr < 0
3697 - IPv6Addr < 0
3690 - IPv6DB < 0
3698 - IPv6DB < 0
3691− - JuicyPixels < 0
3692 - JuicyPixels-extra < 0
3699 - JuicyPixels-extra < 0
3693 - JuicyPixels-scale-dct < 0
3700 - JuicyPixels-scale-dct < 0
3694 - LambdaHack < 0
3701 - LambdaHack < 0
@@ -3697,7 +3704,6 @@ packages:
3697 - Network-NineP < 0
3704 - Network-NineP < 0
3698 - QuasiText < 0
3705 - QuasiText < 0
3699 - RSA < 0
3706 - RSA < 0
3700− - Rasterific < 0
3701 - RefSerialize < 0
3707 - RefSerialize < 0
3702 - SCalendar < 0
3708 - SCalendar < 0
3703 - ShellCheck < 0
3709 - ShellCheck < 0
@@ -3806,7 +3812,6 @@ packages:
3806 - antiope-s3 < 0
3812 - antiope-s3 < 0
3807 - antiope-sns < 0
3813 - antiope-sns < 0
3808 - antiope-sqs < 0
3814 - antiope-sqs < 0
3809− - app-settings < 0
3810 - apply-refact < 0
3815 - apply-refact < 0
3811 - approximate < 0
3816 - approximate < 0
3812 - arrow-list < 0
3817 - arrow-list < 0
@@ -3829,7 +3834,6 @@ packages:
3829 - beam-migrate < 0
3834 - beam-migrate < 0
3830 - beam-sqlite < 0
3835 - beam-sqlite < 0
3831 - bench < 0
3836 - bench < 0
3832− - benchpress < 0
3833 - bhoogle < 0
3837 - bhoogle < 0
3834 - binary-orphans < 0
3838 - binary-orphans < 0
3835 - bins < 0
3839 - bins < 0
@@ -3962,7 +3966,6 @@ packages:
3962 - fswatch < 0
3966 - fswatch < 0
3963 - gdax < 0
3967 - gdax < 0
3964 - generic-aeson < 0
3968 - generic-aeson < 0
3965− - generic-random < 0
3966 - generic-xmlpickler < 0
3969 - generic-xmlpickler < 0
3967 - generics-eot < 0
3970 - generics-eot < 0
3968 - ghc-parser < 0
3971 - ghc-parser < 0
@@ -4044,7 +4047,6 @@ packages:
4044 - hpqtypes < 0
4047 - hpqtypes < 0
4045 - hquantlib < 0
4048 - hquantlib < 0
4046 - hsebaysdk < 0
4049 - hsebaysdk < 0
4047− - hsexif < 0
4048 - hslua < 0
4050 - hslua < 0
4049 - hslua-aeson < 0
4051 - hslua-aeson < 0
4050 - hslua-module-text < 0
4052 - hslua-module-text < 0
@@ -4053,7 +4055,6 @@ packages:
4053 - hspec-wai-json < 0
4055 - hspec-wai-json < 0
4054 - hsx-jmacro < 0
4056 - hsx-jmacro < 0
4055 - hsyslog-udp < 0
4057 - hsyslog-udp < 0
4056− - http-client < 0
4057 - http-client-openssl < 0
4058 - http-client-openssl < 0
4058 - http-client-tls < 0
4059 - http-client-tls < 0
4059 - http-conduit < 0
4060 - http-conduit < 0
@@ -4131,7 +4132,6 @@ packages:
4131 - massiv-io < 0
4132 - massiv-io < 0
4132 - mbug < 0
4133 - mbug < 0
4133 - mega-sdist < 0
4134 - mega-sdist < 0
4134− - memory < 0
4135 - messagepack < 0
4135 - messagepack < 0
4136 - messagepack-rpc < 0
4136 - messagepack-rpc < 0
4137 - microformats2-parser < 0
4137 - microformats2-parser < 0
@@ -4239,7 +4239,6 @@ packages:
4239 - rebase < 0
4239 - rebase < 0
4240 - ref-fd < 0
4240 - ref-fd < 0
4241 - registry < 0
4241 - registry < 0
4242− - repa < 0
4243 - repline < 0
4242 - repline < 0
4244 - req < 0
4243 - req < 0
4245 - req-conduit < 0
4244 - req-conduit < 0
@@ -4453,7 +4452,6 @@ packages:
4453 - exinst < 0
4452 - exinst < 0
4454 - extensible < 0
4453 - extensible < 0
4455 - fgl < 0
4454 - fgl < 0
4456− - first-class-families < 0
4457 - gtk2hs-buildtools < 0
4455 - gtk2hs-buildtools < 0
4458 - hdevtools < 0
4456 - hdevtools < 0
4459 - histogram-fill < 0
4457 - histogram-fill < 0
@@ -4461,7 +4459,6 @@ packages:
4461 - jni < 0
4459 - jni < 0
4462 - large-hashable < 0
4460 - large-hashable < 0
4463 - libmpd < 0
4461 - libmpd < 0
4464− - llvm-hs
4465 - llvm-hs-pretty < 0
4462 - llvm-hs-pretty < 0
4466 - matrix-static < 0
4463 - matrix-static < 0
4467 - med-module < 0
4464 - med-module < 0
@@ -4470,7 +4467,6 @@ packages:
4470 - o-clock < 0
4467 - o-clock < 0
4471 - stm-stats < 0
4468 - stm-stats < 0
4472 - teardown < 0
4469 - teardown < 0
4473− - typelits-witnesses < 0
4474 - typenums < 0
4470 - typenums < 0
4475 - typography-geometry < 0
4471 - typography-geometry < 0
4476 - universe-instances-extended < 0
4472 - universe-instances-extended < 0
@@ -4756,7 +4752,6 @@ skipped-tests:
4756 - github-types
4752 - github-types
4757 - graph-core
4753 - graph-core
4758 - hexml-lens
4754 - hexml-lens
4759− - higher-leveldb
4760 - hspec-core
4755 - hspec-core
4761 - inflections
4756 - inflections
4762 - inline-r
4757 - inline-r
@@ -5005,7 +5000,6 @@ expected-test-failures:
5005 - serialport # "The tests need two serial ports as command line arguments" https://github.com/jputcu/serialport/issues/30
5000 - serialport # "The tests need two serial ports as command line arguments" https://github.com/jputcu/serialport/issues/30
5006 - serversession-backend-redis # redis
5001 - serversession-backend-redis # redis
5007 - shake # Needs ghc on $PATH with some installed haskell packages
5002 - shake # Needs ghc on $PATH with some installed haskell packages
5008− - singletons # Needs ghc on $PATH with som installed haskell packages
5009 - stack # https://github.com/fpco/stackage/issues/3707
5003 - stack # https://github.com/fpco/stackage/issues/3707
5010 - stripe-http-streams # https://github.com/fpco/stackage/issues/2945, needs Stripe account
5004 - stripe-http-streams # https://github.com/fpco/stackage/issues/2945, needs Stripe account
5011 - users-persistent # sqlite
5005 - users-persistent # sqlite
debian-bootstrap.sh+4−3
@@ -268,12 +268,13 @@ cd /tmp \
268# NOTE: also update Dockerfile when cuda version changes
268# NOTE: also update Dockerfile when cuda version changes
269# Install CUDA toolkit
269# Install CUDA toolkit
270# The current version can be found at: https://developer.nvidia.com/cuda-downloads
270# The current version can be found at: https://developer.nvidia.com/cuda-downloads
271−CUDA_PKG=8.0.61-1 # update this on new version
271+CUDA_PKG=10.0.130-1
272−CUDA_VER=${CUDA_PKG:0:3}
272+CUDA_VER=10.0
273−CUDA_APT=${CUDA_VER/./-}
273+CUDA_APT=10-0
274
274
275pushd /tmp \
275pushd /tmp \
276 && wget https://developer.download.nvidia.com/compute/cuda/repos/ubuntu1604/x86_64/cuda-repo-ubuntu1604_${CUDA_PKG}_amd64.deb \
276 && wget https://developer.download.nvidia.com/compute/cuda/repos/ubuntu1604/x86_64/cuda-repo-ubuntu1604_${CUDA_PKG}_amd64.deb \
277+ && apt-key adv --fetch-keys http://developer.download.nvidia.com/compute/cuda/repos/ubuntu1604/x86_64/7fa2af80.pub \
277 && dpkg -i cuda-repo-ubuntu1604_${CUDA_PKG}_amd64.deb \
278 && dpkg -i cuda-repo-ubuntu1604_${CUDA_PKG}_amd64.deb \
278 && apt-get update -qq \
279 && apt-get update -qq \
279 && 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} \
280 && 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} \