Revert "Disable Haddock phase for packages with internal libraries."

Cabal does the right thing since 2.4.0.0 (haskell/cabal#5253) This reverts commit 7017487.
NixOS · Feb 12, 2019 · 04feef6 · 04feef6
1 parent d974819
commit 04feef6
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 153 deletions.
diff --git a/src/Distribution/Nixpkgs/Haskell/FromCabal.hs b/src/Distribution/Nixpkgs/Haskell/FromCabal.hs
@@ -88,7 +88,7 @@ fromPackageDescription haskellResolver nixpkgsResolver missingDeps flags Package
     & Nix.setupDepends .~ maybe mempty convertSetupBuildInfo setupBuildInfo
     & configureFlags .~ mempty
     & cabalFlags .~ flags
-    & runHaddock .~ doHaddockPhase
+    & runHaddock .~ maybe True (not . null . exposedModules) library
     & jailbreak .~ False
     & doCheck .~ True
     & doBenchmark .~ False
@@ -150,11 +150,6 @@ fromPackageDescription haskellResolver nixpkgsResolver missingDeps flags Package
     internalLibNames :: [PackageName]
     internalLibNames = fmap unqualComponentNameToPackageName . catMaybes $ libName <$> subLibraries
 
-    doHaddockPhase :: Bool
-    doHaddockPhase | not (null internalLibNames) = False
-                   | Just l <- library           = not (null (exposedModules l))
-                   | otherwise                   = True
-
     convertBuildInfo :: Cabal.BuildInfo -> Nix.BuildInfo
     convertBuildInfo Cabal.BuildInfo {..} | not buildable = mempty
     convertBuildInfo Cabal.BuildInfo {..} = mempty

diff --git a/test/golden-test-cases/haddock-library.cabal b/test/golden-test-cases/haddock-library.cabal
diff --git a/test/golden-test-cases/haddock-library.nix.golden b/test/golden-test-cases/haddock-library.nix.golden