diff options
| author | pho <pho@pkgsrc.org> | 2020-01-11 08:50:16 +0000 |
|---|---|---|
| committer | pho <pho@pkgsrc.org> | 2020-01-11 08:50:16 +0000 |
| commit | 7c3f2201dca786efa74973472c3f2667a0264bac (patch) | |
| tree | d71f1cf2e852524a19c9fb7db0b1ce084609808e | |
| parent | 6640c106ae50c7cbea486c12a786211ff487fd8a (diff) | |
| download | pkgsrc-7c3f2201dca786efa74973472c3f2667a0264bac.tar.gz | |
Fix build with GHC 8.8
| -rw-r--r-- | devel/hs-vector/Makefile | 4 | ||||
| -rw-r--r-- | devel/hs-vector/buildlink3.mk | 8 | ||||
| -rw-r--r-- | devel/hs-vector/distinfo | 4 | ||||
| -rw-r--r-- | devel/hs-vector/patches/patch-vector.cabal | 20 |
4 files changed, 16 insertions, 20 deletions
diff --git a/devel/hs-vector/Makefile b/devel/hs-vector/Makefile index f73f6b46ccb..e3fbe2b6435 100644 --- a/devel/hs-vector/Makefile +++ b/devel/hs-vector/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2020/01/01 02:43:35 pho Exp $ +# $NetBSD: Makefile,v 1.8 2020/01/11 08:50:16 pho Exp $ DISTNAME= vector-0.12.0.3 CATEGORIES= devel @@ -9,6 +9,4 @@ LICENSE= modified-bsd .include "../../mk/haskell.mk" .include "../../devel/hs-primitive/buildlink3.mk" -.include "../../devel/hs-fail/buildlink3.mk" -.include "../../math/hs-semigroups/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/devel/hs-vector/buildlink3.mk b/devel/hs-vector/buildlink3.mk index 419368bb630..4c7c3abe867 100644 --- a/devel/hs-vector/buildlink3.mk +++ b/devel/hs-vector/buildlink3.mk @@ -1,17 +1,15 @@ -# $NetBSD: buildlink3.mk,v 1.9 2020/01/01 02:43:35 pho Exp $ +# $NetBSD: buildlink3.mk,v 1.10 2020/01/11 08:50:16 pho Exp $ BUILDLINK_TREE+= hs-vector .if !defined(HS_VECTOR_BUILDLINK3_MK) HS_VECTOR_BUILDLINK3_MK:= -BUILDLINK_API_DEPENDS.hs-vector+= hs-vector>=0.11.0 -BUILDLINK_ABI_DEPENDS.hs-vector+= hs-vector>=0.11.0.0 +BUILDLINK_API_DEPENDS.hs-vector+= hs-vector>=0.12.0 +BUILDLINK_ABI_DEPENDS.hs-vector+= hs-vector>=0.12.0.3 BUILDLINK_PKGSRCDIR.hs-vector?= ../../devel/hs-vector .include "../../devel/hs-primitive/buildlink3.mk" -.include "../../devel/hs-fail/buildlink3.mk" -.include "../../math/hs-semigroups/buildlink3.mk" .endif # HS_VECTOR_BUILDLINK3_MK BUILDLINK_TREE+= -hs-vector diff --git a/devel/hs-vector/distinfo b/devel/hs-vector/distinfo index a80b8a32798..a903ed91e32 100644 --- a/devel/hs-vector/distinfo +++ b/devel/hs-vector/distinfo @@ -1,7 +1,7 @@ -$NetBSD: distinfo,v 1.7 2020/01/01 02:43:35 pho Exp $ +$NetBSD: distinfo,v 1.8 2020/01/11 08:50:16 pho Exp $ SHA1 (vector-0.12.0.3.tar.gz) = c57440b2887ed62f7c83526f99e3ce8201e433c7 RMD160 (vector-0.12.0.3.tar.gz) = c030f62c6116e7701ec727b18a9c630a77f70281 SHA512 (vector-0.12.0.3.tar.gz) = 176646ae612866064303cd200e9d940fec1645bb88176a89adb00df3b9a6df96200e3c9cf85a57af3a1481d6633b353da8e03d7a6c467c40e926275fe8d36853 Size (vector-0.12.0.3.tar.gz) = 124899 bytes -SHA1 (patch-vector.cabal) = 878fc2b59215ca4bcc3e418534ef7b29f24ce743 +SHA1 (patch-vector.cabal) = d15623c2147bab0d9d4e859a1539519dd6bf69e3 diff --git a/devel/hs-vector/patches/patch-vector.cabal b/devel/hs-vector/patches/patch-vector.cabal index 8f41af78004..ed689cc9ee1 100644 --- a/devel/hs-vector/patches/patch-vector.cabal +++ b/devel/hs-vector/patches/patch-vector.cabal @@ -1,15 +1,15 @@ -$NetBSD: patch-vector.cabal,v 1.1 2020/01/01 02:43:36 pho Exp $ +$NetBSD: patch-vector.cabal,v 1.2 2020/01/11 08:50:16 pho Exp $ -Relax the upper bound on semigroups +Fix build with GHC 8.8 --- vector.cabal.orig 2001-09-09 01:46:40.000000000 +0000 +++ vector.cabal -@@ -150,7 +150,7 @@ Library - , deepseq >= 1.1 && < 1.5 - if !impl(ghc > 8.0) - Build-Depends: fail == 4.9.* -- , semigroups >= 0.18 && < 0.19 -+ , semigroups >= 0.18 && < 0.20 - - Ghc-Options: -O2 -Wall +@@ -144,7 +144,7 @@ Library + Install-Includes: + vector.h +- Build-Depends: base >= 4.5 && < 4.13 ++ Build-Depends: base >= 4.5 && < 4.14 + , primitive >= 0.5.0.1 && < 0.8 + , ghc-prim >= 0.2 && < 0.6 + , deepseq >= 1.1 && < 1.5 |