Merge branch 'master' into nightly

This commit is contained in:
Jens Petersen 2017-09-24 20:43:53 +09:00
commit 2eb954d592
2 changed files with 62 additions and 28 deletions

View File

@ -7,6 +7,12 @@ cabal-format-version: "1.24"
# Constraints for brand new builds # Constraints for brand new builds
packages: packages:
"Jürgen Keck <jhyphenkeck@gmail.com> @j-keck":
- wreq-stringless
"Olaf Chitil <oc@kent.ac.uk> @OlafChitil":
- FPretty
"Maarten Faddegon <stackage@maartenfaddegon.nl> @MaartenFaddegon": "Maarten Faddegon <stackage@maartenfaddegon.nl> @MaartenFaddegon":
- libgraph - libgraph
- Hoed - Hoed
@ -669,6 +675,13 @@ packages:
"Trevor L. McDonell <tmcdonell@cse.unsw.edu.au> @tmcdonell": "Trevor L. McDonell <tmcdonell@cse.unsw.edu.au> @tmcdonell":
- accelerate - accelerate
- accelerate-llvm
- accelerate-llvm-native
- accelerate-llvm-ptx
- accelerate-io
- accelerate-fft
- accelerate-blas
# - accelerate-bignum # wide-word-0.1.0.3. No maintainer. @erikd. Used by: test-suite
- repa - repa
- repa-io - repa-io
- repa-algorithms - repa-algorithms
@ -676,6 +689,11 @@ packages:
- gloss-algorithms - gloss-algorithms
- gloss-raster - gloss-raster
- gloss-rendering - gloss-rendering
- gloss-accelerate
- gloss-raster-accelerate
- colour-accelerate
- lens-accelerate
- mwc-random-accelerate
- cuda - cuda
- cublas - cublas
- cusparse - cusparse
@ -744,7 +762,7 @@ packages:
"Chris Allen <cma@bitemyapp.com> @bitemyapp": "Chris Allen <cma@bitemyapp.com> @bitemyapp":
- machines-directory - machines-directory
- machines-io - machines-io
# - bloodhound # GHC 8.2.1 - bloodhound
- esqueleto - esqueleto
"Adam Bergmark <adam@bergmark.nl> @bergmark": "Adam Bergmark <adam@bergmark.nl> @bergmark":
@ -939,7 +957,7 @@ packages:
- hledger-lib - hledger-lib
- hledger-ui - hledger-ui
- hledger-web - hledger-web
- hledger-api # - hledger-api
# - shelltestrunner # bounds: Diff, HUnit # - shelltestrunner # bounds: Diff, HUnit
- quickbench - quickbench
- regex-compat-tdfa - regex-compat-tdfa
@ -1879,6 +1897,7 @@ packages:
"koral koral@mailoo.org @k0ral": "koral koral@mailoo.org @k0ral":
- atom-conduit - atom-conduit
- conduit-parse - conduit-parse
- dublincore-xml-conduit
- opml-conduit - opml-conduit
- rss-conduit < 0 # test runtime failure - rss-conduit < 0 # test runtime failure
- imm < 0 # compilation failure via synthesizer-core - imm < 0 # compilation failure via synthesizer-core
@ -1907,7 +1926,6 @@ packages:
- pipes-fastx - pipes-fastx
# - pipes-illumina # via: pipes-bgzf # - pipes-illumina # via: pipes-bgzf
- seqalign - seqalign
- thermonuc
- xlsior < 0 # compilation failure https://github.com/eurekagenomics/xlsior/issues/3 - xlsior < 0 # compilation failure https://github.com/eurekagenomics/xlsior/issues/3
"John Lenz <wuzzeb@gmail.com> @wuzzeb": "John Lenz <wuzzeb@gmail.com> @wuzzeb":
@ -2033,8 +2051,7 @@ packages:
- ipython-kernel # GHC 8 - ipython-kernel # GHC 8
"Andrés Sicard-Ramírez <asr@eafit.edu.co> @asr": "Andrés Sicard-Ramírez <asr@eafit.edu.co> @asr":
[] - Agda
# - Agda # GHC 8.2.1
"James Cook <mokus@deepbondi.net> @mokus0": "James Cook <mokus@deepbondi.net> @mokus0":
- dependent-sum - dependent-sum
@ -2074,7 +2091,7 @@ packages:
# - euphoria # GHC 8.2.1 # - euphoria # GHC 8.2.1
"Ashley Moni ashley.moni1@gmail.com @AshleyMoni": "Ashley Moni ashley.moni1@gmail.com @AshleyMoni":
- quadtree []
"Brian Lewis brian@lorf.org @bsl": "Brian Lewis brian@lorf.org @bsl":
[] []
@ -2142,7 +2159,6 @@ packages:
"Dmitry Ivanov <ethercrow@gmail.com> @ethercrow": "Dmitry Ivanov <ethercrow@gmail.com> @ethercrow":
- charsetdetect-ae - charsetdetect-ae
- compiler-errors
- docopt - docopt
- dynamic-state - dynamic-state
- dyre - dyre
@ -2176,6 +2192,9 @@ packages:
[] []
# - GPipe-GLFW # GHC 8.2.1 via GLFW-b # - GPipe-GLFW # GHC 8.2.1 via GLFW-b
"Jonas Carpay <jonascarpay@gmail.com> @jonascarpay":
- apecs
"Csaba Hruska <csaba.hruska@gmail.com> @csabahruska": "Csaba Hruska <csaba.hruska@gmail.com> @csabahruska":
[] []
# - lambdacube-ir # bounds: aeson # - lambdacube-ir # bounds: aeson
@ -2224,7 +2243,7 @@ packages:
- cabal2nix - cabal2nix
- funcmp - funcmp
- hackage-db - hackage-db
# - hledger-interest # megaparsec bounds: https://github.com/fpco/stackage/issues/2666 - hledger-interest
- hopenssl - hopenssl
- hsdns - hsdns
- hsemail - hsemail
@ -2629,8 +2648,8 @@ packages:
# - ua-parser # bounds aeson # - ua-parser # bounds aeson
- hs-GeoIP - hs-GeoIP
- retry - retry
# - katip # bounds aeson - katip
# - katip-elasticsearch # via bloodhound: bounds: vector - katip-elasticsearch
"Sid Kapur sidharthkapur1@gmail.com @sid-kap": "Sid Kapur sidharthkapur1@gmail.com @sid-kap":
- tuple - tuple
@ -2810,9 +2829,8 @@ packages:
- directory-tree - directory-tree
"Ian Grant Jeffries <ian@housejeffries.com> @seagreen": "Ian Grant Jeffries <ian@housejeffries.com> @seagreen":
[] - hjsonpointer
# - hjsonpointer # GHC 8.2.1 - hjsonschema
# - hjsonschema # GHC 8.2.1
"Drew Hess <src@drewhess.com> @dhess": "Drew Hess <src@drewhess.com> @dhess":
- hpio - hpio
@ -2868,6 +2886,7 @@ packages:
- bson - bson
"Alexis King <lexi.lambda@gmail.com> @lexi-lambda": "Alexis King <lexi.lambda@gmail.com> @lexi-lambda":
- monad-mock
- test-fixture - test-fixture
- text-conversions - text-conversions
- th-to-exp - th-to-exp
@ -2901,8 +2920,7 @@ packages:
- language-fortran - language-fortran
"Philipp Schuster <phischu3000@gmail.com> @phischu": "Philipp Schuster <phischu3000@gmail.com> @phischu":
[] - haskell-names
# - haskell-names # bounds: aeson
"Shao Cheng <astrohavoc@gmail.com> @TerrorJack": "Shao Cheng <astrohavoc@gmail.com> @TerrorJack":
[] []
@ -2962,6 +2980,10 @@ packages:
- lmdb - lmdb
- rdf - rdf
"Michael Swan <mswan@fastmail.com> @michael-swan":
- pcf-font
- pcf-font-embed
"Iago Abal <iagoabal+stack@gmail.com>": "Iago Abal <iagoabal+stack@gmail.com>":
- bv - bv
@ -2991,11 +3013,13 @@ packages:
[] []
# - HDBC-mysql # GHC 8.2.1 # - HDBC-mysql # GHC 8.2.1
"Tony Morris <haskell@tmorris.net> @tonymorris":
- validation
"Tony Day <tonyday567@gmail.com> @tonyday567": "Tony Day <tonyday567@gmail.com> @tonyday567":
- numhask - numhask
- numhask-range - numhask-range
# - chart-unit # bounds optparse-applicative - perf
# - perf # bounds optparse-applicative
- online - online
"Iphigenia Df <iphydf@gmail.com> @iphydf": "Iphigenia Df <iphydf@gmail.com> @iphydf":
@ -3008,7 +3032,6 @@ packages:
- tce-conf - tce-conf
"Jonathan Fischoff <jonathangfischoff@gmail.com>": "Jonathan Fischoff <jonathangfischoff@gmail.com>":
- threads-extra
- clock-extras - clock-extras
- next-ref - next-ref
- tmp-postgres - tmp-postgres
@ -3069,8 +3092,7 @@ packages:
# - hip # via repa-algorithms # - hip # via repa-algorithms
"Hans-Peter Deifel <hpd@hpdeifel.de> @hpdeifel": "Hans-Peter Deifel <hpd@hpdeifel.de> @hpdeifel":
[] - hledger-iadd
# - hledger-iadd # megaparsec bounds: https://github.com/fpco/stackage/issues/2666
"Roy Levien <royl@aldaron.com> @orome": "Roy Levien <royl@aldaron.com> @orome":
- crypto-enigma - crypto-enigma
@ -3135,6 +3157,7 @@ packages:
"ncaq <ncaq@ncaq.net> @ncaq": "ncaq <ncaq@ncaq.net> @ncaq":
- haskell-import-graph - haskell-import-graph
- string-transform
- uniq-deep - uniq-deep
- yesod-form-bootstrap4 - yesod-form-bootstrap4
- yesod-recaptcha2 - yesod-recaptcha2
@ -3370,15 +3393,24 @@ packages:
# https://github.com/fpco/stackage/issues/2779 # https://github.com/fpco/stackage/issues/2779
- xml-conduit < 1.6.0 - xml-conduit < 1.6.0
# https://github.com/fpco/stackage/issues/2797
# - inflections < 0.4.0.0
# https://github.com/fpco/stackage/issues/2826
- uri-templater < 0.3
# https://github.com/fpco/stackage/issues/2832 # https://github.com/fpco/stackage/issues/2832
- io-streams < 1.5 - io-streams < 1.5
# https://github.com/fpco/stackage/issues/2860
- language-c < 0.7
# https://github.com/fpco/stackage/issues/2878
- hackage-db < 2.0
- cabal2nix < 2.6
# https://github.com/fpco/stackage/issues/2894
- marvin < 0.2.4
# https://github.com/fpco/stackage/issues/2893
- megaparsec < 6.2.0
# https://github.com/fpco/stackage/issues/2891
- irc-client < 1.0.0.0
# end of packages # end of packages
# Package flags are applied to individual packages, and override the values of # Package flags are applied to individual packages, and override the values of
@ -3765,7 +3797,6 @@ expected-test-failures:
- ghc-events # https://github.com/haskell/ghc-events/issues/9 - ghc-events # https://github.com/haskell/ghc-events/issues/9
- ghc-syb-utils # https://github.com/nominolo/ghc-syb/issues/18 - ghc-syb-utils # https://github.com/nominolo/ghc-syb/issues/18
- graylog # 0.1.0.1 https://github.com/fpco/stackage/pull/1254 - graylog # 0.1.0.1 https://github.com/fpco/stackage/pull/1254
- haskell-names # 0.7.0 https://github.com/haskell-suite/haskell-names/issues/78
- matplotlib # https://github.com/fpco/stackage/issues/2365 - matplotlib # https://github.com/fpco/stackage/issues/2365
- rematch # No issue tracker, sent e-mail to maintainer https://github.com/fpco/stackage/issues/376 - rematch # No issue tracker, sent e-mail to maintainer https://github.com/fpco/stackage/issues/376
- xlsior # https://github.com/rcallahan/xlsior/issues/1 - xlsior # https://github.com/rcallahan/xlsior/issues/1
@ -3800,7 +3831,6 @@ expected-test-failures:
- foundation # https://github.com/haskell-foundation/foundation/issues/394 - 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
- hspec-expectations-pretty-diff # GHC 8 issue not reported upstream since issue tracker disabled - hspec-expectations-pretty-diff # GHC 8 issue not reported upstream since issue tracker disabled
- hweblib # https://github.com/aycanirican/hweblib/issues/3 - hweblib # https://github.com/aycanirican/hweblib/issues/3
- language-dockerfile # https://github.com/beijaflor-io/haskell-language-dockerfile/issues/8 - language-dockerfile # https://github.com/beijaflor-io/haskell-language-dockerfile/issues/8
@ -3855,6 +3885,8 @@ expected-test-failures:
- tcp-streams-openssl # https://github.com/didi-FP/tcp-streams/issues/5 - tcp-streams-openssl # https://github.com/didi-FP/tcp-streams/issues/5
- tmp-postgres # https://github.com/jfischoff/tmp-postgres/issues/1 - tmp-postgres # https://github.com/jfischoff/tmp-postgres/issues/1
- perf # https://github.com/fpco/stackage/pull/2859
# end of expected-test-failures # end of expected-test-failures
# Benchmarks which are known not to build. Note that, currently we do not run # Benchmarks which are known not to build. Note that, currently we do not run
@ -3983,6 +4015,7 @@ skipped-benchmarks:
- refined - refined
- slave-thread - slave-thread
- stm-containers - stm-containers
- vector-builder
# @ivan-m https://github.com/fpco/stackage/issues/2538#issuecomment-307290070 # @ivan-m https://github.com/fpco/stackage/issues/2538#issuecomment-307290070
- fgl - fgl
- fgl-arbitrary - fgl-arbitrary

View File

@ -126,6 +126,7 @@ apt-get install -y \
nettle-dev \ nettle-dev \
nodejs \ nodejs \
npm \ npm \
nvidia-cuda-dev \
openjdk-8-jdk \ openjdk-8-jdk \
python-mpltoolkits.basemap \ python-mpltoolkits.basemap \
python3-matplotlib \ python3-matplotlib \