From 67957d4fbde51fab5f188c1a67016d04f60b2349 Mon Sep 17 00:00:00 2001 From: Timo von Holtz Date: Thu, 15 Dec 2016 23:10:42 +0100 Subject: [PATCH 01/16] Add hasql-migration --- build-constraints.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/build-constraints.yaml b/build-constraints.yaml index fc701c5a..41dcfa0b 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -1763,6 +1763,7 @@ packages: "Timo von Holtz @tvh": # via haxl - haxl-amazonka + - hasql-migration - servant-JuicyPixels "Artyom @neongreen": From 9f167da8cd1ed7f57c5bba1f17a6df847a3431c0 Mon Sep 17 00:00:00 2001 From: Mathieu Boespflug Date: Sun, 18 Dec 2016 15:29:25 +0100 Subject: [PATCH 02/16] Reenable jvm. Depends on Docker image that includes #2144. --- build-constraints.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index c7476dc2..cd6f2cf7 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -1567,8 +1567,8 @@ packages: - H - inline-r - jni - # Temporary block for https://github.com/fpco/stackage/pull/2139 - # - jvm + - jvm + # BLOCKED GHC 8.0.2 # - sparkle - th-lift From b1f5590f5831cdc8ac302e56770146656838f935 Mon Sep 17 00:00:00 2001 From: Adam Bergmark Date: Sun, 18 Dec 2016 15:32:57 +0100 Subject: [PATCH 03/16] Re-enable doctest suites --- build-constraints.yaml | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index cd6f2cf7..924cac1d 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -2292,7 +2292,7 @@ packages: - ua-parser - hs-GeoIP - retry - - katip + - katip - katip-elasticsearch "Sid Kapur sidharthkapur1@gmail.com @sid-kap": @@ -2767,10 +2767,6 @@ package-flags: tar: old-time: false - # https://github.com/fpco/stackage/pull/482#issuecomment-83635207 - jose-jwt: - doctest: false - time-locale-compat: old-locale: false @@ -3072,12 +3068,6 @@ expected-test-failures: - distributed-process-supervisor # # https://github.com/haskell-d - ghcid # Weird conflicts with sandboxingistributed/distributed-process-supervisor/issues/1 - # Doctest ran across ambiguous modules - # https://github.com/bergmark/blog/blob/master/2016/package-faq.md#ambiguous-modules-when-using-doctest - - doctest # 0.11.0 https://github.com/sol/doctest/issues/137 - - jwt # https://bitbucket.org/ssaasen/haskell-jwt/issues/18/test-suite-build-failure-in-stackage - - warp # https://github.com/yesodweb/wai/issues/579 - # Stackage upper bounds, re-enable these when their upper bound is removed - hindent # 4.6.4 From a10011824d40649e11e56463b01e534cd6b09ace Mon Sep 17 00:00:00 2001 From: Adam Bergmark Date: Sun, 18 Dec 2016 20:44:15 +0100 Subject: [PATCH 04/16] Revert "Re-enable doctest suites" This reverts commit b1f5590f5831cdc8ac302e56770146656838f935. --- build-constraints.yaml | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index 924cac1d..cd6f2cf7 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -2292,7 +2292,7 @@ packages: - ua-parser - hs-GeoIP - retry - - katip + - katip - katip-elasticsearch "Sid Kapur sidharthkapur1@gmail.com @sid-kap": @@ -2767,6 +2767,10 @@ package-flags: tar: old-time: false + # https://github.com/fpco/stackage/pull/482#issuecomment-83635207 + jose-jwt: + doctest: false + time-locale-compat: old-locale: false @@ -3068,6 +3072,12 @@ expected-test-failures: - distributed-process-supervisor # # https://github.com/haskell-d - ghcid # Weird conflicts with sandboxingistributed/distributed-process-supervisor/issues/1 + # Doctest ran across ambiguous modules + # https://github.com/bergmark/blog/blob/master/2016/package-faq.md#ambiguous-modules-when-using-doctest + - doctest # 0.11.0 https://github.com/sol/doctest/issues/137 + - jwt # https://bitbucket.org/ssaasen/haskell-jwt/issues/18/test-suite-build-failure-in-stackage + - warp # https://github.com/yesodweb/wai/issues/579 + # Stackage upper bounds, re-enable these when their upper bound is removed - hindent # 4.6.4 From 8a12ad449aaedd16681729ea323550681b286449 Mon Sep 17 00:00:00 2001 From: Adam Bergmark Date: Mon, 19 Dec 2016 09:41:14 +0100 Subject: [PATCH 05/16] clckwrks upper bound for #2147 --- build-constraints.yaml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index ec9fec2b..03d4a4cf 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -2293,7 +2293,7 @@ packages: - ua-parser - hs-GeoIP - retry - - katip + - katip - katip-elasticsearch "Sid Kapur sidharthkapur1@gmail.com @sid-kap": @@ -2729,6 +2729,9 @@ packages: - cryptonite < 0.21 - memory < 0.14 - tls < 1.3.9 + + # https://github.com/fpco/stackage/issues/2147 + - clckwrks < 0.24.0 # end of packages # Package flags are applied to individual packages, and override the values of From aed09354889e48c7ec9e56a96f9a20b1662762c5 Mon Sep 17 00:00:00 2001 From: Adam Bergmark Date: Mon, 19 Dec 2016 10:11:49 +0100 Subject: [PATCH 06/16] Expect hasql-transaction tests to fail due to missing PostgreSQL --- build-constraints.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/build-constraints.yaml b/build-constraints.yaml index 03d4a4cf..3e708d88 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -2994,6 +2994,7 @@ expected-test-failures: - happy # Needs mtl in the user package DB - haskell-neo4j-client # neo4j with auth disabled - hasql # PostgreSQL + - hasql-transaction # PostgreSQL - hedis - hocilib # oracle - hworker From 589fee65b202388e59d40aa34eb41bf825caebe8 Mon Sep 17 00:00:00 2001 From: Adam Bergmark Date: Mon, 19 Dec 2016 17:19:28 +0100 Subject: [PATCH 07/16] rattletrap upper bound for #2148 --- build-constraints.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/build-constraints.yaml b/build-constraints.yaml index 3e708d88..b69071f4 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -2732,6 +2732,9 @@ packages: # https://github.com/fpco/stackage/issues/2147 - clckwrks < 0.24.0 + + # https://github.com/fpco/stackage/issues/2148 + - rattletrap < 2.1.0 # end of packages # Package flags are applied to individual packages, and override the values of From f3db2b4f057474dbb9e9ce845def3d97eeb10258 Mon Sep 17 00:00:00 2001 From: Adam Bergmark Date: Mon, 19 Dec 2016 17:45:32 +0100 Subject: [PATCH 08/16] Revert "Revert "Re-enable doctest suites"" This reverts commit a10011824d40649e11e56463b01e534cd6b09ace. --- build-constraints.yaml | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index b69071f4..1180a144 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -2774,10 +2774,6 @@ package-flags: tar: old-time: false - # https://github.com/fpco/stackage/pull/482#issuecomment-83635207 - jose-jwt: - doctest: false - time-locale-compat: old-locale: false @@ -3080,12 +3076,6 @@ expected-test-failures: - distributed-process-supervisor # # https://github.com/haskell-d - ghcid # Weird conflicts with sandboxingistributed/distributed-process-supervisor/issues/1 - # Doctest ran across ambiguous modules - # https://github.com/bergmark/blog/blob/master/2016/package-faq.md#ambiguous-modules-when-using-doctest - - doctest # 0.11.0 https://github.com/sol/doctest/issues/137 - - jwt # https://bitbucket.org/ssaasen/haskell-jwt/issues/18/test-suite-build-failure-in-stackage - - warp # https://github.com/yesodweb/wai/issues/579 - # Stackage upper bounds, re-enable these when their upper bound is removed - hindent # 4.6.4 From a2ca9824d572e0b64163070663817c91fc7f4d21 Mon Sep 17 00:00:00 2001 From: Adam Bergmark Date: Mon, 19 Dec 2016 18:05:12 +0100 Subject: [PATCH 09/16] Remove clckwrks upper bound and close #2147 --- build-constraints.yaml | 3 --- 1 file changed, 3 deletions(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index 1180a144..8f053f03 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -2730,9 +2730,6 @@ packages: - memory < 0.14 - tls < 1.3.9 - # https://github.com/fpco/stackage/issues/2147 - - clckwrks < 0.24.0 - # https://github.com/fpco/stackage/issues/2148 - rattletrap < 2.1.0 # end of packages From f16ed6eec16e7a84b4954241795012e43af1872a Mon Sep 17 00:00:00 2001 From: Adam Bergmark Date: Mon, 19 Dec 2016 18:28:20 +0100 Subject: [PATCH 10/16] Print the version/git hash of stackage-curator --- automated/build.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/automated/build.sh b/automated/build.sh index 13e39791..1dd7dadd 100755 --- a/automated/build.sh +++ b/automated/build.sh @@ -77,6 +77,7 @@ rm -f stackage-curator stackage-curator.bz2 wget https://s3.amazonaws.com/stackage-travis/stackage-curator/stackage-curator.bz2 bunzip2 stackage-curator.bz2 chmod +x stackage-curator +stackage-curator --version ) ARGS_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" From 5f337a111c07e011045362bf878e678201185296 Mon Sep 17 00:00:00 2001 From: Adam Bergmark Date: Mon, 19 Dec 2016 19:37:17 +0100 Subject: [PATCH 11/16] Hide protolude and cryptohash due to doctest issues --- build-constraints.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/build-constraints.yaml b/build-constraints.yaml index 8f053f03..79e6e938 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -3318,3 +3318,5 @@ tell-me-when-its-released: hide: - async-dejafu # https://github.com/yesodweb/wai/issues/579 - monads-tf # mtl is preferred +- protolude # `module Panic` conflicts with base +- cryptohash # Superceeded by cryptonite From 8b3625266b40b0534cc2925d9a0f3d5bc8fc60bb Mon Sep 17 00:00:00 2001 From: Adam Bergmark Date: Mon, 19 Dec 2016 19:41:13 +0100 Subject: [PATCH 12/16] Expect ginger tests to fail --- build-constraints.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/build-constraints.yaml b/build-constraints.yaml index 79e6e938..8210046e 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -3042,6 +3042,7 @@ expected-test-failures: - rematch # No issue tracker, sent e-mail to maintainer https://github.com/fpco/stackage/issues/376 - xlsior # https://github.com/rcallahan/xlsior/issues/1 - hakyll # https://github.com/jaspervdj/hakyll/issues/491 + - ginger # https://bitbucket.org/tdammers/ginger/issues/1/test-suite-failure-due-to-missing-test # Assertion failures, these can be real bugs or just limitations # in the test cases. From f11f65be884f0d98fbcdce1fb7582e713746b091 Mon Sep 17 00:00:00 2001 From: Adam Bergmark Date: Mon, 19 Dec 2016 21:58:59 +0100 Subject: [PATCH 13/16] Force rebuilds of cryptohash and protolude --- build-constraints.yaml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/build-constraints.yaml b/build-constraints.yaml index 8210046e..dc5994be 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -2732,6 +2732,10 @@ packages: # https://github.com/fpco/stackage/issues/2148 - rattletrap < 2.1.0 + + # Temporary for doctest debugging + - cryptohash < 0.11.9 + - protolude < 0.1.10 # end of packages # Package flags are applied to individual packages, and override the values of From e28a0f7f6f11e97f3b77e916aaf0ff3fb5ca50f8 Mon Sep 17 00:00:00 2001 From: Adam Bergmark Date: Mon, 19 Dec 2016 22:03:21 +0100 Subject: [PATCH 14/16] Temp disable avers for doctest debugging --- build-constraints.yaml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index dc5994be..7808b48d 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -977,10 +977,10 @@ packages: - pipes-network "Tomas Carnecky @wereHamster": - - avers - - avers-api - - avers-api-docs - - avers-server + # - avers + # - avers-api + # - avers-api-docs + # - avers-server - css-syntax - etcd - github-types From 5d426c7faa892479c8a395069d7f0012c6b9c9db Mon Sep 17 00:00:00 2001 From: Adam Bergmark Date: Mon, 19 Dec 2016 22:14:20 +0100 Subject: [PATCH 15/16] Re-enable temp disabled packages --- build-constraints.yaml | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index 7808b48d..ea0f19a1 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -977,10 +977,10 @@ packages: - pipes-network "Tomas Carnecky @wereHamster": - # - avers - # - avers-api - # - avers-api-docs - # - avers-server + - avers + - avers-api + - avers-api-docs + - avers-server - css-syntax - etcd - github-types @@ -2733,9 +2733,6 @@ packages: # https://github.com/fpco/stackage/issues/2148 - rattletrap < 2.1.0 - # Temporary for doctest debugging - - cryptohash < 0.11.9 - - protolude < 0.1.10 # end of packages # Package flags are applied to individual packages, and override the values of From 777b1ee854503413491fb3e8cfadd0c7c37dd789 Mon Sep 17 00:00:00 2001 From: John Galt Date: Tue, 20 Dec 2016 13:08:36 -0500 Subject: [PATCH 16/16] Add nfc --- build-constraints.yaml | 1 + debian-bootstrap.sh | 1 + 2 files changed, 2 insertions(+) diff --git a/build-constraints.yaml b/build-constraints.yaml index ea0f19a1..baa974ba 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -2071,6 +2071,7 @@ packages: - cacophony - pipes-cacophony - blake2 + - nfc "Adam Curtis @kallisti-dev": [] diff --git a/debian-bootstrap.sh b/debian-bootstrap.sh index 4c28b457..32e6df55 100755 --- a/debian-bootstrap.sh +++ b/debian-bootstrap.sh @@ -84,6 +84,7 @@ apt-get install -y \ libmpfr-dev \ libmysqlclient-dev \ libncurses-dev \ + libnfc-dev \ libnotify-dev \ libopenal-dev \ libpango1.0-dev \