mirrors/git-annex
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Adapt code to optparse-applicative 0.18.1 and later.

Browse source 
optparse-applicative switched to the 'prettyprinter' library in its latest
release, which means the 'H.text' function has disappeared. Instead, 'H.pretty'
can be used to convert all 'Pretty a' types into a renderable document.
This commit is contained in:
Peter Simons 2023-06-21 16:46:54 +02:00 • committed by Joey Hess
parent 79cf8f58d7
commit ffb708be09
No known key found for this signature in database
GPG key ID: DB12DB0FF05F8F38
2 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
CmdLine.hs
View file

@ -116,7 +116,7 @@ parseCmd progname progdesc allargs allcmds getparser =
<*> getparser c <*> getparser c
<*> parserAnnexOptions (cmdannexoptions c) <*> parserAnnexOptions (cmdannexoptions c)
synopsis n d = n ++ " - " ++ d synopsis n d = n ++ " - " ++ d
intro = mconcat $ concatMap (\l -> [H.text l, H.line]) intro = mconcat $ concatMap (\l -> [H.pretty l, H.line])
(synopsis progname progdesc : commandList allcmds) (synopsis progname progdesc : commandList allcmds)
{- Selects the Command that matches the subcommand name. {- Selects the Command that matches the subcommand name.

2
git-annex.cabal
View file

@ -311,7 +311,7 @@ Executable git-annex
Build-Depends: Build-Depends:
base (>= 4.11.1.0 && < 5.0), base (>= 4.11.1.0 && < 5.0),
network-uri (>= 2.6), network-uri (>= 2.6),
optparse-applicative (>= 0.14.1), optparse-applicative (>= 0.18.1),
containers (>= 0.5.8), containers (>= 0.5.8),
exceptions (>= 0.6), exceptions (>= 0.6),
stm (>= 2.3), stm (>= 2.3),