From 56af847caaf4a65b1dd06322ecdf67ce6a349ae7 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Fri, 31 Jul 2015 12:03:19 -0400 Subject: switch Setup file to use postCopy hook, since cabal has stopped running postInst See https://github.com/haskell/cabal/issues/1805 Apparently, old versions of cabal don't run copyHook, but at the moment I don't know who would be using a cabal as old as 1.18, and it seems a lot of complication to run both hooks. Although I think my code is idempotent, so they could both be used if necessary. --- Setup.hs | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Setup.hs b/Setup.hs index 15447b0e3..f90a9b2e5 100644 --- a/Setup.hs +++ b/Setup.hs @@ -23,17 +23,17 @@ main = defaultMainWithHooks simpleUserHooks { preConf = \_ _ -> do Configure.run Configure.tests return (Nothing, []) - , postInst = myPostInst + , postCopy = myPostCopy } -myPostInst :: Args -> InstallFlags -> PackageDescription -> LocalBuildInfo -> IO () -myPostInst _ (InstallFlags { installVerbosity }) pkg lbi = do +myPostCopy :: Args -> CopyFlags -> PackageDescription -> LocalBuildInfo -> IO () +myPostCopy _ (CopyFlags { copyVerbosity }) pkg lbi = do installGitAnnexShell dest verbosity pkg lbi installManpages dest verbosity pkg lbi installDesktopFile dest verbosity pkg lbi where dest = NoCopyDest - verbosity = fromFlag installVerbosity + verbosity = fromFlag copyVerbosity installGitAnnexShell :: CopyDest -> Verbosity -> PackageDescription -> LocalBuildInfo -> IO () installGitAnnexShell copyDest verbosity pkg lbi = -- cgit v1.2.3