[arch-commits] Commit in haskell-fgl/trunk (PKGBUILD base-4.12.patch)

[Felix Yan]

    Date: Thursday, December 6, 2018 @ 09:04:59
  Author: felixonmars
Revision: 411665

upgpkg: haskell-fgl 5.7.0.1-1

rebuild with fgl 5.7.0.1

Modified:
  haskell-fgl/trunk/PKGBUILD
Deleted:
  haskell-fgl/trunk/base-4.12.patch

-----------------+
 PKGBUILD        |   17 +++++------------
 base-4.12.patch |   34 ----------------------------------
 2 files changed, 5 insertions(+), 46 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2018-12-06 09:01:51 UTC (rev 411664)
+++ PKGBUILD	2018-12-06 09:04:59 UTC (rev 411665)
@@ -3,24 +3,17 @@
 
 _hkgname=fgl
 pkgname=haskell-fgl
-pkgver=5.6.0.0
-pkgrel=5
+pkgver=5.7.0.1
+pkgrel=1
 pkgdesc="Martin Erwig's Functional Graph Library"
 url="https://hackage.haskell.org/package/${_hkgname}"
-license=("custom:BSD3")
+license=("BSD")
 arch=('x86_64')
 depends=('ghc-libs')
 makedepends=('ghc')
-source=("https://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz"
-        base-4.12.patch)
-sha512sums=('0da15994f95d86dd27a6678eb762afb72d87b28176f82505691b5e5215e2c73edfe7ed2f36021254a02a749d5f39f23bf68a8957900fb335e651be5b68ec11f2'
-            '73c2e1aa0e886e585b62eeabb5d95f0f3adce06881ea7dbd8c4cd9c2f46757159a29e39a9bba028278f455a1376583f0dd7a85fd1a7e1f7607e89400e573d6de')
+source=("https://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz")
+sha512sums=('5aa06a3489379a2dd1710cb90567cd660a85f3f7a38b2b07994d6db99976eef54aa646e6527f54dae0fdff0b01bc619cfa54935305e35d0f58cf8bc708e66402')
 
-prepare() {
-    cd $_hkgname-$pkgver
-    patch -p1 -i ../base-4.12.patch
-}
-
 build() {
     cd $_hkgname-$pkgver
     

Deleted: base-4.12.patch
===================================================================
--- base-4.12.patch	2018-12-06 09:01:51 UTC (rev 411664)
+++ base-4.12.patch	2018-12-06 09:04:59 UTC (rev 411665)
@@ -1,34 +0,0 @@
---- a/Data/Graph/Inductive/Monad.hs
-+++ b/Data/Graph/Inductive/Monad.hs
-@@ -1,4 +1,4 @@
--{-# LANGUAGE MultiParamTypeClasses #-}
-+{-# LANGUAGE CPP, MultiParamTypeClasses #-}
- 
- -- (c) 2002 by Martin Erwig [see file COPYRIGHT]
- -- | Monadic Graphs
-@@ -19,6 +19,10 @@ module Data.Graph.Inductive.Monad(
- 
- 
- import Data.Graph.Inductive.Graph
-+#if MIN_VERSION_base(4,12,0)
-+import Control.Monad.Fail
-+import Prelude hiding (fail)
-+#endif
- 
- {-# ANN module "HLint: ignore Redundant lambda" #-}
- 
-@@ -39,7 +43,13 @@ import Data.Graph.Inductive.Graph
- 
- -- Monadic Graph
- --
--class (Monad m) => GraphM m gr where
-+class
-+#if MIN_VERSION_base(4,12,0)
-+ (MonadFail m)
-+#else
-+ (Monad m)
-+#endif
-+  => GraphM m gr where
-   {-# MINIMAL emptyM, isEmptyM, matchM, mkGraphM, labNodesM #-}
- 
-   emptyM     :: m (gr a b)