[arch-commits] Commit in stack/trunk (PKGBUILD optparse-applicative-0.16.patch)
Felix Yan
felixonmars at archlinux.org
Thu Oct 29 13:23:01 UTC 2020
Date: Thursday, October 29, 2020 @ 13:23:00
Author: felixonmars
Revision: 736504
upgpkg: stack 2.5.1-9: add patch for optparse-applicative 0.16, thanks berberman
Added:
stack/trunk/optparse-applicative-0.16.patch
Modified:
stack/trunk/PKGBUILD
---------------------------------+
PKGBUILD | 13 ++++++++-----
optparse-applicative-0.16.patch | 25 +++++++++++++++++++++++++
2 files changed, 33 insertions(+), 5 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2020-10-29 12:53:58 UTC (rev 736503)
+++ PKGBUILD 2020-10-29 13:23:00 UTC (rev 736504)
@@ -3,7 +3,7 @@
pkgname=stack
pkgver=2.5.1
-pkgrel=8
+pkgrel=9
pkgdesc="The Haskell Tool Stack"
url="https://github.com/commercialhaskell/stack"
license=("BSD")
@@ -18,7 +18,7 @@
'haskell-http-conduit' 'haskell-http-download' 'haskell-http-types' 'haskell-memory'
'haskell-microlens' 'haskell-mintty' 'haskell-mono-traversable' 'haskell-mustache'
'haskell-neat-interpolation' 'haskell-network-uri' 'haskell-open-browser'
- 'haskell-optparse-applicative0.15' 'haskell-optparse-generic' 'haskell-optparse-simple'
+ 'haskell-optparse-applicative' 'haskell-optparse-generic' 'haskell-optparse-simple'
'haskell-pantry' 'haskell-path' 'haskell-path-io' 'haskell-persistent'
'haskell-persistent-sqlite' 'haskell-persistent-template' 'haskell-primitive'
'haskell-project-template' 'haskell-regex-applicative-text' 'haskell-retry' 'haskell-rio'
@@ -33,12 +33,15 @@
conflicts=('haskell-stack')
replaces=('haskell-stack')
install="stack.install"
-source=("git+https://github.com/commercialhaskell/stack.git#tag=v$pkgver")
-sha512sums=('SKIP')
+source=("git+https://github.com/commercialhaskell/stack.git#tag=v$pkgver"
+ optparse-applicative-0.16.patch)
+sha512sums=('SKIP'
+ '3ed61162edd869d5634e7e8485d784b9a192c97626da817635e6c756ca651454b5b806085aea6d7f8fd54041ae06e1613d9547958a85b777d2dfc35b02c0fbea')
prepare() {
cd $pkgname
- sed -i -e '/semigroups/d;s/optparse-applicative/optparse-applicative < 0.16/' $pkgname.cabal
+ sed -i -e '/semigroups/d' $pkgname.cabal
+ patch -p1 -i ../optparse-applicative-0.16.patch
}
build() {
Added: optparse-applicative-0.16.patch
===================================================================
--- optparse-applicative-0.16.patch (rev 0)
+++ optparse-applicative-0.16.patch 2020-10-29 13:23:00 UTC (rev 736504)
@@ -0,0 +1,25 @@
+diff --git a/src/Options/Applicative/Builder/Extra.hs b/src/Options/Applicative/Builder/Extra.hs
+index d72e43af..c02dfd85 100644
+--- a/src/Options/Applicative/Builder/Extra.hs
++++ b/src/Options/Applicative/Builder/Extra.hs
+@@ -164,7 +164,7 @@ execExtraHelp args helpOpt parser pd =
+ some (strArgument (metavar "OTHER ARGUMENTS") :: Parser String)))
+ (fullDesc <> progDesc pd))
+ return ()
+- where hiddenHelper = abortOption ShowHelpText (long "help" <> hidden <> internal)
++ where hiddenHelper = abortOption (ShowHelpText Nothing) (long "help" <> hidden <> internal)
+
+ -- | 'option', specialized to 'Text'.
+ textOption :: Mod OptionFields Text -> Parser Text
+diff --git a/src/Options/Applicative/Complicated.hs b/src/Options/Applicative/Complicated.hs
+index a11bf51a..e78bd7ab 100644
+--- a/src/Options/Applicative/Complicated.hs
++++ b/src/Options/Applicative/Complicated.hs
+@@ -152,6 +152,6 @@ hsubparser' commandMetavar m = mkParser d g rdr
+ -- | Non-hidden help option.
+ helpOption :: Parser (a -> a)
+ helpOption =
+- abortOption ShowHelpText $
++ abortOption (ShowHelpText Nothing) $
+ long "help" <>
+ help "Show this help text"
More information about the arch-commits
mailing list