Mon Nov 20 20:55:12 UTC 2017

Repository : ssh://git@git.haskell.org/haddock

On branches: 2.17.3.1-spanfix,alexbiehl-patch-1,ghc-8.0,ghc-8.0-facebook,ghc-head,ghc-head1,haddock-quick,headdock-library-1.4.5,ie_avails,issue-303,issue-475,master,pr-filter-maps,pr/cabal-desc,travis,v2.17,v2.17.3,v2.18,wip-located-module-as,wip/D2418,wip/T11080-open-data-kinds,wip/T11430,wip/T12105,wip/T12105-2,wip/T12942,wip/T13163,wip/T3384,wip/embelleshed-rdr,wip/new-tree-one-param,wip/rae,wip/remove-frames,wip/remove-frames1,wip/revert-ttg-2017-11-20,wip/ttg-2017-10-13,wip/ttg-2017-10-31,wip/ttg-2017-11-06,wip/ttg2-2017-11-10,wip/ttg3-2017-11-12,wip/ttg4-constraints-2017-11-13
Link       : http://git.haskell.org/haddock.git/commitdiff/1557c08cac99befbd541dcca4d85c20609518f2b

>---------------------------------------------------------------

commit 1557c08cac99befbd541dcca4d85c20609518f2b
Author: Łukasz Hanuszczak <lukasz.hanuszczak at gmail.com>
Date:   Tue Aug 25 17:41:59 2015 +0200

    Fix test suite failure when used with Stack.


>---------------------------------------------------------------

1557c08cac99befbd541dcca4d85c20609518f2b
 haddock-test/src/Test/Haddock/Config.hs | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/haddock-test/src/Test/Haddock/Config.hs b/haddock-test/src/Test/Haddock/Config.hs
index fff8492..8f1f488 100644
--- a/haddock-test/src/Test/Haddock/Config.hs
+++ b/haddock-test/src/Test/Haddock/Config.hs
@@ -213,6 +213,11 @@ printVersions env haddockPath = do
 
 baseDependencies :: FilePath -> IO [String]
 baseDependencies ghcPath = do
+    -- The 'getInstalledPackages' crashes if used when "GHC_PACKAGE_PATH" is
+    -- set to some value. I am not sure why is that happening and what are the
+    -- consequences of unsetting it - but looks like it works (for now).
+    unsetEnv "GHC_PACKAGE_PATH"
+
     (_, _, cfg) <- configure normal (Just ghcPath) Nothing
         defaultProgramConfiguration
     pkgIndex <- getInstalledPackages normal [GlobalPackageDB] cfg

