[arch-commits] Commit in stack/trunk (PKGBUILD ghc9.patch)

[Felix Yan]

    Date: Thursday, July 22, 2021 @ 18:11:47
  Author: felixonmars
Revision: 983961

upgpkg: stack 2.7.3-1

Modified:
  stack/trunk/PKGBUILD
  stack/trunk/ghc9.patch

------------+
 PKGBUILD   |    6 +++---
 ghc9.patch |   45 ---------------------------------------------
 2 files changed, 3 insertions(+), 48 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2021-07-22 18:04:57 UTC (rev 983960)
+++ PKGBUILD	2021-07-22 18:11:47 UTC (rev 983961)
@@ -2,8 +2,8 @@
 # Contributor: Arch Haskell Team <arch-haskell at haskell.org>
 
 pkgname=stack
-pkgver=2.7.1
-pkgrel=23
+pkgver=2.7.3
+pkgrel=1
 pkgdesc="The Haskell Tool Stack"
 url="https://github.com/commercialhaskell/stack"
 license=("BSD")
@@ -36,7 +36,7 @@
 source=("git+https://github.com/commercialhaskell/stack.git#tag=v$pkgver"
         ghc9.patch)
 sha512sums=('SKIP'
-            '55ad4c484e6858206d7728077ef94c5f299727b4433b51c027931f1e09371c04c454a785091bcb1a28bf7d8af5652e0fc326dd1141e4b60d6bd185834bfd89bd')
+            '5229f2f6a32bf8d317a2fc7a7bb16c0698359255c2ec6cbe74cbc78799aa170d4e174e6e182478e52d7040f12f32b7a2b9c246f185d79b6e3f295ccb59f3f3b8')
 
 prepare() {
   cd $pkgname

Modified: ghc9.patch
===================================================================
--- ghc9.patch	2021-07-22 18:04:57 UTC (rev 983960)
+++ ghc9.patch	2021-07-22 18:11:47 UTC (rev 983961)
@@ -186,48 +186,3 @@
      Nothing  -> mempty
  
  -- | The Stackage project introduced the concept of hidden packages,
-diff --git a/src/Stack/Build/Execute.hs b/src/Stack/Build/Execute.hs
-index a409313f..e220ab86 100644
---- a/src/Stack/Build/Execute.hs
-+++ b/src/Stack/Build/Execute.hs
-@@ -997,7 +997,7 @@ withLockedDistDir announce root inner = do
-               announce $ "still blocking for directory lock on " <>
-                          fromString (toFilePath lockFP) <>
-                          "; maybe another Stack process is running?"
--      withCompanion complainer $
-+      withCompanion (\x -> complainer x) $
-         \stopComplaining ->
-         withRunInIO $ \run ->
-         withFileLock (toFilePath lockFP) Exclusive $ \_ ->
-diff --git a/src/Stack/Storage/Project.hs b/src/Stack/Storage/Project.hs
-index e57a5641..af51f5c1 100644
---- a/src/Stack/Storage/Project.hs
-+++ b/src/Stack/Storage/Project.hs
-@@ -93,8 +93,9 @@ withProjectStorage ::
-        (HasBuildConfig env, HasLogFunc env)
-     => ReaderT SqlBackend (RIO env) a
-     -> RIO env a
--withProjectStorage inner =
--    flip SQLite.withStorage_ inner =<< view (buildConfigL . to bcProjectStorage . to unProjectStorage)
-+withProjectStorage inner = do
-+    storage <- view (buildConfigL . to bcProjectStorage . to unProjectStorage)
-+    SQLite.withStorage_ storage inner
- 
- -- | Key used to retrieve configuration or flag cache
- type ConfigCacheKey = Unique ConfigCacheParent
-diff --git a/src/Stack/Storage/User.hs b/src/Stack/Storage/User.hs
-index c8b739da..376b7d66 100644
---- a/src/Stack/Storage/User.hs
-+++ b/src/Stack/Storage/User.hs
-@@ -134,8 +134,9 @@ withUserStorage ::
-        (HasConfig env, HasLogFunc env)
-     => ReaderT SqlBackend (RIO env) a
-     -> RIO env a
--withUserStorage inner =
--    flip SQLite.withStorage_ inner =<< view (configL . to configUserStorage . to unUserStorage)
-+withUserStorage inner = do
-+    storage <- view (configL . to configUserStorage . to unUserStorage)
-+    SQLite.withStorage_ storage inner
- 
- -- | Key used to retrieve the precompiled cache
- type PrecompiledCacheKey = Unique PrecompiledCacheParent