git.iko.soy/stackage
on master help sign in
Merge branch 'master' into ghc7.10

Conflicts: automated/build.sh build-constraints.yaml

commit50b29244609e7f833bf4e76d0f857cc72457fe33 authorMichael Snoyman <michael@snoyman.com> dateSun 3 May 2015, 17:43 (11 years ago) parent0d1f62a98799db
4 files changed+9−3
compare with master
unifiedsplit
README.md+1 automated/build.sh+1−1 build-constraints.yaml+5−1 stackage/stackage.cabal+2−1
README.md+1
@@ -22,6 +22,7 @@ project information. In addition, we have the following repositories:
2222* [stackage-update](https://github.com/fpco/stackage-update) [![Build Status](https://travis-ci.org/fpco/stackage-update.svg?branch=master)](https://travis-ci.org/fpco/stackage-update)
2323* [stackage-upload](https://github.com/fpco/stackage-upload) [![Build Status](https://travis-ci.org/fpco/stackage-upload.svg?branch=master)](https://travis-ci.org/fpco/stackage-upload)
2424* [stackage-install](https://github.com/fpco/stackage-install) [![Build Status](https://travis-ci.org/fpco/stackage-install.svg?branch=master)](https://travis-ci.org/fpco/stackage-install)
25+* [stackage-build-plan](https://github.com/fpco/stackage-build-plan) [![Build Status](https://travis-ci.org/fpco/stackage-build-plan.svg?branch=master)](https://travis-ci.org/fpco/stackage-build-plan)
2526
2627Get your package included
2728-------------------------
automated/build.sh+1−1
@@ -69,6 +69,6 @@ ARGS_BUILD="$ARGS_COMMON -v $CABAL_DIR:/home/stackage/.cabal:ro -v $GHC_DIR:/hom
6969ARGS_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"
7070
7171# Use cabal update first to initialize ~/.cabal.config, then use stackage-curator update to get it securely
72−docker run $ARGS_PREBUILD $IMAgE /bin/bash -c "cabal update && stackage-curator update && stackage-curator create-plan --plan-file $PLAN_FILE --target $TARGET && stackage-curator check --plan-file $PLAN_FILE && stackage-curator fetch --plan-file $PLAN_FILE && cabal install random cabal-install"
72+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"
7373docker run $ARGS_BUILD $IMAGE stackage-curator make-bundle --plan-file $PLAN_FILE --bundle-file $BUNDLE_FILE --target $TARGET
7474docker 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"
build-constraints.yaml+5−1
@@ -105,6 +105,7 @@ packages:
105105 - stackage-upload
106106 - stackage-cli
107107 - stackage-install
108+ - stackage-build-plan
108109 - statistics-linreg
109110 - th-expand-syns
110111 - thyme
@@ -708,7 +709,7 @@ packages:
708709 "Marcin Mrotek <marcin.jan.mrotek@gmail.com>":
709710 - type-list
710711
711− "David Turner <dave.c.turner@gmail.com>":
712+ "David Turner <dave.c.turner@gmail.com> @davecturner":
712713 - alarmclock
713714 - bank-holidays-england
714715
@@ -1292,6 +1293,9 @@ expected-test-failures:
12921293 # https://github.com/ekmett/linear/issues/75 GHC 7.10
12931294 - linear
12941295
1296+ # https://github.com/yesodweb/Shelly.hs/issues/99
1297+ - shelly
1298+
12951299# Haddocks which are expected to fail. Same concept as expected test failures.
12961300expected-haddock-failures:
12971301 # https://github.com/acw/bytestring-progress/issues/4
stackage/stackage.cabal+2−1
@@ -1,5 +1,5 @@
11name: stackage
2−version: 0.7.1.0
2+version: 0.7.2.0
33synopsis: Dummy package forcing installation of other Stackage packages
44homepage: https://www.stackage.org/
55license: MIT
@@ -18,6 +18,7 @@ library
1818 , stackage-update
1919 , stackage-upload
2020 , stackage-install
21+ , stackage-build-plan
2122 default-language: Haskell2010
2223
2324source-repository head