[arch-commits] Commit in haskell-ghc-api-compat/trunk (2 files)

[Felix Yan]

    Date: Thursday, July 1, 2021 @ 16:01:58
  Author: felixonmars
Revision: 969359

upgpkg: haskell-ghc-api-compat 8.6.1-5: update ways patch again (2)

Modified:
  haskell-ghc-api-compat/trunk/PKGBUILD
  haskell-ghc-api-compat/trunk/ghc-api-compat-ways.patch

---------------------------+
 PKGBUILD                  |    4 +--
 ghc-api-compat-ways.patch |   53 ++++++++++++++++++++++++++++++++++++++++++--
 2 files changed, 53 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2021-07-01 15:57:52 UTC (rev 969358)
+++ PKGBUILD	2021-07-01 16:01:58 UTC (rev 969359)
@@ -4,7 +4,7 @@
 pkgname=haskell-ghc-api-compat
 pkgver=8.6.1
 _commit=9e8c1ec540bc0a68700e8541d44dca14913c5c9e
-pkgrel=4
+pkgrel=5
 pkgdesc="GHC-API compatibility helpers"
 url="https://hackage.haskell.org/package/ghc-api-compat"
 license=("BSD")
@@ -17,7 +17,7 @@
         # https://gitlab.haskell.org/haskell/ghc-api-compat/-/merge_requests/2.patch
         $_hkgname-ways.patch)
 sha256sums=('c9ff586aca0ccd6ccffe333403d21c9b86ed6dbd6335830419c0875c7df891bc'
-            'dcaaffbc488ad94aebcbdbc8f1cb8725f58ee6866058d9bcac72a5b35a2775b5')
+            '66463c2aafb9e341c5bd3d15bc21b7794b25e3ae231bf4c809f78bf24fca3e8d')
 
 prepare() {
   cd $_hkgname-$_commit

Modified: ghc-api-compat-ways.patch
===================================================================
--- ghc-api-compat-ways.patch	2021-07-01 15:57:52 UTC (rev 969358)
+++ ghc-api-compat-ways.patch	2021-07-01 16:01:58 UTC (rev 969359)
@@ -1,7 +1,7 @@
 From c40f91549af351a126cedda71d48a6b7e6ebe725 Mon Sep 17 00:00:00 2001
 From: Potato Hatsue <1793913507 at qq.com>
 Date: Wed, 23 Jun 2021 18:42:40 +0800
-Subject: [PATCH 1/2] Re-export some 'Way' related functions in DynFlags
+Subject: [PATCH 1/3] Re-export some 'Way' related functions in DynFlags
 
 ---
  ghc-api-compat.cabal |  4 ++--
@@ -68,7 +68,7 @@
 From 129557992495996523e5a23086e7e86e91f40fd5 Mon Sep 17 00:00:00 2001
 From: Potato Hatsue <1793913507 at qq.com>
 Date: Wed, 30 Jun 2021 20:25:05 +0800
-Subject: [PATCH 2/2] interpWays
+Subject: [PATCH 2/3] interpWays
 
 ---
  src/DynFlags.hs | 7 +++++++
@@ -102,3 +102,52 @@
 -- 
 GitLab
 
+
+From 06ed5af221b13fdcd4a71994503c40f587b91e96 Mon Sep 17 00:00:00 2001
+From: Potato Hatsue <1793913507 at qq.com>
+Date: Thu, 1 Jul 2021 21:18:02 +0800
+Subject: [PATCH 3/3] Correct the type of interpWays
+
+---
+ ghc-api-compat.cabal | 2 ++
+ src/DynFlags.hs      | 7 +++----
+ 2 files changed, 5 insertions(+), 4 deletions(-)
+
+diff --git a/ghc-api-compat.cabal b/ghc-api-compat.cabal
+index d694c2b..be92e24 100644
+--- a/ghc-api-compat.cabal
++++ b/ghc-api-compat.cabal
+@@ -121,6 +121,8 @@ library
+    if impl(ghc >= 9.0)
+       hs-source-dirs:   src
+       exposed-modules:  Outputable DynFlags
++      build-depends: 
++         containers >= 0.6.0 && <= 0.6.5
+       reexported-modules:
+            GHC.Rename.Bind                as RnBinds
+          , GHC.Rename.Env                 as RnEnv
+diff --git a/src/DynFlags.hs b/src/DynFlags.hs
+index b6a810d..cadb25b 100644
+--- a/src/DynFlags.hs
++++ b/src/DynFlags.hs
+@@ -12,7 +12,7 @@ module DynFlags
+   )
+ where
+ 
+-import Data.Foldable (toList)
++import Data.Set (Set)
+ import GHC.Driver.Session
+ #if MIN_VERSION_GLASGOW_HASKELL(9,2,0,0)
+ import GHC.Platform.Ways
+@@ -26,6 +26,5 @@ buildTag = waysBuildTag . ways
+ dynamicGhc :: Bool
+ dynamicGhc = hostIsDynamic
+ 
+-interpWays :: [Way]
+-interpWays = toList hostFullWays
+-
++interpWays :: Set Way
++interpWays = hostFullWays
+-- 
+GitLab
+