git.iko.soy/stackage
on master help sign in
Merge branch 'master' into nightly
efaaeabMichael Snoyman
automated/build.sh+8−3
compare with master
unifiedsplit
@@ -1,6 +1,6 @@
1#!/usr/bin/env bash
1#!/usr/bin/env bash
2
2
3−set -eux
3+set -eu +x
4
4
5ROOT=$(cd $(dirname $0) ; pwd)
5ROOT=$(cd $(dirname $0) ; pwd)
6TARGET=$1
6TARGET=$1
@@ -98,11 +98,16 @@ curl -L https://www.stackage.org/stack/linux-x86_64 | tar xz --wildcards --strip
98
98
99# Determine the new build plan unless NOPLAN is set
99# Determine the new build plan unless NOPLAN is set
100#
100#
101−# * Update the package index
101+# * Update the package index (unless LTS)
102# * Create a new plan
102# * Create a new plan
103if [ "${NOPLAN:-}x" = "x" ]
103if [ "${NOPLAN:-}x" = "x" ]
104then
104then
105+ if [ $SHORTNAME = "lts" ]
106+ then
107+ docker run $ARGS_PREBUILD $IMAGE /bin/bash -c "exec stackage-curator create-plan --plan-file $PLAN_FILE --target $TARGET ${CONSTRAINTS:-}"
108+ else
105− docker run $ARGS_PREBUILD $IMAGE /bin/bash -c "stack update && exec stackage-curator create-plan --plan-file $PLAN_FILE --target $TARGET ${CONSTRAINTS:-}"
109+ docker run $ARGS_PREBUILD $IMAGE /bin/bash -c "stack update && exec stackage-curator create-plan --plan-file $PLAN_FILE --target $TARGET ${CONSTRAINTS:-}"
110+ fi
106fi
111fi
107
112
108# Do the rest of the pre-build actions:
113# Do the rest of the pre-build actions:
build-constraints.yaml+56−9
@@ -1418,6 +1418,7 @@ packages:
1418 - pipes-csv
1418 - pipes-csv
1419 - pipes-mongodb
1419 - pipes-mongodb
1420 - skeletons
1420 - skeletons
1421+ - streaming-wai
1421
1422
1422 # "Smirnov Alexey <chemistmail@gmail.com> @chemist":
1423 # "Smirnov Alexey <chemistmail@gmail.com> @chemist":
1423 # GHC 8 - snmp
1424 # GHC 8 - snmp
@@ -1565,6 +1566,10 @@ packages:
1565 - distributed-closure
1566 - distributed-closure
1566 - H
1567 - H
1567 - inline-r
1568 - inline-r
1569+ - jni
1570+ # Temporary block for https://github.com/fpco/stackage/pull/2139
1571+ # - jvm
1572+ # - sparkle
1568 - th-lift
1573 - th-lift
1569
1574
1570 "Christopher Reichert <creichert07@gmail.com> @creichert":
1575 "Christopher Reichert <creichert07@gmail.com> @creichert":
@@ -1841,6 +1846,7 @@ packages:
1841
1846
1842 "Dmitry Ivanov <ethercrow@gmail.com> @ethercrow":
1847 "Dmitry Ivanov <ethercrow@gmail.com> @ethercrow":
1843 - charsetdetect-ae
1848 - charsetdetect-ae
1849+ - compiler-errors
1844 - docopt
1850 - docopt
1845 - dynamic-state
1851 - dynamic-state
1846 - dyre
1852 - dyre
@@ -1849,13 +1855,21 @@ packages:
1849 - pointedlist
1855 - pointedlist
1850 - word-trie
1856 - word-trie
1851 - xdg-basedir
1857 - xdg-basedir
1852− # - yi BLOCKED due to yi-language
1858+ # - yi -- disabled because of https://github.com/commercialhaskell/stack/issues/2795
1859+ - yi-core
1860+ # - yi-frontend-pango -- disabled because of https://github.com/commercialhaskell/stack/issues/2795
1861+ - yi-frontend-vty
1853− #- yi-fuzzy-open
1862+ - yi-fuzzy-open
1854−
1863+ - yi-ireader
1864+ - yi-keymap-cua
1865+ - yi-keymap-emacs
1855− # https://github.com/yi-editor/yi/issues/922
1866+ #- yi-keymap-vim # https://github.com/yi-editor/yi/issues/954
1856− # - yi-language
1867+ - yi-language
1857−
1868+ - yi-misc-modes
1869+ - yi-mode-haskell
1870+ - yi-mode-javascript
1858 - yi-rope
1871 - yi-rope
1872+ - yi-snippet
1859
1873
1860 "Tobias Bexelius <tobias_bexelius@hotmail.com> @tobbebex":
1874 "Tobias Bexelius <tobias_bexelius@hotmail.com> @tobbebex":
1861 - GPipe
1875 - GPipe
@@ -2310,8 +2324,6 @@ packages:
2310 "Alp Mestanogullari <alpmestan@gmail.com> @alpmestan":
2324 "Alp Mestanogullari <alpmestan@gmail.com> @alpmestan":
2311 - taggy
2325 - taggy
2312 - taggy-lens
2326 - taggy-lens
2313− # 0.1 Compilation failure https://github.com/fpco/stackage/issues/1660 - inline-java
2314− # via inline-java - sparkle
2315
2327
2316 "Alex McLean <lxyxpx@gmail.com> @yaxu":
2328 "Alex McLean <lxyxpx@gmail.com> @yaxu":
2317 - tidal
2329 - tidal
@@ -2659,6 +2671,9 @@ packages:
2659 "Alexey Kuleshevich <lehins@yandex.ru> @lehins":
2671 "Alexey Kuleshevich <lehins@yandex.ru> @lehins":
2660 - hip
2672 - hip
2661
2673
2674+ "Hans-Peter Deifel <hpd@hpdeifel.de> @hpdeifel":
2675+ - hledger-iadd
2676+
2662 # If you stop maintaining a package you can move it here.
2677 # If you stop maintaining a package you can move it here.
2663 # It will then be disabled if it starts causing problems.
2678 # It will then be disabled if it starts causing problems.
2664 # See https://github.com/fpco/stackage/issues/1056
2679 # See https://github.com/fpco/stackage/issues/1056
@@ -2705,6 +2720,14 @@ packages:
2705
2720
2706 # https://github.com/fpco/stackage/issues/2032
2721 # https://github.com/fpco/stackage/issues/2032
2707 - datasets < 0.2.2
2722 - datasets < 0.2.2
2723+
2724+ # https://github.com/fpco/stackage/issues/2136
2725+ - X11 < 1.7
2726+
2727+ # https://github.com/fpco/stackage/issues/2143
2728+ - cryptonite < 0.21
2729+ - memory < 0.14
2730+ - tls < 1.3.9
2708# end of packages
2731# end of packages
2709
2732
2710# Package flags are applied to individual packages, and override the values of
2733# Package flags are applied to individual packages, and override the values of
@@ -2792,11 +2815,22 @@ configure-args:
2792 - /usr/lib/jvm/java-8-openjdk-amd64/jre/lib/amd64/server
2815 - /usr/lib/jvm/java-8-openjdk-amd64/jre/lib/amd64/server
2793 - --extra-include-dirs
2816 - --extra-include-dirs
2794 - /usr/lib/jvm/java-8-openjdk-amd64/include
2817 - /usr/lib/jvm/java-8-openjdk-amd64/include
2818+ - --extra-include-dirs
2819+ - /usr/lib/jvm/java-8-openjdk-amd64/include/linux
2820+ jvm:
2821+ - --extra-lib-dirs
2822+ - /usr/lib/jvm/java-8-openjdk-amd64/jre/lib/amd64/server
2823+ - --extra-include-dirs
2824+ - /usr/lib/jvm/java-8-openjdk-amd64/include
2825+ - --extra-include-dirs
2826+ - /usr/lib/jvm/java-8-openjdk-amd64/include/linux
2795 sparkle:
2827 sparkle:
2796 - --extra-lib-dirs
2828 - --extra-lib-dirs
2797 - /usr/lib/jvm/java-8-openjdk-amd64/jre/lib/amd64/server
2829 - /usr/lib/jvm/java-8-openjdk-amd64/jre/lib/amd64/server
2798 - --extra-include-dirs
2830 - --extra-include-dirs
2799 - /usr/lib/jvm/java-8-openjdk-amd64/include
2831 - /usr/lib/jvm/java-8-openjdk-amd64/include
2832+ - --extra-include-dirs
2833+ - /usr/lib/jvm/java-8-openjdk-amd64/include/linux
2800 hocilib:
2834 hocilib:
2801 - --extra-lib-dirs
2835 - --extra-lib-dirs
2802 - /usr/local/lib
2836 - /usr/local/lib
@@ -2959,6 +2993,7 @@ expected-test-failures:
2959 - hedis
2993 - hedis
2960 - hocilib # oracle
2994 - hocilib # oracle
2961 - hworker
2995 - hworker
2996+ - jvm
2962 - katip-elasticsearch # elasticsearch
2997 - katip-elasticsearch # elasticsearch
2963 - log # ElasticSearch
2998 - log # ElasticSearch
2964 - mangopay # https://github.com/prowdsponsor/mangopay/issues/30
2999 - mangopay # https://github.com/prowdsponsor/mangopay/issues/30
@@ -3094,7 +3129,7 @@ expected-benchmark-failures:
3094 - dbus # No issue tracker, sent e-mail to maintainer
3129 - dbus # No issue tracker, sent e-mail to maintainer
3095 - thyme # https://github.com/liyang/thyme/issues/50
3130 - thyme # https://github.com/liyang/thyme/issues/50
3096 - xmlgen # https://github.com/skogsbaer/xmlgen/issues/6
3131 - xmlgen # https://github.com/skogsbaer/xmlgen/issues/6
3097− - varying # https://github.com/schell/varying/issues/15
3132+
3098# end of expected-benchmark-failures
3133# end of expected-benchmark-failures
3099
3134
3100
3135
@@ -3276,3 +3311,15 @@ tell-me-when-its-released:
3276- terminal-progress-bar-0.1.1 # Unskip test suite
3311- terminal-progress-bar-0.1.1 # Unskip test suite
3277- optparse-applicative-0.13.0.0 # Unskip test suite https://github.com/pcapriotti/optparse-applicative/issues/228
3312- optparse-applicative-0.13.0.0 # Unskip test suite https://github.com/pcapriotti/optparse-applicative/issues/228
3278- hakyll-4.9.2.0 # re-enable tests
3313- hakyll-4.9.2.0 # re-enable tests
3314+- Spock-core-0.11.0.0 # testsuite fail
3315+
3316+# Packages which should be hidden after registering, to avoid module name
3317+# conflicts. This is intended for at least two use cases:
3318+#
3319+# * Making doctests pass (https://github.com/yesodweb/wai/issues/579)
3320+#
3321+# * Allowing tools like Stack to get a mapping from module name to package name
3322+# for automatically installing dependencies
3323+hide:
3324+- async-dejafu # https://github.com/yesodweb/wai/issues/579
3325+- monads-tf # mtl is preferred
debian-bootstrap.sh+4
@@ -162,3 +162,7 @@ cd /tmp \
162 && echo "/usr/local/lib" > /etc/ld.so.conf.d/usr-local.conf \
162 && echo "/usr/local/lib" > /etc/ld.so.conf.d/usr-local.conf \
163 && echo "/usr/lib/oracle/12.1/client64/lib" > /etc/ld.so.conf.d/oracle-client.conf \
163 && echo "/usr/lib/oracle/12.1/client64/lib" > /etc/ld.so.conf.d/oracle-client.conf \
164 && ldconfig
164 && ldconfig
165+
166+# Add JDK to system paths.
167+echo "/usr/lib/jvm/java-8-openjdk-amd64/jre/lib/amd64/server/" > /etc/ld.so.conf.d/openjdk.conf \
168+ && ldconfig