Sat Jan 21 16:26:23 2023 UTC ()
Add a merge request URL to a patch


(pho)
diff -r1.6 -r1.7 pkgsrc/lang/ghc94/distinfo
diff -r1.1 -r1.2 pkgsrc/lang/ghc94/patches/patch-utils_haddock_haddock.cabal
cvs diff -r1.6 -r1.7 pkgsrc/lang/ghc94/distinfo (expand / switch to unified diff)

--- pkgsrc/lang/ghc94/distinfo 2023/01/21 16:02:11 1.6
+++ pkgsrc/lang/ghc94/distinfo 2023/01/21 16:26:23 1.7
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1$NetBSD: distinfo,v 1.6 2023/01/21 16:02:11 pho Exp $ 1$NetBSD: distinfo,v 1.7 2023/01/21 16:26:23 pho Exp $
2 2
3BLAKE2s (ghc-9.0.1-boot-hadrian.tar.gz) = fff7259676e3d0281c7e15e684b65dc04313c9bcb4d6161962325c3fcee08c7b 3BLAKE2s (ghc-9.0.1-boot-hadrian.tar.gz) = fff7259676e3d0281c7e15e684b65dc04313c9bcb4d6161962325c3fcee08c7b
4SHA512 (ghc-9.0.1-boot-hadrian.tar.gz) = 02047ca0718a240ce702aeac16c2194b6bf73119dacb59816c1e9a631667e420e44c6ef6d5b83f225af3bd31e3ec3fc8f28e9a3cb22e86f63089110429759878 4SHA512 (ghc-9.0.1-boot-hadrian.tar.gz) = 02047ca0718a240ce702aeac16c2194b6bf73119dacb59816c1e9a631667e420e44c6ef6d5b83f225af3bd31e3ec3fc8f28e9a3cb22e86f63089110429759878
5Size (ghc-9.0.1-boot-hadrian.tar.gz) = 1473040 bytes 5Size (ghc-9.0.1-boot-hadrian.tar.gz) = 1473040 bytes
6BLAKE2s (ghc-9.0.1-boot-i386-unknown-freebsd.tar.xz) = 1dd13bbed8d4b873ccb1bed06706f41093ab616c6a63be8e59dfdfeab0af2b72 6BLAKE2s (ghc-9.0.1-boot-i386-unknown-freebsd.tar.xz) = 1dd13bbed8d4b873ccb1bed06706f41093ab616c6a63be8e59dfdfeab0af2b72
7SHA512 (ghc-9.0.1-boot-i386-unknown-freebsd.tar.xz) = f243d2a091dbaa670ecaac913266e428164064e5c73a2d4e96b603f16af94f3c4af4358e01c04d492de8ddd8c4b6d25ebe8b62b929b6191cd87f0f1d13873fde 7SHA512 (ghc-9.0.1-boot-i386-unknown-freebsd.tar.xz) = f243d2a091dbaa670ecaac913266e428164064e5c73a2d4e96b603f16af94f3c4af4358e01c04d492de8ddd8c4b6d25ebe8b62b929b6191cd87f0f1d13873fde
8Size (ghc-9.0.1-boot-i386-unknown-freebsd.tar.xz) = 48912780 bytes 8Size (ghc-9.0.1-boot-i386-unknown-freebsd.tar.xz) = 48912780 bytes
9BLAKE2s (ghc-9.0.1-boot-x86_64-apple-darwin.tar.xz) = 377b623a7fd13401376e07c6fe7e19db321bc9883156894af703d72524816f5f 9BLAKE2s (ghc-9.0.1-boot-x86_64-apple-darwin.tar.xz) = 377b623a7fd13401376e07c6fe7e19db321bc9883156894af703d72524816f5f
10SHA512 (ghc-9.0.1-boot-x86_64-apple-darwin.tar.xz) = 1c2d8e1df4d8545068c453e8437e29f1528015ce056150d98827709c026fc23f5460887467d20321b1d32e3fffefe7081c068d702881184029d1c63c0adb25e4 10SHA512 (ghc-9.0.1-boot-x86_64-apple-darwin.tar.xz) = 1c2d8e1df4d8545068c453e8437e29f1528015ce056150d98827709c026fc23f5460887467d20321b1d32e3fffefe7081c068d702881184029d1c63c0adb25e4
11Size (ghc-9.0.1-boot-x86_64-apple-darwin.tar.xz) = 57551160 bytes 11Size (ghc-9.0.1-boot-x86_64-apple-darwin.tar.xz) = 57551160 bytes
12BLAKE2s (ghc-9.0.1-boot-x86_64-unknown-freebsd.tar.xz) = 4957b6df3c21773d16477ff2d9fc6c4d41e3dee574a39d4672677cbea4f1aa64 12BLAKE2s (ghc-9.0.1-boot-x86_64-unknown-freebsd.tar.xz) = 4957b6df3c21773d16477ff2d9fc6c4d41e3dee574a39d4672677cbea4f1aa64
13SHA512 (ghc-9.0.1-boot-x86_64-unknown-freebsd.tar.xz) = 01b196eca0a23b64687cb795601ca02a409ea0a1b2db48f5b9ab90a95a1db05a254ac92db43726f15382f4cc9e54052685959467a2925fb67ebe5f68570c1eca 13SHA512 (ghc-9.0.1-boot-x86_64-unknown-freebsd.tar.xz) = 01b196eca0a23b64687cb795601ca02a409ea0a1b2db48f5b9ab90a95a1db05a254ac92db43726f15382f4cc9e54052685959467a2925fb67ebe5f68570c1eca
14Size (ghc-9.0.1-boot-x86_64-unknown-freebsd.tar.xz) = 49644112 bytes 14Size (ghc-9.0.1-boot-x86_64-unknown-freebsd.tar.xz) = 49644112 bytes
@@ -53,14 +53,14 @@ SHA1 (patch-libraries_terminfo_configure @@ -53,14 +53,14 @@ SHA1 (patch-libraries_terminfo_configure
53SHA1 (patch-libraries_text_text.cabal) = 5cfa19359cbdca7c836abae60302addd5e3e4218 53SHA1 (patch-libraries_text_text.cabal) = 5cfa19359cbdca7c836abae60302addd5e3e4218
54SHA1 (patch-libraries_time_lib_Data_Time_Clock_Internal_CTimespec.hsc) = 588270767f8a9cbde0648fc99807891fef65d721 54SHA1 (patch-libraries_time_lib_Data_Time_Clock_Internal_CTimespec.hsc) = 588270767f8a9cbde0648fc99807891fef65d721
55SHA1 (patch-libraries_time_lib_Data_Time_Clock_Internal_CTimeval.hs) = 68914d012a98cc4a4a245efeabcb9143dba0246a 55SHA1 (patch-libraries_time_lib_Data_Time_Clock_Internal_CTimeval.hs) = 68914d012a98cc4a4a245efeabcb9143dba0246a
56SHA1 (patch-libraries_unix_System_Posix_Env.hsc) = e94936c139ca15d45cac4a7feb74a601567913ab 56SHA1 (patch-libraries_unix_System_Posix_Env.hsc) = e94936c139ca15d45cac4a7feb74a601567913ab
57SHA1 (patch-libraries_unix_System_Posix_Env_ByteString.hsc) = a579c00d7d5d7ffbb73f6499e09588d6417be123 57SHA1 (patch-libraries_unix_System_Posix_Env_ByteString.hsc) = a579c00d7d5d7ffbb73f6499e09588d6417be123
58SHA1 (patch-libraries_unix_System_Posix_Files_Common.hsc) = 6efef280832d376915a8987e4e8aac283408f607 58SHA1 (patch-libraries_unix_System_Posix_Files_Common.hsc) = 6efef280832d376915a8987e4e8aac283408f607
59SHA1 (patch-libraries_unix_System_Posix_Signals.hsc) = 49215dce493a6bbc440f91a3959e592f86fc779b 59SHA1 (patch-libraries_unix_System_Posix_Signals.hsc) = 49215dce493a6bbc440f91a3959e592f86fc779b
60SHA1 (patch-libraries_unix_include_execvpe.h) = 560c6e9b644687fad62e380f73f08359c48639a2 60SHA1 (patch-libraries_unix_include_execvpe.h) = 560c6e9b644687fad62e380f73f08359c48639a2
61SHA1 (patch-m4_fptools__set__haskell__platform__vars.m4) = 8c7a7ab965f4df8a68bedb35c32ee32c59ac2c94 61SHA1 (patch-m4_fptools__set__haskell__platform__vars.m4) = 8c7a7ab965f4df8a68bedb35c32ee32c59ac2c94
62SHA1 (patch-rts_linker_MMap.c) = 9015bd4db6df0fa44e5d74d79d50c608fe306e98 62SHA1 (patch-rts_linker_MMap.c) = 9015bd4db6df0fa44e5d74d79d50c608fe306e98
63SHA1 (patch-rts_linker_MMap.h) = 8228fabcdaeb1511191da9fc614ff94d3eee8fbd 63SHA1 (patch-rts_linker_MMap.h) = 8228fabcdaeb1511191da9fc614ff94d3eee8fbd
64SHA1 (patch-rts_rts.cabal.in) = 605e30da81e444046d00457fc3961025c2073615 64SHA1 (patch-rts_rts.cabal.in) = 605e30da81e444046d00457fc3961025c2073615
65SHA1 (patch-utils_haddock_driver_Main.hs) = 26b015d3aef9fdff66e66c8e3d9a370a2dbd7067 65SHA1 (patch-utils_haddock_driver_Main.hs) = 26b015d3aef9fdff66e66c8e3d9a370a2dbd7067
66SHA1 (patch-utils_haddock_haddock.cabal) = 80b1ae7304afe14f117d0b432d5dda78e5b916c5 66SHA1 (patch-utils_haddock_haddock.cabal) = c8a244f2f341b736b65b218590d1a3a8309f55ba
cvs diff -r1.1 -r1.2 pkgsrc/lang/ghc94/patches/patch-utils_haddock_haddock.cabal (expand / switch to unified diff)

--- pkgsrc/lang/ghc94/patches/patch-utils_haddock_haddock.cabal 2023/01/21 04:49:25 1.1
+++ pkgsrc/lang/ghc94/patches/patch-utils_haddock_haddock.cabal 2023/01/21 16:26:23 1.2
@@ -1,16 +1,19 @@ @@ -1,16 +1,19 @@
1$NetBSD: patch-utils_haddock_haddock.cabal,v 1.1 2023/01/21 04:49:25 pho Exp $ 1$NetBSD: patch-utils_haddock_haddock.cabal,v 1.2 2023/01/21 16:26:23 pho Exp $
2 2
3Don't assume we always build the threaded RTS. Not upstreamed yet. 3Don't assume we always build the threaded RTS.
 4
 5Pull request:
 6https://github.com/haskell/haddock/pull/1575
4 7
5--- utils/haddock/haddock.cabal.orig 2023-01-11 07:37:47.265320221 +0000 8--- utils/haddock/haddock.cabal.orig 2023-01-11 07:37:47.265320221 +0000
6+++ utils/haddock/haddock.cabal 9+++ utils/haddock/haddock.cabal
7@@ -59,12 +59,16 @@ flag in-ghc-tree 10@@ -59,12 +59,16 @@ flag in-ghc-tree
8 description: Are we in a GHC tree? 11 description: Are we in a GHC tree?
9 default: False 12 default: False
10 manual: True 13 manual: True
11+flag threaded 14+flag threaded
12+ default: False 15+ default: False
13  16
14 executable haddock 17 executable haddock
15 default-language: Haskell2010 18 default-language: Haskell2010
16 main-is: Main.hs 19 main-is: Main.hs