Date: Thursday, September 29, 2022 @ 17:48:47 Author: felixonmars Revision: 1316652
upgpkg: haskell-ci 0.12.1-334: rebuild with aeson 2.0.3.0, aeson-diff 1.1.0.11, aws 0.22.1, bower-json 1.1.0.0, http2 3.0.3, hoauth2 2.1.0, jose 0.9, microlens-aeson 2.4.0, postgresql-binary 0.12.5, postgrest 10.0.0, req 3.10.0, swagger2 2.8.1 Added: haskell-ci/trunk/haskell-ci-aeson-2.patch Modified: haskell-ci/trunk/PKGBUILD --------------------------+ PKGBUILD | 12 ++++++--- haskell-ci-aeson-2.patch | 60 +++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 68 insertions(+), 4 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2022-09-29 17:44:30 UTC (rev 1316651) +++ PKGBUILD 2022-09-29 17:48:47 UTC (rev 1316652) @@ -4,7 +4,7 @@ _hkgname=haskell-ci pkgname=haskell-ci pkgver=0.12.1 -pkgrel=333 +pkgrel=334 pkgdesc="Cabal package script generator for Travis-CI" url="https://haskell-ci.rtfd.org/"; license=("GPL") @@ -16,11 +16,15 @@ 'haskell-network-uri' 'haskell-optparse-applicative' 'shellcheck' 'haskell-temporary' 'haskell-unordered-containers' 'haskell-zinza') makedepends=('ghc' 'uusi' 'haskell-diff' 'haskell-ansi-terminal' 'haskell-tasty' 'haskell-tasty-golden') -source=("https://hackage.haskell.org/packages/archive/$_hkgname/$pkgver/$_hkgname-$pkgver.tar.gz";) -sha512sums=('d93a6b8e880255469b34b568320659802252379f0c5486ed315b366fd07dae935a480047468912bc5a397b9e55b00ea964451790f963d05b8df1d426d871da1c') +source=("https://hackage.haskell.org/packages/archive/$_hkgname/$pkgver/$_hkgname-$pkgver.tar.gz"; + haskell-ci-aeson-2.patch) +sha512sums=('d93a6b8e880255469b34b568320659802252379f0c5486ed315b366fd07dae935a480047468912bc5a397b9e55b00ea964451790f963d05b8df1d426d871da1c' + '6f96010eec7add9740b5c760c76a9dad01e391ebd503c52c93b0126fee7d48e29e3ffd30c387908b0341ebaf20b34caafbd2d291b2f5e0a22b086f0402784497') prepare(){ - uusi -u attoparsec -u base-compat -u optparse-applicative -u ShellCheck $_hkgname-$pkgver/$_hkgname.cabal + cd $_hkgname-$pkgver + patch -p1 -i ../haskell-ci-aeson-2.patch + uusi -u attoparsec -u base-compat -u optparse-applicative -u ShellCheck $_hkgname.cabal } build() { Added: haskell-ci-aeson-2.patch =================================================================== --- haskell-ci-aeson-2.patch (rev 0) +++ haskell-ci-aeson-2.patch 2022-09-29 17:48:47 UTC (rev 1316652) @@ -0,0 +1,60 @@ +From c88e67e675bc4a990da53863c7fb42e67bcf9847 Mon Sep 17 00:00:00 2001 +From: Julian Ospald <hasuf...@posteo.de> +Date: Sun, 10 Oct 2021 00:46:36 +0200 +Subject: [PATCH] cabal-install-parsers: Allow to build with aeson >=2 (#546) + +* Allow to build with aeson >=2 +* Allow to build haskell-ci with aeson >=2 as well +--- + cabal-install-parsers/cabal-install-parsers.cabal | 2 +- + haskell-ci.cabal | 2 +- + src/HaskellCI/YamlSyntax.hs | 10 ++++++++++ + 3 files changed, 12 insertions(+), 2 deletions(-) + +diff --git a/haskell-ci.cabal b/haskell-ci.cabal +index 670e0da9..3b99150f 100644 +--- a/haskell-ci.cabal ++++ b/haskell-ci.cabal +@@ -153,7 +153,7 @@ library haskell-ci-internal + + -- other dependencies + build-depends: +- , aeson ^>=1.5.6.0 ++ , aeson ^>=1.5.6.0 || ^>=2.0.0.0 + , attoparsec ^>=0.13.2.4 + , base-compat ^>=0.11 + , base16-bytestring ^>=1.0.1.0 +diff --git a/src/HaskellCI/YamlSyntax.hs b/src/HaskellCI/YamlSyntax.hs +index 47634056..1c98f835 100644 +--- a/src/HaskellCI/YamlSyntax.hs ++++ b/src/HaskellCI/YamlSyntax.hs +@@ -1,3 +1,4 @@ ++{-# LANGUAGE CPP #-} + {-# LANGUAGE DeriveFoldable #-} + {-# LANGUAGE DeriveFunctor #-} + {-# LANGUAGE DeriveTraversable #-} +@@ -24,7 +25,12 @@ import Data.Monoid (Endo (..)) + + import qualified Data.Aeson as Aeson + import qualified Data.Aeson.Encoding as AE ++#if MIN_VERSION_aeson(2,0,0) ++import qualified Data.Aeson.Key as AK ++import qualified Data.Aeson.KeyMap as AKM ++#else + import qualified Data.HashMap.Strict as HM ++#endif + import qualified Data.List.NonEmpty as NE + import qualified Data.Map.Strict as M + import qualified Data.Text as T +@@ -340,7 +346,11 @@ encodeValue = TL.unpack . TLE.decodeUtf8 . AE.encodingToLazyByteString . enc whe + enc (Aeson.Array v) = AE.list enc (toList v) + enc (Aeson.Object m) = AE.dict AE.text enc M.foldrWithKey (toMap m) + ++#if MIN_VERSION_aeson(2,0,0) ++ toMap = M.fromList . fmap (\(k, v) -> (AK.toText k, v)) . AKM.toList ++#else + toMap = M.fromList . HM.toList ++#endif + + -- a 'Line' is comments before in and actual text after! + data Line = Line [String] ShowS
