From 5fc31eff3c45a7ca8aa9aa9ab46ab17a4ddbe927 Mon Sep 17 00:00:00 2001 From: Ganesh Sittampalam Date: Sun, 16 Jun 2019 12:03:01 +0200 Subject: [PATCH] Get rid of custom Setup.hs files They cause trouble for cabal v2-build. This partially reverts commit 76d8be594abf1341561ed212736c5e28dd940708 and commit bd26e038aca158e19af32340ec8a58bc7b13dda3. ("Make git a test dependency of gitlib-cmdline." and "Make git a test dependency of hlibgit2.") The downside of this change is that if git is missing it will no longer be flagged by cabal. --- gitlib-cmdline/Setup.hs | 8 ++------ gitlib-cmdline/gitlib-cmdline.cabal | 2 +- hlibgit2/Setup.hs | 8 ++------ hlibgit2/hlibgit2.cabal | 2 +- 4 files changed, 6 insertions(+), 14 deletions(-) diff --git a/gitlib-cmdline/Setup.hs b/gitlib-cmdline/Setup.hs index 2e497053..bf689019 100644 --- a/gitlib-cmdline/Setup.hs +++ b/gitlib-cmdline/Setup.hs @@ -1,6 +1,2 @@ -import Distribution.Simple -import Distribution.Simple.Program - -main :: IO () -main = defaultMainWithHooks simpleUserHooks - { hookedPrograms = [ simpleProgram "git" ]} +import Distribution.Simple +main = defaultMain \ No newline at end of file diff --git a/gitlib-cmdline/gitlib-cmdline.cabal b/gitlib-cmdline/gitlib-cmdline.cabal index f4a9219c..7053976e 100644 --- a/gitlib-cmdline/gitlib-cmdline.cabal +++ b/gitlib-cmdline/gitlib-cmdline.cabal @@ -6,7 +6,7 @@ License-file: LICENSE License: MIT Author: John Wiegley Maintainer: johnw@newartisans.com -Build-Type: Custom +Build-Type: Simple Cabal-Version: >=1.10 Category: Git diff --git a/hlibgit2/Setup.hs b/hlibgit2/Setup.hs index 2e497053..bf689019 100644 --- a/hlibgit2/Setup.hs +++ b/hlibgit2/Setup.hs @@ -1,6 +1,2 @@ -import Distribution.Simple -import Distribution.Simple.Program - -main :: IO () -main = defaultMainWithHooks simpleUserHooks - { hookedPrograms = [ simpleProgram "git" ]} +import Distribution.Simple +main = defaultMain \ No newline at end of file diff --git a/hlibgit2/hlibgit2.cabal b/hlibgit2/hlibgit2.cabal index 31162845..aca6a6c1 100644 --- a/hlibgit2/hlibgit2.cabal +++ b/hlibgit2/hlibgit2.cabal @@ -6,7 +6,7 @@ License-file: LICENSE License: MIT Author: John Wiegley, Sakari Jokinen, Jacob Stanleyyeah, Maintainer: johnw@newartisans.com -Build-Type: Custom +Build-Type: Simple Cabal-Version: >=1.10 Category: FFI