haskell/stackage
1
0
Fork 0
mirror of https://github.com/commercialhaskell/stackage.git synced 2026-01-12 07:18:31 +01:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge branch 'ghc7.10'

Browse Source 
Conflicts:
	build-constraints.yaml
This commit is contained in:
Michael Snoyman 2015-05-05 09:02:50 +03:00
commit 23d4626e84
5 changed files with 127 additions and 108 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -2,3 +2,4 @@
/logs/
nightly-*.yaml
lts-*.yaml
*.swp

2
.travis.yml
View File

@ -1,5 +1,5 @@
env:
- CABALVER=1.20 GHCVER=7.8.4
- CABALVER=1.22 GHCVER=7.10.1
# Note: the distinction between `before_install` and `install` is not important.
before_install:

4
Dockerfile
View File

@ -14,9 +14,9 @@ ADD debian-bootstrap.sh /tmp/debian-bootstrap.sh
RUN DEBIAN_FRONTEND=noninteractive bash /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 ghc-7.8.4-htmldocs alex-3.1.3 happy-1.19.4 sudo
RUN DEBIAN_FRONTEND=noninteractive apt-get install -y cabal-install-1.22 ghc-7.10.1 ghc-7.10.1-htmldocs 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.10.1/bin:/opt/cabal/1.22/bin:/opt/alex/3.1.3/bin:/opt/happy/1.19.4/bin:/usr/sbin:/usr/bin:/sbin:/bin
RUN cabal update
RUN cabal install hscolour cabal-install && cp $HOME/.cabal/bin/* /usr/local/bin && rm -rf $HOME/.cabal $HOME/.ghc /tmp/stackage

7
automated/build.sh
View File

@ -4,6 +4,7 @@ set -eux
ROOT=$(cd $(dirname $0) ; pwd)
TARGET=$1
IMAGE=snoyberg/stackage:$(echo $TARGET | cut -d- -f 1)
TROOT=$ROOT/$(echo $TARGET | cut -d. -f 1)
PLAN_FILE=current-plan.yaml
BUNDLE_FILE=current.bundle
@ -68,6 +69,6 @@ ARGS_BUILD="$ARGS_COMMON -v $CABAL_DIR:/home/stackage/.cabal:ro -v $GHC_DIR:/hom
ARGS_UPLOAD="$ARGS_COMMON -v $AUTH_TOKEN:/auth-token:ro -v $HACKAGE_CREDS:/hackage-creds:ro -v $CURATOR_DIR:/home/stackage/.stackage-curator -v $SSH_DIR:/home/ubuntu/.ssh:ro -v $GITCONFIG:/home/stackage/.gitconfig:ro"
# Use cabal update first to initialize ~/.cabal.config, then use stackage-curator update to get it securely
docker run $ARGS_PREBUILD snoyberg/stackage /bin/bash -c "cabal update && stackage-curator update && stackage-curator create-plan --plan-file $PLAN_FILE --target $TARGET ${CONSTRAINTS:-} && stackage-curator check --plan-file $PLAN_FILE && stackage-curator fetch --plan-file $PLAN_FILE && cabal install random cabal-install"
docker run $ARGS_BUILD snoyberg/stackage stackage-curator make-bundle --plan-file $PLAN_FILE --bundle-file $BUNDLE_FILE --target $TARGET
docker run $ARGS_UPLOAD snoyberg/stackage /bin/bash -c "stackage-curator upload --bundle-file $BUNDLE_FILE && stackage-curator hackage-distro --plan-file $PLAN_FILE --target $TARGET && stackage-curator upload-github --plan-file $PLAN_FILE --target $TARGET"
docker run $ARGS_PREBUILD $IMAGE /bin/bash -c "cabal update && stackage-curator update && stackage-curator create-plan --plan-file $PLAN_FILE --target $TARGET ${CONSTRAINTS:-} && stackage-curator check --plan-file $PLAN_FILE && stackage-curator fetch --plan-file $PLAN_FILE && cabal install random cabal-install"
docker run $ARGS_BUILD $IMAGE stackage-curator make-bundle --plan-file $PLAN_FILE --bundle-file $BUNDLE_FILE --target $TARGET
docker run $ARGS_UPLOAD $IMAGE /bin/bash -c "stackage-curator upload --bundle-file $BUNDLE_FILE && stackage-curator hackage-distro --plan-file $PLAN_FILE --target $TARGET && stackage-curator upload-github --plan-file $PLAN_FILE --target $TARGET"

221
build-constraints.yaml
View File

@ -2,7 +2,7 @@
packages:
"Michael Snoyman michael@snoyman.com @snoyberg":
- bzlib-conduit
- cabal-install < 1.19 # GHC 7.10 bumpd to 1.22
- cabal-install
- cabal-src
- case-insensitive
- classy-prelude-yesod
@ -43,7 +43,7 @@ packages:
- repa-io
- repa-algorithms
- repa-devil
- JuicyPixels-repa
#- JuicyPixels-repa GHC 7.10
- cereal-conduit
- binary-conduit
- lzma-conduit
@ -63,6 +63,7 @@ packages:
# https://github.com/fpco/stackage/issues/541
# - Chart-diagrams
- compdata
- configurator
- convertible
@ -72,7 +73,8 @@ packages:
- executable-hash
- executable-path
- fgl
- fixed-list
# https://github.com/jvranish/FixedList/issues/1
#- fixed-list GHC 7.10
- foreign-store
- formatting
#- fpco-api
@ -83,13 +85,15 @@ packages:
- hmatrix-gsl
- hxt
- hxt-relaxng
- hybrid-vectors
# https://github.com/ekmett/hybrid-vectors/issues/1
# - hybrid-vectors GHC 7.10
- indents
- language-c
- lhs2tex
- persistent-mongoDB
- pretty-class
- quandl-api
# https://github.com/pvdbrand/quandl-api/issues/2 GHC 7.10
#- quandl-api
- random-fu
- random-source
- shelly
@ -105,7 +109,8 @@ packages:
- statistics-linreg
- th-expand-syns
- thyme
- webdriver
# https://github.com/kallisti-dev/hs-webdriver/issues/71
# - webdriver
- web-fpco
- criterion
- th-lift
@ -113,18 +118,19 @@ packages:
- th-desugar
- quickcheck-assertions
- distributed-process-simplelocalnet
# Cloud Haskell not yet updated to GHC 7.10
#- distributed-process-simplelocalnet
# cloud-haskell
- rank1dynamic
- distributed-static
#- rank1dynamic
#- distributed-static
- network-transport
- distributed-process
- distributed-process-extras
- distributed-process-async
- distributed-process-client-server
- distributed-process-supervisor
- distributed-process-task
- distributed-process-execution
#- distributed-process
#- distributed-process-extras
#- distributed-process-async
#- distributed-process-client-server
#- distributed-process-supervisor
#- distributed-process-task
#- distributed-process-execution
- kure
@ -189,7 +195,6 @@ packages:
"Vincent Hanquez":
- bytedump
- certificate
- cipher-aes
- cipher-rc4
- connection
@ -201,14 +206,16 @@ packages:
- crypto-random-api
- hit
- language-java
- libgit
# https://github.com/vincenthz/hs-libgit/issues/4
# - libgit GHC 7.10
- pem
- siphash
- socks
- tls
- tls-debug
- vhd
- udbus
# https://github.com/vincenthz/hs-udbus/issues/4
# - udbus GHC 7.10
- xenstore
"Chris Done":
@ -222,9 +229,10 @@ packages:
- lucid
- osdkeys
- pdfinfo
- present
#- present GHC 7.10, via atto-lisp
- pure-io
- scrobble
# https://github.com/jgoerzen/testpack/issues/11
#- scrobble GHC 7.10, for QuickCheck 2.8 via testpack
- shell-conduit
- sourcemap
- hindent
@ -237,7 +245,8 @@ packages:
- RefSerialize
- TCache
- Workflow
- MFlow
# https://github.com/agocorona/MFlow/issues/60 GHC 7.10
# - MFlow
"Edward Kmett <ekmett@gmail.com>":
- ad
@ -251,7 +260,8 @@ packages:
- comonad
- comonads-fd
- comonad-transformers
- compensated
# https://github.com/ekmett/compensated/issues/5
#- compensated GHC 7.10
- compressed
- concurrent-supply
- constraints
@ -259,7 +269,8 @@ packages:
- distributive
- either
- eq
- ersatz
# https://github.com/ekmett/ersatz/issues/11 GHC 7.10
# - ersatz
- exceptions
- free
- graphs
@ -280,7 +291,7 @@ packages:
- monad-products
- monad-st
- monad-st
- mtl < 2.2 # GHC 7.10 bump
- mtl
- nats
- numeric-extras
- parsers
@ -295,7 +306,8 @@ packages:
- semigroupoids
- semigroups
- speculation
- streams
# https://github.com/ekmett/streams/issues/11
# - streams GHC 7.10
- tagged
- vector-instances
- void
@ -447,7 +459,8 @@ packages:
- json-autotype
"Dominic Steinitz <dominic@steinitz.org>":
- yarr
[]
# - yarr GHC 7.10
"Roman Cheplyaka <roma@ro-che.info>":
- action-permutations
@ -486,7 +499,7 @@ packages:
"Joachim Breitner <mail@joachim-breitner.de>":
- circle-packing
- arbtt
- ghc-heap-view
# - ghc-heap-view GHC 7.10
- tttool
- gipeda
- list-fusion-probe
@ -496,18 +509,18 @@ packages:
- HandsomeSoup
"Clint Adams <clint@debian.org>":
- hOpenPGP
#- hOpenPGP GHC 7.10, via syb-with-class
- openpgp-asciiarmor
- MusicBrainz
# - MusicBrainz GHC 7.10, time 1.5
- DAV
- hopenpgp-tools
#- hopenpgp-tools GHC 7.10, via syb-with-class
# https://github.com/fpco/stackage/issues/160
"Ketil Malde":
- biocore
- biofasta
- biofastq
- biosff
# - biosff GHC 7.10
- blastxml
- bioace
- biophd < 0.0.6 || > 0.0.6
@ -565,7 +578,8 @@ packages:
- ghc-syb-utils
"Boris Buliga <d12frosted@icloud.com>":
- ghc-mod
# https://github.com/kazu-yamamoto/ghc-mod/issues/437 GHC 7.10
# - ghc-mod
- io-choice
- system-canonicalpath
@ -618,7 +632,8 @@ packages:
- interpolatedstring-perl6
- iproute
- missing-foreign
- MissingH
# https://github.com/jgoerzen/testpack/issues/11
#- MissingH GHC 7.10, for QuickCheck 2.8 via testpack
- multimap
- parallel-io
- text-binary
@ -636,8 +651,8 @@ packages:
- hasql-backend
- hasql-postgres
- list-t
- mtl-prelude < 2 # GHC 7.10 bump
- neat-interpolation
- mtl-prelude
#- neat-interpolation GHC 7.10
- partial-handler
- postgresql-binary
- slave-thread
@ -664,7 +679,8 @@ packages:
#- elm-compiler
- elm-core-sources
#- elm-package
- language-glsl
# https://github.com/noteed/language-glsl/issues/11
#- language-glsl GHC 7.10
- prettyclass
- QuasiText
- union-find
@ -706,7 +722,8 @@ packages:
"Alexandr Ruchkin voidex@live.com @mvoidex":
- hdocs
- hsdev
# https://github.com/kazu-yamamoto/ghc-mod/issues/437 GHC 7.10
# - hsdev
"Aleksey Kliger aleksey@lambdageek.org @lambdageek":
- unbound-generics
@ -714,11 +731,12 @@ packages:
"Alois Cochard alois.cochard@gmail.com @aloiscochard":
# https://github.com/fpco/stackage/issues/415
# - codex
- machines-directory
#- machines-directory GHC 7.10
- machines-io
- machines-process
# on behalf of Bryan O'Sullivan @bos
- wreq
# https://github.com/bos/wreq/issues/61
# - wreq GHC 7.10
"Andraz Bajt andraz@bajt.me @edofic":
- effect-handlers
@ -746,7 +764,7 @@ packages:
"Jeffrey Rosenbluth jeffrey.rosenbluth@gmail.com":
- palette
- diagrams-canvas
#- diagrams-canvas GHC 7.10, via blank-canvas
- diagrams-rasterific
- lucid-svg
@ -780,7 +798,7 @@ packages:
- string-conversions
"Oleg Grenrus oleg.grenrus@iki.fi @phadej":
- edit-distance
#- edit-distance GHC 7.10
- lattices
- waitra
@ -850,10 +868,11 @@ packages:
- cabal-file-th
"Gershom Bazerman <gershomb@gmail.com> @gbaz":
- jmacro
- jmacro-rpc
- jmacro-rpc-happstack
- jmacro-rpc-snap
# http://hub.darcs.net/gershomb/jmacro/issue/1 GHC 7.10
#- jmacro
#- jmacro-rpc
#- jmacro-rpc-happstack
#- jmacro-rpc-snap
- mbox
- kmeans
- boolsimplifier
@ -861,9 +880,11 @@ packages:
- maximal-cliques
"Alexander Bondarenko <aenor.realm@gmail.com> @wiz":
- soap
- soap-tls
- soap-openssl
[]
# GHC 7.10, via iconv
#- soap
#- soap-tls
#- soap-openssl
"Andres Löh <andres@well-typed.com> @kosmikus":
- generics-sop
@ -928,24 +949,9 @@ packages:
- aeson-better-errors
"Stackage upper bounds":
# GHC 7.8 uppdate bound
- haddock-api < 2.16
- haddock-library < 1.2
- hdocs < 0.4.2
- haskell-packages < 0.3
- compdata < 0.10
# Force a specific version that's compatible with transformers 0.3
- transformers-compat == 0.4.0.3
- mtl-compat == 0.2.1.1
# https://github.com/fpco/stackage/issues/476
- vector-space < 0.10
# https://github.com/fpco/stackage/issues/479
- QuickCheck < 2.8
- cabal-test-quickcheck < 0.1.5
# https://github.com/jgm/pandoc/issues/2036
- highlighting-kate < 0.5.13
@ -959,14 +965,6 @@ packages:
# 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/537
- zlib < 0.6
@ -990,26 +988,12 @@ package-flags:
simplelocalnet: true
p2p: true
# GHC 7.10: Remove this
# Note that the flag is lower-cased, because that's what Cabal does
# Perhaps the codebase should automatically lower case flag names?
storable-complex:
instanceinbase: false
logfloat:
splitbase: true
curl:
new-base: true
# GHC 7.10 remove
aeson:
old-locale: true
tttool:
old-locale: true
amazonka-core:
old-locale: true
hxt:
network-uri: true
hxt-http:
@ -1019,6 +1003,7 @@ package-flags:
pandoc:
https: true
old-locale: false
text:
integer-simple: false
@ -1027,27 +1012,21 @@ package-flags:
old-time: false
mtl-compat:
two-point-one: true
two-point-one: false
two-point-two: false
# https://github.com/fpco/stackage/pull/482#issuecomment-83635207
jose-jwt:
doctest: false
arbtt:
old-locale: true
time-locale-compat:
old-locale: false
debian:
pretty-new: false
cabal-debian:
pretty-112: false
HsOpenSSL:
fast-bignum: false
hledger:
old-locale: true
hledger-lib:
old-locale: true
hledger-web:
old-locale: true
cabal-rpm:
old-locale: false
# By skipping a test suite, we do not pull in the build dependencies
skipped-tests:
@ -1098,6 +1077,19 @@ skipped-tests:
# https://github.com/Soostone/retry/issues/18
- retry
# Just a temporary package with a flimsy, inherited test suite
- Cabal-ide-backend
# QuickCheck 2.8
- bson
- cabal-install
- exceptions
- graphviz
- pandoc
- testpack
- vector
- Cabal
# Tests which we should build and run, but which are expected to fail. We
# should not fail a build based on a test failure for one of these packages.
expected-test-failures:
@ -1279,14 +1271,38 @@ expected-test-failures:
# 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
- hedis
- redis-io
# https://code.google.com/p/scrapyourboilerplate/issues/detail?id=26&thanks=26&ts=1430372304, GHC 7.10
- syb
# https://github.com/lymar/hastache/issues/47 GHC 7.10
- hastache
# https://github.com/simonmar/alex/issues/62 GHC 7.10
- alex
# https://github.com/kazu-yamamoto/http-date/issues/6 GHC 7.10
- http-date
# https://github.com/haskell-suite/haskell-names/issues/63 GHC 7.10
- haskell-names
# https://github.com/bos/text/issues/118 GHC 7.10
- text
# https://github.com/ekmett/hyperloglog/issues/10 GHC 7.10
- hyperloglog
# https://github.com/acid-state/safecopy/issues/25 GHC 7.10
- safecopy
# https://github.com/ekmett/linear/issues/75 GHC 7.10
- linear
# Haddocks which are expected to fail. Same concept as expected test failures.
expected-haddock-failures:
# https://github.com/acw/bytestring-progress/issues/4
@ -1301,6 +1317,7 @@ expected-haddock-failures:
# Requires build before haddock, which doesn't always happen in incremental
# builds. Could consider special-casing this requirement.
- gtk
- gtk3
# Not sure why, but it's a temporary package anyway
- Cabal-ide-backend