Skip to content

Commit bcbe706

Browse files
committed
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.
1 parent 1ac06d3 commit bcbe706

File tree

4 files changed

+44
-0
lines changed

4 files changed

+44
-0
lines changed

cabal2pkg/Makefile

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,13 @@ HOMEPAGE= https://github.com/depressed-pho/cabal2pkg
1212
COMMENT= Tool to automate importing/updating Haskell packages in pkgsrc
1313
LICENSE= unlicense
1414

15+
HASKELL_UNRESTRICT_DEPENDENCIES+= \
16+
Cabal \
17+
Cabal-syntax \
18+
Diff \
19+
containers \
20+
extra
21+
1522
# cabal2pkg should not depend on shared Haskell libraries, because it needs
1623
# to be usable even while the tree of Haskell packages in pkgsrc is broken,
1724
# i.e. while we are updating the tree.

cabal2pkg/distinfo

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,3 +3,5 @@ $NetBSD$
33
BLAKE2s (cabal2pkg-0.1.1.tar.gz) = 7bd5cf4f91134301df766b7296e88db6ad3fb9056ca411b66591c341143fd6ca
44
SHA512 (cabal2pkg-0.1.1.tar.gz) = b1208d8adf3cabd8e0be965f469ac289a6d0cbb3f65c7a31dd05a2dc4b5f2ddb938e397ee45a6c0f8dacf9f2956f9a4a7c50bf88db6d3132ae0d021ec4298603
55
Size (cabal2pkg-0.1.1.tar.gz) = 67842 bytes
6+
SHA1 (patch-cabal2pkg.cabal) = b2d8cb1344dd82c38b93cd53c58d95214f40f1cc
7+
SHA1 (patch-src_System_OsString_Posix_Instances.hs) = 71f3c9b663a444301baa20ffd333f27daf7128d6
Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
$NetBSD$
2+
3+
Fix build with GHC 9.10
4+
5+
--- cabal2pkg.cabal.orig 2025-02-02 07:32:42.492143593 +0000
6+
+++ cabal2pkg.cabal
7+
@@ -1,4 +1,4 @@
8+
-cabal-version: 3.4
9+
+cabal-version: 3.12
10+
name: cabal2pkg
11+
version: 0.1.1
12+
synopsis: A tool to automate importing/updating Haskell packages in pkgsrc
13+
@@ -118,6 +118,7 @@ executable cabal2pkg
14+
, network-uri ^>= 2.6.4
15+
, optparse-applicative ^>= 0.18.1
16+
, ordered-containers ^>= 0.2.3
17+
+ , os-string ^>= 2.0.2
18+
, prettyprinter ^>= 1.7.1
19+
, prettyprinter-ansi-terminal ^>= 1.1.3
20+
, pretty-show ^>= 1.10
Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
$NetBSD$
2+
3+
Fix build with GHC 9.10
4+
5+
--- src/System/OsString/Posix/Instances.hs.orig 2025-02-02 07:36:16.634791582 +0000
6+
+++ src/System/OsString/Posix/Instances.hs
7+
@@ -3,7 +3,7 @@
8+
module System.OsString.Posix.Instances () where
9+
10+
import Data.CaseInsensitive (FoldCase(..))
11+
-import System.OsPath.Data.ByteString.Short (fromShort, toShort)
12+
+import System.OsString.Data.ByteString.Short (fromShort, toShort)
13+
import System.OsString.Internal.Types (PosixString(..))
14+
15+
instance FoldCase PosixString where

0 commit comments

Comments
 (0)