From 98013605beac25a7d67865ad8542339c806e45b4 Mon Sep 17 00:00:00 2001 From: pho Date: Tue, 31 Dec 2019 16:26:32 +0000 Subject: Update to unordered-containers 0.2.10.0 0.2.10.0 * Add HashMap.alterF. * Add HashMap.keysSet. * Make HashMap.Strict.traverseWithKey force the results before installing them in the map. 0.2.9.0 * Add Ord/Ord1/Ord2 instances. (Thanks, Oleg Grenrus) * Use SmallArray# instead of Array# for GHC versions 7.10 and above. (Thanks, Dmitry Ivanov) * Adjust for Semigroup => Monoid proposal implementation. (Thanks, Ryan Scott) Bug fixes * Fix a strictness bug in fromListWith. * Enable eager blackholing for pre-8.2 GHC versions to work around a runtime system bug. (Thanks, Ben Gamari) * Avoid sketchy reimplementation of ST when compiling with recent GHC. Other changes * Remove support for GHC versions before 7.8. (Thanks, Dmitry Ivanov) * Add internal documentaton. (Thanks, Johan Tibell) 0.2.8.0 * Add Eq1/2, Show1/2, Read1 instances with base-4.9 * Eq (HashSet a) doesn't require Hashable a anymore, only Eq a. * Add Hashable1/2 with hashable-1.2.6.0 * Add differenceWith function. 0.2.7.2 * Don't use -fregs-graphs * Fix benchmark compilation on stack. 0.2.7.1 * Fix linker error related to popcnt. * Haddock improvements. * Fix benchmark compilation when downloaded from Hackage. 0.2.7.0 * Support criterion 1.1 * Add unionWithKey for hash maps. 0.2.6.0 * Mark several modules as Trustworthy. * Add Hashable instances for HashMap and HashSet. * Add mapMaybe, mapMaybeWithKey, update, alter, and intersectionWithKey. * Add roles. * Add Hashable and Semigroup instances. --- devel/hs-unordered-containers/Makefile | 5 ++-- devel/hs-unordered-containers/PLIST | 30 ---------------------- devel/hs-unordered-containers/buildlink3.mk | 6 ++--- devel/hs-unordered-containers/distinfo | 11 ++++---- .../patches/patch-unordered-containers.cabal | 15 +++++++++++ 5 files changed, 26 insertions(+), 41 deletions(-) delete mode 100644 devel/hs-unordered-containers/PLIST create mode 100644 devel/hs-unordered-containers/patches/patch-unordered-containers.cabal (limited to 'devel/hs-unordered-containers') diff --git a/devel/hs-unordered-containers/Makefile b/devel/hs-unordered-containers/Makefile index 8ac1334d1dd..fff93cf1a89 100644 --- a/devel/hs-unordered-containers/Makefile +++ b/devel/hs-unordered-containers/Makefile @@ -1,7 +1,6 @@ -# $NetBSD: Makefile,v 1.11 2016/01/10 11:49:10 szptvlfn Exp $ +# $NetBSD: Makefile,v 1.12 2019/12/31 16:26:32 pho Exp $ -DISTNAME= unordered-containers-0.2.5.1 -PKGREVISION= 2 +DISTNAME= unordered-containers-0.2.10.0 CATEGORIES= devel MAINTAINER= pho@cielonegro.org diff --git a/devel/hs-unordered-containers/PLIST b/devel/hs-unordered-containers/PLIST deleted file mode 100644 index 130ce901d45..00000000000 --- a/devel/hs-unordered-containers/PLIST +++ /dev/null @@ -1,30 +0,0 @@ -@comment $NetBSD: PLIST,v 1.1 2014/05/27 21:33:50 szptvlfn Exp $ -lib/unordered-containers-${PKGVERSION}/${HASKELL_VERSION}/Data/HashMap/Array.hi -lib/unordered-containers-${PKGVERSION}/${HASKELL_VERSION}/Data/HashMap/Base.hi -lib/unordered-containers-${PKGVERSION}/${HASKELL_VERSION}/Data/HashMap/Lazy.hi -lib/unordered-containers-${PKGVERSION}/${HASKELL_VERSION}/Data/HashMap/PopCount.hi -lib/unordered-containers-${PKGVERSION}/${HASKELL_VERSION}/Data/HashMap/Strict.hi -lib/unordered-containers-${PKGVERSION}/${HASKELL_VERSION}/Data/HashMap/Unsafe.hi -lib/unordered-containers-${PKGVERSION}/${HASKELL_VERSION}/Data/HashMap/UnsafeShift.hi -lib/unordered-containers-${PKGVERSION}/${HASKELL_VERSION}/Data/HashSet.hi -lib/unordered-containers-${PKGVERSION}/${HASKELL_VERSION}/HSunordered-containers-${PKGVERSION}.o -lib/unordered-containers-${PKGVERSION}/${HASKELL_VERSION}/libHSunordered-containers-${PKGVERSION}.a -lib/unordered-containers-${PKGVERSION}/${HASKELL_VERSION}/package-description -share/doc/unordered-containers-${PKGVERSION}/LICENSE -${PLIST.doc}share/doc/unordered-containers-${PKGVERSION}/html/Data-HashMap-Lazy.html -${PLIST.doc}share/doc/unordered-containers-${PKGVERSION}/html/Data-HashMap-Strict.html -${PLIST.doc}share/doc/unordered-containers-${PKGVERSION}/html/Data-HashSet.html -${PLIST.doc}share/doc/unordered-containers-${PKGVERSION}/html/doc-index.html -${PLIST.doc}share/doc/unordered-containers-${PKGVERSION}/html/frames.html -${PLIST.doc}share/doc/unordered-containers-${PKGVERSION}/html/haddock-util.js -${PLIST.doc}share/doc/unordered-containers-${PKGVERSION}/html/hslogo-16.png -${PLIST.doc}share/doc/unordered-containers-${PKGVERSION}/html/index-frames.html -${PLIST.doc}share/doc/unordered-containers-${PKGVERSION}/html/index.html -${PLIST.doc}share/doc/unordered-containers-${PKGVERSION}/html/mini_Data-HashMap-Lazy.html -${PLIST.doc}share/doc/unordered-containers-${PKGVERSION}/html/mini_Data-HashMap-Strict.html -${PLIST.doc}share/doc/unordered-containers-${PKGVERSION}/html/mini_Data-HashSet.html -${PLIST.doc}share/doc/unordered-containers-${PKGVERSION}/html/minus.gif -${PLIST.doc}share/doc/unordered-containers-${PKGVERSION}/html/ocean.css -${PLIST.doc}share/doc/unordered-containers-${PKGVERSION}/html/plus.gif -${PLIST.doc}share/doc/unordered-containers-${PKGVERSION}/html/synopsis.png -${PLIST.doc}share/doc/unordered-containers-${PKGVERSION}/html/unordered-containers.haddock diff --git a/devel/hs-unordered-containers/buildlink3.mk b/devel/hs-unordered-containers/buildlink3.mk index 61670d60348..ff29ad3ec9d 100644 --- a/devel/hs-unordered-containers/buildlink3.mk +++ b/devel/hs-unordered-containers/buildlink3.mk @@ -1,12 +1,12 @@ -# $NetBSD: buildlink3.mk,v 1.11 2016/01/10 11:49:10 szptvlfn Exp $ +# $NetBSD: buildlink3.mk,v 1.12 2019/12/31 16:26:32 pho Exp $ BUILDLINK_TREE+= hs-unordered-containers .if !defined(HS_UNORDERED_CONTAINERS_BUILDLINK3_MK) HS_UNORDERED_CONTAINERS_BUILDLINK3_MK:= -BUILDLINK_API_DEPENDS.hs-unordered-containers+= hs-unordered-containers>=0.2.5 -BUILDLINK_ABI_DEPENDS.hs-unordered-containers+= hs-unordered-containers>=0.2.5.1nb2 +BUILDLINK_API_DEPENDS.hs-unordered-containers+= hs-unordered-containers>=0.2.10 +BUILDLINK_ABI_DEPENDS.hs-unordered-containers+= hs-unordered-containers>=0.2.10.0 BUILDLINK_PKGSRCDIR.hs-unordered-containers?= ../../devel/hs-unordered-containers .include "../../devel/hs-hashable/buildlink3.mk" diff --git a/devel/hs-unordered-containers/distinfo b/devel/hs-unordered-containers/distinfo index 9d0bf4e9c76..1e9869366c2 100644 --- a/devel/hs-unordered-containers/distinfo +++ b/devel/hs-unordered-containers/distinfo @@ -1,6 +1,7 @@ -$NetBSD: distinfo,v 1.4 2015/11/03 03:27:34 agc Exp $ +$NetBSD: distinfo,v 1.5 2019/12/31 16:26:32 pho Exp $ -SHA1 (unordered-containers-0.2.5.1.tar.gz) = 54e622d716757e7487efa6ccd5b5633f1c600baf -RMD160 (unordered-containers-0.2.5.1.tar.gz) = ff2a8484e61adf05b0270fa7d59770a4fb3f2910 -SHA512 (unordered-containers-0.2.5.1.tar.gz) = 179f51d28efce91198d7710cb3008d5fb913aa43673629c3d3910f312dbf9f56706995df743fd0dad740a3ced2290c4089df7a526c8f6c4ab1e6f8b8e71a87b7 -Size (unordered-containers-0.2.5.1.tar.gz) = 26093 bytes +SHA1 (unordered-containers-0.2.10.0.tar.gz) = 17d0a16aabbb03c91953b24b39cd3432f8c9afd3 +RMD160 (unordered-containers-0.2.10.0.tar.gz) = b0a825c7c5fde3d5cb4136790f59c677e03eef41 +SHA512 (unordered-containers-0.2.10.0.tar.gz) = 450e5e839e0092b2476a0abfc3eb2f45fba634a9e782cddf25b3db3730d16dd2e65673f46678ab4ad23be71525ae5f72888b89b03402cb70e20fc33feb765766 +Size (unordered-containers-0.2.10.0.tar.gz) = 44733 bytes +SHA1 (patch-unordered-containers.cabal) = bd7765f3b4d041c0e603d3774f42ca4df6f710c2 diff --git a/devel/hs-unordered-containers/patches/patch-unordered-containers.cabal b/devel/hs-unordered-containers/patches/patch-unordered-containers.cabal new file mode 100644 index 00000000000..f171303e6b5 --- /dev/null +++ b/devel/hs-unordered-containers/patches/patch-unordered-containers.cabal @@ -0,0 +1,15 @@ +$NetBSD: patch-unordered-containers.cabal,v 1.1 2019/12/31 16:26:32 pho Exp $ + +Relax upper bound for hashable + +--- unordered-containers.cabal.orig 2019-01-18 17:14:17.000000000 +0000 ++++ unordered-containers.cabal +@@ -43,7 +43,7 @@ library + build-depends: + base >= 4.7 && < 5, + deepseq >= 1.1, +- hashable >= 1.0.1.1 && < 1.3 ++ hashable >= 1.0.1.1 && < 1.4 + + default-language: Haskell2010 + -- cgit v1.2.3