Date: Monday, May 21, 2018 @ 07:21:08 Author: felixonmars Revision: 325813
upgpkg: haskell-tamarin-prover-term 1.4.0-5 rebuild with async,2.2.1 Modified: haskell-tamarin-prover-term/trunk/PKGBUILD haskell-tamarin-prover-term/trunk/ghc-8.4.patch ---------------+ PKGBUILD | 4 ++-- ghc-8.4.patch | 13 +++++++++++++ 2 files changed, 15 insertions(+), 2 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2018-05-21 07:16:13 UTC (rev 325812) +++ PKGBUILD 2018-05-21 07:21:08 UTC (rev 325813) @@ -5,7 +5,7 @@ _hkgname=tamarin-prover-term pkgname=haskell-tamarin-prover-term pkgver=1.4.0 -pkgrel=4 +pkgrel=5 pkgdesc="Term manipulation library for the tamarin prover" url="http://www.infsec.ethz.ch/research/software/tamarin" license=("GPL") @@ -16,7 +16,7 @@ source=("tamarin-prover-$pkgver.tar.gz::https://github.com/tamarin-prover/tamarin-prover/archive/$pkgver.tar.gz" ghc-8.4.patch) sha512sums=('7c1afe6a53b596c2ce01e9ad7a7f464af1f4efbc5f8edc13d5ec8bc32ce4e91ddde91dff6ab8e01cf3cf30a37a3a18953d937debc36c9df664f718d968e2ae74' - 'cec9149094345c7a4ef063b64f8bae51c26692c4995461dbee01d4933a307f1912a31c8c246577eca2517b454225eeba30348fb5bf0ebbc2421509089fd7b842') + 'd5031c558ecbd7f273a4b0055fe753d14b2dde60738507d7cb22e859b391455259d7099fbcaf4025912389bd93421d89b97d5d79d92a325b1f0c5caa50676513') prepare() { cd tamarin-prover-$pkgver Modified: ghc-8.4.patch =================================================================== --- ghc-8.4.patch 2018-05-21 07:16:13 UTC (rev 325812) +++ ghc-8.4.patch 2018-05-21 07:21:08 UTC (rev 325813) @@ -96,6 +96,19 @@ -- | Ensure that the computed substitution @sigma@ satisfies -- @t ==_AC apply sigma p@ after the delayed equations are solved. +diff --git a/lib/theory/src/Theory/Constraint/System/Guarded.hs b/lib/theory/src/Theory/Constraint/System/Guarded.hs +index f98fc7c2..2aac8ce2 100644 +--- a/lib/theory/src/Theory/Constraint/System/Guarded.hs ++++ b/lib/theory/src/Theory/Constraint/System/Guarded.hs +@@ -435,7 +435,7 @@ gall ss atos gf = GGuarded All ss atos gf + + -- | Local newtype to avoid orphan instance. + newtype ErrorDoc d = ErrorDoc { unErrorDoc :: d } +- deriving( Monoid, NFData, Document, HighlightDocument ) ++ deriving( Monoid, Semigroup, NFData, Document, HighlightDocument ) + + -- | @formulaToGuarded fm@ returns a guarded formula @gf@ that is + -- equivalent to @fm@ under the assumption that this is possible. diff --git a/lib/utils/src/Extension/Data/Bounded.hs b/lib/utils/src/Extension/Data/Bounded.hs index 5f166006..6ca7970d 100644 --- a/lib/utils/src/Extension/Data/Bounded.hs
