Date: Monday, October 15, 2018 @ 17:46:14 Author: felixonmars Revision: 394245
upgpkg: haskell-fgl 5.6.0.0-4 fix patch Added: haskell-fgl/trunk/base-4.12.patch Modified: haskell-fgl/trunk/PKGBUILD -----------------+ PKGBUILD | 8 ++++---- base-4.12.patch | 34 ++++++++++++++++++++++++++++++++++ 2 files changed, 38 insertions(+), 4 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2018-10-15 17:29:26 UTC (rev 394244) +++ PKGBUILD 2018-10-15 17:46:14 UTC (rev 394245) @@ -4,7 +4,7 @@ _hkgname=fgl pkgname=haskell-fgl pkgver=5.6.0.0 -pkgrel=3 +pkgrel=4 pkgdesc="Martin Erwig's Functional Graph Library" url="https://hackage.haskell.org/package/${_hkgname}"; license=("custom:BSD3") @@ -12,13 +12,13 @@ depends=('ghc-libs') makedepends=('ghc') source=("https://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz"; - https://patch-diff.githubusercontent.com/raw/haskell/fgl/pull/80.patch) + base-4.12.patch) sha512sums=('0da15994f95d86dd27a6678eb762afb72d87b28176f82505691b5e5215e2c73edfe7ed2f36021254a02a749d5f39f23bf68a8957900fb335e651be5b68ec11f2' - 'b9adfd74bc6b48311b1ac34e6f71948962fc87b123ad18028325750ea67a72f2648e119e7b45a6d15377b6258e4d443881910768021ccc795fa77b1841b5f556') + '73c2e1aa0e886e585b62eeabb5d95f0f3adce06881ea7dbd8c4cd9c2f46757159a29e39a9bba028278f455a1376583f0dd7a85fd1a7e1f7607e89400e573d6de') prepare() { cd $_hkgname-$pkgver - patch -p1 -i ../80.patch || : + patch -p1 -i ../base-4.12.patch } build() { Added: base-4.12.patch =================================================================== --- base-4.12.patch (rev 0) +++ base-4.12.patch 2018-10-15 17:46:14 UTC (rev 394245) @@ -0,0 +1,34 @@ +--- 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)
