git.iko.soy/typeable/cabal2nix
on master help sign in
lib: fix broken optHaddock logic

When that value is set, it means that the --no-haddock options was not given on the command line. That is not the same thing as meaning that Haddock generation should be enabled.

commit7c77e7e78a94a72681d9d59e69391feada1085fa authorPeter Simons <simons@cryp.to> dateThu 28 Jun 2018, 16:15 (8 years ago) parent8810b21
1 file changed+2−2
compare with master
unifiedsplit
src/Cabal2nix.hs+2−2
src/Cabal2nix.hs+2−2
@@ -9,7 +9,7 @@ module Cabal2nix
99
1010import Control.Exception ( bracket )
1111import Control.Lens
12−import Control.Monad ( when )
12+import Control.Monad
1313import Data.List
1414import Data.List.Split
1515import Data.Maybe ( fromMaybe, isJust, listToMaybe )
@@ -218,7 +218,7 @@ processPackage Options{..} pkg = do
218218 (pkgCabal pkg)
219219 & src .~ pkgSource pkg
220220 & subpath .~ fromMaybe "." optSubpath
221− & runHaddock .~ optHaddock
221+ & runHaddock %~ (optHaddock &&)
222222 & jailbreak .~ optJailbreak
223223 & hyperlinkSource .~ optHyperlinkSource
224224 & enableLibraryProfiling .~ (fromMaybe False optEnableProfiling || optEnableLibraryProfiling)