Skip to content

Commit 5fc31ef

Browse files
committed
Get rid of custom Setup.hs files
They cause trouble for cabal v2-build. This partially reverts commit 76d8be5 and commit bd26e03. ("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.
1 parent edc2a21 commit 5fc31ef

File tree

4 files changed

+6
-14
lines changed

4 files changed

+6
-14
lines changed

gitlib-cmdline/Setup.hs

+2-6
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,2 @@
1-
import Distribution.Simple
2-
import Distribution.Simple.Program
3-
4-
main :: IO ()
5-
main = defaultMainWithHooks simpleUserHooks
6-
{ hookedPrograms = [ simpleProgram "git" ]}
1+
import Distribution.Simple
2+
main = defaultMain

gitlib-cmdline/gitlib-cmdline.cabal

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ License-file: LICENSE
66
License: MIT
77
Author: John Wiegley
88
Maintainer: [email protected]
9-
Build-Type: Custom
9+
Build-Type: Simple
1010
Cabal-Version: >=1.10
1111
Category: Git
1212

hlibgit2/Setup.hs

+2-6
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,2 @@
1-
import Distribution.Simple
2-
import Distribution.Simple.Program
3-
4-
main :: IO ()
5-
main = defaultMainWithHooks simpleUserHooks
6-
{ hookedPrograms = [ simpleProgram "git" ]}
1+
import Distribution.Simple
2+
main = defaultMain

hlibgit2/hlibgit2.cabal

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ License-file: LICENSE
66
License: MIT
77
Author: John Wiegley, Sakari Jokinen, Jacob Stanleyyeah,
88
Maintainer: [email protected]
9-
Build-Type: Custom
9+
Build-Type: Simple
1010
Cabal-Version: >=1.10
1111
Category: FFI
1212

0 commit comments

Comments
 (0)