Date: Wednesday, June 16, 2021 @ 22:00:49 Author: felixonmars Revision: 964344
upgpkg: stack 2.7.1-1 Modified: stack/trunk/PKGBUILD Deleted: stack/trunk/optparse-applicative-0.16.patch ---------------------------------+ PKGBUILD | 12 ++++-------- optparse-applicative-0.16.patch | 25 ------------------------- 2 files changed, 4 insertions(+), 33 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2021-06-16 22:00:43 UTC (rev 964343) +++ PKGBUILD 2021-06-16 22:00:49 UTC (rev 964344) @@ -2,8 +2,8 @@ # Contributor: Arch Haskell Team <arch-hask...@haskell.org> pkgname=stack -pkgver=2.5.1 -pkgrel=231 +pkgver=2.7.1 +pkgrel=1 pkgdesc="The Haskell Tool Stack" url="https://github.com/commercialhaskell/stack" license=("BSD") @@ -33,16 +33,12 @@ conflicts=('haskell-stack') replaces=('haskell-stack') install="stack.install" -source=("git+https://github.com/commercialhaskell/stack.git#tag=v$pkgver" - optparse-applicative-0.16.patch) -sha512sums=('SKIP' - '3ed61162edd869d5634e7e8485d784b9a192c97626da817635e6c756ca651454b5b806085aea6d7f8fd54041ae06e1613d9547958a85b777d2dfc35b02c0fbea') +source=("git+https://github.com/commercialhaskell/stack.git#tag=v$pkgver") +sha512sums=('SKIP') prepare() { cd $pkgname uusi -d semigroups -d persistent-template $pkgname.cabal - sed -i '1i{-# LANGUAGE DataKinds #-}' src/Stack/Storage/User.hs src/Stack/Storage/Project.hs - patch -p1 -i ../optparse-applicative-0.16.patch } build() { Deleted: optparse-applicative-0.16.patch =================================================================== --- optparse-applicative-0.16.patch 2021-06-16 22:00:43 UTC (rev 964343) +++ optparse-applicative-0.16.patch 2021-06-16 22:00:49 UTC (rev 964344) @@ -1,25 +0,0 @@ -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"