CVS commit: pkgsrc/lang/ghc94

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

Module Name:    pkgsrc
Committed By:   pho
Date:           Sat Jan 21 12:59:54 UTC 2023

Modified Files:
        pkgsrc/lang/ghc94: distinfo
        pkgsrc/lang/ghc94/patches:
            patch-libraries_base_System_Environment_ExecutablePath.hsc
            patch-libraries_ghc-boot_GHC_BaseDir.hs

Log Message:
Add merge request URLs to patches


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 pkgsrc/lang/ghc94/distinfo
cvs rdiff -u -r1.1 -r1.2 \
    pkgsrc/lang/ghc94/patches/patch-libraries_base_System_Environment_ExecutablePath.hsc \
    pkgsrc/lang/ghc94/patches/patch-libraries_ghc-boot_GHC_BaseDir.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.2 pkgsrc/lang/ghc94/distinfo:1.3
--- pkgsrc/lang/ghc94/distinfo:1.2      Sat Jan 21 12:02:49 2023
+++ pkgsrc/lang/ghc94/distinfo  Sat Jan 21 12:59:54 2023
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.2 2023/01/21 12:02:49 pho Exp $
+$NetBSD: distinfo,v 1.3 2023/01/21 12:59:54 pho Exp $
 
 BLAKE2s (ghc-9.0.1-boot-hadrian.tar.gz) = fff7259676e3d0281c7e15e684b65dc04313c9bcb4d6161962325c3fcee08c7b
 SHA512 (ghc-9.0.1-boot-hadrian.tar.gz) = 02047ca0718a240ce702aeac16c2194b6bf73119dacb59816c1e9a631667e420e44c6ef6d5b83f225af3bd31e3ec3fc8f28e9a3cb22e86f63089110429759878
@@ -45,9 +45,9 @@ SHA1 (patch-libraries_Cabal_Cabal_src_Di
 SHA1 (patch-libraries_base_GHC_Event_KQueue.hsc) = 8ee5da667a241a05fde3c580d3dc9bdc05aa5f00
 SHA1 (patch-libraries_base_System_CPUTime_Posix_Times.hsc) = 2bfb779d534d12073287274ce5e90b99e457a860
 SHA1 (patch-libraries_base_System_Environment.hs) = 7d79a91f295915b4408d5f41d5405739d7189215
-SHA1 (patch-libraries_base_System_Environment_ExecutablePath.hsc) = d3c4f9c4fd3589e4a2e47d1e6c6648ccdb8a1df6
+SHA1 (patch-libraries_base_System_Environment_ExecutablePath.hsc) = 30baa7f76f20d449feea0f634ca6b90e04d9481e
 SHA1 (patch-libraries_base_configure) = 4e02082cdfde8d927d12f3d2f3d98ace6d4ee116
-SHA1 (patch-libraries_ghc-boot_GHC_BaseDir.hs) = e3393294a27f5d33db07252cbae4308ba4a2d877
+SHA1 (patch-libraries_ghc-boot_GHC_BaseDir.hs) = 6885d0426eb4c09462b6628924a0801fe6c83a2f
 SHA1 (patch-libraries_process_cbits_posix_fork__exec.c) = 9c942faf829a64a20237c788e8c8265179db55c7
 SHA1 (patch-libraries_terminfo_configure.ac) = c961bc2280c38b950888b9a34358738eae072abf
 SHA1 (patch-libraries_text_text.cabal) = 5cfa19359cbdca7c836abae60302addd5e3e4218

Index: pkgsrc/lang/ghc94/patches/patch-libraries_base_System_Environment_ExecutablePath.hsc
diff -u pkgsrc/lang/ghc94/patches/patch-libraries_base_System_Environment_ExecutablePath.hsc:1.1 pkgsrc/lang/ghc94/patches/patch-libraries_base_System_Environment_ExecutablePath.hsc:1.2
--- pkgsrc/lang/ghc94/patches/patch-libraries_base_System_Environment_ExecutablePath.hsc:1.1    Sat Jan 21 04:49:25 2023
+++ pkgsrc/lang/ghc94/patches/patch-libraries_base_System_Environment_ExecutablePath.hsc        Sat Jan 21 12:59:54 2023
@@ -1,6 +1,9 @@
-$NetBSD: patch-libraries_base_System_Environment_ExecutablePath.hsc,v 1.1 2023/01/21 04:49:25 pho Exp $
+$NetBSD: patch-libraries_base_System_Environment_ExecutablePath.hsc,v 1.2 2023/01/21 12:59:54 pho Exp $
 
-Support executablePath on Solaris. Not upstreamed yet.
+Support executablePath on Solaris.
+
+Merge request:
+https://gitlab.haskell.org/ghc/ghc/-/merge_requests/9768
 
 --- libraries/base/System/Environment/ExecutablePath.hsc.orig  2023-01-14 16:23:19.153537486 +0000
 +++ libraries/base/System/Environment/ExecutablePath.hsc
Index: pkgsrc/lang/ghc94/patches/patch-libraries_ghc-boot_GHC_BaseDir.hs
diff -u pkgsrc/lang/ghc94/patches/patch-libraries_ghc-boot_GHC_BaseDir.hs:1.1 pkgsrc/lang/ghc94/patches/patch-libraries_ghc-boot_GHC_BaseDir.hs:1.2
--- pkgsrc/lang/ghc94/patches/patch-libraries_ghc-boot_GHC_BaseDir.hs:1.1       Sat Jan 21 04:49:25 2023
+++ pkgsrc/lang/ghc94/patches/patch-libraries_ghc-boot_GHC_BaseDir.hs   Sat Jan 21 12:59:54 2023
@@ -1,8 +1,11 @@
-$NetBSD: patch-libraries_ghc-boot_GHC_BaseDir.hs,v 1.1 2023/01/21 04:49:25 pho Exp $
+$NetBSD: patch-libraries_ghc-boot_GHC_BaseDir.hs,v 1.2 2023/01/21 12:59:54 pho Exp $
 
 Make getBaseDir less platform-dependent by making use of base-4.17
 `executablePath` when possible, and falling back on `getExecutablePath`
-when it's not available. Not upstreamed yet.
+when it's not available.
+
+Merge request:
+https://gitlab.haskell.org/ghc/ghc/-/merge_requests/9768
 
 --- libraries/ghc-boot/GHC/BaseDir.hs.orig     2023-01-14 17:06:00.667592015 +0000
 +++ libraries/ghc-boot/GHC/BaseDir.hs