[arch-commits] Commit in haskell-tamarin-prover-term/trunk (PKGBUILD ghc-8.4.patch)
Felix Yan
felixonmars at archlinux.org
Sun Jan 20 11:13:48 UTC 2019
Date: Sunday, January 20, 2019 @ 11:13:48
Author: felixonmars
Revision: 425032
upgpkg: haskell-tamarin-prover-term 1.4.1-1
rebuild with tamarin-prover 1.4.1
Modified:
haskell-tamarin-prover-term/trunk/PKGBUILD
Deleted:
haskell-tamarin-prover-term/trunk/ghc-8.4.patch
---------------+
PKGBUILD | 15 +--
ghc-8.4.patch | 221 --------------------------------------------------------
2 files changed, 4 insertions(+), 232 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2019-01-20 11:12:38 UTC (rev 425031)
+++ PKGBUILD 2019-01-20 11:13:48 UTC (rev 425032)
@@ -3,8 +3,8 @@
_hkgname=tamarin-prover-term
pkgname=haskell-tamarin-prover-term
-pkgver=1.4.0
-pkgrel=26
+pkgver=1.4.1
+pkgrel=1
pkgdesc="Term manipulation library for the tamarin prover"
url="http://www.infsec.ethz.ch/research/software/tamarin"
license=("GPL")
@@ -12,16 +12,9 @@
depends=('ghc-libs' 'haskell-hunit' 'haskell-attoparsec' 'haskell-dlist'
'haskell-safe' 'haskell-tamarin-prover-utils')
makedepends=('ghc')
-source=("tamarin-prover-$pkgver.tar.gz::https://github.com/tamarin-prover/tamarin-prover/archive/$pkgver.tar.gz"
- ghc-8.4.patch)
-sha512sums=('7c1afe6a53b596c2ce01e9ad7a7f464af1f4efbc5f8edc13d5ec8bc32ce4e91ddde91dff6ab8e01cf3cf30a37a3a18953d937debc36c9df664f718d968e2ae74'
- 'd5031c558ecbd7f273a4b0055fe753d14b2dde60738507d7cb22e859b391455259d7099fbcaf4025912389bd93421d89b97d5d79d92a325b1f0c5caa50676513')
+source=("tamarin-prover-$pkgver.tar.gz::https://github.com/tamarin-prover/tamarin-prover/archive/$pkgver.tar.gz")
+sha512sums=('4d3aeae02be5d430bff6c55d78656e3c9a648674d235bfeb36ce227a39abd3054a132b99ff8040abf05d8e26506fe85d21ecfb6fce73062dd45b5ba98d941144')
-prepare() {
- cd tamarin-prover-$pkgver
- patch -p1 -i ../ghc-8.4.patch
-}
-
build() {
cd "${srcdir}/tamarin-prover-${pkgver}/lib/term"
Deleted: ghc-8.4.patch
===================================================================
--- ghc-8.4.patch 2019-01-20 11:12:38 UTC (rev 425031)
+++ ghc-8.4.patch 2019-01-20 11:13:48 UTC (rev 425032)
@@ -1,221 +0,0 @@
-diff --git a/lib/term/src/Term/Maude/Signature.hs b/lib/term/src/Term/Maude/Signature.hs
-index 98c25d9f..1a4ce82f 100644
---- a/lib/term/src/Term/Maude/Signature.hs
-+++ b/lib/term/src/Term/Maude/Signature.hs
-@@ -104,9 +104,9 @@ maudeSig msig@(MaudeSig {enableDH,enableBP,enableMSet,enableXor,enableDiff=_,stF
- `S.union` dhReducibleFunSig `S.union` bpReducibleFunSig `S.union` xorReducibleFunSig
-
- -- | A monoid instance to combine maude signatures.
--instance Monoid MaudeSig where
-- (MaudeSig dh1 bp1 mset1 xor1 diff1 stFunSyms1 stRules1 _ _) `mappend`
-- (MaudeSig dh2 bp2 mset2 xor2 diff2 stFunSyms2 stRules2 _ _) =
-+instance Semigroup MaudeSig where
-+ MaudeSig dh1 bp1 mset1 xor1 diff1 stFunSyms1 stRules1 _ _ <>
-+ MaudeSig dh2 bp2 mset2 xor2 diff2 stFunSyms2 stRules2 _ _ =
- maudeSig (mempty {enableDH=dh1||dh2
- ,enableBP=bp1||bp2
- ,enableMSet=mset1||mset2
-@@ -114,6 +114,8 @@ instance Monoid MaudeSig where
- ,enableDiff=diff1||diff2
- ,stFunSyms=S.union stFunSyms1 stFunSyms2
- ,stRules=S.union stRules1 stRules2})
-+
-+instance Monoid MaudeSig where
- mempty = MaudeSig False False False False False S.empty S.empty S.empty S.empty
-
- -- | Non-AC function symbols.
-diff --git a/lib/term/src/Term/Rewriting/Definitions.hs b/lib/term/src/Term/Rewriting/Definitions.hs
-index bd942b6a..18562e4e 100644
---- a/lib/term/src/Term/Rewriting/Definitions.hs
-+++ b/lib/term/src/Term/Rewriting/Definitions.hs
-@@ -44,10 +44,12 @@ evalEqual (Equal l r) = l == r
- instance Functor Equal where
- fmap f (Equal lhs rhs) = Equal (f lhs) (f rhs)
-
-+instance Semigroup a => Semigroup (Equal a) where
-+ (Equal l1 r1) <> (Equal l2 r2) =
-+ Equal (l1 <> l2) (r1 <> r2)
-+
- instance Monoid a => Monoid (Equal a) where
- mempty = Equal mempty mempty
-- (Equal l1 r1) `mappend` (Equal l2 r2) =
-- Equal (l1 `mappend` l2) (r1 `mappend` r2)
-
- instance Foldable Equal where
- foldMap f (Equal l r) = f l `mappend` f r
-@@ -104,14 +106,15 @@ instance Functor Match where
- fmap _ NoMatch = NoMatch
- fmap f (DelayedMatches ms) = DelayedMatches (fmap (f *** f) ms)
-
-+instance Semigroup (Match a) where
-+ NoMatch <> _ = NoMatch
-+ _ <> NoMatch = NoMatch
-+ DelayedMatches ms1 <> DelayedMatches ms2 =
-+ DelayedMatches (ms1 <> ms2)
-+
- instance Monoid (Match a) where
- mempty = DelayedMatches []
-
-- NoMatch `mappend` _ = NoMatch
-- _ `mappend` NoMatch = NoMatch
-- DelayedMatches ms1 `mappend` DelayedMatches ms2 =
-- DelayedMatches (ms1 `mappend` ms2)
--
-
- instance Foldable Match where
- foldMap _ NoMatch = mempty
-@@ -136,10 +139,12 @@ data RRule a = RRule a a
- instance Functor RRule where
- fmap f (RRule lhs rhs) = RRule (f lhs) (f rhs)
-
-+instance Monoid a => Semigroup (RRule a) where
-+ (RRule l1 r1) <> (RRule l2 r2) =
-+ RRule (l1 <> l2) (r1 <> r2)
-+
- instance Monoid a => Monoid (RRule a) where
- mempty = RRule mempty mempty
-- (RRule l1 r1) `mappend` (RRule l2 r2) =
-- RRule (l1 `mappend` l2) (r1 `mappend` r2)
-
- instance Foldable RRule where
- foldMap f (RRule l r) = f l `mappend` f r
-diff --git a/lib/term/src/Term/Unification.hs b/lib/term/src/Term/Unification.hs
-index e1de0163..7ce6bb41 100644
---- a/lib/term/src/Term/Unification.hs
-+++ b/lib/term/src/Term/Unification.hs
-@@ -265,9 +265,11 @@ unifyRaw l0 r0 = do
-
- data MatchFailure = NoMatcher | ACProblem
-
-+instance Semigroup MatchFailure where
-+ _ <> _ = NoMatcher
-+
- instance Monoid MatchFailure where
- mempty = NoMatcher
-- mappend _ _ = NoMatcher
-
- -- | 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
-+++ b/lib/utils/src/Extension/Data/Bounded.hs
-@@ -16,14 +16,18 @@ module Extension.Data.Bounded (
- newtype BoundedMax a = BoundedMax {getBoundedMax :: a}
- deriving( Eq, Ord, Show )
-
-+instance (Ord a, Bounded a) => Semigroup (BoundedMax a) where
-+ BoundedMax x <> BoundedMax y = BoundedMax (max x y)
-+
- instance (Ord a, Bounded a) => Monoid (BoundedMax a) where
- mempty = BoundedMax minBound
-- (BoundedMax x) `mappend` (BoundedMax y) = BoundedMax (max x y)
-
- -- | A newtype wrapper for a monoid of the minimum of a bounded type.
- newtype BoundedMin a = BoundedMin {getBoundedMin :: a}
- deriving( Eq, Ord, Show )
-
-+instance (Ord a, Bounded a) => Semigroup (BoundedMin a) where
-+ BoundedMin x <> BoundedMin y = BoundedMin (min x y)
-+
- instance (Ord a, Bounded a) => Monoid (BoundedMin a) where
- mempty = BoundedMin maxBound
-- (BoundedMin x) `mappend` (BoundedMin y) = BoundedMin (min x y)
-\ No newline at end of file
-diff --git a/lib/utils/src/Extension/Data/Monoid.hs b/lib/utils/src/Extension/Data/Monoid.hs
-index 83655c34..ca4f53c2 100644
---- a/lib/utils/src/Extension/Data/Monoid.hs
-+++ b/lib/utils/src/Extension/Data/Monoid.hs
-@@ -38,10 +38,12 @@ newtype MinMax a = MinMax { getMinMax :: Maybe (a, a) }
- minMaxSingleton :: a -> MinMax a
- minMaxSingleton x = MinMax (Just (x, x))
-
-+instance Ord a => Semigroup (MinMax a) where
-+ MinMax Nothing <> y = y
-+ x <> MinMax Nothing = x
-+ MinMax (Just (xMin, xMax)) <> MinMax (Just (yMin, yMax)) =
-+ MinMax (Just (min xMin yMin, max xMax yMax))
-+
-+
- instance Ord a => Monoid (MinMax a) where
- mempty = MinMax Nothing
--
-- MinMax Nothing `mappend` y = y
-- x `mappend` MinMax Nothing = x
-- MinMax (Just (xMin, xMax)) `mappend` MinMax (Just (yMin, yMax)) =
-- MinMax (Just (min xMin yMin, max xMax yMax))
-diff --git a/lib/utils/src/Logic/Connectives.hs b/lib/utils/src/Logic/Connectives.hs
-index 2e441172..7206cc2c 100644
---- a/lib/utils/src/Logic/Connectives.hs
-+++ b/lib/utils/src/Logic/Connectives.hs
-@@ -23,12 +23,12 @@ import Control.DeepSeq
-
- -- | A conjunction of atoms of type a.
- newtype Conj a = Conj { getConj :: [a] }
-- deriving (Monoid, Foldable, Traversable, Eq, Ord, Show, Binary,
-+ deriving (Monoid, Semigroup, Foldable, Traversable, Eq, Ord, Show, Binary,
- Functor, Applicative, Monad, Alternative, MonadPlus, Typeable, Data, NFData)
-
- -- | A disjunction of atoms of type a.
- newtype Disj a = Disj { getDisj :: [a] }
-- deriving (Monoid, Foldable, Traversable, Eq, Ord, Show, Binary,
-+ deriving (Monoid, Semigroup, Foldable, Traversable, Eq, Ord, Show, Binary,
- Functor, Applicative, Monad, Alternative, MonadPlus, Typeable, Data, NFData)
-
- instance MonadDisj Disj where
-diff --git a/lib/utils/src/Text/PrettyPrint/Class.hs b/lib/utils/src/Text/PrettyPrint/Class.hs
-index f5eb42fe..13be6515 100644
---- a/lib/utils/src/Text/PrettyPrint/Class.hs
-+++ b/lib/utils/src/Text/PrettyPrint/Class.hs
-@@ -187,9 +187,11 @@ instance Document Doc where
- nest i (Doc d) = Doc $ P.nest i d
- caseEmptyDoc yes no (Doc d) = if P.isEmpty d then yes else no
-
-+instance Semigroup Doc where
-+ Doc d1 <> Doc d2 = Doc $ (P.<>) d1 d2
-+
- instance Monoid Doc where
- mempty = Doc $ P.empty
-- mappend (Doc d1) (Doc d2) = Doc $ (P.<>) d1 d2
-
- ------------------------------------------------------------------------------
- -- Additional combinators
-diff --git a/lib/utils/src/Text/PrettyPrint/Html.hs b/lib/utils/src/Text/PrettyPrint/Html.hs
-index 3de5e307..10103eb7 100644
---- a/lib/utils/src/Text/PrettyPrint/Html.hs
-+++ b/lib/utils/src/Text/PrettyPrint/Html.hs
-@@ -90,7 +90,7 @@ attribute (key,value) = " " ++ key ++ "=\"" ++ escapeHtmlEntities value ++ "\""
-
- -- | A 'Document' transformer that adds proper HTML escaping.
- newtype HtmlDoc d = HtmlDoc { getHtmlDoc :: d }
-- deriving( Monoid )
-+ deriving( Monoid, Semigroup )
-
- -- | Wrap a document such that HTML markup can be added without disturbing the
- -- layout.
-@@ -182,9 +182,11 @@ getNoHtmlDoc = runIdentity . unNoHtmlDoc
- instance NFData d => NFData (NoHtmlDoc d) where
- rnf = rnf . getNoHtmlDoc
-
-+instance Semigroup d => Semigroup (NoHtmlDoc d) where
-+ (<>) = liftA2 (<>)
-+
- instance Monoid d => Monoid (NoHtmlDoc d) where
- mempty = pure mempty
-- mappend = liftA2 mappend
-
- instance Document d => Document (NoHtmlDoc d) where
- char = pure . char
More information about the arch-commits
mailing list