From bf3c4d72a0fda38561376eac7eda216158783267 Mon Sep 17 00:00:00 2001 From: "Edward Z. Yang" Date: Tue, 14 Mar 2017 14:23:35 -0700 Subject: Fix haddock-test to work with latest version of Cabal. Signed-off-by: Edward Z. Yang --- haddock-test/src/Test/Haddock/Config.hs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'haddock-test') diff --git a/haddock-test/src/Test/Haddock/Config.hs b/haddock-test/src/Test/Haddock/Config.hs index dea101d8..e1e920f2 100644 --- a/haddock-test/src/Test/Haddock/Config.hs +++ b/haddock-test/src/Test/Haddock/Config.hs @@ -237,7 +237,7 @@ baseDependencies ghcPath = do exitFailure (ifArg:_) -> pure ifArg ifaces pkgIndex name = do - pkg <- join $ snd <$> lookupPackageName pkgIndex (PackageName name) + pkg <- join $ snd <$> lookupPackageName pkgIndex (mkPackageName name) iface <$> haddockInterfaces pkg <*> haddockHTMLs pkg iface file html = "--read-interface=" ++ html ++ "," ++ file -- cgit v1.2.3 From dc45f3a2f1c12a3358471e97b85ca6b1cc82ef1e Mon Sep 17 00:00:00 2001 From: alexbiehl Date: Fri, 29 Sep 2017 21:15:24 +0200 Subject: Bump base for haddock-library and haddock-test --- haddock-library/haddock-library.cabal | 2 +- haddock-test/haddock-test.cabal | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'haddock-test') diff --git a/haddock-library/haddock-library.cabal b/haddock-library/haddock-library.cabal index 368c0112..5b0f1481 100644 --- a/haddock-library/haddock-library.cabal +++ b/haddock-library/haddock-library.cabal @@ -50,7 +50,7 @@ library attoparsec default-language: Haskell2010 build-depends: - base >= 4.5 && < 4.11 + base >= 4.5 && < 4.12 , bytestring >= 0.9.2.1 && < 0.11 , deepseq >= 1.3 && < 1.5 diff --git a/haddock-test/haddock-test.cabal b/haddock-test/haddock-test.cabal index 56dd1845..6b6c9fd8 100644 --- a/haddock-test/haddock-test.cabal +++ b/haddock-test/haddock-test.cabal @@ -16,7 +16,7 @@ library default-language: Haskell2010 ghc-options: -Wall hs-source-dirs: src - build-depends: base >= 4.3 && < 4.11, bytestring, directory, process, filepath, Cabal, xml, xhtml, syb + build-depends: base >= 4.3 && < 4.12, bytestring, directory, process, filepath, Cabal, xml, xhtml, syb exposed-modules: Test.Haddock -- cgit v1.2.3