CVS commit: pkgsrc/lang/ghc94

["Masatake Daimon" <pho%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   pho
Date:           Tue Oct 10 14:58:42 UTC 2023

Modified Files:
        pkgsrc/lang/ghc94: distinfo
Added Files:
        pkgsrc/lang/ghc94/patches: patch-hadrian_bootstrap_src_Main.hs

Log Message:
lang/ghc94: Fix build of hadrian/bootstrap with cabal-install-parsers >= 0.6


To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 pkgsrc/lang/ghc94/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/lang/ghc94/patches/patch-hadrian_bootstrap_src_Main.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/ghc94/distinfo
diff -u pkgsrc/lang/ghc94/distinfo:1.13 pkgsrc/lang/ghc94/distinfo:1.14
--- pkgsrc/lang/ghc94/distinfo:1.13     Mon Oct  9 02:49:52 2023
+++ pkgsrc/lang/ghc94/distinfo  Tue Oct 10 14:58:41 2023
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.13 2023/10/09 02:49:52 pho Exp $
+$NetBSD: distinfo,v 1.14 2023/10/10 14:58:41 pho Exp $
 
 BLAKE2s (ghc-9.0.1-boot-hadrian.tar.gz) = fff7259676e3d0281c7e15e684b65dc04313c9bcb4d6161962325c3fcee08c7b
 SHA512 (ghc-9.0.1-boot-hadrian.tar.gz) = 02047ca0718a240ce702aeac16c2194b6bf73119dacb59816c1e9a631667e420e44c6ef6d5b83f225af3bd31e3ec3fc8f28e9a3cb22e86f63089110429759878
@@ -35,6 +35,7 @@ SHA1 (patch-compiler_GHC_SysTools_Proces
 SHA1 (patch-configure.ac) = 985482ae70830ddbf1334c9c82a2cec78a34bb4c
 SHA1 (patch-hadrian_bindist_Makefile) = 9a2a708d200ee03a199e8626210b13174a5b3663
 SHA1 (patch-hadrian_bootstrap_bootstrap.py) = 7ef1691e3596f796488574dfd3d829a3cc83a1e2
+SHA1 (patch-hadrian_bootstrap_src_Main.hs) = 8b1542d2b1d15dc0ac990b20c910b9b87a42dde8
 SHA1 (patch-hadrian_src_Builder.hs) = fc0d05c4a8b052dac87a8d2e7a6166f8779bd92a
 SHA1 (patch-hadrian_src_Oracles_Setting.hs) = 498d1f810fa2f57151909eb672b73f137f1a7b01
 SHA1 (patch-hadrian_src_Rules_BinaryDist.hs) = fb908f74b8b619bccd673fbdb40b1c53ab7a51d8

Added files:

Index: pkgsrc/lang/ghc94/patches/patch-hadrian_bootstrap_src_Main.hs
diff -u /dev/null pkgsrc/lang/ghc94/patches/patch-hadrian_bootstrap_src_Main.hs:1.1
--- /dev/null   Tue Oct 10 14:58:42 2023
+++ pkgsrc/lang/ghc94/patches/patch-hadrian_bootstrap_src_Main.hs       Tue Oct 10 14:58:42 2023
@@ -0,0 +1,39 @@
+$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