Tue Oct 10 14:58:42 2023 UTC ()
lang/ghc94: Fix build of hadrian/bootstrap with cabal-install-parsers >= 0.6


(pho)
diff -r1.13 -r1.14 pkgsrc/lang/ghc94/distinfo
diff -r0 -r1.1 pkgsrc/lang/ghc94/patches/patch-hadrian_bootstrap_src_Main.hs
cvs diff -r1.13 -r1.14 pkgsrc/lang/ghc94/distinfo (expand / switch to unified diff)

--- pkgsrc/lang/ghc94/distinfo 2023/10/09 02:49:52 1.13
+++ pkgsrc/lang/ghc94/distinfo 2023/10/10 14:58:41 1.14
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1$NetBSD: distinfo,v 1.13 2023/10/09 02:49:52 pho Exp $ 1$NetBSD: distinfo,v 1.14 2023/10/10 14:58:41 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) = 415565e02e37e7a6496a116f3a9ebb0d87c5751d5215d4a38a78cec06318372e 6BLAKE2s (ghc-9.0.1-boot-i386-unknown-freebsd.tar.xz) = 415565e02e37e7a6496a116f3a9ebb0d87c5751d5215d4a38a78cec06318372e
7SHA512 (ghc-9.0.1-boot-i386-unknown-freebsd.tar.xz) = 4fcf2eaa25b33ca77ad4ce465258ca6f9487995219d69416933a84b3d70b7908a09004f3279b4368f81ebb4fdd14465859147ebe683ac7f538307ce5dd74241d 7SHA512 (ghc-9.0.1-boot-i386-unknown-freebsd.tar.xz) = 4fcf2eaa25b33ca77ad4ce465258ca6f9487995219d69416933a84b3d70b7908a09004f3279b4368f81ebb4fdd14465859147ebe683ac7f538307ce5dd74241d
8Size (ghc-9.0.1-boot-i386-unknown-freebsd.tar.xz) = 48862704 bytes 8Size (ghc-9.0.1-boot-i386-unknown-freebsd.tar.xz) = 48862704 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) = 8c96f43487ea89547f87eeb2e2d1d3ba0e8d34618502b9c9b8e1792944e908a5 12BLAKE2s (ghc-9.0.1-boot-x86_64-unknown-freebsd.tar.xz) = 8c96f43487ea89547f87eeb2e2d1d3ba0e8d34618502b9c9b8e1792944e908a5
13SHA512 (ghc-9.0.1-boot-x86_64-unknown-freebsd.tar.xz) = 1ec81c83e247855e6e67bca3529955a24d8a9213c2d2f22997bb5260e1119edd5a463e4ecd7d3d1ebf85dbd090a12f1c1ac9776ad14395742e1b20ae1e1a45a4 13SHA512 (ghc-9.0.1-boot-x86_64-unknown-freebsd.tar.xz) = 1ec81c83e247855e6e67bca3529955a24d8a9213c2d2f22997bb5260e1119edd5a463e4ecd7d3d1ebf85dbd090a12f1c1ac9776ad14395742e1b20ae1e1a45a4
14Size (ghc-9.0.1-boot-x86_64-unknown-freebsd.tar.xz) = 49606768 bytes 14Size (ghc-9.0.1-boot-x86_64-unknown-freebsd.tar.xz) = 49606768 bytes
@@ -25,26 +25,27 @@ BLAKE2s (ghc-9.2.1-boot-x86_64-unknown-s @@ -25,26 +25,27 @@ BLAKE2s (ghc-9.2.1-boot-x86_64-unknown-s
25SHA512 (ghc-9.2.1-boot-x86_64-unknown-solaris2.tar.xz) = 7e55f4a002808aa1ae3c6053b129f0f0c0ac2d9f6b9ad5e4fc7c0fa9a09defeea2ed46a7e8d4c5a81213b631aacfa4cdd92b3bc724a6ee4de8b9d201840f3185 25SHA512 (ghc-9.2.1-boot-x86_64-unknown-solaris2.tar.xz) = 7e55f4a002808aa1ae3c6053b129f0f0c0ac2d9f6b9ad5e4fc7c0fa9a09defeea2ed46a7e8d4c5a81213b631aacfa4cdd92b3bc724a6ee4de8b9d201840f3185
26Size (ghc-9.2.1-boot-x86_64-unknown-solaris2.tar.xz) = 69490428 bytes 26Size (ghc-9.2.1-boot-x86_64-unknown-solaris2.tar.xz) = 69490428 bytes
27BLAKE2s (ghc-9.4.7-src.tar.xz) = e6afd6da016256bfa07a83cde66a006f6f77ebdc81231872f1c574dd24158bd4 27BLAKE2s (ghc-9.4.7-src.tar.xz) = e6afd6da016256bfa07a83cde66a006f6f77ebdc81231872f1c574dd24158bd4
28SHA512 (ghc-9.4.7-src.tar.xz) = 0fa2b864e90e6b76fa5a12b7ab417c0b945653707cdbc4942fbba58f93baee43b6160bb23aa0aa1282907022956275fa5469875059a743f181987d1b067f30e2 28SHA512 (ghc-9.4.7-src.tar.xz) = 0fa2b864e90e6b76fa5a12b7ab417c0b945653707cdbc4942fbba58f93baee43b6160bb23aa0aa1282907022956275fa5469875059a743f181987d1b067f30e2
29Size (ghc-9.4.7-src.tar.xz) = 28618472 bytes 29Size (ghc-9.4.7-src.tar.xz) = 28618472 bytes
30BLAKE2s (netbsd-9.0-amd64-libterminfo.tar.gz) = cf57e942d3331df269d8668bc09c59e8a81fbdfa5bb6c671d758d367a23c84ce 30BLAKE2s (netbsd-9.0-amd64-libterminfo.tar.gz) = cf57e942d3331df269d8668bc09c59e8a81fbdfa5bb6c671d758d367a23c84ce
31SHA512 (netbsd-9.0-amd64-libterminfo.tar.gz) = 79288d44b84df8848afc2cdfee628cc4fd1ec0334159403ef8ba994d617bc56a7114af3031198afb5f3b8f45c0463a848099431e32bc6725042908576b6f95b8 31SHA512 (netbsd-9.0-amd64-libterminfo.tar.gz) = 79288d44b84df8848afc2cdfee628cc4fd1ec0334159403ef8ba994d617bc56a7114af3031198afb5f3b8f45c0463a848099431e32bc6725042908576b6f95b8
32Size (netbsd-9.0-amd64-libterminfo.tar.gz) = 27744 bytes 32Size (netbsd-9.0-amd64-libterminfo.tar.gz) = 27744 bytes
33SHA1 (patch-compiler_GHC_Driver_Pipeline_Execute.hs) = 8a86aabddfa4cc5dcff3bb9812010696fb6a16df 33SHA1 (patch-compiler_GHC_Driver_Pipeline_Execute.hs) = 8a86aabddfa4cc5dcff3bb9812010696fb6a16df
34SHA1 (patch-compiler_GHC_SysTools_Process.hs) = ceb26657516e207e22d555ec6f87f735344b0d08 34SHA1 (patch-compiler_GHC_SysTools_Process.hs) = ceb26657516e207e22d555ec6f87f735344b0d08
35SHA1 (patch-configure.ac) = 985482ae70830ddbf1334c9c82a2cec78a34bb4c 35SHA1 (patch-configure.ac) = 985482ae70830ddbf1334c9c82a2cec78a34bb4c
36SHA1 (patch-hadrian_bindist_Makefile) = 9a2a708d200ee03a199e8626210b13174a5b3663 36SHA1 (patch-hadrian_bindist_Makefile) = 9a2a708d200ee03a199e8626210b13174a5b3663
37SHA1 (patch-hadrian_bootstrap_bootstrap.py) = 7ef1691e3596f796488574dfd3d829a3cc83a1e2 37SHA1 (patch-hadrian_bootstrap_bootstrap.py) = 7ef1691e3596f796488574dfd3d829a3cc83a1e2
 38SHA1 (patch-hadrian_bootstrap_src_Main.hs) = 8b1542d2b1d15dc0ac990b20c910b9b87a42dde8
38SHA1 (patch-hadrian_src_Builder.hs) = fc0d05c4a8b052dac87a8d2e7a6166f8779bd92a 39SHA1 (patch-hadrian_src_Builder.hs) = fc0d05c4a8b052dac87a8d2e7a6166f8779bd92a
39SHA1 (patch-hadrian_src_Oracles_Setting.hs) = 498d1f810fa2f57151909eb672b73f137f1a7b01 40SHA1 (patch-hadrian_src_Oracles_Setting.hs) = 498d1f810fa2f57151909eb672b73f137f1a7b01
40SHA1 (patch-hadrian_src_Rules_BinaryDist.hs) = fb908f74b8b619bccd673fbdb40b1c53ab7a51d8 41SHA1 (patch-hadrian_src_Rules_BinaryDist.hs) = fb908f74b8b619bccd673fbdb40b1c53ab7a51d8
41SHA1 (patch-hadrian_src_Settings_Builders_Ghc.hs) = e2913e9f83bb36bb0b432a24518c9b6ca2990c6a 42SHA1 (patch-hadrian_src_Settings_Builders_Ghc.hs) = e2913e9f83bb36bb0b432a24518c9b6ca2990c6a
42SHA1 (patch-hadrian_src_Settings_Default.hs) = 0e0278308ca4decac3fabd89831195b2a20c6eab 43SHA1 (patch-hadrian_src_Settings_Default.hs) = 0e0278308ca4decac3fabd89831195b2a20c6eab
43SHA1 (patch-hadrian_src_Settings_Packages.hs) = 3112830dc86422ab717e12de4c6a76eda80fa909 44SHA1 (patch-hadrian_src_Settings_Packages.hs) = 3112830dc86422ab717e12de4c6a76eda80fa909
44SHA1 (patch-libraries_Cabal_Cabal_src_Distribution_Simple_GHC.hs) = a8b2eeec9a469b43e611f79fbf5b080c1e05aa50 45SHA1 (patch-libraries_Cabal_Cabal_src_Distribution_Simple_GHC.hs) = a8b2eeec9a469b43e611f79fbf5b080c1e05aa50
45SHA1 (patch-libraries_base_GHC_Event_KQueue.hsc) = 8ee5da667a241a05fde3c580d3dc9bdc05aa5f00 46SHA1 (patch-libraries_base_GHC_Event_KQueue.hsc) = 8ee5da667a241a05fde3c580d3dc9bdc05aa5f00
46SHA1 (patch-libraries_base_System_CPUTime_Posix_Times.hsc) = 2bfb779d534d12073287274ce5e90b99e457a860 47SHA1 (patch-libraries_base_System_CPUTime_Posix_Times.hsc) = 2bfb779d534d12073287274ce5e90b99e457a860
47SHA1 (patch-libraries_base_System_Environment.hs) = 7d79a91f295915b4408d5f41d5405739d7189215 48SHA1 (patch-libraries_base_System_Environment.hs) = 7d79a91f295915b4408d5f41d5405739d7189215
48SHA1 (patch-libraries_base_System_Environment_ExecutablePath.hsc) = 30baa7f76f20d449feea0f634ca6b90e04d9481e 49SHA1 (patch-libraries_base_System_Environment_ExecutablePath.hsc) = 30baa7f76f20d449feea0f634ca6b90e04d9481e
49SHA1 (patch-libraries_base_configure) = 4e02082cdfde8d927d12f3d2f3d98ace6d4ee116 50SHA1 (patch-libraries_base_configure) = 4e02082cdfde8d927d12f3d2f3d98ace6d4ee116
50SHA1 (patch-libraries_ghc-boot_GHC_BaseDir.hs) = 6885d0426eb4c09462b6628924a0801fe6c83a2f 51SHA1 (patch-libraries_ghc-boot_GHC_BaseDir.hs) = 6885d0426eb4c09462b6628924a0801fe6c83a2f
File Added: pkgsrc/lang/ghc94/patches/patch-hadrian_bootstrap_src_Main.hs
$NetBSD: patch-hadrian_bootstrap_src_Main.hs,v 1.1 2023/10/10 14:58:42 pho Exp $

Fix build with cabal-install-parsers >= 0.6. This doesn't affect normal
builds. It's only for creating Hadrian bootstrap source archives.

Not upstreamed yet.

--- hadrian/bootstrap/src/Main.hs.orig	2023-10-10 14:46:57.489617026 +0000
+++ hadrian/bootstrap/src/Main.hs
@@ -1,3 +1,5 @@
+{-# Language CPP #-}
+
 module Main (main) where
 
 import Control.Monad      (when)
@@ -34,7 +36,11 @@ main = do
 
 main1 :: FilePath -> IO ()
 main1 planPath = do
+#if MIN_VERSION_cabal_install_parsers(0, 4, 0)
+    meta <- snd <$> I.cachedHackageMetadata
+#else
     meta <- I.cachedHackageMetadata
+#endif
     plan <- P.decodePlanJson planPath
     main2 meta plan
 
@@ -85,7 +91,11 @@ main2 meta plan = do
                         return
                             ( Hackage
                             , Just $ fromIntegral (I.riRevision relInfo)
+#if MIN_VERSION_cabal_install_parsers(0, 6, 0)
+                            , P.sha256FromByteString $ I.getSHA256 $ I.riCabalHash relInfo
+#else
                             , P.sha256FromByteString $ I.getSHA256 $ I.riCabal relInfo
+#endif
                             )
 
                     Nothing -> case P.uType unit of