haskell/stackage
1
0
Fork 0
mirror of https://github.com/commercialhaskell/stackage.git synced 2026-01-31 16:40:26 +01:00
Code Issues Actions 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/ /logs/
nightly-*.yaml nightly-*.yaml
lts-*.yaml lts-*.yaml
*.swp

2
.travis.yml
View File

@ -1,5 +1,5 @@
env: 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. # Note: the distinction between `before_install` and `install` is not important.
before_install: 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 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 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 update
RUN cabal install hscolour cabal-install && 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

7
automated/build.sh
View File

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