pkgsrc-Changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
CVS commit: pkgsrc/lang/ghc98
Module Name: pkgsrc
Committed By: pho
Date: Sun Jan 12 15:02:35 UTC 2025
Modified Files:
pkgsrc/lang/ghc98: bootstrap.mk distinfo
pkgsrc/lang/ghc98/patches: patch-hadrian_bootstrap_bootstrap.py
patch-hadrian_src_Settings_Packages.hs
Added Files:
pkgsrc/lang/ghc98/files: hadrian-extra.patch hadrian-hashable.patch
hadrian-splitmix.patch
pkgsrc/lang/ghc98/patches: patch-hadrian_hadrian.cabal
patch-linters_lint-commit-msg_lint-commit-msg.cabal
patch-linters_lint-submodule-refs_lint-submodule-refs.cabal
patch-linters_lint-whitespace_lint-whitespace.cabal
patch-linters_linters-common_linters-common.cabal
Log Message:
lang/ghc98: Replace the bootkit for NetBSD/aarch64 with GHC 9.8.2
NFCI. It produces the same binary as before so revbump is not required.
This is necessary for the upcoming GHC 9.10. I'm going to replace the
bootkit for each platform one by one, import lang/ghc910, update every
pkgsrc package written in Haskell, then switch the default compiler after
that.
I might have to give up on FreeBSD/i386 though. The upstream apparently
stopped caring about i386 platforms and I'm already seeing several signs of
it bitrotting away. In fact ghci, the REPL for GHC, has already stopped
working for years but I have received zero complaints so far which probably
means we can just let it go.
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 pkgsrc/lang/ghc98/bootstrap.mk
cvs rdiff -u -r1.11 -r1.12 pkgsrc/lang/ghc98/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/lang/ghc98/files/hadrian-extra.patch \
pkgsrc/lang/ghc98/files/hadrian-hashable.patch \
pkgsrc/lang/ghc98/files/hadrian-splitmix.patch
cvs rdiff -u -r1.3 -r1.4 \
pkgsrc/lang/ghc98/patches/patch-hadrian_bootstrap_bootstrap.py
cvs rdiff -u -r0 -r1.1 pkgsrc/lang/ghc98/patches/patch-hadrian_hadrian.cabal \
pkgsrc/lang/ghc98/patches/patch-linters_lint-commit-msg_lint-commit-msg.cabal \
pkgsrc/lang/ghc98/patches/patch-linters_lint-submodule-refs_lint-submodule-refs.cabal \
pkgsrc/lang/ghc98/patches/patch-linters_lint-whitespace_lint-whitespace.cabal \
pkgsrc/lang/ghc98/patches/patch-linters_linters-common_linters-common.cabal
cvs rdiff -u -r1.2 -r1.3 \
pkgsrc/lang/ghc98/patches/patch-hadrian_src_Settings_Packages.hs
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: pkgsrc/lang/ghc98/bootstrap.mk
diff -u pkgsrc/lang/ghc98/bootstrap.mk:1.6 pkgsrc/lang/ghc98/bootstrap.mk:1.7
--- pkgsrc/lang/ghc98/bootstrap.mk:1.6 Wed Jan 8 10:17:27 2025
+++ pkgsrc/lang/ghc98/bootstrap.mk Sun Jan 12 15:02:34 2025
@@ -1,4 +1,4 @@
-# $NetBSD: bootstrap.mk,v 1.6 2025/01/08 10:17:27 pho Exp $
+# $NetBSD: bootstrap.mk,v 1.7 2025/01/12 15:02:34 pho Exp $
# -----------------------------------------------------------------------------
# Select a bindist of bootstrapping compiler on a per-platform basis. See
# ./files/BOOTSTRAP.md for details.
@@ -59,8 +59,7 @@ DISTFILES:= ${DISTFILES} ${BOOT_ARCHIVE}
.endif
.if ${MACHINE_PLATFORM:MNetBSD-*-aarch64} || make(distinfo) || make(makesum) || make(mdi)
-# Cross-compiled from x86_64 on a QEMU guest. It took days to compile...
-BOOT_VERSION:= 9.4.7
+BOOT_VERSION:= 9.8.2
BOOT_ARCHIVE:= ghc-${BOOT_VERSION}-boot-aarch64-unknown-netbsd.tar.xz
DISTFILES:= ${DISTFILES} ${BOOT_ARCHIVE} ${HADRIAN_BOOT_SOURCE} # Available in LOCAL_PORTS
.endif
@@ -134,10 +133,16 @@ pre-configure:
# RTS even if it doesn't. Note that GHC devs are in the process of moving
# the settings file from being generated by configure, to being generated
# by the build system. This workaround is expected to go away in the
-# (hopefully near) future.
+# (hopefully near) future. config.mk.in is in the top-level directory since
+# 9.8.2. It was previously in mk/.
${RUN}cd ${WRKDIR}/bootkit-dist/${BOOT_ARCHIVE_TOP_DIR} && \
- ${SED} -e '/^GhcRTSWays/d' < mk/config.mk.in > mk/config.mk.in.tmp && \
- ${MV} -f mk/config.mk.in.tmp mk/config.mk.in
+ if ${TEST} -f config.mk.in; then \
+ fp="config.mk.in"; \
+ else \
+ fp="mk/config.mk.in"; \
+ fi; \
+ ${SED} -e '/^GhcRTSWays/d' < "$${fp}" > "$${fp}.tmp" && \
+ ${MV} -f "$${fp}.tmp" "$${fp}"
# </kludge>
${RUN}cd ${WRKDIR}/bootkit-dist/${BOOT_ARCHIVE_TOP_DIR} && \
${PKGSRC_SETENV} ${CONFIGURE_ENV} ${SH} ./configure \
Index: pkgsrc/lang/ghc98/distinfo
diff -u pkgsrc/lang/ghc98/distinfo:1.11 pkgsrc/lang/ghc98/distinfo:1.12
--- pkgsrc/lang/ghc98/distinfo:1.11 Wed Jan 8 14:51:06 2025
+++ pkgsrc/lang/ghc98/distinfo Sun Jan 12 15:02:34 2025
@@ -1,11 +1,8 @@
-$NetBSD: distinfo,v 1.11 2025/01/08 14:51:06 pho Exp $
+$NetBSD: distinfo,v 1.12 2025/01/12 15:02:34 pho Exp $
BLAKE2s (ghc-9.4.7-boot-aarch64-apple-darwin.tar.xz) = c771cfa45f5635bdf8175775cf7a67c9541bd5b4d4927ed9b5189e3dcefcd2ba
SHA512 (ghc-9.4.7-boot-aarch64-apple-darwin.tar.xz) = 3d50e4c6605ebfa7eef018d3e9e11e8115cf2f97e24a5adfc05fd1bab152c726e240f9a213d73e220dc7fc5b9358df74eee0d4cb1b77bd5491f28899c831b1a4
Size (ghc-9.4.7-boot-aarch64-apple-darwin.tar.xz) = 109805384 bytes
-BLAKE2s (ghc-9.4.7-boot-aarch64-unknown-netbsd.tar.xz) = a691117b405b9f7954b954acc382b3357a9ff8c98151514c82d18d83da397940
-SHA512 (ghc-9.4.7-boot-aarch64-unknown-netbsd.tar.xz) = 1c917a52a020be3a1878f9d7e8e4c47d31180e54248c127a60706c1053a95b2d8a487f79e7fb5daa725178f271a7cc17e4e7b47ce2119f8546e259c63b9864d8
-Size (ghc-9.4.7-boot-aarch64-unknown-netbsd.tar.xz) = 90305900 bytes
BLAKE2s (ghc-9.4.7-boot-hadrian-ghc9.8.tar.gz) = ac74fdc6f8a5d4a75bda0c6501902c2c160d3780b41b739129b5a36773c295cd
SHA512 (ghc-9.4.7-boot-hadrian-ghc9.8.tar.gz) = e086a40eb6b655fcb22744a32247ab596adf649179681d6203514d66cbc0989e6b59430de5f02e18419b27584e2dbac5a418fb40f66bcdc76e8776d1e315a332
Size (ghc-9.4.7-boot-hadrian-ghc9.8.tar.gz) = 1527081 bytes
@@ -24,6 +21,12 @@ Size (ghc-9.4.7-boot-x86_64-unknown-netb
BLAKE2s (ghc-9.4.7-boot-x86_64-unknown-solaris2.tar.xz) = 82abea5431d6d106c7eb4388c196594a050446f8164aecd5c76e263a96114a03
SHA512 (ghc-9.4.7-boot-x86_64-unknown-solaris2.tar.xz) = c6dd73fce67dd8a4933a7f31318af662bc3fd873e3d96fa6aa2e0c72282c554cc2e13abdecc29919231c3cf346d878f5f738bb72f2db53d63dd79bf07a1e2d91
Size (ghc-9.4.7-boot-x86_64-unknown-solaris2.tar.xz) = 128747936 bytes
+BLAKE2s (ghc-9.8.2-boot-aarch64-unknown-netbsd.tar.xz) = 8595c7115a7c7d131c16806fbb7156de3595ae35122db0a95bb9d525fd80a5ee
+SHA512 (ghc-9.8.2-boot-aarch64-unknown-netbsd.tar.xz) = 6ae7c3a75b5794aa3ab890ad29f575754f6c0b674f7f7111255018ace0f7c07610ce5bb5687fdfde371a024322de35fea6d5248ba02ab47ba235a6a8b5e9d8ae
+Size (ghc-9.8.2-boot-aarch64-unknown-netbsd.tar.xz) = 91507768 bytes
+BLAKE2s (ghc-9.8.2-boot-hadrian-ghc9.8.tar.gz) = 054f11f3e443c5c4c88bc14690983c83a9fb14eac95d3da885fe59bbc698ca90
+SHA512 (ghc-9.8.2-boot-hadrian-ghc9.8.tar.gz) = 9b8a28041bf08e79064cc7e275b35fdc1c76766081e7c26c589e08df21aeadfcebab560320c6132177b5aafd887cd071c4b37263e9763ade2900c0689f5e9a4e
+Size (ghc-9.8.2-boot-hadrian-ghc9.8.tar.gz) = 1528222 bytes
BLAKE2s (ghc-9.8.2-src.tar.xz) = 4d903dc828e46d12ad4dc8be912e2996666351ecf8b7a5e1c85790f1fb7eaa5a
SHA512 (ghc-9.8.2-src.tar.xz) = 9b677d5ead5ebb5df7bc960055a76ef00e68ed8102844997b12154bf71bdbfafdfff9ca31edce86b3df759242a7c98f52a464887973b53985f54ecd9fc4b4627
Size (ghc-9.8.2-src.tar.xz) = 32432564 bytes
@@ -31,12 +34,13 @@ SHA1 (patch-compiler_GHC_Driver_Pipeline
SHA1 (patch-compiler_GHC_SysTools_Process.hs) = ceb26657516e207e22d555ec6f87f735344b0d08
SHA1 (patch-configure.ac) = 985482ae70830ddbf1334c9c82a2cec78a34bb4c
SHA1 (patch-hadrian_bindist_Makefile) = 3a91d56be4f1b59c6534eceb5b1a4f8e86d49c68
-SHA1 (patch-hadrian_bootstrap_bootstrap.py) = bf96af392612aad143373f628dcbd3345b83eee7
+SHA1 (patch-hadrian_bootstrap_bootstrap.py) = 968830b0bf97cd59c7dddd4b5a6d77197963f94e
SHA1 (patch-hadrian_bootstrap_src_Main.hs) = 2e0a7ae2ef195013ca07313c150a7e48b6985e32
+SHA1 (patch-hadrian_hadrian.cabal) = c1b41c7ea96afb6f64d6a1043ef5d302dba49a77
SHA1 (patch-hadrian_src_Builder.hs) = bbfb1ddc30af900c89ca3cf649a32da2a1c83174
SHA1 (patch-hadrian_src_Rules_BinaryDist.hs) = fb908f74b8b619bccd673fbdb40b1c53ab7a51d8
SHA1 (patch-hadrian_src_Settings_Builders_Ghc.hs) = e2913e9f83bb36bb0b432a24518c9b6ca2990c6a
-SHA1 (patch-hadrian_src_Settings_Packages.hs) = f21f801727cf5889c3b41e88beb33290a4cc1574
+SHA1 (patch-hadrian_src_Settings_Packages.hs) = c543ebdcd3b71edacdf4c843462494b0ccc2c8e6
SHA1 (patch-libraries_Cabal_Cabal_src_Distribution_Simple_GHC.hs) = 9e6028dd6ffc2d3c71493fbb7336adcec9f08f78
SHA1 (patch-libraries_Cabal_Cabal_src_Distribution_Simple_Register.hs) = adbb8fe40fc1a0e4afa7cd4bfb1c32b08ab73f15
SHA1 (patch-libraries_base_GHC_Event_KQueue.hsc) = 8ee5da667a241a05fde3c580d3dc9bdc05aa5f00
@@ -53,6 +57,10 @@ SHA1 (patch-libraries_unix_System_Posix_
SHA1 (patch-libraries_unix_System_Posix_Signals.hsc) = ee59a04571881382bcfd9fc82bf196ff86a40ed5
SHA1 (patch-libraries_unix_System_Posix_User.hsc) = b583f591838fe2d7f42241787e02c5385d336939
SHA1 (patch-libraries_unix_System_Posix_User_ByteString.hsc) = 2a331de2292835ae6904980facd8201705fa63e8
+SHA1 (patch-linters_lint-commit-msg_lint-commit-msg.cabal) = 05fc63a1350197b3189110cf1162935fb4407a7f
+SHA1 (patch-linters_lint-submodule-refs_lint-submodule-refs.cabal) = 77ae34a0b58d4213c9e82a71db4b05d47a34862a
+SHA1 (patch-linters_lint-whitespace_lint-whitespace.cabal) = 61941f07cc350cba1ef39a5fe2fb5a61875c4966
+SHA1 (patch-linters_linters-common_linters-common.cabal) = aefc902558b4c03525048103f074d3d94430bb52
SHA1 (patch-m4_fp__find__cxx__std__lib.m4) = 67a86c6eaf4ce1cabb87080651ec4b42f3b7a914
SHA1 (patch-m4_fptools__set__haskell__platform__vars.m4) = 8c7a7ab965f4df8a68bedb35c32ee32c59ac2c94
SHA1 (patch-rts_rts.cabal.in) = d6805ed0669d73ad68488283c579e1e41eb0536e
Index: pkgsrc/lang/ghc98/patches/patch-hadrian_bootstrap_bootstrap.py
diff -u pkgsrc/lang/ghc98/patches/patch-hadrian_bootstrap_bootstrap.py:1.3 pkgsrc/lang/ghc98/patches/patch-hadrian_bootstrap_bootstrap.py:1.4
--- pkgsrc/lang/ghc98/patches/patch-hadrian_bootstrap_bootstrap.py:1.3 Sat May 11 14:55:51 2024
+++ pkgsrc/lang/ghc98/patches/patch-hadrian_bootstrap_bootstrap.py Sun Jan 12 15:02:35 2025
@@ -1,4 +1,4 @@
-$NetBSD: patch-hadrian_bootstrap_bootstrap.py,v 1.3 2024/05/11 14:55:51 pho Exp $
+$NetBSD: patch-hadrian_bootstrap_bootstrap.py,v 1.4 2025/01/12 15:02:35 pho Exp $
Hunk #0, #1:
bootstrap.py assumes that GHC always has a threaded RTS but our
@@ -45,7 +45,7 @@ Hunk #1-#7:
+ with open(patch_path) as patch_file:
+ patch = patch_file.read()
+ subprocess_run(
-+ ['patch', '-p1', '-b'], cwd=sdist_dir, input=patch, check=True, encoding='UTF-8')
++ ['patch', '-p1', '-b', '-l'], cwd=sdist_dir, input=patch, check=True, encoding='UTF-8')
+
+ # If it's from Hackage and we've already installed it, don't do it
+ # twice. That only wastes time.
Index: pkgsrc/lang/ghc98/patches/patch-hadrian_src_Settings_Packages.hs
diff -u pkgsrc/lang/ghc98/patches/patch-hadrian_src_Settings_Packages.hs:1.2 pkgsrc/lang/ghc98/patches/patch-hadrian_src_Settings_Packages.hs:1.3
--- pkgsrc/lang/ghc98/patches/patch-hadrian_src_Settings_Packages.hs:1.2 Sun May 12 02:52:35 2024
+++ pkgsrc/lang/ghc98/patches/patch-hadrian_src_Settings_Packages.hs Sun Jan 12 15:02:35 2025
@@ -1,11 +1,15 @@
-$NetBSD: patch-hadrian_src_Settings_Packages.hs,v 1.2 2024/05/12 02:52:35 pho Exp $
+$NetBSD: patch-hadrian_src_Settings_Packages.hs,v 1.3 2025/01/12 15:02:35 pho Exp $
-Hunk #0, #1:
+Hunk #1, #3:
Don't assume we always build the threaded RTS. We can't upstream this
until they adopt this change to Haddock:
https://github.com/haskell/haddock/commit/75a94e010fb5b0236c670d22b04f5472397dc15d
-Hunk #2:
+Hunk #0, #1, #2:
+ Fix build with GHC >= 9.8.1:
+ https://gitlab.haskell.org/ghc/ghc/-/merge_requests/11541
+
+Hunk #4:
Hadrian does something unholy on i386 to gain speed but it seems to be
incompatible with LLD. Disable the speed hack to work around a linkage
failure. Ideally we should do this by detecting the type of linker but
@@ -13,15 +17,33 @@ Hunk #2:
--- hadrian/src/Settings/Packages.hs.orig 2024-02-22 20:59:45.000000000 +0000
+++ hadrian/src/Settings/Packages.hs
-@@ -29,6 +29,7 @@ packageArgs = do
+@@ -6,6 +6,7 @@ import Oracles.Setting
+ import Oracles.Flag
+ import Packages
+ import Settings
++import Data.Version.Extra
+
+ -- | Package-specific command-line arguments.
+ packageArgs :: Args
+@@ -29,6 +30,8 @@ packageArgs = do
cursesLibraryDir <- getSetting CursesLibDir
ffiIncludeDir <- getSetting FfiIncludeDir
ffiLibraryDir <- getSetting FfiLibDir
++ stageVersion <- readVersion <$> (expr $ ghcVersionStage stage)
+ rtsWays <- getRtsWays
mconcat
--------------------------------- base ---------------------------------
-@@ -166,7 +167,17 @@ packageArgs = do
+@@ -79,7 +82,7 @@ packageArgs = do
+ -- not being fixed to `ghc`, when building stage0, we must set
+ -- -this-unit-id to `ghc` because the boot compiler expects that.
+ -- We do it through a cabal flag in ghc.cabal
+- , stage0 ? arg "+hadrian-stage0"
++ , stageVersion < makeVersion [9, 8, 1] ? arg "+hadrian-stage0"
+ , flag StaticLibzstd `cabalFlag` "static-libzstd"
+ ]
+
+@@ -166,7 +169,17 @@ packageArgs = do
-------------------------------- haddock -------------------------------
, package haddock ?
@@ -40,7 +62,7 @@ Hunk #2:
---------------------------------- text --------------------------------
, package text ? mconcat
-@@ -441,7 +452,7 @@ rtsPackageArgs = package rts ? do
+@@ -441,7 +454,7 @@ rtsPackageArgs = package rts ? do
speedHack :: Action Bool
speedHack = do
i386 <- anyTargetArch ["i386"]
Added files:
Index: pkgsrc/lang/ghc98/files/hadrian-extra.patch
diff -u /dev/null pkgsrc/lang/ghc98/files/hadrian-extra.patch:1.1
--- /dev/null Sun Jan 12 15:02:35 2025
+++ pkgsrc/lang/ghc98/files/hadrian-extra.patch Sun Jan 12 15:02:35 2025
@@ -0,0 +1,64 @@
+$NetBSD: hadrian-extra.patch,v 1.1 2025/01/12 15:02:35 pho Exp $
+
+Allow it to build with GHC 9.8.x. Already fixed in upstream.
+
+--- extra-1.7.12.orig/extra.cabal 2025-01-12 11:29:59.465902826 +0900
++++ extra-1.7.12/extra.cabal 2025-01-12 11:36:39.814907687 +0900
+@@ -32,7 +32,7 @@
+ default-language: Haskell2010
+ hs-source-dirs: src
+ build-depends:
+- base >= 4.9 && < 4.19,
++ base,
+ directory,
+ filepath,
+ process,
+--- extra-1.7.12.orig/src/Data/List/Extra.hs 2001-09-09 10:46:40.000000000 +0900
++++ extra-1.7.12/src/Data/List/Extra.hs 2025-01-12 11:38:17.127540438 +0900
+@@ -1,4 +1,4 @@
+-{-# LANGUAGE TupleSections, ConstraintKinds #-}
++{-# LANGUAGE CPP, TupleSections, ConstraintKinds #-}
+
+ -- | This module extends "Data.List" with extra functions of a similar nature.
+ -- The package also exports the existing "Data.List" functions.
+@@ -156,6 +156,7 @@
+ lastDef d xs = foldl (\_ x -> x) d xs -- I know this looks weird, but apparently this is the fastest way to do this: https://hackage.haskell.org/package/base-4.12.0.0/docs/src/GHC.List.html#last
+ {-# INLINE lastDef #-}
+
++#if __GLASGOW_HASKELL__ <= 906
+ -- | A total variant of the list index function `(!!)`.
+ --
+ -- > [2,3,4] !? 1 == Just 3
+@@ -169,6 +170,7 @@
+ 0 -> Just x
+ _ -> r (k-1)) (const Nothing) xs n
+ {-# INLINABLE (!?) #-}
++#endif
+
+ -- | A composition of 'not' and 'null'.
+ --
+@@ -187,6 +189,7 @@
+ list nil cons [] = nil
+ list nil cons (x:xs) = cons x xs
+
++#if __GLASGOW_HASKELL__ <= 906
+ -- | If the list is empty returns 'Nothing', otherwise returns the 'init' and the 'last'.
+ --
+ -- > unsnoc "test" == Just ("tes",'t')
+@@ -197,6 +200,7 @@
+ unsnoc [x] = Just ([], x)
+ unsnoc (x:xs) = Just (x:a, b)
+ where Just (a,b) = unsnoc xs
++#endif
+
+ -- | Append an element to the start of a list, an alias for '(:)'.
+ --
+@@ -286,7 +290,7 @@
+ --
+ -- > concatUnzip [("a","AB"),("bc","C")] == ("abc","ABC")
+ concatUnzip :: [([a], [b])] -> ([a], [b])
+-concatUnzip = (concat *** concat) . unzip
++concatUnzip = (concat *** concat) . Prelude.unzip
+
+ -- | A merging of 'unzip3' and 'concat'.
+ --
Index: pkgsrc/lang/ghc98/files/hadrian-hashable.patch
diff -u /dev/null pkgsrc/lang/ghc98/files/hadrian-hashable.patch:1.1
--- /dev/null Sun Jan 12 15:02:35 2025
+++ pkgsrc/lang/ghc98/files/hadrian-hashable.patch Sun Jan 12 15:02:35 2025
@@ -0,0 +1,24 @@
+$NetBSD: hadrian-hashable.patch,v 1.1 2025/01/12 15:02:35 pho Exp $
+
+Allow it to build with GHC 9.8.x. Already fixed in upstream.
+
+--- hashable-1.4.2.0/hashable.cabal.orig 2025-01-12 02:44:35.285644238 +0000
++++ hashable-1.4.2.0/hashable.cabal
+@@ -77,13 +77,13 @@ library
+ include-dirs: include
+ hs-source-dirs: src
+ build-depends:
+- base >=4.10.1.0 && <4.19
+- , bytestring >=0.10.8.2 && <0.12
++ base
++ , bytestring
+ , containers >=0.5.10.2 && <0.7
+- , deepseq >=1.4.3.0 && <1.5
++ , deepseq
+ , filepath >=1.4.1.2 && <1.5
+ , ghc-prim
+- , text >=1.2.3.0 && <1.3 || >=2.0 && <2.1
++ , text
+
+ if !impl(ghc >=9.2)
+ build-depends: base-orphans >=0.8.6 && <0.10
Index: pkgsrc/lang/ghc98/files/hadrian-splitmix.patch
diff -u /dev/null pkgsrc/lang/ghc98/files/hadrian-splitmix.patch:1.1
--- /dev/null Sun Jan 12 15:02:35 2025
+++ pkgsrc/lang/ghc98/files/hadrian-splitmix.patch Sun Jan 12 15:02:35 2025
@@ -0,0 +1,17 @@
+$NetBSD: hadrian-splitmix.patch,v 1.1 2025/01/12 15:02:35 pho Exp $
+
+Allow it to build with GHC 9.8.x. Already fixed in upstream.
+
+--- splitmix.cabal.orig 2025-01-12 02:00:28.583229536 +0000
++++ splitmix.cabal
+@@ -80,8 +80,8 @@ library
+ -- ghc-options: -fplugin=DumpCore -fplugin-opt DumpCore:core-html
+
+ build-depends:
+- base >=4.3 && <4.19
+- , deepseq >=1.3.0.0 && <1.5
++ base
++ , deepseq
+
+ if flag(optimised-mixer)
+ cpp-options: -DOPTIMISED_MIX32=1
Index: pkgsrc/lang/ghc98/patches/patch-hadrian_hadrian.cabal
diff -u /dev/null pkgsrc/lang/ghc98/patches/patch-hadrian_hadrian.cabal:1.1
--- /dev/null Sun Jan 12 15:02:35 2025
+++ pkgsrc/lang/ghc98/patches/patch-hadrian_hadrian.cabal Sun Jan 12 15:02:35 2025
@@ -0,0 +1,15 @@
+$NetBSD: patch-hadrian_hadrian.cabal,v 1.1 2025/01/12 15:02:35 pho Exp $
+
+Allow it to build with GHC 9.8.x. Already fixed in upstream.
+
+--- hadrian/hadrian.cabal.orig 2025-01-12 03:00:29.789011438 +0000
++++ hadrian/hadrian.cabal
+@@ -151,7 +151,7 @@ executable hadrian
+ , TypeOperators
+ other-extensions: MultiParamTypeClasses
+ , TypeFamilies
+- build-depends: Cabal >= 3.2 && < 3.9
++ build-depends: Cabal
+ , base >= 4.11 && < 5
+ , bytestring >= 0.10 && < 0.13
+ , containers >= 0.5 && < 0.7
Index: pkgsrc/lang/ghc98/patches/patch-linters_lint-commit-msg_lint-commit-msg.cabal
diff -u /dev/null pkgsrc/lang/ghc98/patches/patch-linters_lint-commit-msg_lint-commit-msg.cabal:1.1
--- /dev/null Sun Jan 12 15:02:35 2025
+++ pkgsrc/lang/ghc98/patches/patch-linters_lint-commit-msg_lint-commit-msg.cabal Sun Jan 12 15:02:35 2025
@@ -0,0 +1,11 @@
+$NetBSD: patch-linters_lint-commit-msg_lint-commit-msg.cabal,v 1.1 2025/01/12 15:02:35 pho Exp $
+
+Allow it to build with GHC 9.8.x. Already fixed in upstream.
+
+--- linters/lint-commit-msg/lint-commit-msg.cabal.orig 2025-01-12 04:45:24.345305599 +0000
++++ linters/lint-commit-msg/lint-commit-msg.cabal
+@@ -26,4 +26,3 @@ executable lint-commit-msg
+ base
+ >= 4.14 && < 5,
+ text
+- >= 1.2 && < 2.1
Index: pkgsrc/lang/ghc98/patches/patch-linters_lint-submodule-refs_lint-submodule-refs.cabal
diff -u /dev/null pkgsrc/lang/ghc98/patches/patch-linters_lint-submodule-refs_lint-submodule-refs.cabal:1.1
--- /dev/null Sun Jan 12 15:02:35 2025
+++ pkgsrc/lang/ghc98/patches/patch-linters_lint-submodule-refs_lint-submodule-refs.cabal Sun Jan 12 15:02:35 2025
@@ -0,0 +1,16 @@
+$NetBSD: patch-linters_lint-submodule-refs_lint-submodule-refs.cabal,v 1.1 2025/01/12 15:02:35 pho Exp $
+
+Allow it to build with GHC 9.8.x. Already fixed in upstream.
+
+--- linters/lint-submodule-refs/lint-submodule-refs.cabal.orig 2025-01-12 04:47:27.735023240 +0000
++++ linters/lint-submodule-refs/lint-submodule-refs.cabal
+@@ -14,8 +14,7 @@ executable lint-submodule-refs
+ build-depends:
+ base
+ >= 4.14 && < 5,
+- text
+- >= 1.2 && < 2.1,
++ text,
+ linters-common
+
+ ghc-options:
Index: pkgsrc/lang/ghc98/patches/patch-linters_lint-whitespace_lint-whitespace.cabal
diff -u /dev/null pkgsrc/lang/ghc98/patches/patch-linters_lint-whitespace_lint-whitespace.cabal:1.1
--- /dev/null Sun Jan 12 15:02:35 2025
+++ pkgsrc/lang/ghc98/patches/patch-linters_lint-whitespace_lint-whitespace.cabal Sun Jan 12 15:02:35 2025
@@ -0,0 +1,11 @@
+$NetBSD: patch-linters_lint-whitespace_lint-whitespace.cabal,v 1.1 2025/01/12 15:02:35 pho Exp $
+
+Allow it to build with GHC 9.8.x. Already fixed in upstream.
+
+--- linters/lint-whitespace/lint-whitespace.cabal.orig 2025-01-12 04:49:43.005054016 +0000
++++ linters/lint-whitespace/lint-whitespace.cabal
+@@ -28,4 +28,3 @@ executable lint-whitespace
+ base
+ >= 4.14 && < 5,
+ text
+- >= 1.2 && < 2.1,
Index: pkgsrc/lang/ghc98/patches/patch-linters_linters-common_linters-common.cabal
diff -u /dev/null pkgsrc/lang/ghc98/patches/patch-linters_linters-common_linters-common.cabal:1.1
--- /dev/null Sun Jan 12 15:02:35 2025
+++ pkgsrc/lang/ghc98/patches/patch-linters_linters-common_linters-common.cabal Sun Jan 12 15:02:35 2025
@@ -0,0 +1,16 @@
+$NetBSD: patch-linters_linters-common_linters-common.cabal,v 1.1 2025/01/12 15:02:35 pho Exp $
+
+Allow it to build with GHC 9.8.x. Already fixed in upstream.
+
+--- linters/linters-common/linters-common.cabal.orig 2025-01-12 03:08:26.258934584 +0000
++++ linters/linters-common/linters-common.cabal
+@@ -15,8 +15,7 @@ library
+ ^>= 1.6,
+ base
+ >= 4.14 && < 5,
+- text
+- >= 1.2 && < 2.1,
++ text,
+ deepseq
+ >= 1.1,
+
Home |
Main Index |
Thread Index |
Old Index