[pkgsrc/trunk]: pkgsrc/www/hs-bower-json Update to bower-json-1.1.0.0

[pho <pho%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/8e06084074ca
branches:  trunk
changeset: 384873:8e06084074ca
user:      pho <pho%pkgsrc.org@localhost>
date:      Tue Sep 06 19:03:33 2022 +0000

description:
Update to bower-json-1.1.0.0

No release notes have been provided by the upstream.

diffstat:

 www/hs-bower-json/Makefile                                            |   5 +-
 www/hs-bower-json/buildlink3.mk                                       |   6 +-
 www/hs-bower-json/distinfo                                            |   9 +-
 www/hs-bower-json/patches/patch-src_Web_Bower_PackageMeta_Internal.hs |  52 ----------
 4 files changed, 9 insertions(+), 63 deletions(-)

diffs (102 lines):

diff -r e4bbf2c2583a -r 8e06084074ca www/hs-bower-json/Makefile
--- a/www/hs-bower-json/Makefile        Tue Sep 06 19:00:22 2022 +0000
+++ b/www/hs-bower-json/Makefile        Tue Sep 06 19:03:33 2022 +0000
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.3 2022/08/20 08:08:23 wiz Exp $
+# $NetBSD: Makefile,v 1.4 2022/09/06 19:03:33 pho Exp $
 
-DISTNAME=      bower-json-1.0.0.1
-PKGREVISION=   2
+DISTNAME=      bower-json-1.1.0.0
 CATEGORIES=    www
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
diff -r e4bbf2c2583a -r 8e06084074ca www/hs-bower-json/buildlink3.mk
--- a/www/hs-bower-json/buildlink3.mk   Tue Sep 06 19:00:22 2022 +0000
+++ b/www/hs-bower-json/buildlink3.mk   Tue Sep 06 19:03:33 2022 +0000
@@ -1,12 +1,12 @@
-# $NetBSD: buildlink3.mk,v 1.3 2022/08/20 08:08:23 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2022/09/06 19:03:33 pho Exp $
 
 BUILDLINK_TREE+=       hs-bower-json
 
 .if !defined(HS_BOWER_JSON_BUILDLINK3_MK)
 HS_BOWER_JSON_BUILDLINK3_MK:=
 
-BUILDLINK_API_DEPENDS.hs-bower-json+=  hs-bower-json>=1.0.0
-BUILDLINK_ABI_DEPENDS.hs-bower-json+=  hs-bower-json>=1.0.0.1nb2
+BUILDLINK_API_DEPENDS.hs-bower-json+=  hs-bower-json>=1.1.0
+BUILDLINK_ABI_DEPENDS.hs-bower-json+=  hs-bower-json>=1.1.0.0
 BUILDLINK_PKGSRCDIR.hs-bower-json?=    ../../www/hs-bower-json
 
 .include "../../converters/hs-aeson/buildlink3.mk"
diff -r e4bbf2c2583a -r 8e06084074ca www/hs-bower-json/distinfo
--- a/www/hs-bower-json/distinfo        Tue Sep 06 19:00:22 2022 +0000
+++ b/www/hs-bower-json/distinfo        Tue Sep 06 19:03:33 2022 +0000
@@ -1,6 +1,5 @@
-$NetBSD: distinfo,v 1.1 2022/02/23 16:09:43 pho Exp $
+$NetBSD: distinfo,v 1.2 2022/09/06 19:03:33 pho Exp $
 
-BLAKE2s (bower-json-1.0.0.1.tar.gz) = bd8a3e94a160cbfcd959c1b3c026b660472af241a40790d466d8f718f0733e99
-SHA512 (bower-json-1.0.0.1.tar.gz) = 809a3b7b2653dc23e9704ab38ae446663a23edf071a72134de0da24dfeeaa8e714e565ba6429949bb4507e49e24cbeaaba1547a517b8fff6f35be619fb121928
-Size (bower-json-1.0.0.1.tar.gz) = 6721 bytes
-SHA1 (patch-src_Web_Bower_PackageMeta_Internal.hs) = 7f1eb26db7c12649556e8183b5ed734d01c77096
+BLAKE2s (bower-json-1.1.0.0.tar.gz) = 7e41cf38a4d409cdbacef4e85c102b1550214c57a4d1924fe1c2295e0e0e6229
+SHA512 (bower-json-1.1.0.0.tar.gz) = 2430770d0a77943c857c7b354c5e034178e4a0ee04affbef2f233bf9924f7ae69d7f26d47037ee703d9b144007ec4edea984d21189a72079b9556ea37f0e0539
+Size (bower-json-1.1.0.0.tar.gz) = 6715 bytes
diff -r e4bbf2c2583a -r 8e06084074ca www/hs-bower-json/patches/patch-src_Web_Bower_PackageMeta_Internal.hs
--- a/www/hs-bower-json/patches/patch-src_Web_Bower_PackageMeta_Internal.hs     Tue Sep 06 19:00:22 2022 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,52 +0,0 @@
-$NetBSD: patch-src_Web_Bower_PackageMeta_Internal.hs,v 1.1 2022/02/23 16:09:43 pho Exp $
-
-Fix build with aeson-2.0
-
---- src/Web/Bower/PackageMeta/Internal.hs.orig 2016-12-25 00:06:09.000000000 +0000
-+++ src/Web/Bower/PackageMeta/Internal.hs
-@@ -29,6 +29,7 @@ import qualified Data.ByteString.Lazy as
- import Data.Aeson ((.=))
- import qualified Data.Aeson as A
- import qualified Data.Aeson.Types as Aeson
-+import qualified Data.Aeson.Key as Key
- import Data.Aeson.BetterErrors (Parse, ParseError, asText, asString, asBool, eachInArray, eachInObjectWithKey, withText, key, keyMay, keyOrDefault, toAesonParser', toAesonParser, displayError, 
parse)
- 
- ---------------------
-@@ -222,7 +223,7 @@ asPackageMeta =
- 
-   asAssocListOf :: (Text -> a) -> Parse BowerError [(PackageName, a)]
-   asAssocListOf g =
--    eachInObjectWithKey parsePackageName (g <$> asText)
-+    eachInObjectWithKey (parsePackageName . Key.toText) (g <$> asText)
- 
- parseModuleType :: Text -> Either BowerError ModuleType
- parseModuleType str =
-@@ -301,8 +302,8 @@ instance A.ToJSON PackageMeta where
-       ]
- 
-       where
--      assoc :: A.ToJSON a => Text -> [(PackageName, a)] -> [Aeson.Pair]
--      assoc = maybeArrayAssocPair runPackageName
-+      assoc :: A.ToJSON a => Aeson.Key -> [(PackageName, a)] -> [Aeson.Pair]
-+      assoc = maybeArrayAssocPair (Key.fromText . runPackageName)
- 
- instance A.ToJSON PackageName where
-   toJSON = A.toJSON . runPackageName
-@@ -329,14 +330,14 @@ instance A.ToJSON Version where
- instance A.ToJSON VersionRange where
-   toJSON = A.toJSON . runVersionRange
- 
--maybePair :: A.ToJSON a => Text -> Maybe a -> [Aeson.Pair]
-+maybePair :: A.ToJSON a => Aeson.Key -> Maybe a -> [Aeson.Pair]
- maybePair k = maybe [] (\val -> [k .= val])
- 
--maybeArrayPair :: A.ToJSON a => Text -> [a] -> [Aeson.Pair]
-+maybeArrayPair :: A.ToJSON a => Aeson.Key -> [a] -> [Aeson.Pair]
- maybeArrayPair _   [] = []
- maybeArrayPair k xs = [k .= xs]
- 
--maybeArrayAssocPair :: A.ToJSON b => (a -> Text) -> Text -> [(a,b)] -> [Aeson.Pair]
-+maybeArrayAssocPair :: A.ToJSON b => (a -> Aeson.Key) -> Aeson.Key -> [(a,b)] -> [Aeson.Pair]
- maybeArrayAssocPair _ _   [] = []
- maybeArrayAssocPair f k xs = [k .= A.object (map (\(k', v) -> f k' .= v) xs)]
-