Merge pull request #621 from NixOS/drop-haddock-overrides

FromCabal.PostProcess: drop haddockHook
NixOS · May 20, 2024 · 79b7377 · 79b7377
2 parents d129ba9 + a77ca3c
commit 79b7377
Showing 1 changed file with 0 additions and 7 deletions.
diff --git a/cabal2nix/src/Distribution/Nixpkgs/Haskell/FromCabal/PostProcess.hs b/cabal2nix/src/Distribution/Nixpkgs/Haskell/FromCabal/PostProcess.hs
@@ -116,7 +116,6 @@ hooks =
   , ("graphviz", set (testDepends . system . contains (pkg "graphviz")) True)
   , ("gtk3", gtk3Hook)
   , ("gtkglext", gtkglextHook)
-  , ("haddock", haddockHook) -- https://github.com/haskell/haddock/issues/511
   , ("hakyll", set (testDepends . tool . contains (pkg "util-linux")) True) -- test suite depends on "rev"
   , ("haskell-src-exts", set doCheck False)
   , ("hfsevents", hfseventsOverrides)
@@ -217,12 +216,6 @@ gtk3Hook :: Derivation -> Derivation    -- https://github.com/NixOS/cabal2nix/is
 gtk3Hook = set (libraryDepends . pkgconfig . contains (pkg "gtk3")) True
          . over (libraryDepends . pkgconfig) (Set.filter (\b -> view localName b /= "gtk3"))
 
-haddockHook :: Derivation -> Derivation
-haddockHook = set doCheck False
-            . set phaseOverrides "preCheck = \"unset GHC_PACKAGE_PATH\";"
-            . over (dependencies . haskell) (Set.filter (\b -> view localName b /= "haddock-test"))
-            . set (metaSection . broken) False
-
 hfusePreConfigure :: String
 hfusePreConfigure = unlines
   [ "preConfigure = ''"