pkgsrc-WIP-changes archive

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

wip/cabal2pkg: Work around build failures with GHC 9.10



Module Name:	pkgsrc-wip
Committed By:	PHO <pho%cielonegro.org@localhost>
Pushed By:	pho
Date:		Sun Feb 2 16:37:33 2025 +0900
Changeset:	bcbe706506da024d1597591ee604dc2fb85975fd

Modified Files:
	cabal2pkg/Makefile
	cabal2pkg/distinfo
Added Files:
	cabal2pkg/patches/patch-cabal2pkg.cabal
	cabal2pkg/patches/patch-src_System_OsString_Posix_Instances.hs

Log Message:
wip/cabal2pkg: Work around build failures with GHC 9.10

I'll soon fix it properly, as I am the upstream of this software. But for now let's just work around issues.

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=bcbe706506da024d1597591ee604dc2fb85975fd

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

diffstat:
 cabal2pkg/Makefile                                   |  7 +++++++
 cabal2pkg/distinfo                                   |  2 ++
 cabal2pkg/patches/patch-cabal2pkg.cabal              | 20 ++++++++++++++++++++
 .../patch-src_System_OsString_Posix_Instances.hs     | 15 +++++++++++++++
 4 files changed, 44 insertions(+)

diffs:
diff --git a/cabal2pkg/Makefile b/cabal2pkg/Makefile
index 1f75782107..8b9556086f 100644
--- a/cabal2pkg/Makefile
+++ b/cabal2pkg/Makefile
@@ -12,6 +12,13 @@ HOMEPAGE=	https://github.com/depressed-pho/cabal2pkg
 COMMENT=	Tool to automate importing/updating Haskell packages in pkgsrc
 LICENSE=	unlicense
 
+HASKELL_UNRESTRICT_DEPENDENCIES+=	\
+	Cabal	\
+	Cabal-syntax	\
+	Diff	\
+	containers	\
+	extra
+
 # cabal2pkg should not depend on shared Haskell libraries, because it needs
 # to be usable even while the tree of Haskell packages in pkgsrc is broken,
 # i.e. while we are updating the tree.
diff --git a/cabal2pkg/distinfo b/cabal2pkg/distinfo
index fa1a172817..4d24f0a50f 100644
--- a/cabal2pkg/distinfo
+++ b/cabal2pkg/distinfo
@@ -3,3 +3,5 @@ $NetBSD$
 BLAKE2s (cabal2pkg-0.1.1.tar.gz) = 7bd5cf4f91134301df766b7296e88db6ad3fb9056ca411b66591c341143fd6ca
 SHA512 (cabal2pkg-0.1.1.tar.gz) = b1208d8adf3cabd8e0be965f469ac289a6d0cbb3f65c7a31dd05a2dc4b5f2ddb938e397ee45a6c0f8dacf9f2956f9a4a7c50bf88db6d3132ae0d021ec4298603
 Size (cabal2pkg-0.1.1.tar.gz) = 67842 bytes
+SHA1 (patch-cabal2pkg.cabal) = b2d8cb1344dd82c38b93cd53c58d95214f40f1cc
+SHA1 (patch-src_System_OsString_Posix_Instances.hs) = 71f3c9b663a444301baa20ffd333f27daf7128d6
diff --git a/cabal2pkg/patches/patch-cabal2pkg.cabal b/cabal2pkg/patches/patch-cabal2pkg.cabal
new file mode 100644
index 0000000000..14594e4ac1
--- /dev/null
+++ b/cabal2pkg/patches/patch-cabal2pkg.cabal
@@ -0,0 +1,20 @@
+$NetBSD$
+
+Fix build with GHC 9.10
+
+--- cabal2pkg.cabal.orig	2025-02-02 07:32:42.492143593 +0000
++++ cabal2pkg.cabal
+@@ -1,4 +1,4 @@
+-cabal-version:      3.4
++cabal-version:      3.12
+ name:               cabal2pkg
+ version:            0.1.1
+ synopsis:           A tool to automate importing/updating Haskell packages in pkgsrc
+@@ -118,6 +118,7 @@ executable cabal2pkg
+       , network-uri          ^>= 2.6.4
+       , optparse-applicative ^>= 0.18.1
+       , ordered-containers   ^>= 0.2.3
++      , os-string            ^>= 2.0.2
+       , prettyprinter        ^>= 1.7.1
+       , prettyprinter-ansi-terminal ^>= 1.1.3
+       , pretty-show          ^>= 1.10
diff --git a/cabal2pkg/patches/patch-src_System_OsString_Posix_Instances.hs b/cabal2pkg/patches/patch-src_System_OsString_Posix_Instances.hs
new file mode 100644
index 0000000000..b125090a85
--- /dev/null
+++ b/cabal2pkg/patches/patch-src_System_OsString_Posix_Instances.hs
@@ -0,0 +1,15 @@
+$NetBSD$
+
+Fix build with GHC 9.10
+
+--- src/System/OsString/Posix/Instances.hs.orig	2025-02-02 07:36:16.634791582 +0000
++++ src/System/OsString/Posix/Instances.hs
+@@ -3,7 +3,7 @@
+ module System.OsString.Posix.Instances () where
+ 
+ import Data.CaseInsensitive (FoldCase(..))
+-import System.OsPath.Data.ByteString.Short (fromShort, toShort)
++import System.OsString.Data.ByteString.Short (fromShort, toShort)
+ import System.OsString.Internal.Types (PosixString(..))
+ 
+ instance FoldCase PosixString where


Home | Main Index | Thread Index | Old Index