diff options
| -rw-r--r-- | devel/hs-protolude/Makefile | 4 | ||||
| -rw-r--r-- | devel/hs-protolude/buildlink3.mk | 6 | ||||
| -rw-r--r-- | devel/hs-protolude/distinfo | 11 | ||||
| -rw-r--r-- | devel/hs-protolude/patches/patch-protolude.cabal | 30 | ||||
| -rw-r--r-- | devel/hs-protolude/patches/patch-src_Protolude.hs | 17 | ||||
| -rw-r--r-- | devel/hs-protolude/patches/patch-src_Protolude_Base.hs | 15 |
6 files changed, 9 insertions, 74 deletions
diff --git a/devel/hs-protolude/Makefile b/devel/hs-protolude/Makefile index d80c0be36c4..48e70ed755d 100644 --- a/devel/hs-protolude/Makefile +++ b/devel/hs-protolude/Makefile @@ -1,6 +1,6 @@ -# $NetBSD: Makefile,v 1.2 2022/02/26 03:58:05 pho Exp $ +# $NetBSD: Makefile,v 1.3 2022/09/07 06:43:41 pho Exp $ -DISTNAME= protolude-0.3.0 +DISTNAME= protolude-0.3.2 PKGREVISION= 1 CATEGORIES= devel diff --git a/devel/hs-protolude/buildlink3.mk b/devel/hs-protolude/buildlink3.mk index 1953bb28b75..dc39d334985 100644 --- a/devel/hs-protolude/buildlink3.mk +++ b/devel/hs-protolude/buildlink3.mk @@ -1,12 +1,12 @@ -# $NetBSD: buildlink3.mk,v 1.2 2022/02/26 03:58:05 pho Exp $ +# $NetBSD: buildlink3.mk,v 1.3 2022/09/07 06:43:41 pho Exp $ BUILDLINK_TREE+= hs-protolude .if !defined(HS_PROTOLUDE_BUILDLINK3_MK) HS_PROTOLUDE_BUILDLINK3_MK:= -BUILDLINK_API_DEPENDS.hs-protolude+= hs-protolude>=0.3.0 -BUILDLINK_ABI_DEPENDS.hs-protolude+= hs-protolude>=0.3.0nb1 +BUILDLINK_API_DEPENDS.hs-protolude+= hs-protolude>=0.3.2 +BUILDLINK_ABI_DEPENDS.hs-protolude+= hs-protolude>=0.3.2nb1 BUILDLINK_PKGSRCDIR.hs-protolude?= ../../devel/hs-protolude .include "../../devel/hs-async/buildlink3.mk" diff --git a/devel/hs-protolude/distinfo b/devel/hs-protolude/distinfo index 07487d93290..bb9773fd437 100644 --- a/devel/hs-protolude/distinfo +++ b/devel/hs-protolude/distinfo @@ -1,8 +1,5 @@ -$NetBSD: distinfo,v 1.1 2022/02/23 16:18:22 pho Exp $ +$NetBSD: distinfo,v 1.2 2022/09/07 06:43:41 pho Exp $ -BLAKE2s (protolude-0.3.0.tar.gz) = 5a3480875bcea6b86ba51e72256d319083d53837ede620b9a69cec7bb285aea8 -SHA512 (protolude-0.3.0.tar.gz) = 0941e344320e09fca457ce0be31b1fbb7c715a11ea371263d029942cb649bfb1194b012493e31697c5a05bd3e4de5108bcd2c82c79c9f2f30b260959ec8f0738 -Size (protolude-0.3.0.tar.gz) = 19645 bytes -SHA1 (patch-protolude.cabal) = 60c89036c59010a6071c277684260ca3a9c4f387 -SHA1 (patch-src_Protolude.hs) = c86fce59c022fcde9094a8c6b2164e7f9ff3d1b5 -SHA1 (patch-src_Protolude_Base.hs) = 7f0de4a09aa66ce79cc60d25e86a01f6607fe156 +BLAKE2s (protolude-0.3.2.tar.gz) = d21df8a2c8575b4c156f75a563b2bbbd84dd64dc5516a5667929c2b2c52594c1 +SHA512 (protolude-0.3.2.tar.gz) = 575b955e13a32948286181db04f696776fd44678697a6788fc8a39ca2577342802ad4b46235940ef5137487c60b9ee195bee9aca1966ec448523a515f616afb2 +Size (protolude-0.3.2.tar.gz) = 19288 bytes diff --git a/devel/hs-protolude/patches/patch-protolude.cabal b/devel/hs-protolude/patches/patch-protolude.cabal deleted file mode 100644 index e06d676e1db..00000000000 --- a/devel/hs-protolude/patches/patch-protolude.cabal +++ /dev/null @@ -1,30 +0,0 @@ -$NetBSD: patch-protolude.cabal,v 1.1 2022/02/23 16:18:22 pho Exp $ - -Fix build with GHC 9.2 - ---- protolude.cabal.orig 2020-03-28 08:55:52.000000000 +0000 -+++ protolude.cabal -@@ -77,18 +77,18 @@ library - build-depends: - array >=0.4 && <0.6 - , async >=2.0 && <2.3 -- , base >=4.6 && <4.15 -- , bytestring >=0.10 && <0.11 -+ , base >=4.6 && <5 -+ , bytestring >=0.10 - , containers >=0.5 && <0.7 - , deepseq >=1.3 && <1.5 -- , ghc-prim >=0.3 && <0.7 -- , hashable >=1.2 && <1.4 -+ , ghc-prim >=0.3 -+ , hashable >=1.2 - , mtl >=2.1 && <2.3 - , mtl-compat >=0.2 && <0.3 - , stm >=2.4 && <2.6 - , text >=1.2 && <1.3 - , transformers >=0.2 && <0.6 -- , transformers-compat >=0.4 && <0.7 -+ , transformers-compat >=0.4 - - if !impl(ghc >=8.0) - build-depends: fail ==4.9.* diff --git a/devel/hs-protolude/patches/patch-src_Protolude.hs b/devel/hs-protolude/patches/patch-src_Protolude.hs deleted file mode 100644 index 6e5d3a289ca..00000000000 --- a/devel/hs-protolude/patches/patch-src_Protolude.hs +++ /dev/null @@ -1,17 +0,0 @@ -$NetBSD: patch-src_Protolude.hs,v 1.1 2022/02/23 16:18:22 pho Exp $ - -Fix build with GHC 9.2 - ---- src/Protolude.hs.orig 2022-02-20 14:27:37.821200859 +0000 -+++ src/Protolude.hs -@@ -267,8 +267,10 @@ import Data.List.NonEmpty as List ( - import Data.Semigroup as Semigroup ( - Semigroup(sconcat, stimes) - , WrappedMonoid -+#if !MIN_VERSION_base(4,16,0) - , Option(..) - , option -+#endif - , diff - , cycle1 - , stimesMonoid diff --git a/devel/hs-protolude/patches/patch-src_Protolude_Base.hs b/devel/hs-protolude/patches/patch-src_Protolude_Base.hs deleted file mode 100644 index 88cfc3e1d7a..00000000000 --- a/devel/hs-protolude/patches/patch-src_Protolude_Base.hs +++ /dev/null @@ -1,15 +0,0 @@ -$NetBSD: patch-src_Protolude_Base.hs,v 1.1 2022/02/23 16:18:22 pho Exp $ - -https://github.com/protolude/protolude/pull/126 - ---- src/Protolude/Base.hs.orig 2022-02-20 14:25:46.651110411 +0000 -+++ src/Protolude/Base.hs -@@ -67,7 +67,7 @@ import GHC.Real as Base ( - , fromIntegral - , fromRational - , gcd --#if MIN_VERSION_base(4,9,0) -+#if MIN_VERSION_base(4,9,0) && !MIN_VERSION_base(4,15,0) - , gcdInt' - , gcdWord' - #endif |