Removed support for optparse-applicative versions older than 0.10.
Debian stable has 0.10.0.
This commit is contained in:
parent
38215b7463
commit
aea694ed3f
4 changed files with 3 additions and 6 deletions
4
Test.hs
4
Test.hs
|
@ -112,15 +112,11 @@ main ps = do
|
||||||
)
|
)
|
||||||
where
|
where
|
||||||
parseOpts pprefs pinfo args =
|
parseOpts pprefs pinfo args =
|
||||||
#if MIN_VERSION_optparse_applicative(0,10,0)
|
|
||||||
case execParserPure pprefs pinfo args of
|
case execParserPure pprefs pinfo args of
|
||||||
(Options.Applicative.Failure failure) -> do
|
(Options.Applicative.Failure failure) -> do
|
||||||
let (msg, _exit) = renderFailure failure "git-annex test"
|
let (msg, _exit) = renderFailure failure "git-annex test"
|
||||||
error msg
|
error msg
|
||||||
v -> handleParseResult v
|
v -> handleParseResult v
|
||||||
#else
|
|
||||||
handleParseResult $ execParserPure pprefs pinfo args
|
|
||||||
#endif
|
|
||||||
|
|
||||||
ingredients :: [Ingredient]
|
ingredients :: [Ingredient]
|
||||||
ingredients =
|
ingredients =
|
||||||
|
|
1
debian/changelog
vendored
1
debian/changelog
vendored
|
@ -31,6 +31,7 @@ git-annex (5.20150618) UNRELEASED; urgency=medium
|
||||||
reflog. This provides a way to not consider old versions of files to be
|
reflog. This provides a way to not consider old versions of files to be
|
||||||
unused after they have reached a specified age, when the old refs in
|
unused after they have reached a specified age, when the old refs in
|
||||||
the reflog expire.
|
the reflog expire.
|
||||||
|
* Removed support for optparse-applicative versions older than 0.10.
|
||||||
|
|
||||||
-- Joey Hess <id@joeyh.name> Thu, 02 Jul 2015 12:31:14 -0400
|
-- Joey Hess <id@joeyh.name> Thu, 02 Jul 2015 12:31:14 -0400
|
||||||
|
|
||||||
|
|
2
debian/control
vendored
2
debian/control
vendored
|
@ -69,7 +69,7 @@ Build-Depends:
|
||||||
libghc-tasty-hunit-dev,
|
libghc-tasty-hunit-dev,
|
||||||
libghc-tasty-quickcheck-dev,
|
libghc-tasty-quickcheck-dev,
|
||||||
libghc-tasty-rerun-dev,
|
libghc-tasty-rerun-dev,
|
||||||
libghc-optparse-applicative-dev,
|
libghc-optparse-applicative-dev (>= 0.10),
|
||||||
lsof [!kfreebsd-i386 !kfreebsd-amd64 !hurd-any],
|
lsof [!kfreebsd-i386 !kfreebsd-amd64 !hurd-any],
|
||||||
ikiwiki,
|
ikiwiki,
|
||||||
perlmagick,
|
perlmagick,
|
||||||
|
|
|
@ -164,7 +164,7 @@ Executable git-annex
|
||||||
|
|
||||||
if flag(TestSuite)
|
if flag(TestSuite)
|
||||||
Build-Depends: tasty (>= 0.7), tasty-hunit, tasty-quickcheck, tasty-rerun,
|
Build-Depends: tasty (>= 0.7), tasty-hunit, tasty-quickcheck, tasty-rerun,
|
||||||
optparse-applicative (>= 0.9.1), crypto-api
|
optparse-applicative (>= 0.10), crypto-api
|
||||||
CPP-Options: -DWITH_TESTSUITE
|
CPP-Options: -DWITH_TESTSUITE
|
||||||
|
|
||||||
if flag(TDFA)
|
if flag(TDFA)
|
||||||
|
|
Loading…
Reference in a new issue