From 1c01bb6e1ca2fd179b0aa3a20b144ff5b941b27e Mon Sep 17 00:00:00 2001 From: Kirill Zaborsky Date: Tue, 19 Feb 2019 14:57:37 +0300 Subject: [PATCH] Fix building haddocks for packages with internal libraries --- src/Stack/Build/Haddock.hs | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/Stack/Build/Haddock.hs b/src/Stack/Build/Haddock.hs index 8135ffe583..8281fcdd77 100644 --- a/src/Stack/Build/Haddock.hs +++ b/src/Stack/Build/Haddock.hs @@ -25,6 +25,7 @@ import Data.Time (UTCTime) import Path import Path.Extra import Path.IO +import RIO.List (intercalate) import RIO.PrettyPrint import Stack.Constants import Stack.PackageDump @@ -235,6 +236,9 @@ generateHaddockIndex descr wc bco dumpPackages docRelFP destDir = do docRelFP FP. packageIdentifierString dpPackageIdent FP. (packageNameString name FP.<.> "haddock") + interfaces = intercalate "," $ + maybeToList dpHaddockHtml ++ [srcInterfaceFP] + destInterfaceAbsFile <- parseCollapsedAbsFile (toFilePath destDir FP. destInterfaceRelFP) esrcInterfaceModTime <- tryGetModificationTime srcInterfaceAbsFile return $ @@ -242,11 +246,7 @@ generateHaddockIndex descr wc bco dumpPackages docRelFP destDir = do Left _ -> Nothing Right srcInterfaceModTime -> Just - ( [ "-i" - , concat - [ docRelFP FP. packageIdentifierString dpPackageIdent - , "," - , destInterfaceRelFP ]] + ( [ "-i", interfaces ] , srcInterfaceModTime , srcInterfaceAbsFile , destInterfaceAbsFile )