From 29d420110f96a3949d6dcdbd00410d0f49c995ab Mon Sep 17 00:00:00 2001 From: Dmitry Ivanov Date: Sat, 3 Dec 2016 18:22:23 +0100 Subject: [PATCH 01/19] Update yi packages --- build-constraints.yaml | 21 +++++++++++++++------ 1 file changed, 15 insertions(+), 6 deletions(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index a76bdeee..a91698d9 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -1820,6 +1820,7 @@ packages: "Dmitry Ivanov @ethercrow": - charsetdetect-ae + - compiler-errors - docopt - dynamic-state - dyre @@ -1828,13 +1829,21 @@ packages: - pointedlist - word-trie - xdg-basedir - # - yi BLOCKED due to yi-language - #- yi-fuzzy-open - - # https://github.com/yi-editor/yi/issues/922 - # - yi-language - + # - yi -- disabled because of https://github.com/commercialhaskell/stack/issues/2795 + - yi-core + # - yi-frontend-pango -- disabled because of https://github.com/commercialhaskell/stack/issues/2795 + - yi-frontend-vty + - yi-fuzzy-open + - yi-ireader + - yi-keymap-cua + - yi-keymap-emacs + - yi-keymap-vim + - yi-language + - yi-misc-modes + - yi-mode-haskell + - yi-mode-javascript - yi-rope + - yi-snippet "Tobias Bexelius @tobbebex": - GPipe From 5afcfd5807a1058493261db0819c66274d1ded3f Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Sun, 11 Dec 2016 10:15:04 +0900 Subject: [PATCH 02/19] disable yi-keymap-vim (yi-editor/yi#954) testsuite missing dir --- build-constraints.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index 6f777af9..431a64e9 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -1858,7 +1858,7 @@ packages: - yi-ireader - yi-keymap-cua - yi-keymap-emacs - - yi-keymap-vim + #- yi-keymap-vim # https://github.com/yi-editor/yi/issues/954 - yi-language - yi-misc-modes - yi-mode-haskell From e34e6dc4a2a4695987b50ff6f8cc768f98c94910 Mon Sep 17 00:00:00 2001 From: Michael Snoyman Date: Sun, 11 Dec 2016 12:32:49 +0200 Subject: [PATCH 03/19] Add the hide field yesodweb/wai#579 --- build-constraints.yaml | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/build-constraints.yaml b/build-constraints.yaml index 431a64e9..d900caa2 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -3285,3 +3285,14 @@ tell-me-when-its-released: - terminal-progress-bar-0.1.1 # Unskip test suite - optparse-applicative-0.13.0.0 # Unskip test suite https://github.com/pcapriotti/optparse-applicative/issues/228 - hakyll-4.9.2.0 # re-enable tests + +# Packages which should be hidden after registering, to avoid module name +# conflicts. This is intended for at least two use cases: +# +# * Making doctests pass (https://github.com/yesodweb/wai/issues/579) +# +# * Allowing tools like Stack to get a mapping from module name to package name +# for automatically installing dependencies +hide: +- async-dejafu # https://github.com/yesodweb/wai/issues/579 +- monads-tf # mtl is preferred From abf2d92daa8eb04e5c38559ddc01769e1cc91aab Mon Sep 17 00:00:00 2001 From: Hans-Peter Deifel Date: Sun, 11 Dec 2016 20:22:32 +0100 Subject: [PATCH 04/19] Add hledger-iadd --- build-constraints.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/build-constraints.yaml b/build-constraints.yaml index d900caa2..adcfa3a5 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -2668,6 +2668,9 @@ packages: "Alexey Kuleshevich @lehins": - hip + "Hans-Peter Deifel @hpdeifel": + - hledger-iadd + # If you stop maintaining a package you can move it here. # It will then be disabled if it starts causing problems. # See https://github.com/fpco/stackage/issues/1056 From 463183880d4a875e8e45ab2b9a321aee63fc1268 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Mon, 12 Dec 2016 11:16:51 +0900 Subject: [PATCH 05/19] waiting for Spock-core release for testsuite (agrafix/Spock#102) --- build-constraints.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/build-constraints.yaml b/build-constraints.yaml index adcfa3a5..6d1de3dc 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -3288,6 +3288,7 @@ tell-me-when-its-released: - terminal-progress-bar-0.1.1 # Unskip test suite - optparse-applicative-0.13.0.0 # Unskip test suite https://github.com/pcapriotti/optparse-applicative/issues/228 - hakyll-4.9.2.0 # re-enable tests +- Spock-core-0.11.0.0 # testsuite fail # Packages which should be hidden after registering, to avoid module name # conflicts. This is intended for at least two use cases: From ba321e5359638047eb1f0ce292d1f271291cfbc6 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Tue, 13 Dec 2016 11:54:18 +0900 Subject: [PATCH 06/19] build.sh: quieten builds with set +x --- automated/build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/automated/build.sh b/automated/build.sh index a145ac5b..9df389fb 100755 --- a/automated/build.sh +++ b/automated/build.sh @@ -1,6 +1,6 @@ #!/usr/bin/env bash -set -eux +set -eu +x ROOT=$(cd $(dirname $0) ; pwd) TARGET=$1 From e7584ea7e2fd3c64eb2cb57df39d83d79987a6ed Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Tue, 13 Dec 2016 13:38:10 +0900 Subject: [PATCH 07/19] Revert "allow varying benchmark fail (schell/varying#15)" should be fixed in 0.7.0.3 This reverts commit 65d74692c99975e4ac7b3dbd6367e6754ade8464. --- build-constraints.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index 6d1de3dc..ed0764b4 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -3106,7 +3106,7 @@ expected-benchmark-failures: - dbus # No issue tracker, sent e-mail to maintainer - thyme # https://github.com/liyang/thyme/issues/50 - xmlgen # https://github.com/skogsbaer/xmlgen/issues/6 - - varying # https://github.com/schell/varying/issues/15 + # end of expected-benchmark-failures From acf180a7583e54831dfd62b88336501afb42082d Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Tue, 13 Dec 2016 14:41:50 +0900 Subject: [PATCH 08/19] build.sh: do not update Hackage packages list for LTS New packages from Hackage should only be pulled by Nightly. ie LTS should never be ahead of Nightly in terms of package versions. --- automated/build.sh | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/automated/build.sh b/automated/build.sh index 9df389fb..13e39791 100755 --- a/automated/build.sh +++ b/automated/build.sh @@ -98,11 +98,16 @@ curl -L https://www.stackage.org/stack/linux-x86_64 | tar xz --wildcards --strip # Determine the new build plan unless NOPLAN is set # -# * Update the package index +# * Update the package index (unless LTS) # * Create a new plan if [ "${NOPLAN:-}x" = "x" ] then - docker run $ARGS_PREBUILD $IMAGE /bin/bash -c "stack update && exec stackage-curator create-plan --plan-file $PLAN_FILE --target $TARGET ${CONSTRAINTS:-}" + if [ $SHORTNAME = "lts" ] + then + docker run $ARGS_PREBUILD $IMAGE /bin/bash -c "exec stackage-curator create-plan --plan-file $PLAN_FILE --target $TARGET ${CONSTRAINTS:-}" + else + docker run $ARGS_PREBUILD $IMAGE /bin/bash -c "stack update && exec stackage-curator create-plan --plan-file $PLAN_FILE --target $TARGET ${CONSTRAINTS:-}" + fi fi # Do the rest of the pre-build actions: From b05c971e062b0eb91b1b6d20d81f6688c6cb13ec Mon Sep 17 00:00:00 2001 From: Michael Snoyman Date: Wed, 14 Dec 2016 09:46:46 +0200 Subject: [PATCH 09/19] Upper bound for #2135 --- build-constraints.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/build-constraints.yaml b/build-constraints.yaml index ed0764b4..a009436a 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -2717,6 +2717,9 @@ packages: # https://github.com/fpco/stackage/issues/2032 - datasets < 0.2.2 + + # https://github.com/fpco/stackage/issues/2135 + - glabrous < 0.2 # end of packages # Package flags are applied to individual packages, and override the values of From be33e6c37397b3de0ef9a5bffb7c73edabc2e0f1 Mon Sep 17 00:00:00 2001 From: Michael Snoyman Date: Wed, 14 Dec 2016 22:10:46 +0200 Subject: [PATCH 10/19] Remove upper bound and close #2135 This reverts commit b05c971e062b0eb91b1b6d20d81f6688c6cb13ec. --- build-constraints.yaml | 3 --- 1 file changed, 3 deletions(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index a009436a..ed0764b4 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -2717,9 +2717,6 @@ packages: # https://github.com/fpco/stackage/issues/2032 - datasets < 0.2.2 - - # https://github.com/fpco/stackage/issues/2135 - - glabrous < 0.2 # end of packages # Package flags are applied to individual packages, and override the values of From 9dd4548a8d226bc40feabf204b71399e373e8ce9 Mon Sep 17 00:00:00 2001 From: Michael Snoyman Date: Thu, 15 Dec 2016 10:12:09 +0200 Subject: [PATCH 11/19] Upper bound for #2136 --- build-constraints.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/build-constraints.yaml b/build-constraints.yaml index ed0764b4..fc701c5a 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -2717,6 +2717,9 @@ packages: # https://github.com/fpco/stackage/issues/2032 - datasets < 0.2.2 + + # https://github.com/fpco/stackage/issues/2136 + - X11 < 1.7 # end of packages # Package flags are applied to individual packages, and override the values of From b99d63bec31ab896294388552405c3fcdf09dd54 Mon Sep 17 00:00:00 2001 From: Mathieu Boespflug Date: Fri, 16 Dec 2016 12:07:26 +0100 Subject: [PATCH 12/19] Add jni, jvm, sparkle once more. This is another attempt at #2003. The list of includes has been expanded. Fixes #1660. --- build-constraints.yaml | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index fc701c5a..92930d85 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -1565,6 +1565,9 @@ packages: - distributed-closure - H - inline-r + - jni + - jvm + - sparkle - th-lift "Christopher Reichert @creichert": @@ -2319,8 +2322,6 @@ packages: "Alp Mestanogullari @alpmestan": - taggy - taggy-lens - # 0.1 Compilation failure https://github.com/fpco/stackage/issues/1660 - inline-java - # via inline-java - sparkle "Alex McLean @yaxu": - tidal @@ -2807,11 +2808,15 @@ configure-args: - /usr/lib/jvm/java-8-openjdk-amd64/jre/lib/amd64/server - --extra-include-dirs - /usr/lib/jvm/java-8-openjdk-amd64/include + - --extra-include-dirs + - /usr/lib/jvm/java-8-openjdk-amd64/include/linux sparkle: - --extra-lib-dirs - /usr/lib/jvm/java-8-openjdk-amd64/jre/lib/amd64/server - --extra-include-dirs - /usr/lib/jvm/java-8-openjdk-amd64/include + - --extra-include-dirs + - /usr/lib/jvm/java-8-openjdk-amd64/include/linux hocilib: - --extra-lib-dirs - /usr/local/lib From f5c36341e1d911a5acb9703a1c8e8060705f6cef Mon Sep 17 00:00:00 2001 From: Mathieu Boespflug Date: Fri, 16 Dec 2016 13:33:52 +0100 Subject: [PATCH 13/19] Add jvm to expected-test-failures. The reason for this is that on Debian for some reason the linker doesn't add a RUNPATH entry for libjvm.so, despite the fact that it's installed in a non-standard location. So running the test suite will yield a "libjvm.so not found" error. --- build-constraints.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/build-constraints.yaml b/build-constraints.yaml index 92930d85..b8bdc726 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -2979,6 +2979,7 @@ expected-test-failures: - hedis - hocilib # oracle - hworker + - jvm - katip-elasticsearch # elasticsearch - log # ElasticSearch - mangopay # https://github.com/prowdsponsor/mangopay/issues/30 From b079eac0d6c534b542b7bb0701f1fb90fe93e6a1 Mon Sep 17 00:00:00 2001 From: William Casarin Date: Fri, 16 Dec 2016 09:02:38 -0800 Subject: [PATCH 14/19] Add streaming-wai --- build-constraints.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/build-constraints.yaml b/build-constraints.yaml index fc701c5a..a9524d8a 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -1418,6 +1418,7 @@ packages: - pipes-csv - pipes-mongodb - skeletons + - streaming-wai # "Smirnov Alexey @chemist": # GHC 8 - snmp From 1fb8383f19f77630ca4d3ec59b60d03bd092b54a Mon Sep 17 00:00:00 2001 From: Michael Snoyman Date: Sat, 17 Dec 2016 18:53:57 +0200 Subject: [PATCH 15/19] Upper bounds for #2143 --- build-constraints.yaml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/build-constraints.yaml b/build-constraints.yaml index a9524d8a..fba2f8ed 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -2721,6 +2721,10 @@ packages: # https://github.com/fpco/stackage/issues/2136 - X11 < 1.7 + + # https://github.com/fpco/stackage/issues/2143 + - cryptonite < 0.21 + - memory < 0.14 # end of packages # Package flags are applied to individual packages, and override the values of From 9dd723dd2dff0eaf2499203e04caf2662c542d2c Mon Sep 17 00:00:00 2001 From: Michael Snoyman Date: Sat, 17 Dec 2016 18:56:19 +0200 Subject: [PATCH 16/19] Extra upper bound for #2143 --- build-constraints.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/build-constraints.yaml b/build-constraints.yaml index fba2f8ed..3800d6b3 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -2725,6 +2725,7 @@ packages: # https://github.com/fpco/stackage/issues/2143 - cryptonite < 0.21 - memory < 0.14 + - tls < 1.3.9 # end of packages # Package flags are applied to individual packages, and override the values of From 3f136b9882ee49b7fe0fd801d84a5bca1319251d Mon Sep 17 00:00:00 2001 From: Michael Snoyman Date: Sun, 18 Dec 2016 10:43:19 +0200 Subject: [PATCH 17/19] configure-args for jvm --- build-constraints.yaml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/build-constraints.yaml b/build-constraints.yaml index a740c743..ccf4af94 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -2816,6 +2816,13 @@ configure-args: - /usr/lib/jvm/java-8-openjdk-amd64/include - --extra-include-dirs - /usr/lib/jvm/java-8-openjdk-amd64/include/linux + jvm: + - --extra-lib-dirs + - /usr/lib/jvm/java-8-openjdk-amd64/jre/lib/amd64/server + - --extra-include-dirs + - /usr/lib/jvm/java-8-openjdk-amd64/include + - --extra-include-dirs + - /usr/lib/jvm/java-8-openjdk-amd64/include/linux sparkle: - --extra-lib-dirs - /usr/lib/jvm/java-8-openjdk-amd64/jre/lib/amd64/server From 229ad9b04533c1ff3a633d5fcc14a5b8e50ae3c8 Mon Sep 17 00:00:00 2001 From: Michael Snoyman Date: Sun, 18 Dec 2016 10:47:49 +0200 Subject: [PATCH 18/19] Temporarily block jvm and sparkle #2139 --- build-constraints.yaml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index ccf4af94..c7476dc2 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -1567,8 +1567,9 @@ packages: - H - inline-r - jni - - jvm - - sparkle + # Temporary block for https://github.com/fpco/stackage/pull/2139 + # - jvm + # - sparkle - th-lift "Christopher Reichert @creichert": From 6e56fb1fc2ca8de644bec3c59c233702f0cf01ff Mon Sep 17 00:00:00 2001 From: Mathieu Boespflug Date: Sun, 18 Dec 2016 14:05:09 +0100 Subject: [PATCH 19/19] Add openjdk paths to dynamic linker system paths. --- debian-bootstrap.sh | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/debian-bootstrap.sh b/debian-bootstrap.sh index b651d4ea..4c28b457 100755 --- a/debian-bootstrap.sh +++ b/debian-bootstrap.sh @@ -162,3 +162,7 @@ cd /tmp \ && echo "/usr/local/lib" > /etc/ld.so.conf.d/usr-local.conf \ && echo "/usr/lib/oracle/12.1/client64/lib" > /etc/ld.so.conf.d/oracle-client.conf \ && ldconfig + +# Add JDK to system paths. +echo "/usr/lib/jvm/java-8-openjdk-amd64/jre/lib/amd64/server/" > /etc/ld.so.conf.d/openjdk.conf \ + && ldconfig