Date: Monday, March 6, 2023 @ 17:13:22 Author: felixonmars Revision: 1415662
upgpkg: haskell-aeson-compat 0.3.10-94: rebuild with aeson 2.1.2.0 Added: haskell-aeson-compat/trunk/aeson-2.1.2.patch Modified: haskell-aeson-compat/trunk/PKGBUILD -------------------+ PKGBUILD | 9 ++++++--- aeson-2.1.2.patch | 18 ++++++++++++++++++ 2 files changed, 24 insertions(+), 3 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2023-03-06 17:13:10 UTC (rev 1415661) +++ PKGBUILD 2023-03-06 17:13:22 UTC (rev 1415662) @@ -4,7 +4,7 @@ _hkgname=aeson-compat pkgname=haskell-aeson-compat pkgver=0.3.10 -pkgrel=93 +pkgrel=94 pkgdesc="Compatibility layer for aeson" url="https://hackage.haskell.org/package/${_hkgname}"; license=("BSD") @@ -15,11 +15,14 @@ 'haskell-vector') makedepends=('ghc' 'uusi' 'haskell-base-orphans' 'haskell-quickcheck' 'haskell-quickcheck-instances' 'haskell-tasty' 'haskell-tasty-hunit' 'haskell-tasty-quickcheck') -source=("https://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz";) -sha512sums=('5e44568c29e9886cdfa10dfa9e7f9ce93b0927a2317fdfc9427378867d6b5cf95d1cea12a7e28ff6f7f9cb6eca4b4eb4d9d0dce3353af5b390f06ea691243557') +source=("https://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz"; + aeson-2.1.2.patch) +sha512sums=('5e44568c29e9886cdfa10dfa9e7f9ce93b0927a2317fdfc9427378867d6b5cf95d1cea12a7e28ff6f7f9cb6eca4b4eb4d9d0dce3353af5b390f06ea691243557' + 'dbc85760b4d431319670cdf394fbe6eb1bce7a82e8351ad9e746bbd9dc3bcc3b1a3d3e9b18da0eedaf68ce41a9784bf9bc7298dbf6ea8a2c32543f0cae4ff565') prepare() { cd $_hkgname-$pkgver + patch -p1 -i ../aeson-2.1.2.patch uusi -u aeson -u attoparsec-iso8601 -u hashable -u vector $_hkgname.cabal } Added: aeson-2.1.2.patch =================================================================== --- aeson-2.1.2.patch (rev 0) +++ aeson-2.1.2.patch 2023-03-06 17:13:22 UTC (rev 1415662) @@ -0,0 +1,18 @@ +diff --git a/src/Data/Aeson/Compat.hs b/src/Data/Aeson/Compat.hs +index eeb583a..c80fd64 100644 +--- a/src/Data/Aeson/Compat.hs ++++ b/src/Data/Aeson/Compat.hs +@@ -167,11 +167,13 @@ import qualified Data.Aeson.KeyMap as KM + + import Data.Attoparsec.Number (Number (..)) + ++#if !MIN_VERSION_aeson(2,1,2) + -- | Exception thrown by 'decode' - family of functions in this module. + newtype AesonException = AesonException String + deriving (Show, Typeable) + + instance Exception AesonException ++#endif + + eitherAesonExc :: (MonadThrow m) => Either String a -> m a + eitherAesonExc (Left err) = throwM (AesonException err)
