Merge branch 'master' into nightly

This commit is contained in:
Dan Burton 2017-08-31 16:22:24 -07:00
commit ce5e23c8e8
No known key found for this signature in database
GPG Key ID: C11E00118F0CE509
2 changed files with 32 additions and 14 deletions

View File

@ -472,7 +472,7 @@ packages:
- xenstore - xenstore
"Chris Done @chrisdone": "Chris Done @chrisdone":
- labels < 0 # compilation failure https://github.com/chrisdone/labels/issues/8 - labels
- ace - ace
- ical - ical
- check-email - check-email
@ -670,11 +670,12 @@ packages:
- gloss-algorithms - gloss-algorithms
- gloss-raster - gloss-raster
- gloss-rendering - gloss-rendering
- cuda # https://github.com/fpco/stackage/issues/2813
- cublas # - cuda
- cusparse # - cublas
- cusolver # - cusparse
- nvvm # - cusolver
# - nvvm
"Liam O'Connor <liamoc@cse.unsw.edu.au> @liamoc": "Liam O'Connor <liamoc@cse.unsw.edu.au> @liamoc":
[] []
@ -847,7 +848,7 @@ packages:
- openpgp-asciiarmor - openpgp-asciiarmor
- MusicBrainz - MusicBrainz
- DAV - DAV
- hopenpgp-tools # - hopenpgp-tools # https://github.com/fpco/stackage/issues/2812
- opensource - opensource
"Piyush P Kurur <ppk@cse.iitk.ac.in> @piyush-kurur": "Piyush P Kurur <ppk@cse.iitk.ac.in> @piyush-kurur":
@ -1671,6 +1672,7 @@ packages:
- annotated-wl-pprint - annotated-wl-pprint
"Yitz Gale <gale@sefer.org> @ygale": "Yitz Gale <gale@sefer.org> @ygale":
- strict-concurrency
- timezone-series - timezone-series
- timezone-olson - timezone-olson
@ -2249,7 +2251,7 @@ packages:
- strict-base-types - strict-base-types
- withdependencies - withdependencies
- hruby - hruby
- language-puppet # - language-puppet # https://github.com/fpco/stackage/issues/2822
- tar-conduit - tar-conduit
# - stm-firehose # bounds: http-types, stm-conduit, transformers, wai, warp # - stm-firehose # bounds: http-types, stm-conduit, transformers, wai, warp
# - hslogstash # bounds: aeson, lens, time, transformers # via: stm-firehose # - hslogstash # bounds: aeson, lens, time, transformers # via: stm-firehose
@ -2311,9 +2313,10 @@ packages:
- flat-mcmc - flat-mcmc
"Facundo Domínguez <facundo.dominguez@tweag.io> @facundominguez": "Facundo Domínguez <facundo.dominguez@tweag.io> @facundominguez":
- distributed-process # https://github.com/haskell-distributed/distributed-process/issues/312
- distributed-process-tests # - distributed-process
- distributed-process-simplelocalnet # - distributed-process-tests
# - distributed-process-simplelocalnet
- distributed-static - distributed-static
- network-transport - network-transport
- network-transport-tests - network-transport-tests
@ -3255,6 +3258,7 @@ packages:
"Alexander Ignatyev <ignatyev.alexander@gmail.com> @alexander-ignatyev": "Alexander Ignatyev <ignatyev.alexander@gmail.com> @alexander-ignatyev":
- astro - astro
- mltool - mltool
- hmatrix-morpheus
"Edward Amsden <edwardamsden@gmail.com> @eamsden": "Edward Amsden <edwardamsden@gmail.com> @eamsden":
- h2c - h2c
@ -3281,12 +3285,20 @@ packages:
"Daniel Campoverde <alx@sillybytes.net> @alx741": "Daniel Campoverde <alx@sillybytes.net> @alx741":
- currencies - currencies
- alerts
- yesod-alerts
"José Lorenzo Rodríguez <jose.zap@gmail.com> @lorenzo": "José Lorenzo Rodríguez <jose.zap@gmail.com> @lorenzo":
- wrecker - wrecker
- docker-build-cacher - docker-build-cacher
# - mysql-haskell-nem : blocked on mysql-haskell # - mysql-haskell-nem : blocked on mysql-haskell
"Phil Ruffwind <rf@rufflewind.com> @Rufflewind":
- blas-hs
"Eitan Chatav <eitan@gmail.com> @echatav":
- squeal-postgresql
# If you stop maintaining a package you can move it here. # If you stop maintaining a package you can move it here.
# It will then be disabled if it starts causing problems. # It will then be disabled if it starts causing problems.
# See https://github.com/fpco/stackage/issues/1056 # See https://github.com/fpco/stackage/issues/1056
@ -3316,8 +3328,10 @@ packages:
- Win32 == 2.5.4.1 - Win32 == 2.5.4.1
"Stackage upper bounds": "Stackage upper bounds":
# https://github.com/fpco/stackage/issues/2663 # https://github.com/fpco/stackage/issues/2814
- doctest < 0.12 - doctest < 0.12
# Once unconstrained, remove the following skipped-tests
# - sbv
# https://github.com/fpco/stackage/issues/2714 # https://github.com/fpco/stackage/issues/2714
- brick < 0.21 - brick < 0.21
@ -3539,6 +3553,7 @@ skipped-tests:
# Blocked by stackage upper bounds. These can be re-enabled once # Blocked by stackage upper bounds. These can be re-enabled once
# the relevant stackage upper bound is lifted. # the relevant stackage upper bound is lifted.
- sbv # doctest >= 0.13
# Compilation failures # Compilation failures
- proto-lens-combinators # https://github.com/google/proto-lens/issues/119 - proto-lens-combinators # https://github.com/google/proto-lens/issues/119
@ -3609,7 +3624,6 @@ expected-test-failures:
- distributed-process - distributed-process
- distributed-process-execution # https://github.com/haskell-distributed/distributed-process-execution/issues/2 - distributed-process-execution # https://github.com/haskell-distributed/distributed-process-execution/issues/2
- distributed-process-task - distributed-process-task
- dotenv # https://github.com/stackbuilders/dotenv-hs/issues/58
- foldl-statistics # https://github.com/data61/foldl-statistics/issues/2 - foldl-statistics # https://github.com/data61/foldl-statistics/issues/2
- fsnotify # Often runs out of inotify handles - fsnotify # Often runs out of inotify handles
- hastache - hastache
@ -3735,6 +3749,7 @@ expected-test-failures:
- DRBG # https://github.com/TomMD/DRBG/issues/7 - DRBG # https://github.com/TomMD/DRBG/issues/7
- cayley-client # https://github.com/MichelBoucey/cayley-client/issues/2 - cayley-client # https://github.com/MichelBoucey/cayley-client/issues/2
- direct-sqlite # 2.3.17 https://github.com/IreneKnapp/direct-sqlite/issues/63 - direct-sqlite # 2.3.17 https://github.com/IreneKnapp/direct-sqlite/issues/63
- download # https://github.com/fpco/stackage/issues/2811
- ed25519 # 0.0.5.0 https://github.com/thoughtpolice/hs-ed25519/issues/15 - ed25519 # 0.0.5.0 https://github.com/thoughtpolice/hs-ed25519/issues/15
- ghc-exactprint # https://github.com/alanz/ghc-exactprint/issues/47 - ghc-exactprint # https://github.com/alanz/ghc-exactprint/issues/47
- nettle # https://github.com/stbuehler/haskell-nettle/issues/8 - nettle # https://github.com/stbuehler/haskell-nettle/issues/8
@ -3745,6 +3760,7 @@ expected-test-failures:
- unicode-show # https://github.com/nushio3/unicode-show/issues/2 - unicode-show # https://github.com/nushio3/unicode-show/issues/2
- xml-picklers # https://github.com/Philonous/xml-picklers/issues/5 - xml-picklers # https://github.com/Philonous/xml-picklers/issues/5
- xmonad # 0.12 https://github.com/xmonad/xmonad/issues/36 - xmonad # 0.12 https://github.com/xmonad/xmonad/issues/36
- yahoo-finance-api # https://github.com/fpco/stackage/issues/2821
# Compilation failures # Compilation failures
- ListLike # No issue tracker, e-mail sent to maintainer - ListLike # No issue tracker, e-mail sent to maintainer
@ -3752,6 +3768,7 @@ expected-test-failures:
- commutative # https://github.com/athanclark/commutative/issues/4 - commutative # https://github.com/athanclark/commutative/issues/4
- dbus # 0.10.12 No issue tracker, e-mail sent to maintainer - dbus # 0.10.12 No issue tracker, e-mail sent to maintainer
- flat # https://github.com/Quid2/flat/issues/1 - flat # https://github.com/Quid2/flat/issues/1
- foundation # https://github.com/haskell-foundation/foundation/issues/394
- haddock - haddock
- heap # https://github.com/pruvisto/heap/issues/4 - heap # https://github.com/pruvisto/heap/issues/4
- hledger-iadd # https://github.com/hpdeifel/hledger-iadd/issues/26 - hledger-iadd # https://github.com/hpdeifel/hledger-iadd/issues/26
@ -3837,6 +3854,7 @@ expected-benchmark-failures:
- xmlgen # https://github.com/skogsbaer/xmlgen/issues/6 - xmlgen # https://github.com/skogsbaer/xmlgen/issues/6
- raaz # https://github.com/raaz-crypto/raaz/issues/338 - raaz # https://github.com/raaz-crypto/raaz/issues/338
- http2 - http2
- xxhash # https://github.com/christian-marie/xxhash/issues/4
# end of expected-benchmark-failures # end of expected-benchmark-failures

View File

@ -220,7 +220,7 @@ pushd /tmp \
&& 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} \ && 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} \
&& rm cuda-repo-ubuntu1604_${CUDA_PKG}_amd64.deb \ && rm cuda-repo-ubuntu1604_${CUDA_PKG}_amd64.deb \
&& export CUDA_PATH=/usr/local/cuda-${CUDA_VER} \ && export CUDA_PATH=/usr/local/cuda-${CUDA_VER} \
&& export LD_LIBRARY_PATH=${CUDA_PATH}/nvvm/lib64:${LD_LIBRARY_PATH} \ && export LD_LIBRARY_PATH=${CUDA_PATH}/nvvm/lib64:${LD_LIBRARY_PATH+x} \
&& export LD_LIBRARY_PATH=${CUDA_PATH}/lib64:${LD_LIBRARY_PATH} \ && export LD_LIBRARY_PATH=${CUDA_PATH}/lib64:${LD_LIBRARY_PATH} \
&& export PATH=${CUDA_PATH}/bin:${PATH} \ && export PATH=${CUDA_PATH}/bin:${PATH} \
&& popd && popd