@@ -9,7 +9,7 @@ module Cabal2nix
10import Control.Exception ( bracket )
10import Control.Exception ( bracket )
11import Control.Lens
11import Control.Lens
12−import Control.Monad ( when )
12+import Control.Monad
13import Data.List
13import Data.List
14import Data.List.Split
14import Data.List.Split
15import Data.Maybe ( fromMaybe, isJust, listToMaybe )
15import Data.Maybe ( fromMaybe, isJust, listToMaybe )
@@ -218,7 +218,7 @@ processPackage Options{..} pkg = do
218 (pkgCabal pkg)
218 (pkgCabal pkg)
219 & src .~ pkgSource pkg
219 & src .~ pkgSource pkg
220 & subpath .~ fromMaybe "." optSubpath
220 & subpath .~ fromMaybe "." optSubpath
221− & runHaddock .~ optHaddock
221+ & runHaddock %~ (optHaddock &&)
222 & jailbreak .~ optJailbreak
222 & jailbreak .~ optJailbreak
223 & hyperlinkSource .~ optHyperlinkSource
223 & hyperlinkSource .~ optHyperlinkSource
224 & enableLibraryProfiling .~ (fromMaybe False optEnableProfiling || optEnableLibraryProfiling)
224 & enableLibraryProfiling .~ (fromMaybe False optEnableProfiling || optEnableLibraryProfiling)