CVS commit: pkgsrc/devel/hs-protolude

["Masatake Daimon" <pho%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   pho
Date:           Sat Feb  1 09:22:11 UTC 2025

Modified Files:
        pkgsrc/devel/hs-protolude: Makefile distinfo
Added Files:
        pkgsrc/devel/hs-protolude/patches: patch-src_Protolude_List.hs
            patch-src_Protolude_Safe.hs

Log Message:
devel/hs-protolude: Fix build with GHC 9.10


To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 pkgsrc/devel/hs-protolude/Makefile
cvs rdiff -u -r1.4 -r1.5 pkgsrc/devel/hs-protolude/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/devel/hs-protolude/patches/patch-src_Protolude_List.hs \
    pkgsrc/devel/hs-protolude/patches/patch-src_Protolude_Safe.hs

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/devel/hs-protolude/Makefile
diff -u pkgsrc/devel/hs-protolude/Makefile:1.10 pkgsrc/devel/hs-protolude/Makefile:1.11
--- pkgsrc/devel/hs-protolude/Makefile:1.10     Thu May  9 01:32:08 2024
+++ pkgsrc/devel/hs-protolude/Makefile  Sat Feb  1 09:22:10 2025
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2024/05/09 01:32:08 pho Exp $
+# $NetBSD: Makefile,v 1.11 2025/02/01 09:22:10 pho Exp $
 
 DISTNAME=      protolude-0.3.4
 PKGREVISION=   1
@@ -8,6 +8,10 @@ MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
 COMMENT=       Sensible starting Prelude for building custom Preludes
 LICENSE=       mit
 
+HASKELL_UNRESTRICT_DEPENDENCIES+=      \
+       base    \
+       hashable
+
 .include "../../devel/hs-async/buildlink3.mk"
 .include "../../devel/hs-hashable/buildlink3.mk"
 .include "../../devel/hs-mtl-compat/buildlink3.mk"

Index: pkgsrc/devel/hs-protolude/distinfo
diff -u pkgsrc/devel/hs-protolude/distinfo:1.4 pkgsrc/devel/hs-protolude/distinfo:1.5
--- pkgsrc/devel/hs-protolude/distinfo:1.4      Tue Apr 30 13:38:14 2024
+++ pkgsrc/devel/hs-protolude/distinfo  Sat Feb  1 09:22:10 2025
@@ -1,5 +1,7 @@
-$NetBSD: distinfo,v 1.4 2024/04/30 13:38:14 pho Exp $
+$NetBSD: distinfo,v 1.5 2025/02/01 09:22:10 pho Exp $
 
 BLAKE2s (protolude-0.3.4.tar.gz) = 55016f2ad0801cbe47d3439aae82a2c31d3531bbb0e247b8f5f7a84f3cafa105
 SHA512 (protolude-0.3.4.tar.gz) = cd1e46d01fee8797bf3556db25791e80f91a9775a4945820246b36c62714ea02d079e3fc4abcec9e28a379fe9aace7cc8b7514c65d27f1579dca1aa49e7b919a
 Size (protolude-0.3.4.tar.gz) = 19321 bytes
+SHA1 (patch-src_Protolude_List.hs) = 7ab18f57f766c7f22a22a91830332a7fb7943da2
+SHA1 (patch-src_Protolude_Safe.hs) = 34b84b39bc20801170a353db07afc072db1a0f18

Added files:

Index: pkgsrc/devel/hs-protolude/patches/patch-src_Protolude_List.hs
diff -u /dev/null pkgsrc/devel/hs-protolude/patches/patch-src_Protolude_List.hs:1.1
--- /dev/null   Sat Feb  1 09:22:11 2025
+++ pkgsrc/devel/hs-protolude/patches/patch-src_Protolude_List.hs       Sat Feb  1 09:22:10 2025
@@ -0,0 +1,16 @@
+$NetBSD: patch-src_Protolude_List.hs,v 1.1 2025/02/01 09:22:10 pho Exp $
+
+Fix build on GHC 9.10:
+https://github.com/protolude/protolude/issues/149
+
+--- src/Protolude/List.hs.orig 2025-02-01 09:20:44.880216971 +0000
++++ src/Protolude/List.hs
+@@ -20,7 +20,7 @@ import Data.List (groupBy, sortBy)
+ import Data.Maybe (Maybe (Nothing))
+ import Data.Ord (Ord, comparing)
+ import qualified Data.Set as Set
+-import GHC.Num ((*), (+), Num)
++import Prelude ((*), (+), Num)
+ 
+ head :: (Foldable f) => f a -> Maybe a
+ head = foldr (\x _ -> pure x) Nothing
Index: pkgsrc/devel/hs-protolude/patches/patch-src_Protolude_Safe.hs
diff -u /dev/null pkgsrc/devel/hs-protolude/patches/patch-src_Protolude_Safe.hs:1.1
--- /dev/null   Sat Feb  1 09:22:11 2025
+++ pkgsrc/devel/hs-protolude/patches/patch-src_Protolude_Safe.hs       Sat Feb  1 09:22:10 2025
@@ -0,0 +1,16 @@
+$NetBSD: patch-src_Protolude_Safe.hs,v 1.1 2025/02/01 09:22:10 pho Exp $
+
+Fix build on GHC 9.10:
+https://github.com/protolude/protolude/issues/149
+
+--- src/Protolude/Safe.hs.orig 2025-02-01 09:19:33.810599346 +0000
++++ src/Protolude/Safe.hs
+@@ -35,7 +35,7 @@ import Data.Either (Either(Left, Right))
+ import Data.Function ((.))
+ import Data.List (null, head, last, tail, init, maximum, minimum, foldr1, foldl1, foldl1', (++))
+ 
+-import GHC.Num ((-))
++import Prelude ((-))
+ import GHC.Show (show)
+ 
+ liftMay :: (a -> Bool) -> (a -> b) -> (a -> Maybe b)