git.iko.soy/stackage
on master help sign in
Merge branch 'master' of https://github.com/fpco/stackage
3afe460Athan Clark
automated/build.sh+2−9
compare with master
unifiedsplit
@@ -7,13 +7,6 @@ TARGET=$1
7TAG=$(echo $TARGET | cut -d- -f 1)
7TAG=$(echo $TARGET | cut -d- -f 1)
8IMAGE=snoyberg/stackage:$TAG
8IMAGE=snoyberg/stackage:$TAG
9
9
10−if [ "$TAG" = "nightly" ]
11−then
12− TROOT=$ROOT/nightly
13−else
14− TROOT=$ROOT/$(echo $TARGET | cut -d. -f 1)
15−fi
16−
17PLAN_FILE=current-plan.yaml
10PLAN_FILE=current-plan.yaml
18DOCMAP_FILE=current-docmap.yaml
11DOCMAP_FILE=current-docmap.yaml
19BUNDLE_FILE=current.bundle
12BUNDLE_FILE=current.bundle
@@ -21,8 +14,8 @@ BUNDLE_FILE=current.bundle
21CABAL_DIR=$ROOT/cabal
14CABAL_DIR=$ROOT/cabal
22GHC_DIR=$ROOT/ghc
15GHC_DIR=$ROOT/ghc
23DOT_STACKAGE_DIR=$ROOT/dot-stackage
16DOT_STACKAGE_DIR=$ROOT/dot-stackage
24−WORKDIR=$TROOT/work
17+WORKDIR=$ROOT/$TAG/work
25−SSH_DIR=$ROOT/ssh-$(echo $TARGET | cut -d- -f 1)
18+SSH_DIR=$ROOT/ssh-$TAG
26
19
27mkdir -p \
20mkdir -p \
28 "$CABAL_DIR" \
21 "$CABAL_DIR" \
build-constraints.yaml+48−32
@@ -45,7 +45,7 @@ packages:
45 - repa-io
45 - repa-io
46 - repa-algorithms
46 - repa-algorithms
47 - repa-devil
47 - repa-devil
48− - JuicyPixels-repa < 0.6.1 || > 0.7 # GHC 7.10 (e-mail sent by @bergmark)
48+ - JuicyPixels-repa
49 - cereal-conduit
49 - cereal-conduit
50 - binary-conduit
50 - binary-conduit
51 - lzma-conduit
51 - lzma-conduit
@@ -143,6 +143,7 @@ packages:
143 - prednote
143 - prednote
144 - cartel
144 - cartel
145 - Earley
145 - Earley
146+ - ofx
146
147
147 "Neil Mitchell":
148 "Neil Mitchell":
148 - hlint
149 - hlint
@@ -277,7 +278,8 @@ packages:
277 #- compensated GHC 7.10
278 #- compensated GHC 7.10
278 - compressed
279 - compressed
279 - concurrent-supply
280 - concurrent-supply
281+ # https://github.com/fpco/stackage/issues/973
280− - constraints
282+ - constraints < 0.6
281 - contravariant
283 - contravariant
282 - distributive
284 - distributive
283 - either
285 - either
@@ -330,7 +332,6 @@ packages:
330 - gl
332 - gl
331 - lens-aeson
333 - lens-aeson
332 - zlib-lens
334 - zlib-lens
333− - generic-deriving
334 - hyperloglog
335 - hyperloglog
335
336
336 "Andrew Farmer <afarmer@ittc.ku.edu>":
337 "Andrew Farmer <afarmer@ittc.ku.edu>":
@@ -359,12 +360,14 @@ packages:
359 - BlogLiterately-diagrams
360 - BlogLiterately-diagrams
360 - diagrams
361 - diagrams
361 - diagrams-builder
362 - diagrams-builder
363+ # https://github.com/diagrams/diagrams-haddock/issues/26
362− - diagrams-haddock
364+ - diagrams-haddock < 0.3.0.8
363 - diagrams-contrib
365 - diagrams-contrib
364 - diagrams-core
366 - diagrams-core
365 - diagrams-lib
367 - diagrams-lib
366 - diagrams-postscript
368 - diagrams-postscript
369+ # https://github.com/fpco/stackage/issues/976
367− - diagrams-svg
370+ - diagrams-svg < 1.3.1.8
368 - dual-tree
371 - dual-tree
369 - force-layout
372 - force-layout
370 - haxr
373 - haxr
@@ -629,7 +632,6 @@ packages:
629
632
630 "Simon Michael <simon@joyful.com>":
633 "Simon Michael <simon@joyful.com>":
631 - hledger
634 - hledger
632− # https://github.com/fpco/stackage/issues/938
633 # - hledger-ui
635 # - hledger-ui
634 - hledger-web
636 - hledger-web
635 - shelltestrunner
637 - shelltestrunner
@@ -658,7 +660,7 @@ packages:
658 # https://github.com/d12frosted/CanonicalPath/issues/5
660 # https://github.com/d12frosted/CanonicalPath/issues/5
659 # - system-canonicalpath
661 # - system-canonicalpath
660
662
661− "Daniel Gröber <dxld@darkboxed.org>":
663+ "Daniel Gröber <dxld@darkboxed.org> @DanielG":
662 - ghc-mod
664 - ghc-mod
663 - cabal-helper
665 - cabal-helper
664
666
@@ -865,7 +867,8 @@ packages:
865 - palette
867 - palette
866 #- diagrams-canvas GHC 7.10, via blank-canvas
868 #- diagrams-canvas GHC 7.10, via blank-canvas
867 - diagrams-rasterific
869 - diagrams-rasterific
870+ # https://github.com/fpco/stackage/issues/976
868− - lucid-svg
871+ - lucid-svg < 0.6.0.0
869 - diagrams-html5
872 - diagrams-html5
870 - static-canvas
873 - static-canvas
871
874
@@ -1368,6 +1371,7 @@ packages:
1368
1371
1369 "Ryan Scott <ryan.gl.scott@gmail.com> @RyanGlScott":
1372 "Ryan Scott <ryan.gl.scott@gmail.com> @RyanGlScott":
1370 - base-orphans
1373 - base-orphans
1374+ - generic-deriving
1371 - invariant
1375 - invariant
1372 - keycode
1376 - keycode
1373 - text-show
1377 - text-show
@@ -1604,9 +1608,10 @@ packages:
1604 "Tim Baumann <tim@timbaumann.info> @timjb":
1608 "Tim Baumann <tim@timbaumann.info> @timjb":
1605 - engine-io-yesod
1609 - engine-io-yesod
1606
1610
1607− "Tim McGilchrist <timmcgil@gmail.com> @lambda_foo":
1611+ "Tim McGilchrist <timmcgil@gmail.com> @tmcgilchrist":
1608 - riak
1612 - riak
1609−
1613+ - airship
1614+
1610 "Yuras Shumovich <shumovichy@gmai.com> @Yuras":
1615 "Yuras Shumovich <shumovichy@gmai.com> @Yuras":
1611 - pdf-toolbox-core
1616 - pdf-toolbox-core
1612 - pdf-toolbox-content
1617 - pdf-toolbox-content
@@ -1628,10 +1633,11 @@ packages:
1628 "John Galt <jgalt@centromere.net> @centromere":
1633 "John Galt <jgalt@centromere.net> @centromere":
1629 - cacophony
1634 - cacophony
1630 - pipes-cacophony
1635 - pipes-cacophony
1636+ - blake2
1631
1637
1632 "Adam Curtis <kallisti.dev@gmail.com> @kallisti-dev":
1638 "Adam Curtis <kallisti.dev@gmail.com> @kallisti-dev":
1633 - webdriver
1639 - webdriver
1634−
1640+
1635 "Luke Iannini <lukexi@me.com> @lukexi":
1641 "Luke Iannini <lukexi@me.com> @lukexi":
1636 - inline-c
1642 - inline-c
1637 - inline-c-cpp
1643 - inline-c-cpp
@@ -1639,10 +1645,21 @@ packages:
1639
1645
1640 "Emin Karayel <me@eminkarayel.de>":
1646 "Emin Karayel <me@eminkarayel.de>":
1641 - sync-mht
1647 - sync-mht
1642−
1648+
1643 "Michael Schröder <mc.schroeder@gmail.com> @mcschroeder":
1649 "Michael Schröder <mc.schroeder@gmail.com> @mcschroeder":
1644 - ttrie
1650 - ttrie
1645
1651
1652+ # https://github.com/fpco/stackage/pull/979
1653+ # "Andrew Lelechenko <andrew.lelechenko@gmail.com> @Bodigrim":
1654+ # - exp-pairs
1655+
1656+ # https://github.com/fpco/stackage/pull/980
1657+ # "Stefan Kersten <kaoskorobase@gmail.com> @kaoskorobase":
1658+ # - hsndfile
1659+
1660+ "yihuang <yi.codeplayer@gmail.com> @yihuang":
1661+ - tagstream-conduit
1662+
1646 "Stackage upper bounds":
1663 "Stackage upper bounds":
1647 # https://github.com/fpco/stackage/issues/537
1664 # https://github.com/fpco/stackage/issues/537
1648 - zlib < 0.6
1665 - zlib < 0.6
@@ -1679,39 +1696,32 @@ packages:
1679 # https://github.com/idontgetoutmuch/largeword/pull/12
1696 # https://github.com/idontgetoutmuch/largeword/pull/12
1680 - largeword < 1.2.4
1697 - largeword < 1.2.4
1681
1698
1682− # https://github.com/jgm/pandoc/issues/2466
1683− # Can be removed after > 1.15.1.1 is out.
1684− - pandoc < 1.15.1.1 || > 1.15.1.1
1685−
1686 # https://github.com/fpco/stackage/issues/942
1699 # https://github.com/fpco/stackage/issues/942
1687 - semigroups < 0.18
1700 - semigroups < 0.18
1688
1701
1689− # https://github.com/fpco/stackage/issues/944
1690− - linear < 1.20
1691− - reflection < 2.1
1692− - diagrams-lib < 1.3.0.4
1693− - luminance < 0.6
1694− - luminance-samples < 0.6
1695− - lens < 4.13
1696− - semigroups < 0.17
1697−
1698 # https://github.com/fpco/stackage/issues/946
1702 # https://github.com/fpco/stackage/issues/946
1699 - cereal < 0.5
1703 - cereal < 0.5
1700 - messagepack < 0.5.0
1704 - messagepack < 0.5.0
1701 - messagepack-rpc < 0.5.1
1705 - messagepack-rpc < 0.5.1
1706+ - DRBG < 0.5.5
1702
1707
1703 # https://github.com/fpco/stackage/issues/957
1708 # https://github.com/fpco/stackage/issues/957
1704 - exact-pi < 0.3
1709 - exact-pi < 0.3
1705
1710
1706− # https://github.com/fpco/stackage/issues/959
1707− - th-orphans < 0.13
1708−
1709− # https://github.com/fpco/stackage/issues/960
1710− - HaskellNet < 0.5
1711−
1712 # https://github.com/fpco/stackage/issues/968
1711 # https://github.com/fpco/stackage/issues/968
1713 - bifunctors < 5.1
1712 - bifunctors < 5.1
1714
1713
1714+ # https://github.com/fpco/stackage/issues/975
1715+ - retry < 0.7
1716+
1717+ # https://github.com/fpco/stackage/issues/944
1718+ - lens < 4.13
1719+ - reflection < 2.1
1720+
1721+ # https://github.com/fpco/stackage/issues/981
1722+ - haskell-src-exts < 1.17
1723+ - derive < 2.5.23
1724+ - hlint < 1.9.23
1715# end of packages
1725# end of packages
1716
1726
1717
1727
@@ -1841,9 +1851,13 @@ skipped-tests:
1841 # https://github.com/fpco/stackage/issues/934
1851 # https://github.com/fpco/stackage/issues/934
1842 - cacophony
1852 - cacophony
1843
1853
1854+ # Build error with lens-4.13
1855+ # https://github.com/brendanhay/amazonka/issues/251
1856+ - amazonka-ec2
1857+ - amazonka-s3
1858+ - amazonka-swf
1844# end of skipped-tests
1859# end of skipped-tests
1845
1860
1846−
1847# Tests which we should build and run, but which are expected to fail. We
1861# Tests which we should build and run, but which are expected to fail. We
1848# should not fail a build based on a test failure for one of these packages.
1862# should not fail a build based on a test failure for one of these packages.
1849expected-test-failures:
1863expected-test-failures:
@@ -2152,6 +2166,8 @@ expected-test-failures:
2152 - hworker
2166 - hworker
2153 - hworker-ses
2167 - hworker-ses
2154
2168
2169+ # https://github.com/chrisdone/hindent/issues/166
2170+ - hindent
2155# end of expected-test-failures
2171# end of expected-test-failures
2156
2172
2157
2173
debian-bootstrap.sh+1
@@ -54,6 +54,7 @@ apt-get install -y \
54 libpq-dev \
54 libpq-dev \
55 libsdl2-dev \
55 libsdl2-dev \
56 libsnappy-dev \
56 libsnappy-dev \
57+ libsndfile1-dev \
57 libsqlite3-dev \
58 libsqlite3-dev \
58 libssl-dev \
59 libssl-dev \
59 libtagc0-dev \
60 libtagc0-dev \