Merge branch 'master' into ghc7.10

Conflicts:
	build-constraints.yaml
This commit is contained in:
Michael Snoyman 2015-04-12 12:32:40 +03:00
commit 63854caa1c
3 changed files with 116 additions and 45 deletions

View File

@ -1,4 +1,4 @@
FROM ubuntu:12.04 FROM ubuntu:14.04
ENV HOME /home/stackage ENV HOME /home/stackage
ENV LANG en_US.UTF-8 ENV LANG en_US.UTF-8
@ -14,12 +14,12 @@ ADD debian-bootstrap.sh /tmp/debian-bootstrap.sh
RUN DEBIAN_FRONTEND=noninteractive bash /tmp/debian-bootstrap.sh RUN DEBIAN_FRONTEND=noninteractive bash /tmp/debian-bootstrap.sh
RUN rm /tmp/debian-bootstrap.sh RUN rm /tmp/debian-bootstrap.sh
RUN DEBIAN_FRONTEND=noninteractive apt-get install -y cabal-install-1.20 ghc-7.8.4 alex-3.1.3 happy-1.19.4 RUN DEBIAN_FRONTEND=noninteractive apt-get install -y cabal-install-1.20 ghc-7.8.4 alex-3.1.3 happy-1.19.4 sudo
ENV PATH /home/stackage/.cabal/bin:/usr/local/sbin:/usr/local/bin:/opt/ghc/7.8.4/bin:/opt/cabal/1.20/bin:/opt/alex/3.1.3/bin:/opt/happy/1.19.4/bin:/usr/sbin:/usr/bin:/sbin:/bin ENV PATH /home/stackage/.cabal/bin:/usr/local/sbin:/usr/local/bin:/opt/ghc/7.8.4/bin:/opt/cabal/1.20/bin:/opt/alex/3.1.3/bin:/opt/happy/1.19.4/bin:/usr/sbin:/usr/bin:/sbin:/bin
RUN cabal update RUN cabal update
RUN cabal install hscolour cabal-install --constraint "Cabal < 1.22" && cp $HOME/.cabal/bin/* /usr/local/bin && rm -rf $HOME/.cabal $HOME/.ghc /tmp/stackage RUN cabal install hscolour cabal-install && cp $HOME/.cabal/bin/* /usr/local/bin && rm -rf $HOME/.cabal $HOME/.ghc /tmp/stackage
RUN wget https://s3.amazonaws.com/stackage-travis/stackage-curator/stackage-curator.bz2 && bunzip2 stackage-curator.bz2 && chmod +x stackage-curator && mv stackage-curator /usr/local/bin RUN wget https://s3.amazonaws.com/stackage-travis/stackage-curator/stackage-curator.bz2 && bunzip2 stackage-curator.bz2 && chmod +x stackage-curator && mv stackage-curator /usr/local/bin
RUN cd /home/stackage && cabal update && stackage-curator check RUN cd /home/stackage && cabal update && stackage-curator check

View File

@ -19,7 +19,6 @@ packages:
- persistent-postgresql - persistent-postgresql
- persistent-sqlite - persistent-sqlite
- persistent-template - persistent-template
- process-conduit
- random-shuffle - random-shuffle
- sphinx - sphinx
- stm-conduit - stm-conduit
@ -50,6 +49,7 @@ packages:
- lzma-conduit - lzma-conduit
- mutable-containers - mutable-containers
- hpc-coveralls - hpc-coveralls
- monad-unlift
"FP Complete michael@fpcomplete.com @snoyberg": "FP Complete michael@fpcomplete.com @snoyberg":
- alex - alex
@ -121,6 +121,15 @@ packages:
- kure - kure
- ide-backend
- ide-backend-server
- ide-backend-rts
- hackage-mirror
- wai-middleware-consul
- monad-logger-json
- monad-logger-syslog
"Omari Norman <omari@smileystation.com>": "Omari Norman <omari@smileystation.com>":
- rainbow - rainbow
- multiarg - multiarg
@ -217,12 +226,11 @@ packages:
# requires old haddock currently - haskell-docs # requires old haddock currently - haskell-docs
# TODO: Add structured-haskell-mode once they've been ported to HSE 1.16. # TODO: Add structured-haskell-mode once they've been ported to HSE 1.16.
# GHC 7.6 "Alberto G. Corona <agocorona@gmail.com>":
# "Alberto G. Corona <agocorona@gmail.com>": - RefSerialize
# - RefSerialize - TCache
# - TCache - Workflow
# - Workflow - MFlow
# - MFlow
"Edward Kmett <ekmett@gmail.com>": "Edward Kmett <ekmett@gmail.com>":
- ad - ad
@ -291,9 +299,8 @@ packages:
- gl - gl
- lens-aeson - lens-aeson
- zlib-lens - zlib-lens
# Temporary upper bound for some of the above packages - generic-deriving
- generic-deriving < 1.7 - hyperloglog
# hyperloglog
"Andrew Farmer <afarmer@ittc.ku.edu>": "Andrew Farmer <afarmer@ittc.ku.edu>":
- scotty - scotty
@ -313,6 +320,7 @@ packages:
- monad-coroutine - monad-coroutine
- incremental-parser - incremental-parser
- monoid-subclasses - monoid-subclasses
- picoparsec
"Brent Yorgey <byorgey@gmail.com>": "Brent Yorgey <byorgey@gmail.com>":
- active - active
@ -380,12 +388,15 @@ packages:
- binary-list - binary-list
- haskintex - haskintex
- post-mess-age - post-mess-age
- include-file
"Gabriel Gonzalez <Gabriel439@gmail.com>": "Gabriel Gonzalez <Gabriel439@gmail.com>":
- pipes - pipes
- pipes-parse - pipes-parse
- pipes-concurrency - pipes-concurrency
- pipes-safe - pipes-safe
- turtle
- foldl
"Chris Allen <cma@bitemyapp.com>": "Chris Allen <cma@bitemyapp.com>":
- bloodhound - bloodhound
@ -434,11 +445,7 @@ packages:
- action-permutations - action-permutations
- amqp - amqp
- curl - curl
- generics-sop - haskell-names
# https://github.com/fpco/stackage/issues/341
- haskell-names < 0.5
- haskell-packages - haskell-packages
- heredoc - heredoc
- hse-cpp - hse-cpp
@ -474,6 +481,8 @@ packages:
- ghc-heap-view - ghc-heap-view
- tttool - tttool
- gipeda - gipeda
- list-fusion-probe
- haskell-spacegoo
"Aditya Bhargava <adit@adit.io": "Aditya Bhargava <adit@adit.io":
- HandsomeSoup - HandsomeSoup
@ -532,6 +541,8 @@ packages:
"Simon Michael <simon@joyful.com>": "Simon Michael <simon@joyful.com>":
- hledger - hledger
- shelltestrunner
- hledger-web
"Mihai Maruseac <mihai.maruseac@gmail.com>": "Mihai Maruseac <mihai.maruseac@gmail.com>":
- io-manager - io-manager
@ -684,7 +695,8 @@ packages:
- unbound-generics - unbound-generics
"Alois Cochard alois.cochard@gmail.com @aloiscochard": "Alois Cochard alois.cochard@gmail.com @aloiscochard":
- codex # https://github.com/fpco/stackage/issues/415
# - codex
- machines-directory - machines-directory
- machines-io - machines-io
- machines-process - machines-process
@ -743,6 +755,8 @@ packages:
- string-conversions - string-conversions
"Oleg Grenrus oleg.grenrus@iki.fi @phadej": "Oleg Grenrus oleg.grenrus@iki.fi @phadej":
- edit-distance
- lattices
- waitra - waitra
"Adam C. Foltzer acfoltzer@galois.com @acfoltzer": "Adam C. Foltzer acfoltzer@galois.com @acfoltzer":
@ -818,38 +832,75 @@ packages:
- cubicspline - cubicspline
- maximal-cliques - maximal-cliques
"Alexander Bondarenko <aenor.realm@gmail.com> @wiz":
- soap
- soap-tls
- soap-openssl
"Andres Löh <andres@well-typed.com> @kosmikus":
- generics-sop
"Vivian McPhail <haskell.vivian.mcphail@gmail.com>":
- hmatrix-gsl-stats
- hstatistics
- hsignal
- plot
- plot-gtk
- plot-gtk3
- vector-buffer
- hmatrix-repa
"Noam Lewis <jones.noamle@gmail.com> @sinelaw":
- xml-to-json
- xml-to-json-fast
"Tim Baumann <tim@timbaumann.info> @timjb":
- aeson-schema
"David Fox <dsf@seereason.com> @ddssff":
- debian
- cabal-debian
"Stefan Saasen <stefan@saasen.me>":
- jwt
"Sven Bartscher sven.bartscher@weltraumschlangen.de @kritzefitz":
- setlocale
"Stackage upper bounds": "Stackage upper bounds":
# https://github.com/fpco/stackage/issues/415
- hackage-db < 1.12
# https://github.com/fpco/stackage/issues/424
- control-monad-free < 0.6
# https://github.com/fpco/stackage/issues/442
- blaze-builder < 0.4
# https://github.com/fpco/stackage/issues/487
- blaze-markup < 0.7
- blaze-html < 0.8
# https://github.com/fpco/stackage/issues/467 # https://github.com/fpco/stackage/issues/467
- lens < 4.8 - lens < 4.8
# https://github.com/fpco/stackage/issues/476 # https://github.com/fpco/stackage/issues/476
- vector-space < 0.10 - vector-space < 0.10
# https://github.com/ekmett/linear/issues/70
- linear < 1.18
# https://github.com/fpco/stackage/issues/479 # https://github.com/fpco/stackage/issues/479
- QuickCheck < 2.8 - QuickCheck < 2.8
- cabal-test-quickcheck < 0.1.5
# https://github.com/fpco/stackage/issues/483 # https://github.com/jgm/pandoc/issues/2036
- rethinkdb-client-driver < 0.0.15 - highlighting-kate < 0.5.13
# https://github.com/fpco/stackage/issues/494 # https://github.com/fpco/stackage/issues/509
- criterion < 1.1 - srcloc < 0.5
# https://github.com/fpco/stackage/issues/515
- exception-transformers < 0.4
- exception-mtl < 0.4
# https://github.com/fpco/stackage/issues/517
- generic-deriving < 1.7
# https://github.com/fpco/stackage/issues/524
- repa < 3.4
- repa-algorithms < 3.4
- repa-io < 3.4
# https://github.com/Happstack/happstack-server/issues/6
- happstack-server < 7.4.3
# https://github.com/fpco/stackage/issues/531
- sbv < 4.3
# Package flags are applied to individual packages, and override the values of # Package flags are applied to individual packages, and override the values of
# global-flags # global-flags
@ -883,6 +934,7 @@ package-flags:
pandoc: pandoc:
https: true https: true
old-locale: false
text: text:
integer-simple: false integer-simple: false
@ -898,6 +950,12 @@ package-flags:
jose-jwt: jose-jwt:
doctest: false doctest: false
time-locale-compat:
old-locale: false
HsOpenSSL:
fast-bignum: false
# By skipping a test suite, we do not pull in the build dependencies # By skipping a test suite, we do not pull in the build dependencies
skipped-tests: skipped-tests:
- ReadArgs # old version of hspec - ReadArgs # old version of hspec
@ -1125,6 +1183,15 @@ expected-test-failures:
# Requires locally running services # Requires locally running services
- network-anonymous-i2p - network-anonymous-i2p
# Tests not reliable on non-Windows systems
- nsis
# Just a temporary package with a flimsy, inherited test suite
- Cabal-ide-backend
# Requires running server
- consul-haskell
# Haddocks which are expected to fail. Same concept as expected test failures. # Haddocks which are expected to fail. Same concept as expected test failures.
expected-haddock-failures: expected-haddock-failures:
# https://github.com/acw/bytestring-progress/issues/4 # https://github.com/acw/bytestring-progress/issues/4
@ -1140,6 +1207,9 @@ expected-haddock-failures:
# builds. Could consider special-casing this requirement. # builds. Could consider special-casing this requirement.
- gtk - gtk
# Not sure why, but it's a temporary package anyway
- Cabal-ide-backend
# Benchmarks which should not be built. Note that Stackage does *not* generally # Benchmarks which should not be built. Note that Stackage does *not* generally
# build benchmarks. The difference here will be whether dependencies for these # build benchmarks. The difference here will be whether dependencies for these
# benchmarks are included or not. # benchmarks are included or not.
@ -1166,8 +1236,10 @@ skipped-benchmarks:
# sometimes falls out-of-sync on hasql-postgres # sometimes falls out-of-sync on hasql-postgres
- hasql - hasql
# https://github.com/fpco/stackage/issues/488 # https://github.com/fpco/stackage/issues/494
- uuid-types - case-insensitive
- postgresql-binary
- scientific
skipped-profiling: skipped-profiling:
# https://github.com/nomeata/ghc-heap-view/commit/8d198eb8fbbad2ce0c4527c781659f35b8909c04#diff-8288955e209cfbead5b318a8598be9c0R10 # https://github.com/nomeata/ghc-heap-view/commit/8d198eb8fbbad2ce0c4527c781659f35b8909c04#diff-8288955e209cfbead5b318a8598be9c0R10

View File

@ -10,9 +10,8 @@
# instructions, see: # instructions, see:
# http://www.stackage.org/install # http://www.stackage.org/install
add-apt-repository -y ppa:chris-lea/zeromq
add-apt-repository -y ppa:floe/libtisch
add-apt-repository -y ppa:zoogie/sdl2-snapshots add-apt-repository -y ppa:zoogie/sdl2-snapshots
apt-get update apt-get update
apt-get install -y \ apt-get install -y \
build-essential \ build-essential \
@ -21,7 +20,6 @@ apt-get install -y \
wget \ wget \
m4 \ m4 \
texlive-full \ texlive-full \
libgmp3c2 \
libgmp3-dev \ libgmp3-dev \
zlib1g-dev \ zlib1g-dev \
libedit2 \ libedit2 \
@ -53,6 +51,7 @@ apt-get install -y \
liblzma-dev \ liblzma-dev \
libsdl2-dev \ libsdl2-dev \
libxss-dev \ libxss-dev \
libgtk-3-dev \
libzmq3-dev libzmq3-dev
mkdir /tmp/nettle-build mkdir /tmp/nettle-build