From ba2e106d701e87a2580d69b76dfecf0106fca6c2 Mon Sep 17 00:00:00 2001 From: Gleb Popov Date: Mon, 7 Nov 2022 18:29:16 +0300 Subject: [PATCH] lang/ghc: Update to 9.2.5 MFH: 2022Q4 --- .../files/patch-bootstrap_linux-8.10.7.json | 9 +++++---- lang/ghc/Makefile | 6 +++--- lang/ghc/distinfo | 6 +++--- lang/ghc/pkg-plist | 3 +++ 4 files changed, 14 insertions(+), 10 deletions(-) diff --git a/devel/hs-cabal-install/files/patch-bootstrap_linux-8.10.7.json b/devel/hs-cabal-install/files/patch-bootstrap_linux-8.10.7.json index 194b14e5bc9d..fd6bb1a2e87f 100644 --- a/devel/hs-cabal-install/files/patch-bootstrap_linux-8.10.7.json +++ b/devel/hs-cabal-install/files/patch-bootstrap_linux-8.10.7.json @@ -140,7 +140,7 @@ { "package": "base", - "version": "4.14.3.0" -+ "version": "4.16.3.0" ++ "version": "4.16.4.0" }, { "package": "array", @@ -191,11 +191,11 @@ { "package": "ghc-boot-th", - "version": "8.10.7" -+ "version": "9.2.4" ++ "version": "9.2.5" }, { "package": "pretty", -@@ -329,15 +329,15 @@ +@@ -329,23 +329,23 @@ }, { "package": "template-haskell", @@ -214,7 +214,8 @@ }, { "package": "process", -@@ -345,7 +345,7 @@ +- "version": "1.6.13.2" ++ "version": "1.6.16.0" }, { "package": "stm", diff --git a/lang/ghc/Makefile b/lang/ghc/Makefile index 009ea13fcb8c..59b2cc33c12f 100644 --- a/lang/ghc/Makefile +++ b/lang/ghc/Makefile @@ -61,19 +61,19 @@ GMP_LIB_DEPENDS= libgmp.so:math/gmp PROFILE_VARS= enable_profile=YES PROFILE_VARS_OFF= enable_profile=NO -GHC_VERSION?= 9.2.4 +GHC_VERSION?= 9.2.5 LLVM_VERSION?= 12 BOOT_GHC_VERSION= 8.10.7 # LLVM version that bootstrap compiler uses BOOT_LLVM_VERSION= 10 -BASE_PACKAGES?= Cabal-3.6.3.0 array-0.5.4.0 base-4.16.3.0 binary-0.8.9.0 \ +BASE_PACKAGES?= Cabal-3.6.3.0 array-0.5.4.0 base-4.16.4.0 binary-0.8.9.0 \ bytestring-0.11.3.1 containers-0.6.5.1 deepseq-1.4.6.1 \ directory-1.3.6.2 exceptions-0.10.4 filepath-1.4.2.2 \ ghc-${GHC_VERSION} ghc-bignum-1.2 ghc-compact-0.1.0.0 \ ghc-prim-0.8.0 haskeline-0.8.2 hpc-0.6.1.0 \ integer-gmp-1.1 mtl-2.2.2 parsec-3.1.15.0 pretty-1.3.3.6 \ - process-1.6.13.2 stm-2.5.0.2 template-haskell-2.18.0.0 \ + process-1.6.16.0 stm-2.5.0.2 template-haskell-2.18.0.0 \ terminfo-0.4.1.5 text-1.2.5.0 time-1.11.1.1 \ transformers-0.5.6.2 unix-2.7.2.2 xhtml-3000.2.2.1 diff --git a/lang/ghc/distinfo b/lang/ghc/distinfo index 9d56962394b0..dfc8667ea225 100644 --- a/lang/ghc/distinfo +++ b/lang/ghc/distinfo @@ -1,6 +1,6 @@ -TIMESTAMP = 1653682073 -SHA256 (ghc-9.2.4-src.tar.xz) = 15213888064a0ec4e7723d075f31b87a678ce0851773d58b44ef7aa3de996458 -SIZE (ghc-9.2.4-src.tar.xz) = 24632968 +TIMESTAMP = 1667818255 +SHA256 (ghc-9.2.5-src.tar.xz) = 0606797d1b38e2d88ee2243f38ec6b9a1aa93e9b578e95f0de9a9c0a4144021c +SIZE (ghc-9.2.5-src.tar.xz) = 24655072 SHA256 (ghc-8.10.7-src.tar.xz) = e3eef6229ce9908dfe1ea41436befb0455fefb1932559e860ad4c606b0d03c9d SIZE (ghc-8.10.7-src.tar.xz) = 19932668 SHA256 (ghc-8.10.7-boot-amd64-freebsd.tar.xz) = 5adfeceee2c3aa1208da174390cbb8e8c1d0a333b7c4a3a676a63f93beaf3126 diff --git a/lang/ghc/pkg-plist b/lang/ghc/pkg-plist index 5b8195104765..5d0b16d58d51 100644 --- a/lang/ghc/pkg-plist +++ b/lang/ghc/pkg-plist @@ -1446,6 +1446,9 @@ lib/ghc-%%GHC_VERSION%%/base-%%BASE_VERSION%%/GHC/StaticPtr/Internal.hi %%DYNAMIC%%lib/ghc-%%GHC_VERSION%%/base-%%BASE_VERSION%%/GHC/Stats.dyn_hi lib/ghc-%%GHC_VERSION%%/base-%%BASE_VERSION%%/GHC/Stats.hi %%PROFILE%%lib/ghc-%%GHC_VERSION%%/base-%%BASE_VERSION%%/GHC/Stats.p_hi +%%DYNAMIC%%lib/ghc-%%GHC_VERSION%%/ghc-%%GHC_VERSION%%/GHC/StgToCmm/Lit.dyn_hi +lib/ghc-%%GHC_VERSION%%/ghc-%%GHC_VERSION%%/GHC/StgToCmm/Lit.hi +%%PROFILE%%lib/ghc-%%GHC_VERSION%%/ghc-%%GHC_VERSION%%/GHC/StgToCmm/Lit.p_hi %%DYNAMIC%%lib/ghc-%%GHC_VERSION%%/base-%%BASE_VERSION%%/GHC/Storable.dyn_hi lib/ghc-%%GHC_VERSION%%/base-%%BASE_VERSION%%/GHC/Storable.hi %%PROFILE%%lib/ghc-%%GHC_VERSION%%/base-%%BASE_VERSION%%/GHC/Storable.p_hi