From 6a94bc96f79ded771c1c395b77c4b1824ed65ce3 Mon Sep 17 00:00:00 2001
From: Cale Gibbard <cgibbard@gmail.com>
Date: Fri, 7 Feb 2020 16:55:56 -0500
Subject: Fix build of haddock in stage1

We have to use the correct version of the GHC API, but the version of the compiler itself doesn't matter.
---
 haddock-api/src/Haddock/InterfaceFile.hs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'haddock-api')

diff --git a/haddock-api/src/Haddock/InterfaceFile.hs b/haddock-api/src/Haddock/InterfaceFile.hs
index 812d6a50..e96ff665 100644
--- a/haddock-api/src/Haddock/InterfaceFile.hs
+++ b/haddock-api/src/Haddock/InterfaceFile.hs
@@ -82,7 +82,7 @@ binaryInterfaceMagic = 0xD0Cface
 -- (2) set `binaryInterfaceVersionCompatibility` to [binaryInterfaceVersion]
 --
 binaryInterfaceVersion :: Word16
-#if (__GLASGOW_HASKELL__ >= 811) && (__GLASGOW_HASKELL__ < 813)
+#if MIN_VERSION_ghc(8,11,0) && !MIN_VERSION_ghc(8,13,0)
 binaryInterfaceVersion = 34
 
 binaryInterfaceVersionCompatibility :: [Word16]
-- 
cgit v1.2.3


From 948370b2bc7ab5a631b152eefbec17f697c3f247 Mon Sep 17 00:00:00 2001
From: John Ericson <John.Ericson@Obsidian.Systems>
Date: Mon, 10 Feb 2020 16:18:07 -0500
Subject: Noramlize `tested-with` fields in cabal files

---
 haddock-api/haddock-api.cabal         | 1 +
 haddock-library/haddock-library.cabal | 2 ++
 haddock-test/haddock-test.cabal       | 3 ++-
 haddock.cabal                         | 2 +-
 4 files changed, 6 insertions(+), 2 deletions(-)

(limited to 'haddock-api')

diff --git a/haddock-api/haddock-api.cabal b/haddock-api/haddock-api.cabal
index 5eb69345..2c892de6 100644
--- a/haddock-api/haddock-api.cabal
+++ b/haddock-api/haddock-api.cabal
@@ -13,6 +13,7 @@ bug-reports:          https://github.com/haskell/haddock/issues
 copyright:            (c) Simon Marlow, David Waern
 category:             Documentation
 build-type:           Simple
+tested-with:          GHC==8.10.*, GHC==8.8.1, GHC==8.6.5
 
 extra-source-files:
   CHANGES.md
diff --git a/haddock-library/haddock-library.cabal b/haddock-library/haddock-library.cabal
index 9cc011de..feb98e2f 100644
--- a/haddock-library/haddock-library.cabal
+++ b/haddock-library/haddock-library.cabal
@@ -17,6 +17,8 @@ maintainer:           Alec Theriault <alec.theriault@gmail.com>, Alex Biehl <ale
 homepage:             http://www.haskell.org/haddock/
 bug-reports:          https://github.com/haskell/haddock/issues
 category:             Documentation
+tested-with:          GHC==8.10.*, GHC==8.8.1, GHC==8.6.5
+
 extra-source-files:
   CHANGES.md
 
diff --git a/haddock-test/haddock-test.cabal b/haddock-test/haddock-test.cabal
index a656d707..f5105f92 100644
--- a/haddock-test/haddock-test.cabal
+++ b/haddock-test/haddock-test.cabal
@@ -1,3 +1,4 @@
+cabal-version:        >= 1.10
 name:                 haddock-test
 version:              0.0.1
 synopsis:             Test utilities for Haddock
@@ -9,8 +10,8 @@ bug-reports:          https://github.com/haskell/haddock/issues
 copyright:            (c) Simon Marlow, David Waern
 category:             Documentation
 build-type:           Simple
-cabal-version:        >= 1.10
 stability:            experimental
+tested-with:          GHC==8.10.*, GHC==8.8.1, GHC==8.6.5
 
 library
   default-language: Haskell2010
diff --git a/haddock.cabal b/haddock.cabal
index 89156794..c8a3239e 100644
--- a/haddock.cabal
+++ b/haddock.cabal
@@ -33,7 +33,7 @@ bug-reports:          https://github.com/haskell/haddock/issues
 copyright:            (c) Simon Marlow, David Waern
 category:             Documentation
 build-type:           Simple
-tested-with:          GHC==8.6.*
+tested-with:          GHC==8.10.*, GHC==8.8.1, GHC==8.6.5
 
 extra-source-files:
   CHANGES.md
-- 
cgit v1.2.3