Merge pull request #88 from hsenag/master

Get rid of custom Setup.hs files
jwiegley · Jul 13, 2019 · 6520ffc · 6520ffc
2 parents edc2a21 + 5fc31ef
commit 6520ffc
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 14 deletions.
diff --git 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
diff --git 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:          [email protected]
-Build-Type:          Custom
+Build-Type:          Simple
 Cabal-Version:       >=1.10
 Category:            Git
 

diff --git 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
diff --git 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:          [email protected]
-Build-Type:          Custom
+Build-Type:          Simple
 Cabal-Version:       >=1.10
 Category:            FFI