pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc Fix build with GHC 9.2



details:   https://anonhg.NetBSD.org/pkgsrc/rev/159033bb4a6c
branches:  trunk
changeset: 373454:159033bb4a6c
user:      pho <pho%pkgsrc.org@localhost>
date:      Fri Feb 11 13:15:31 2022 +0000

description:
Fix build with GHC 9.2

diffstat:

 math/hs-nats/Makefile                    |  6 +-----
 net/hs-resolv/distinfo                   |  4 ++--
 net/hs-resolv/patches/patch-resolv.cabal |  9 ++++++---
 3 files changed, 9 insertions(+), 10 deletions(-)

diffs (59 lines):

diff -r 2662f8a7175a -r 159033bb4a6c math/hs-nats/Makefile
--- a/math/hs-nats/Makefile     Fri Feb 11 13:15:16 2022 +0000
+++ b/math/hs-nats/Makefile     Fri Feb 11 13:15:31 2022 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2022/01/18 02:48:18 pho Exp $
+# $NetBSD: Makefile,v 1.16 2022/02/11 13:15:46 pho Exp $
 
 DISTNAME=      nats-1.1.2
 PKGREVISION=   2
@@ -8,10 +8,6 @@
 COMMENT=       Haskell 98 natural numbers
 LICENSE=       modified-bsd
 
-# This package becomes essentially blank when built with GHC >=
-# 7.10. Haddock complains when there are no input files.
-HASKELL_ENABLE_HADDOCK_DOCUMENTATION=  no
-
 .include "../../mk/haskell.mk"
 .include "../../devel/hs-hashable/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r 2662f8a7175a -r 159033bb4a6c net/hs-resolv/distinfo
--- a/net/hs-resolv/distinfo    Fri Feb 11 13:15:16 2022 +0000
+++ b/net/hs-resolv/distinfo    Fri Feb 11 13:15:31 2022 +0000
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.4 2021/10/26 11:05:46 nia Exp $
+$NetBSD: distinfo,v 1.5 2022/02/11 13:15:31 pho Exp $
 
 BLAKE2s (resolv-0.1.2.0.tar.gz) = 33bc573ba6213afe7e033d640580197d85daaff8e3a95ff2a1b29b11cccab5e5
 SHA512 (resolv-0.1.2.0.tar.gz) = fae2d0717a109b0d6cc19c51c773bc68c64c0048b9d930528cf5622ee270ebaddec180c1d444542e8eb036262611f5b88deadeea223fb2ef2b15b41369a2376e
 Size (resolv-0.1.2.0.tar.gz) = 156710 bytes
-SHA1 (patch-resolv.cabal) = 9d0fd43d1ce8a7ed070af07c3a94a9d6ba51a441
+SHA1 (patch-resolv.cabal) = f7672ad5a72afabfe61fe80beab9f533ae7f9650
diff -r 2662f8a7175a -r 159033bb4a6c net/hs-resolv/patches/patch-resolv.cabal
--- a/net/hs-resolv/patches/patch-resolv.cabal  Fri Feb 11 13:15:16 2022 +0000
+++ b/net/hs-resolv/patches/patch-resolv.cabal  Fri Feb 11 13:15:31 2022 +0000
@@ -1,11 +1,11 @@
-$NetBSD: patch-resolv.cabal,v 1.1 2021/04/24 12:25:09 pho Exp $
+$NetBSD: patch-resolv.cabal,v 1.2 2022/02/11 13:15:31 pho Exp $
 
 Fix build with GHC 9.
 Fix build with base16-bytestring-1.0.*.
 
 --- resolv.cabal.orig  2001-09-09 01:46:40.000000000 +0000
 +++ resolv.cabal
-@@ -92,8 +92,8 @@ library
+@@ -92,10 +92,10 @@ library
                       Compat
  
    -- we need binary-0.7.3 for isolate
@@ -14,5 +14,8 @@
 +  build-depends:     base               >= 4.5 && <5
 +                   , base16-bytestring ^>= 1.0
                     , binary            ^>=0.7.3 || ^>= 0.8
-                    , bytestring        ^>=0.9.2 || ^>= 0.10
+-                   , bytestring        ^>=0.9.2 || ^>= 0.10
++                   , bytestring        ^>=0.9.2 || ^>= 0.10 || ^>= 0.11
                     , containers        ^>=0.4.2.1 || ^>= 0.5 || ^>= 0.6
+ 
+   ghc-options:       -Wall



Home | Main Index | Thread Index | Old Index