From 3d2b9d08bfdac47c853d5e99a8e224e4375b82f4 Mon Sep 17 00:00:00 2001 From: Herbert Valerio Riedel Date: Sat, 8 Sep 2018 10:11:05 +0200 Subject: [PATCH] Allow arguments to be passed to `Setup.hs haddock` for `build-type:configure` In the course of 4466310e48e8c401ca2492d0fc2c5018ad8de961 (see #5526) the `Setup.hs haddock` CLI was extended to allow component ids to be passed as positional arguments. However, `autoconfUserHooks` which is used in case of `build-type: Configure` wasn't updated accordingly, and consequently this caused `new-haddock` to break for packages using `Configure`. cc @alexbiehl Fixes #5503 (cherry picked from commit 86dabda8ff1eb31e80dc1ca2eff21e2839211fdd) --- Cabal/Distribution/Simple.hs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Cabal/Distribution/Simple.hs b/Cabal/Distribution/Simple.hs index b420046cf73..1ea57170989 100644 --- a/Cabal/Distribution/Simple.hs +++ b/Cabal/Distribution/Simple.hs @@ -668,7 +668,7 @@ autoconfUserHooks preClean = readHook cleanVerbosity cleanDistPref, preInst = readHook installVerbosity installDistPref, preHscolour = readHook hscolourVerbosity hscolourDistPref, - preHaddock = readHook haddockVerbosity haddockDistPref, + preHaddock = readHookWithArgs haddockVerbosity haddockDistPref, preReg = readHook regVerbosity regDistPref, preUnreg = readHook regVerbosity regDistPref }