on master help sign in
Merge remote-tracking branch 'origin/master' into HEAD
commit707e059112017c9c7f4282a60af363ca7d8ed3eb authorAdam Bergmark <adam@bergmark.nl> dateWed 21 Dec 2016, 16:06 (10 years ago) parentefaaeabed39a50
3 files changed+15−13
automated/build.sh+1 build-constraints.yaml+13−13 debian-bootstrap.sh+1
automated/build.sh+1
@@ -77,6 +77,7 @@ rm -f stackage-curator stackage-curator.bz2
7777wget https://s3.amazonaws.com/stackage-travis/stackage-curator/stackage-curator.bz2
7878bunzip2 stackage-curator.bz2
7979chmod +x stackage-curator
80+stackage-curator --version
8081)
8182
8283ARGS_COMMON="--rm -v $WORKDIR:$HOME/work -w $HOME/work -v $BINDIR/stackage-curator:/usr/bin/stackage-curator:ro -v /etc/passwd:/etc/passwd:ro -v /etc/group:/etc/group:ro -v $EXTRA_BIN_DIR/stack:/usr/bin/stack:ro"
build-constraints.yaml+13−13
@@ -1567,8 +1567,8 @@ packages:
15671567 - H
15681568 - inline-r
15691569 - jni
1570− # Temporary block for https://github.com/fpco/stackage/pull/2139
1571− # - jvm
1570+ - jvm
1571+ # BLOCKED GHC 8.0.2
15721572 # - sparkle
15731573 - th-lift
15741574
@@ -1768,6 +1768,7 @@ packages:
17681768
17691769 "Timo von Holtz <tvh@tvholtz.de> @tvh":
17701770 # via haxl - haxl-amazonka
1771+ - hasql-migration
17711772 - servant-JuicyPixels
17721773
17731774 "Artyom <yom@artyom.me> @neongreen":
@@ -2070,6 +2071,7 @@ packages:
20702071 - cacophony
20712072 - pipes-cacophony
20722073 - blake2
2074+ - nfc
20732075
20742076 "Adam Curtis <kallisti.dev@gmail.com> @kallisti-dev":
20752077 []
@@ -2292,7 +2294,7 @@ packages:
22922294 - ua-parser
22932295 - hs-GeoIP
22942296 - retry
2295− - katip
2297+ - katip
22962298 - katip-elasticsearch
22972299
22982300 "Sid Kapur sidharthkapur1@gmail.com @sid-kap":
@@ -2728,6 +2730,10 @@ packages:
27282730 - cryptonite < 0.21
27292731 - memory < 0.14
27302732 - tls < 1.3.9
2733+
2734+ # https://github.com/fpco/stackage/issues/2148
2735+ - rattletrap < 2.1.0
2736+
27312737# end of packages
27322738
27332739# Package flags are applied to individual packages, and override the values of
@@ -2767,10 +2773,6 @@ package-flags:
27672773 tar:
27682774 old-time: false
27692775
2770− # https://github.com/fpco/stackage/pull/482#issuecomment-83635207
2771− jose-jwt:
2772− doctest: false
2773−
27742776 time-locale-compat:
27752777 old-locale: false
27762778
@@ -2990,6 +2992,7 @@ expected-test-failures:
29902992 - happy # Needs mtl in the user package DB
29912993 - haskell-neo4j-client # neo4j with auth disabled
29922994 - hasql # PostgreSQL
2995+ - hasql-transaction # PostgreSQL
29932996 - hedis
29942997 - hocilib # oracle
29952998 - hworker
@@ -3041,6 +3044,7 @@ expected-test-failures:
30413044 - rematch # No issue tracker, sent e-mail to maintainer https://github.com/fpco/stackage/issues/376
30423045 - xlsior # https://github.com/rcallahan/xlsior/issues/1
30433046 - hakyll # https://github.com/jaspervdj/hakyll/issues/491
3047+ - ginger # https://bitbucket.org/tdammers/ginger/issues/1/test-suite-failure-due-to-missing-test
30443048
30453049 # Assertion failures, these can be real bugs or just limitations
30463050 # in the test cases.
@@ -3072,12 +3076,6 @@ expected-test-failures:
30723076 - distributed-process-supervisor # # https://github.com/haskell-d
30733077 - ghcid # Weird conflicts with sandboxingistributed/distributed-process-supervisor/issues/1
30743078
3075− # Doctest ran across ambiguous modules
3076− # https://github.com/bergmark/blog/blob/master/2016/package-faq.md#ambiguous-modules-when-using-doctest
3077− - doctest # 0.11.0 https://github.com/sol/doctest/issues/137
3078− - jwt # https://bitbucket.org/ssaasen/haskell-jwt/issues/18/test-suite-build-failure-in-stackage
3079− - warp # https://github.com/yesodweb/wai/issues/579
3080−
30813079 # Stackage upper bounds, re-enable these when their upper bound is removed
30823080 - hindent # 4.6.4
30833081
@@ -3323,3 +3321,5 @@ tell-me-when-its-released:
33233321hide:
33243322- async-dejafu # https://github.com/yesodweb/wai/issues/579
33253323- monads-tf # mtl is preferred
3324+- protolude # `module Panic` conflicts with base
3325+- cryptohash # Superceeded by cryptonite
debian-bootstrap.sh+1
@@ -84,6 +84,7 @@ apt-get install -y \
8484 libmpfr-dev \
8585 libmysqlclient-dev \
8686 libncurses-dev \
87+ libnfc-dev \
8788 libnotify-dev \
8889 libopenal-dev \
8990 libpango1.0-dev \