From a77ca3cec8d5fb638f35b0777f661eabcbaeb23e Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Mon, 20 May 2024 13:56:51 +0200 Subject: [PATCH] FromCabal.PostProcess: drop haddockHook - 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). --- .../Distribution/Nixpkgs/Haskell/FromCabal/PostProcess.hs | 7 ------- 1 file changed, 7 deletions(-) diff --git a/cabal2nix/src/Distribution/Nixpkgs/Haskell/FromCabal/PostProcess.hs b/cabal2nix/src/Distribution/Nixpkgs/Haskell/FromCabal/PostProcess.hs index 1b717d26..417fdc97 100644 --- 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 = ''"