Date: Thursday, September 29, 2022 @ 17:16:21 Author: felixonmars Revision: 1316620
upgpkg: cabal-plan 0.7.2.0-201: 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: cabal-plan/trunk/cabal-plan-aeson-2.patch Modified: cabal-plan/trunk/PKGBUILD --------------------------+ PKGBUILD | 11 +++++++---- cabal-plan-aeson-2.patch | 39 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 46 insertions(+), 4 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2022-09-29 17:11:57 UTC (rev 1316619) +++ PKGBUILD 2022-09-29 17:16:21 UTC (rev 1316620) @@ -3,7 +3,7 @@ _hkgname=cabal-plan pkgname=cabal-plan pkgver=0.7.2.0 -pkgrel=200 +pkgrel=201 pkgdesc="Library and utility for processing cabal's plan.json file" url="https://github.com/hvr/cabal-plan"; license=("GPL") @@ -13,12 +13,15 @@ 'haskell-optparse-applicative' 'haskell-semialign' 'haskell-singleton-bool' 'haskell-tar' 'haskell-these' 'haskell-topograph' 'haskell-vector' 'haskell-zlib') makedepends=('ghc' 'uusi') -source=("https://hackage.haskell.org/packages/archive/$_hkgname/$pkgver/$_hkgname-$pkgver.tar.gz";) -sha256sums=('233a3d1460732fe3486169023758e431d37c5c9156fb28d829decaf7b9170f85') +source=("https://hackage.haskell.org/packages/archive/$_hkgname/$pkgver/$_hkgname-$pkgver.tar.gz"; + cabal-plan-aeson-2.patch) +sha256sums=('233a3d1460732fe3486169023758e431d37c5c9156fb28d829decaf7b9170f85' + '9247a90d0098e6388feb6b1046894defacfa2d1c51136b838be25f04a011e0fc') prepare() { cd $_hkgname-$pkgver - uusi -u base -u base-compat -u Cabal -u optics-core -u optparse-applicative -u semialign $_hkgname.cabal + patch -p1 -i ../cabal-plan-aeson-2.patch + uusi -u aeson -u base -u base-compat -u Cabal -u optics-core -u optparse-applicative -u semialign $_hkgname.cabal } build() { Added: cabal-plan-aeson-2.patch =================================================================== --- cabal-plan-aeson-2.patch (rev 0) +++ cabal-plan-aeson-2.patch 2022-09-29 17:16:21 UTC (rev 1316620) @@ -0,0 +1,39 @@ +From e2c8c66d3ca916cee7dec2fa3fd867052ff1fd51 Mon Sep 17 00:00:00 2001 +From: Julian Ospald <[email protected]> +Date: Sat, 9 Oct 2021 21:49:46 +0200 +Subject: [PATCH] Allow to build with aeson >=2 wrt #75 + +--- + cabal-plan.cabal | 2 +- + src/Cabal/Plan.hs | 11 ++++++++++- + 2 files changed, 11 insertions(+), 2 deletions(-) + +diff --git a/src/Cabal/Plan.hs b/src/Cabal/Plan.hs +index eeb5a19..b098e0c 100755 +--- a/src/Cabal/Plan.hs ++++ b/src/Cabal/Plan.hs +@@ -57,6 +57,9 @@ module Cabal.Plan + import Control.Applicative as App + import Control.Monad + import Data.Aeson ++#if MIN_VERSION_aeson(2,0,0) ++import qualified Data.Aeson.Key as AK ++#endif + import Data.Aeson.Types + import qualified Data.ByteString as B + import qualified Data.ByteString.Base16 as B16 +@@ -370,7 +373,13 @@ instance FromJSON PlanJson where + pure pim + + (.:?!) :: (FromJSON a, Monoid a) => Object -> Text -> Parser a +-o .:?! fld = o .:? fld .!= Data.Monoid.mempty ++o .:?! fld = o .:? fT fld .!= Data.Monoid.mempty ++ where ++#if MIN_VERSION_aeson(2,0,0) ++ fT = AK.fromText ++#else ++ fT = id ++#endif + + planItemAllDeps :: Unit -> Set UnitId + planItemAllDeps Unit{..} = mconcat [ ciLibDeps <> ciExeDeps | CompInfo{..} <- M.elems uComps ]
