aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexander Biehl <alexbiehl@gmail.com>2018-04-03 16:35:50 +0200
committerGitHub <noreply@github.com>2018-04-03 16:35:50 +0200
commit256b908e0e2bf65812258c21b74d280f9a021cd4 (patch)
tree1821743eff1bd1aea6a3b2a03275ea3bae40cc8a
parent59812a09eb69cbf12407206381f4c214987b1efd (diff)
Travis: Build with ghc-8.4.2 (#793)
-rw-r--r--.travis.yml4
-rw-r--r--haddock-api/haddock-api.cabal2
-rw-r--r--html-test/ref/Bug310.html4
-rw-r--r--html-test/ref/Bug548.html8
4 files changed, 9 insertions, 9 deletions
diff --git a/.travis.yml b/.travis.yml
index 4afc18f4..39135739 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -26,9 +26,9 @@ before_cache:
matrix:
include:
- - compiler: "ghc-8.4.1"
+ - compiler: "ghc-8.4.2"
# env: TEST=--disable-tests BENCH=--disable-benchmarks
- addons: {apt: {packages: [ghc-ppa-tools,cabal-install-head,ghc-8.4.1], sources: [hvr-ghc]}}
+ addons: {apt: {packages: [ghc-ppa-tools,cabal-install-head,ghc-8.4.2], sources: [hvr-ghc]}}
- compiler: "ghc-head"
# env: TEST=--disable-tests BENCH=--disable-benchmarks
addons: {apt: {packages: [ghc-ppa-tools,cabal-install-head,ghc-head], sources: [hvr-ghc]}}
diff --git a/haddock-api/haddock-api.cabal b/haddock-api/haddock-api.cabal
index f5803e09..acb4d9e4 100644
--- a/haddock-api/haddock-api.cabal
+++ b/haddock-api/haddock-api.cabal
@@ -169,7 +169,7 @@ test-suite spec
build-depends: Cabal ^>= 2.0.0
, ghc ^>= 8.4
, ghc-paths ^>= 0.1.0.9
- , haddock-library ^>= 1.5.0
+ , haddock-library ^>= 1.6.0
, xhtml ^>= 3000.2.2
, hspec ^>= 2.4.4
, QuickCheck ^>= 2.11
diff --git a/html-test/ref/Bug310.html b/html-test/ref/Bug310.html
index e8ce24f8..47da5387 100644
--- a/html-test/ref/Bug310.html
+++ b/html-test/ref/Bug310.html
@@ -89,7 +89,7 @@
>Addition of type-level naturals.</p
><p
><em
- >Since: 4.7.0.0</em
+ >Since: base-4.7.0.0</em
></p
></div
></div
@@ -99,4 +99,4 @@
></div
></body
></html
-> \ No newline at end of file
+>
diff --git a/html-test/ref/Bug548.html b/html-test/ref/Bug548.html
index 29216433..b32f8c8c 100644
--- a/html-test/ref/Bug548.html
+++ b/html-test/ref/Bug548.html
@@ -183,7 +183,7 @@
><td class="doc"
><p
><em
- >Since: 2.1</em
+ >Since: base-2.1</em
></p
></td
></tr
@@ -239,7 +239,7 @@
><td class="doc"
><p
><em
- >Since: 2.1</em
+ >Since: base-2.1</em
></p
></td
></tr
@@ -333,7 +333,7 @@
><td class="doc"
><p
><em
- >Since: 2.1</em
+ >Since: base-2.1</em
></p
></td
></tr
@@ -611,4 +611,4 @@
></div
></body
></html
-> \ No newline at end of file
+>