From e6e468e64583b9280f0ddf5a7318ac732edcffde Mon Sep 17 00:00:00 2001 From: Michael Snoyman Date: Fri, 18 Sep 2015 11:42:39 +0300 Subject: [PATCH 1/5] Remove expected failure for meteficha/yesod-auth-account-fork#4 --- build-constraints.yaml | 3 --- 1 file changed, 3 deletions(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index 3b384af1..c0399a25 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -1921,9 +1921,6 @@ expected-test-failures: # https://github.com/kazu-yamamoto/ghc-mod/issues/611 - ghc-mod - # https://github.com/meteficha/yesod-auth-account-fork/issues/4 - - yesod-auth-account-fork - # Haddocks which are expected to fail. Same concept as expected test failures. expected-haddock-failures: # https://github.com/acw/bytestring-progress/issues/4 From e67cc495ac6c40179c2c23c3363d7f75c3903200 Mon Sep 17 00:00:00 2001 From: Adam Bergmark Date: Fri, 18 Sep 2015 11:53:02 +0200 Subject: [PATCH 2/5] Attempt to install pkg-config libR for inline-r (#842) --- debian-bootstrap.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/debian-bootstrap.sh b/debian-bootstrap.sh index 490c99cc..3353407e 100755 --- a/debian-bootstrap.sh +++ b/debian-bootstrap.sh @@ -65,6 +65,7 @@ apt-get install -y \ nodejs \ npm \ libadns1-dev \ + r-base-dev \ libpcap0.8-dev mkdir /tmp/nettle-build From a24f752c259426f257d28d16714f6b9f18cd8c23 Mon Sep 17 00:00:00 2001 From: Adam Bergmark Date: Fri, 18 Sep 2015 11:56:46 +0200 Subject: [PATCH 3/5] Re-enable inline-r and H (closes #842) --- build-constraints.yaml | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index c0399a25..1bd5cd63 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -1018,10 +1018,8 @@ packages: "Mateusz Kowalczyk @Fuuzetsu": - aeson-schema - - # https://github.com/fpco/stackage/issues/842 - # - inline-r - # - H + - inline-r + - H "David Fox @ddssff": - debian From f544b06200ab5da48a6e8ccacd78a97ce4b067de Mon Sep 17 00:00:00 2001 From: Adam Bergmark Date: Fri, 18 Sep 2015 12:09:25 +0200 Subject: [PATCH 4/5] Disable inline-r and H again (reopens #842) --- build-constraints.yaml | 6 ++++-- debian-bootstrap.sh | 1 - 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index 1bd5cd63..c0399a25 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -1018,8 +1018,10 @@ packages: "Mateusz Kowalczyk @Fuuzetsu": - aeson-schema - - inline-r - - H + + # https://github.com/fpco/stackage/issues/842 + # - inline-r + # - H "David Fox @ddssff": - debian diff --git a/debian-bootstrap.sh b/debian-bootstrap.sh index 3353407e..490c99cc 100755 --- a/debian-bootstrap.sh +++ b/debian-bootstrap.sh @@ -65,7 +65,6 @@ apt-get install -y \ nodejs \ npm \ libadns1-dev \ - r-base-dev \ libpcap0.8-dev mkdir /tmp/nettle-build From 1fca1d304e5a563fc29ce6f102b8e9d2c504d3e5 Mon Sep 17 00:00:00 2001 From: Adam Bergmark Date: Fri, 18 Sep 2015 19:13:05 +0200 Subject: [PATCH 5/5] Disable yesod-auth-account-fork due to test suite build failure meteficha/yesod-auth-account-fork#5 --- build-constraints.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index c0399a25..8348ab99 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -412,7 +412,8 @@ packages: - serversession-frontend-wai - serversession-frontend-yesod - thumbnail-plus - - yesod-auth-account-fork + # meteficha/yesod-auth-account-fork#5 + # - yesod-auth-account-fork - yesod-auth-fb - yesod-fb - yesod-mangopay