Skip to content

Commit

Permalink
FromCabal.PostProcess: drop haddockHook
Browse files Browse the repository at this point in the history
- haddock-test is uploaded to hackage now
- The `doCheck = false;` can live in nixpkgs as can the
  `unset GHC_PACKAGE_PATH` should it be needed again (it isn't executed
  currently).
  • Loading branch information
sternenseemann committed May 20, 2024
1 parent f8e6bf7 commit a77ca3c
Showing 1 changed file with 0 additions and 7 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -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 = ''"
Expand Down

0 comments on commit a77ca3c

Please sign in to comment.