git.iko.soy/stackage
on master help sign in
Merge remote-tracking branch 'origin/master' into HEAD
707e059Adam Bergmark
automated/build.sh+1
compare with master
unifiedsplit
@@ -77,6 +77,7 @@ rm -f stackage-curator stackage-curator.bz2
77wget https://s3.amazonaws.com/stackage-travis/stackage-curator/stackage-curator.bz2
77wget https://s3.amazonaws.com/stackage-travis/stackage-curator/stackage-curator.bz2
78bunzip2 stackage-curator.bz2
78bunzip2 stackage-curator.bz2
79chmod +x stackage-curator
79chmod +x stackage-curator
80+stackage-curator --version
80)
81)
81
82
82ARGS_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"
83ARGS_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:
1567 - H
1567 - H
1568 - inline-r
1568 - inline-r
1569 - jni
1569 - jni
1570− # Temporary block for https://github.com/fpco/stackage/pull/2139
1571− # - jvm
1570+ - jvm
1571+ # BLOCKED GHC 8.0.2
1572 # - sparkle
1572 # - sparkle
1573 - th-lift
1573 - th-lift
1574
1574
@@ -1768,6 +1768,7 @@ packages:
1768
1768
1769 "Timo von Holtz <tvh@tvholtz.de> @tvh":
1769 "Timo von Holtz <tvh@tvholtz.de> @tvh":
1770 # via haxl - haxl-amazonka
1770 # via haxl - haxl-amazonka
1771+ - hasql-migration
1771 - servant-JuicyPixels
1772 - servant-JuicyPixels
1772
1773
1773 "Artyom <yom@artyom.me> @neongreen":
1774 "Artyom <yom@artyom.me> @neongreen":
@@ -2070,6 +2071,7 @@ packages:
2070 - cacophony
2071 - cacophony
2071 - pipes-cacophony
2072 - pipes-cacophony
2072 - blake2
2073 - blake2
2074+ - nfc
2073
2075
2074 "Adam Curtis <kallisti.dev@gmail.com> @kallisti-dev":
2076 "Adam Curtis <kallisti.dev@gmail.com> @kallisti-dev":
2075 []
2077 []
@@ -2292,7 +2294,7 @@ packages:
2292 - ua-parser
2294 - ua-parser
2293 - hs-GeoIP
2295 - hs-GeoIP
2294 - retry
2296 - retry
2295− - katip
2297+ - katip
2296 - katip-elasticsearch
2298 - katip-elasticsearch
2297
2299
2298 "Sid Kapur sidharthkapur1@gmail.com @sid-kap":
2300 "Sid Kapur sidharthkapur1@gmail.com @sid-kap":
@@ -2728,6 +2730,10 @@ packages:
2728 - cryptonite < 0.21
2730 - cryptonite < 0.21
2729 - memory < 0.14
2731 - memory < 0.14
2730 - tls < 1.3.9
2732 - tls < 1.3.9
2733+
2734+ # https://github.com/fpco/stackage/issues/2148
2735+ - rattletrap < 2.1.0
2736+
2731# end of packages
2737# end of packages
2732
2738
2733# Package flags are applied to individual packages, and override the values of
2739# Package flags are applied to individual packages, and override the values of
@@ -2767,10 +2773,6 @@ package-flags:
2767 tar:
2773 tar:
2768 old-time: false
2774 old-time: false
2769
2775
2770− # https://github.com/fpco/stackage/pull/482#issuecomment-83635207
2771− jose-jwt:
2772− doctest: false
2773−
2774 time-locale-compat:
2776 time-locale-compat:
2775 old-locale: false
2777 old-locale: false
2776
2778
@@ -2990,6 +2992,7 @@ expected-test-failures:
2990 - happy # Needs mtl in the user package DB
2992 - happy # Needs mtl in the user package DB
2991 - haskell-neo4j-client # neo4j with auth disabled
2993 - haskell-neo4j-client # neo4j with auth disabled
2992 - hasql # PostgreSQL
2994 - hasql # PostgreSQL
2995+ - hasql-transaction # PostgreSQL
2993 - hedis
2996 - hedis
2994 - hocilib # oracle
2997 - hocilib # oracle
2995 - hworker
2998 - hworker
@@ -3041,6 +3044,7 @@ expected-test-failures:
3041 - rematch # No issue tracker, sent e-mail to maintainer https://github.com/fpco/stackage/issues/376
3044 - rematch # No issue tracker, sent e-mail to maintainer https://github.com/fpco/stackage/issues/376
3042 - xlsior # https://github.com/rcallahan/xlsior/issues/1
3045 - xlsior # https://github.com/rcallahan/xlsior/issues/1
3043 - hakyll # https://github.com/jaspervdj/hakyll/issues/491
3046 - hakyll # https://github.com/jaspervdj/hakyll/issues/491
3047+ - ginger # https://bitbucket.org/tdammers/ginger/issues/1/test-suite-failure-due-to-missing-test
3044
3048
3045 # Assertion failures, these can be real bugs or just limitations
3049 # Assertion failures, these can be real bugs or just limitations
3046 # in the test cases.
3050 # in the test cases.
@@ -3072,12 +3076,6 @@ expected-test-failures:
3072 - distributed-process-supervisor # # https://github.com/haskell-d
3076 - distributed-process-supervisor # # https://github.com/haskell-d
3073 - ghcid # Weird conflicts with sandboxingistributed/distributed-process-supervisor/issues/1
3077 - ghcid # Weird conflicts with sandboxingistributed/distributed-process-supervisor/issues/1
3074
3078
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−
3081 # Stackage upper bounds, re-enable these when their upper bound is removed
3079 # Stackage upper bounds, re-enable these when their upper bound is removed
3082 - hindent # 4.6.4
3080 - hindent # 4.6.4
3083
3081
@@ -3323,3 +3321,5 @@ tell-me-when-its-released:
3323hide:
3321hide:
3324- async-dejafu # https://github.com/yesodweb/wai/issues/579
3322- async-dejafu # https://github.com/yesodweb/wai/issues/579
3325- monads-tf # mtl is preferred
3323- 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 \
84 libmpfr-dev \
84 libmpfr-dev \
85 libmysqlclient-dev \
85 libmysqlclient-dev \
86 libncurses-dev \
86 libncurses-dev \
87+ libnfc-dev \
87 libnotify-dev \
88 libnotify-dev \
88 libopenal-dev \
89 libopenal-dev \
89 libpango1.0-dev \
90 libpango1.0-dev \