[arch-commits] Commit in haskell-tamarin-prover-term/repos (3 files)

[Felix Yan via arch-commits]

Date: Tuesday, December 29, 2020 @ 09:30:42
  Author: felixonmars
Revision: 796631

archrelease: copy trunk to community-staging-x86_64

Added:
  haskell-tamarin-prover-term/repos/community-staging-x86_64/
  haskell-tamarin-prover-term/repos/community-staging-x86_64/PKGBUILD
(from rev 796630, haskell-tamarin-prover-term/trunk/PKGBUILD)
  haskell-tamarin-prover-term/repos/community-staging-x86_64/maude-3.1.patch
(from rev 796630, haskell-tamarin-prover-term/trunk/maude-3.1.patch)

-+
 PKGBUILD|   45 +
 maude-3.1.patch |   35 +++
 2 files changed, 80 insertions(+)

Copied: haskell-tamarin-prover-term/repos/community-staging-x86_64/PKGBUILD 
(from rev 796630, haskell-tamarin-prover-term/trunk/PKGBUILD)
===
--- community-staging-x86_64/PKGBUILD   (rev 0)
+++ community-staging-x86_64/PKGBUILD   2020-12-29 09:30:42 UTC (rev 796631)
@@ -0,0 +1,45 @@
+# Maintainer: Felix Yan 
+# Contributor: Arch Haskell Team 
+
+_hkgname=tamarin-prover-term
+pkgname=haskell-tamarin-prover-term
+pkgver=1.6.0
+pkgrel=28
+pkgdesc="Term manipulation library for the tamarin prover"
+url="http://www.infsec.ethz.ch/research/software/tamarin;
+license=("GPL")
+arch=('x86_64')
+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;
+maude-3.1.patch)
+sha512sums=('7f3569f740d63d715b92a8f073eaecb8b32efe59b910b246977d36bb9e873765440e72feb6e76c7cbafab0495b88cfc666bb1dd12f685627c60d5cbd97b2973e'
+
'1ef5e4c370a0c5f5541d50600604ba7adc566c2f5cf415cdb844842bb10b343edd00aa5aa654f8e55355c80f48a34382c87c3fba4adca0c77e726f407f3815c3')
+
+prepare() {
+cd tamarin-prover-$pkgver
+patch -p1 -i ../maude-3.1.patch
+}
+
+build() {
+cd tamarin-prover-$pkgver/lib/term
+
+runhaskell Setup configure -O --enable-shared --enable-executable-dynamic 
--disable-library-vanilla \
+--prefix=/usr --docdir=/usr/share/doc/$pkgname \
+--dynlibdir=/usr/lib --libsubdir=\$compiler/site-local/\$pkgid
+runhaskell Setup build $MAKEFLAGS
+runhaskell Setup register --gen-script
+runhaskell Setup unregister --gen-script
+sed -i -r -e "s|ghc-pkg.*update[^ ]* |&'--force' |" register.sh
+sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh
+}
+
+package() {
+cd tamarin-prover-$pkgver/lib/term
+
+install -D -m744 register.sh 
"$pkgdir"/usr/share/haskell/register/$pkgname.sh
+install -D -m744 unregister.sh 
"$pkgdir"/usr/share/haskell/unregister/$pkgname.sh
+runhaskell Setup copy --destdir="$pkgdir"
+rm -f "$pkgdir"/usr/share/doc/$pkgname/LICENSE
+}

Copied: 
haskell-tamarin-prover-term/repos/community-staging-x86_64/maude-3.1.patch 
(from rev 796630, haskell-tamarin-prover-term/trunk/maude-3.1.patch)
===
--- community-staging-x86_64/maude-3.1.patch(rev 0)
+++ community-staging-x86_64/maude-3.1.patch2020-12-29 09:30:42 UTC (rev 
796631)
@@ -0,0 +1,35 @@
+diff --git a/lib/term/src/Term/Maude/Parser.hs 
b/lib/term/src/Term/Maude/Parser.hs
+index 187c35dc..0a1d3c35 100644
+--- a/lib/term/src/Term/Maude/Parser.hs
 b/lib/term/src/Term/Maude/Parser.hs
+@@ -224,7 +224,7 @@ parseVariantsReply msig reply = flip parseOnly reply $ do
+ <* endOfLine <* string "rewrites: "
+ <* takeWhile1 isDigit <* endOfLine <* endOfInput
+   where
+-parseVariant = string "Variant #" *> takeWhile1 isDigit *> endOfLine *>
++parseVariant = string "Variant " *> optional (char '#') *> takeWhile1 
isDigit *> endOfLine *>
+string "rewrites: " *> takeWhile1 isDigit *> endOfLine *>
+parseReprintedTerm *> manyTill parseEntry endOfLine
+ parseReprintedTerm = choice [ string "TOP" *> pure LSortMsg, parseSort ]
+@@ -235,7 +235,7 @@ parseVariantsReply msig reply = flip parseOnly reply $ do
+ -- | @parseSubstitution l@ parses a single substitution returned by Maude.
+ parseSubstitution :: MaudeSig -> Parser MSubst
+ parseSubstitution msig = do
+-endOfLine *> string "Solution " *> takeWhile1 isDigit *> endOfLine
++endOfLine *> choice [string "Solution ", string "Unifier ", string 
"Matcher "] *> takeWhile1 isDigit *> endOfLine
+ choice [ string "empty substitution" *> endOfLine *> pure []
+, many1 parseEntry]
+   where 
+diff --git a/src/Main/Environment.hs b/src/Main/Environment.hs
+index ecb15d2f..1b55c2e7 100644
+--- a/src/Main/Environment.hs
 b/src/Main/Environment.hs
+@@ -175,7 +175,7 @@ ensureMaude as = do
+ 
+ --  Maude versions prior to 2.7.1 are no longer supported,
+ --  because the 'get variants' command is incompatible.
+-  

[arch-commits] Commit in haskell-tamarin-prover-term/repos (3 files)

[Felix Yan via arch-commits]

Date: Monday, December 28, 2020 @ 08:56:53
  Author: felixonmars
Revision: 794387

archrelease: copy trunk to community-staging-x86_64

Added:
  haskell-tamarin-prover-term/repos/community-staging-x86_64/
  haskell-tamarin-prover-term/repos/community-staging-x86_64/PKGBUILD
(from rev 794386, haskell-tamarin-prover-term/trunk/PKGBUILD)
  haskell-tamarin-prover-term/repos/community-staging-x86_64/maude-3.1.patch
(from rev 794386, haskell-tamarin-prover-term/trunk/maude-3.1.patch)

-+
 PKGBUILD|   45 +
 maude-3.1.patch |   35 +++
 2 files changed, 80 insertions(+)

Copied: haskell-tamarin-prover-term/repos/community-staging-x86_64/PKGBUILD 
(from rev 794386, haskell-tamarin-prover-term/trunk/PKGBUILD)
===
--- community-staging-x86_64/PKGBUILD   (rev 0)
+++ community-staging-x86_64/PKGBUILD   2020-12-28 08:56:53 UTC (rev 794387)
@@ -0,0 +1,45 @@
+# Maintainer: Felix Yan 
+# Contributor: Arch Haskell Team 
+
+_hkgname=tamarin-prover-term
+pkgname=haskell-tamarin-prover-term
+pkgver=1.6.0
+pkgrel=27
+pkgdesc="Term manipulation library for the tamarin prover"
+url="http://www.infsec.ethz.ch/research/software/tamarin;
+license=("GPL")
+arch=('x86_64')
+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;
+maude-3.1.patch)
+sha512sums=('7f3569f740d63d715b92a8f073eaecb8b32efe59b910b246977d36bb9e873765440e72feb6e76c7cbafab0495b88cfc666bb1dd12f685627c60d5cbd97b2973e'
+
'1ef5e4c370a0c5f5541d50600604ba7adc566c2f5cf415cdb844842bb10b343edd00aa5aa654f8e55355c80f48a34382c87c3fba4adca0c77e726f407f3815c3')
+
+prepare() {
+cd tamarin-prover-$pkgver
+patch -p1 -i ../maude-3.1.patch
+}
+
+build() {
+cd tamarin-prover-$pkgver/lib/term
+
+runhaskell Setup configure -O --enable-shared --enable-executable-dynamic 
--disable-library-vanilla \
+--prefix=/usr --docdir=/usr/share/doc/$pkgname \
+--dynlibdir=/usr/lib --libsubdir=\$compiler/site-local/\$pkgid
+runhaskell Setup build $MAKEFLAGS
+runhaskell Setup register --gen-script
+runhaskell Setup unregister --gen-script
+sed -i -r -e "s|ghc-pkg.*update[^ ]* |&'--force' |" register.sh
+sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh
+}
+
+package() {
+cd tamarin-prover-$pkgver/lib/term
+
+install -D -m744 register.sh 
"$pkgdir"/usr/share/haskell/register/$pkgname.sh
+install -D -m744 unregister.sh 
"$pkgdir"/usr/share/haskell/unregister/$pkgname.sh
+runhaskell Setup copy --destdir="$pkgdir"
+rm -f "$pkgdir"/usr/share/doc/$pkgname/LICENSE
+}

Copied: 
haskell-tamarin-prover-term/repos/community-staging-x86_64/maude-3.1.patch 
(from rev 794386, haskell-tamarin-prover-term/trunk/maude-3.1.patch)
===
--- community-staging-x86_64/maude-3.1.patch(rev 0)
+++ community-staging-x86_64/maude-3.1.patch2020-12-28 08:56:53 UTC (rev 
794387)
@@ -0,0 +1,35 @@
+diff --git a/lib/term/src/Term/Maude/Parser.hs 
b/lib/term/src/Term/Maude/Parser.hs
+index 187c35dc..0a1d3c35 100644
+--- a/lib/term/src/Term/Maude/Parser.hs
 b/lib/term/src/Term/Maude/Parser.hs
+@@ -224,7 +224,7 @@ parseVariantsReply msig reply = flip parseOnly reply $ do
+ <* endOfLine <* string "rewrites: "
+ <* takeWhile1 isDigit <* endOfLine <* endOfInput
+   where
+-parseVariant = string "Variant #" *> takeWhile1 isDigit *> endOfLine *>
++parseVariant = string "Variant " *> optional (char '#') *> takeWhile1 
isDigit *> endOfLine *>
+string "rewrites: " *> takeWhile1 isDigit *> endOfLine *>
+parseReprintedTerm *> manyTill parseEntry endOfLine
+ parseReprintedTerm = choice [ string "TOP" *> pure LSortMsg, parseSort ]
+@@ -235,7 +235,7 @@ parseVariantsReply msig reply = flip parseOnly reply $ do
+ -- | @parseSubstitution l@ parses a single substitution returned by Maude.
+ parseSubstitution :: MaudeSig -> Parser MSubst
+ parseSubstitution msig = do
+-endOfLine *> string "Solution " *> takeWhile1 isDigit *> endOfLine
++endOfLine *> choice [string "Solution ", string "Unifier ", string 
"Matcher "] *> takeWhile1 isDigit *> endOfLine
+ choice [ string "empty substitution" *> endOfLine *> pure []
+, many1 parseEntry]
+   where 
+diff --git a/src/Main/Environment.hs b/src/Main/Environment.hs
+index ecb15d2f..1b55c2e7 100644
+--- a/src/Main/Environment.hs
 b/src/Main/Environment.hs
+@@ -175,7 +175,7 @@ ensureMaude as = do
+ 
+ --  Maude versions prior to 2.7.1 are no longer supported,
+ --  because the 'get variants' command is incompatible.
+-   

[arch-commits] Commit in haskell-tamarin-prover-term/repos (3 files)

[Felix Yan via arch-commits]

Date: Saturday, December 26, 2020 @ 03:11:33
  Author: felixonmars
Revision: 791728

archrelease: copy trunk to community-staging-x86_64

Added:
  haskell-tamarin-prover-term/repos/community-staging-x86_64/
  haskell-tamarin-prover-term/repos/community-staging-x86_64/PKGBUILD
(from rev 791727, haskell-tamarin-prover-term/trunk/PKGBUILD)
  haskell-tamarin-prover-term/repos/community-staging-x86_64/maude-3.1.patch
(from rev 791727, haskell-tamarin-prover-term/trunk/maude-3.1.patch)

-+
 PKGBUILD|   45 +
 maude-3.1.patch |   35 +++
 2 files changed, 80 insertions(+)

Copied: haskell-tamarin-prover-term/repos/community-staging-x86_64/PKGBUILD 
(from rev 791727, haskell-tamarin-prover-term/trunk/PKGBUILD)
===
--- community-staging-x86_64/PKGBUILD   (rev 0)
+++ community-staging-x86_64/PKGBUILD   2020-12-26 03:11:33 UTC (rev 791728)
@@ -0,0 +1,45 @@
+# Maintainer: Felix Yan 
+# Contributor: Arch Haskell Team 
+
+_hkgname=tamarin-prover-term
+pkgname=haskell-tamarin-prover-term
+pkgver=1.6.0
+pkgrel=26
+pkgdesc="Term manipulation library for the tamarin prover"
+url="http://www.infsec.ethz.ch/research/software/tamarin;
+license=("GPL")
+arch=('x86_64')
+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;
+maude-3.1.patch)
+sha512sums=('7f3569f740d63d715b92a8f073eaecb8b32efe59b910b246977d36bb9e873765440e72feb6e76c7cbafab0495b88cfc666bb1dd12f685627c60d5cbd97b2973e'
+
'1ef5e4c370a0c5f5541d50600604ba7adc566c2f5cf415cdb844842bb10b343edd00aa5aa654f8e55355c80f48a34382c87c3fba4adca0c77e726f407f3815c3')
+
+prepare() {
+cd tamarin-prover-$pkgver
+patch -p1 -i ../maude-3.1.patch
+}
+
+build() {
+cd tamarin-prover-$pkgver/lib/term
+
+runhaskell Setup configure -O --enable-shared --enable-executable-dynamic 
--disable-library-vanilla \
+--prefix=/usr --docdir=/usr/share/doc/$pkgname \
+--dynlibdir=/usr/lib --libsubdir=\$compiler/site-local/\$pkgid
+runhaskell Setup build $MAKEFLAGS
+runhaskell Setup register --gen-script
+runhaskell Setup unregister --gen-script
+sed -i -r -e "s|ghc-pkg.*update[^ ]* |&'--force' |" register.sh
+sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh
+}
+
+package() {
+cd tamarin-prover-$pkgver/lib/term
+
+install -D -m744 register.sh 
"$pkgdir"/usr/share/haskell/register/$pkgname.sh
+install -D -m744 unregister.sh 
"$pkgdir"/usr/share/haskell/unregister/$pkgname.sh
+runhaskell Setup copy --destdir="$pkgdir"
+rm -f "$pkgdir"/usr/share/doc/$pkgname/LICENSE
+}

Copied: 
haskell-tamarin-prover-term/repos/community-staging-x86_64/maude-3.1.patch 
(from rev 791727, haskell-tamarin-prover-term/trunk/maude-3.1.patch)
===
--- community-staging-x86_64/maude-3.1.patch(rev 0)
+++ community-staging-x86_64/maude-3.1.patch2020-12-26 03:11:33 UTC (rev 
791728)
@@ -0,0 +1,35 @@
+diff --git a/lib/term/src/Term/Maude/Parser.hs 
b/lib/term/src/Term/Maude/Parser.hs
+index 187c35dc..0a1d3c35 100644
+--- a/lib/term/src/Term/Maude/Parser.hs
 b/lib/term/src/Term/Maude/Parser.hs
+@@ -224,7 +224,7 @@ parseVariantsReply msig reply = flip parseOnly reply $ do
+ <* endOfLine <* string "rewrites: "
+ <* takeWhile1 isDigit <* endOfLine <* endOfInput
+   where
+-parseVariant = string "Variant #" *> takeWhile1 isDigit *> endOfLine *>
++parseVariant = string "Variant " *> optional (char '#') *> takeWhile1 
isDigit *> endOfLine *>
+string "rewrites: " *> takeWhile1 isDigit *> endOfLine *>
+parseReprintedTerm *> manyTill parseEntry endOfLine
+ parseReprintedTerm = choice [ string "TOP" *> pure LSortMsg, parseSort ]
+@@ -235,7 +235,7 @@ parseVariantsReply msig reply = flip parseOnly reply $ do
+ -- | @parseSubstitution l@ parses a single substitution returned by Maude.
+ parseSubstitution :: MaudeSig -> Parser MSubst
+ parseSubstitution msig = do
+-endOfLine *> string "Solution " *> takeWhile1 isDigit *> endOfLine
++endOfLine *> choice [string "Solution ", string "Unifier ", string 
"Matcher "] *> takeWhile1 isDigit *> endOfLine
+ choice [ string "empty substitution" *> endOfLine *> pure []
+, many1 parseEntry]
+   where 
+diff --git a/src/Main/Environment.hs b/src/Main/Environment.hs
+index ecb15d2f..1b55c2e7 100644
+--- a/src/Main/Environment.hs
 b/src/Main/Environment.hs
+@@ -175,7 +175,7 @@ ensureMaude as = do
+ 
+ --  Maude versions prior to 2.7.1 are no longer supported,
+ --  because the 'get variants' command is incompatible.
+- 

[arch-commits] Commit in haskell-tamarin-prover-term/repos (3 files)

[Felix Yan via arch-commits]

Date: Friday, December 25, 2020 @ 03:13:20
  Author: felixonmars
Revision: 789506

archrelease: copy trunk to community-staging-x86_64

Added:
  haskell-tamarin-prover-term/repos/community-staging-x86_64/
  haskell-tamarin-prover-term/repos/community-staging-x86_64/PKGBUILD
(from rev 789505, haskell-tamarin-prover-term/trunk/PKGBUILD)
  haskell-tamarin-prover-term/repos/community-staging-x86_64/maude-3.1.patch
(from rev 789505, haskell-tamarin-prover-term/trunk/maude-3.1.patch)

-+
 PKGBUILD|   45 +
 maude-3.1.patch |   35 +++
 2 files changed, 80 insertions(+)

Copied: haskell-tamarin-prover-term/repos/community-staging-x86_64/PKGBUILD 
(from rev 789505, haskell-tamarin-prover-term/trunk/PKGBUILD)
===
--- community-staging-x86_64/PKGBUILD   (rev 0)
+++ community-staging-x86_64/PKGBUILD   2020-12-25 03:13:20 UTC (rev 789506)
@@ -0,0 +1,45 @@
+# Maintainer: Felix Yan 
+# Contributor: Arch Haskell Team 
+
+_hkgname=tamarin-prover-term
+pkgname=haskell-tamarin-prover-term
+pkgver=1.6.0
+pkgrel=25
+pkgdesc="Term manipulation library for the tamarin prover"
+url="http://www.infsec.ethz.ch/research/software/tamarin;
+license=("GPL")
+arch=('x86_64')
+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;
+maude-3.1.patch)
+sha512sums=('7f3569f740d63d715b92a8f073eaecb8b32efe59b910b246977d36bb9e873765440e72feb6e76c7cbafab0495b88cfc666bb1dd12f685627c60d5cbd97b2973e'
+
'1ef5e4c370a0c5f5541d50600604ba7adc566c2f5cf415cdb844842bb10b343edd00aa5aa654f8e55355c80f48a34382c87c3fba4adca0c77e726f407f3815c3')
+
+prepare() {
+cd tamarin-prover-$pkgver
+patch -p1 -i ../maude-3.1.patch
+}
+
+build() {
+cd tamarin-prover-$pkgver/lib/term
+
+runhaskell Setup configure -O --enable-shared --enable-executable-dynamic 
--disable-library-vanilla \
+--prefix=/usr --docdir=/usr/share/doc/$pkgname \
+--dynlibdir=/usr/lib --libsubdir=\$compiler/site-local/\$pkgid
+runhaskell Setup build $MAKEFLAGS
+runhaskell Setup register --gen-script
+runhaskell Setup unregister --gen-script
+sed -i -r -e "s|ghc-pkg.*update[^ ]* |&'--force' |" register.sh
+sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh
+}
+
+package() {
+cd tamarin-prover-$pkgver/lib/term
+
+install -D -m744 register.sh 
"$pkgdir"/usr/share/haskell/register/$pkgname.sh
+install -D -m744 unregister.sh 
"$pkgdir"/usr/share/haskell/unregister/$pkgname.sh
+runhaskell Setup copy --destdir="$pkgdir"
+rm -f "$pkgdir"/usr/share/doc/$pkgname/LICENSE
+}

Copied: 
haskell-tamarin-prover-term/repos/community-staging-x86_64/maude-3.1.patch 
(from rev 789505, haskell-tamarin-prover-term/trunk/maude-3.1.patch)
===
--- community-staging-x86_64/maude-3.1.patch(rev 0)
+++ community-staging-x86_64/maude-3.1.patch2020-12-25 03:13:20 UTC (rev 
789506)
@@ -0,0 +1,35 @@
+diff --git a/lib/term/src/Term/Maude/Parser.hs 
b/lib/term/src/Term/Maude/Parser.hs
+index 187c35dc..0a1d3c35 100644
+--- a/lib/term/src/Term/Maude/Parser.hs
 b/lib/term/src/Term/Maude/Parser.hs
+@@ -224,7 +224,7 @@ parseVariantsReply msig reply = flip parseOnly reply $ do
+ <* endOfLine <* string "rewrites: "
+ <* takeWhile1 isDigit <* endOfLine <* endOfInput
+   where
+-parseVariant = string "Variant #" *> takeWhile1 isDigit *> endOfLine *>
++parseVariant = string "Variant " *> optional (char '#') *> takeWhile1 
isDigit *> endOfLine *>
+string "rewrites: " *> takeWhile1 isDigit *> endOfLine *>
+parseReprintedTerm *> manyTill parseEntry endOfLine
+ parseReprintedTerm = choice [ string "TOP" *> pure LSortMsg, parseSort ]
+@@ -235,7 +235,7 @@ parseVariantsReply msig reply = flip parseOnly reply $ do
+ -- | @parseSubstitution l@ parses a single substitution returned by Maude.
+ parseSubstitution :: MaudeSig -> Parser MSubst
+ parseSubstitution msig = do
+-endOfLine *> string "Solution " *> takeWhile1 isDigit *> endOfLine
++endOfLine *> choice [string "Solution ", string "Unifier ", string 
"Matcher "] *> takeWhile1 isDigit *> endOfLine
+ choice [ string "empty substitution" *> endOfLine *> pure []
+, many1 parseEntry]
+   where 
+diff --git a/src/Main/Environment.hs b/src/Main/Environment.hs
+index ecb15d2f..1b55c2e7 100644
+--- a/src/Main/Environment.hs
 b/src/Main/Environment.hs
+@@ -175,7 +175,7 @@ ensureMaude as = do
+ 
+ --  Maude versions prior to 2.7.1 are no longer supported,
+ --  because the 'get variants' command is incompatible.
+-   

[arch-commits] Commit in haskell-tamarin-prover-term/repos (3 files)

[Felix Yan via arch-commits]

Date: Thursday, December 24, 2020 @ 13:02:32
  Author: felixonmars
Revision: 787203

archrelease: copy trunk to community-staging-x86_64

Added:
  haskell-tamarin-prover-term/repos/community-staging-x86_64/
  haskell-tamarin-prover-term/repos/community-staging-x86_64/PKGBUILD
(from rev 787202, haskell-tamarin-prover-term/trunk/PKGBUILD)
  haskell-tamarin-prover-term/repos/community-staging-x86_64/maude-3.1.patch
(from rev 787202, haskell-tamarin-prover-term/trunk/maude-3.1.patch)

-+
 PKGBUILD|   45 +
 maude-3.1.patch |   35 +++
 2 files changed, 80 insertions(+)

Copied: haskell-tamarin-prover-term/repos/community-staging-x86_64/PKGBUILD 
(from rev 787202, haskell-tamarin-prover-term/trunk/PKGBUILD)
===
--- community-staging-x86_64/PKGBUILD   (rev 0)
+++ community-staging-x86_64/PKGBUILD   2020-12-24 13:02:32 UTC (rev 787203)
@@ -0,0 +1,45 @@
+# Maintainer: Felix Yan 
+# Contributor: Arch Haskell Team 
+
+_hkgname=tamarin-prover-term
+pkgname=haskell-tamarin-prover-term
+pkgver=1.6.0
+pkgrel=24
+pkgdesc="Term manipulation library for the tamarin prover"
+url="http://www.infsec.ethz.ch/research/software/tamarin;
+license=("GPL")
+arch=('x86_64')
+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;
+maude-3.1.patch)
+sha512sums=('7f3569f740d63d715b92a8f073eaecb8b32efe59b910b246977d36bb9e873765440e72feb6e76c7cbafab0495b88cfc666bb1dd12f685627c60d5cbd97b2973e'
+
'1ef5e4c370a0c5f5541d50600604ba7adc566c2f5cf415cdb844842bb10b343edd00aa5aa654f8e55355c80f48a34382c87c3fba4adca0c77e726f407f3815c3')
+
+prepare() {
+cd tamarin-prover-$pkgver
+patch -p1 -i ../maude-3.1.patch
+}
+
+build() {
+cd tamarin-prover-$pkgver/lib/term
+
+runhaskell Setup configure -O --enable-shared --enable-executable-dynamic 
--disable-library-vanilla \
+--prefix=/usr --docdir=/usr/share/doc/$pkgname \
+--dynlibdir=/usr/lib --libsubdir=\$compiler/site-local/\$pkgid
+runhaskell Setup build $MAKEFLAGS
+runhaskell Setup register --gen-script
+runhaskell Setup unregister --gen-script
+sed -i -r -e "s|ghc-pkg.*update[^ ]* |&'--force' |" register.sh
+sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh
+}
+
+package() {
+cd tamarin-prover-$pkgver/lib/term
+
+install -D -m744 register.sh 
"$pkgdir"/usr/share/haskell/register/$pkgname.sh
+install -D -m744 unregister.sh 
"$pkgdir"/usr/share/haskell/unregister/$pkgname.sh
+runhaskell Setup copy --destdir="$pkgdir"
+rm -f "$pkgdir"/usr/share/doc/$pkgname/LICENSE
+}

Copied: 
haskell-tamarin-prover-term/repos/community-staging-x86_64/maude-3.1.patch 
(from rev 787202, haskell-tamarin-prover-term/trunk/maude-3.1.patch)
===
--- community-staging-x86_64/maude-3.1.patch(rev 0)
+++ community-staging-x86_64/maude-3.1.patch2020-12-24 13:02:32 UTC (rev 
787203)
@@ -0,0 +1,35 @@
+diff --git a/lib/term/src/Term/Maude/Parser.hs 
b/lib/term/src/Term/Maude/Parser.hs
+index 187c35dc..0a1d3c35 100644
+--- a/lib/term/src/Term/Maude/Parser.hs
 b/lib/term/src/Term/Maude/Parser.hs
+@@ -224,7 +224,7 @@ parseVariantsReply msig reply = flip parseOnly reply $ do
+ <* endOfLine <* string "rewrites: "
+ <* takeWhile1 isDigit <* endOfLine <* endOfInput
+   where
+-parseVariant = string "Variant #" *> takeWhile1 isDigit *> endOfLine *>
++parseVariant = string "Variant " *> optional (char '#') *> takeWhile1 
isDigit *> endOfLine *>
+string "rewrites: " *> takeWhile1 isDigit *> endOfLine *>
+parseReprintedTerm *> manyTill parseEntry endOfLine
+ parseReprintedTerm = choice [ string "TOP" *> pure LSortMsg, parseSort ]
+@@ -235,7 +235,7 @@ parseVariantsReply msig reply = flip parseOnly reply $ do
+ -- | @parseSubstitution l@ parses a single substitution returned by Maude.
+ parseSubstitution :: MaudeSig -> Parser MSubst
+ parseSubstitution msig = do
+-endOfLine *> string "Solution " *> takeWhile1 isDigit *> endOfLine
++endOfLine *> choice [string "Solution ", string "Unifier ", string 
"Matcher "] *> takeWhile1 isDigit *> endOfLine
+ choice [ string "empty substitution" *> endOfLine *> pure []
+, many1 parseEntry]
+   where 
+diff --git a/src/Main/Environment.hs b/src/Main/Environment.hs
+index ecb15d2f..1b55c2e7 100644
+--- a/src/Main/Environment.hs
 b/src/Main/Environment.hs
+@@ -175,7 +175,7 @@ ensureMaude as = do
+ 
+ --  Maude versions prior to 2.7.1 are no longer supported,
+ --  because the 'get variants' command is incompatible.
+- 

[arch-commits] Commit in haskell-tamarin-prover-term/repos (3 files)

[Felix Yan via arch-commits]

Date: Wednesday, December 23, 2020 @ 05:36:39
  Author: felixonmars
Revision: 783719

archrelease: copy trunk to community-staging-x86_64

Added:
  haskell-tamarin-prover-term/repos/community-staging-x86_64/
  haskell-tamarin-prover-term/repos/community-staging-x86_64/PKGBUILD
(from rev 783718, haskell-tamarin-prover-term/trunk/PKGBUILD)
  haskell-tamarin-prover-term/repos/community-staging-x86_64/maude-3.1.patch
(from rev 783718, haskell-tamarin-prover-term/trunk/maude-3.1.patch)

-+
 PKGBUILD|   45 +
 maude-3.1.patch |   35 +++
 2 files changed, 80 insertions(+)

Copied: haskell-tamarin-prover-term/repos/community-staging-x86_64/PKGBUILD 
(from rev 783718, haskell-tamarin-prover-term/trunk/PKGBUILD)
===
--- community-staging-x86_64/PKGBUILD   (rev 0)
+++ community-staging-x86_64/PKGBUILD   2020-12-23 05:36:39 UTC (rev 783719)
@@ -0,0 +1,45 @@
+# Maintainer: Felix Yan 
+# Contributor: Arch Haskell Team 
+
+_hkgname=tamarin-prover-term
+pkgname=haskell-tamarin-prover-term
+pkgver=1.6.0
+pkgrel=23
+pkgdesc="Term manipulation library for the tamarin prover"
+url="http://www.infsec.ethz.ch/research/software/tamarin;
+license=("GPL")
+arch=('x86_64')
+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;
+maude-3.1.patch)
+sha512sums=('7f3569f740d63d715b92a8f073eaecb8b32efe59b910b246977d36bb9e873765440e72feb6e76c7cbafab0495b88cfc666bb1dd12f685627c60d5cbd97b2973e'
+
'1ef5e4c370a0c5f5541d50600604ba7adc566c2f5cf415cdb844842bb10b343edd00aa5aa654f8e55355c80f48a34382c87c3fba4adca0c77e726f407f3815c3')
+
+prepare() {
+cd tamarin-prover-$pkgver
+patch -p1 -i ../maude-3.1.patch
+}
+
+build() {
+cd tamarin-prover-$pkgver/lib/term
+
+runhaskell Setup configure -O --enable-shared --enable-executable-dynamic 
--disable-library-vanilla \
+--prefix=/usr --docdir=/usr/share/doc/$pkgname \
+--dynlibdir=/usr/lib --libsubdir=\$compiler/site-local/\$pkgid
+runhaskell Setup build $MAKEFLAGS
+runhaskell Setup register --gen-script
+runhaskell Setup unregister --gen-script
+sed -i -r -e "s|ghc-pkg.*update[^ ]* |&'--force' |" register.sh
+sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh
+}
+
+package() {
+cd tamarin-prover-$pkgver/lib/term
+
+install -D -m744 register.sh 
"$pkgdir"/usr/share/haskell/register/$pkgname.sh
+install -D -m744 unregister.sh 
"$pkgdir"/usr/share/haskell/unregister/$pkgname.sh
+runhaskell Setup copy --destdir="$pkgdir"
+rm -f "$pkgdir"/usr/share/doc/$pkgname/LICENSE
+}

Copied: 
haskell-tamarin-prover-term/repos/community-staging-x86_64/maude-3.1.patch 
(from rev 783718, haskell-tamarin-prover-term/trunk/maude-3.1.patch)
===
--- community-staging-x86_64/maude-3.1.patch(rev 0)
+++ community-staging-x86_64/maude-3.1.patch2020-12-23 05:36:39 UTC (rev 
783719)
@@ -0,0 +1,35 @@
+diff --git a/lib/term/src/Term/Maude/Parser.hs 
b/lib/term/src/Term/Maude/Parser.hs
+index 187c35dc..0a1d3c35 100644
+--- a/lib/term/src/Term/Maude/Parser.hs
 b/lib/term/src/Term/Maude/Parser.hs
+@@ -224,7 +224,7 @@ parseVariantsReply msig reply = flip parseOnly reply $ do
+ <* endOfLine <* string "rewrites: "
+ <* takeWhile1 isDigit <* endOfLine <* endOfInput
+   where
+-parseVariant = string "Variant #" *> takeWhile1 isDigit *> endOfLine *>
++parseVariant = string "Variant " *> optional (char '#') *> takeWhile1 
isDigit *> endOfLine *>
+string "rewrites: " *> takeWhile1 isDigit *> endOfLine *>
+parseReprintedTerm *> manyTill parseEntry endOfLine
+ parseReprintedTerm = choice [ string "TOP" *> pure LSortMsg, parseSort ]
+@@ -235,7 +235,7 @@ parseVariantsReply msig reply = flip parseOnly reply $ do
+ -- | @parseSubstitution l@ parses a single substitution returned by Maude.
+ parseSubstitution :: MaudeSig -> Parser MSubst
+ parseSubstitution msig = do
+-endOfLine *> string "Solution " *> takeWhile1 isDigit *> endOfLine
++endOfLine *> choice [string "Solution ", string "Unifier ", string 
"Matcher "] *> takeWhile1 isDigit *> endOfLine
+ choice [ string "empty substitution" *> endOfLine *> pure []
+, many1 parseEntry]
+   where 
+diff --git a/src/Main/Environment.hs b/src/Main/Environment.hs
+index ecb15d2f..1b55c2e7 100644
+--- a/src/Main/Environment.hs
 b/src/Main/Environment.hs
+@@ -175,7 +175,7 @@ ensureMaude as = do
+ 
+ --  Maude versions prior to 2.7.1 are no longer supported,
+ --  because the 'get variants' command is incompatible.

[arch-commits] Commit in haskell-tamarin-prover-term/repos (3 files)

[Felix Yan via arch-commits]

Date: Monday, December 21, 2020 @ 13:54:48
  Author: felixonmars
Revision: 781080

archrelease: copy trunk to community-staging-x86_64

Added:
  haskell-tamarin-prover-term/repos/community-staging-x86_64/
  haskell-tamarin-prover-term/repos/community-staging-x86_64/PKGBUILD
(from rev 781079, haskell-tamarin-prover-term/trunk/PKGBUILD)
  haskell-tamarin-prover-term/repos/community-staging-x86_64/maude-3.1.patch
(from rev 781079, haskell-tamarin-prover-term/trunk/maude-3.1.patch)

-+
 PKGBUILD|   45 +
 maude-3.1.patch |   35 +++
 2 files changed, 80 insertions(+)

Copied: haskell-tamarin-prover-term/repos/community-staging-x86_64/PKGBUILD 
(from rev 781079, haskell-tamarin-prover-term/trunk/PKGBUILD)
===
--- community-staging-x86_64/PKGBUILD   (rev 0)
+++ community-staging-x86_64/PKGBUILD   2020-12-21 13:54:48 UTC (rev 781080)
@@ -0,0 +1,45 @@
+# Maintainer: Felix Yan 
+# Contributor: Arch Haskell Team 
+
+_hkgname=tamarin-prover-term
+pkgname=haskell-tamarin-prover-term
+pkgver=1.6.0
+pkgrel=22
+pkgdesc="Term manipulation library for the tamarin prover"
+url="http://www.infsec.ethz.ch/research/software/tamarin;
+license=("GPL")
+arch=('x86_64')
+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;
+maude-3.1.patch)
+sha512sums=('7f3569f740d63d715b92a8f073eaecb8b32efe59b910b246977d36bb9e873765440e72feb6e76c7cbafab0495b88cfc666bb1dd12f685627c60d5cbd97b2973e'
+
'1ef5e4c370a0c5f5541d50600604ba7adc566c2f5cf415cdb844842bb10b343edd00aa5aa654f8e55355c80f48a34382c87c3fba4adca0c77e726f407f3815c3')
+
+prepare() {
+cd tamarin-prover-$pkgver
+patch -p1 -i ../maude-3.1.patch
+}
+
+build() {
+cd tamarin-prover-$pkgver/lib/term
+
+runhaskell Setup configure -O --enable-shared --enable-executable-dynamic 
--disable-library-vanilla \
+--prefix=/usr --docdir=/usr/share/doc/$pkgname \
+--dynlibdir=/usr/lib --libsubdir=\$compiler/site-local/\$pkgid
+runhaskell Setup build $MAKEFLAGS
+runhaskell Setup register --gen-script
+runhaskell Setup unregister --gen-script
+sed -i -r -e "s|ghc-pkg.*update[^ ]* |&'--force' |" register.sh
+sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh
+}
+
+package() {
+cd tamarin-prover-$pkgver/lib/term
+
+install -D -m744 register.sh 
"$pkgdir"/usr/share/haskell/register/$pkgname.sh
+install -D -m744 unregister.sh 
"$pkgdir"/usr/share/haskell/unregister/$pkgname.sh
+runhaskell Setup copy --destdir="$pkgdir"
+rm -f "$pkgdir"/usr/share/doc/$pkgname/LICENSE
+}

Copied: 
haskell-tamarin-prover-term/repos/community-staging-x86_64/maude-3.1.patch 
(from rev 781079, haskell-tamarin-prover-term/trunk/maude-3.1.patch)
===
--- community-staging-x86_64/maude-3.1.patch(rev 0)
+++ community-staging-x86_64/maude-3.1.patch2020-12-21 13:54:48 UTC (rev 
781080)
@@ -0,0 +1,35 @@
+diff --git a/lib/term/src/Term/Maude/Parser.hs 
b/lib/term/src/Term/Maude/Parser.hs
+index 187c35dc..0a1d3c35 100644
+--- a/lib/term/src/Term/Maude/Parser.hs
 b/lib/term/src/Term/Maude/Parser.hs
+@@ -224,7 +224,7 @@ parseVariantsReply msig reply = flip parseOnly reply $ do
+ <* endOfLine <* string "rewrites: "
+ <* takeWhile1 isDigit <* endOfLine <* endOfInput
+   where
+-parseVariant = string "Variant #" *> takeWhile1 isDigit *> endOfLine *>
++parseVariant = string "Variant " *> optional (char '#') *> takeWhile1 
isDigit *> endOfLine *>
+string "rewrites: " *> takeWhile1 isDigit *> endOfLine *>
+parseReprintedTerm *> manyTill parseEntry endOfLine
+ parseReprintedTerm = choice [ string "TOP" *> pure LSortMsg, parseSort ]
+@@ -235,7 +235,7 @@ parseVariantsReply msig reply = flip parseOnly reply $ do
+ -- | @parseSubstitution l@ parses a single substitution returned by Maude.
+ parseSubstitution :: MaudeSig -> Parser MSubst
+ parseSubstitution msig = do
+-endOfLine *> string "Solution " *> takeWhile1 isDigit *> endOfLine
++endOfLine *> choice [string "Solution ", string "Unifier ", string 
"Matcher "] *> takeWhile1 isDigit *> endOfLine
+ choice [ string "empty substitution" *> endOfLine *> pure []
+, many1 parseEntry]
+   where 
+diff --git a/src/Main/Environment.hs b/src/Main/Environment.hs
+index ecb15d2f..1b55c2e7 100644
+--- a/src/Main/Environment.hs
 b/src/Main/Environment.hs
+@@ -175,7 +175,7 @@ ensureMaude as = do
+ 
+ --  Maude versions prior to 2.7.1 are no longer supported,
+ --  because the 'get variants' command is incompatible.
+-   

[arch-commits] Commit in haskell-tamarin-prover-term/repos (3 files)

[Felix Yan via arch-commits]

Date: Thursday, December 17, 2020 @ 19:49:10
  Author: felixonmars
Revision: 777923

archrelease: copy trunk to community-staging-x86_64

Added:
  haskell-tamarin-prover-term/repos/community-staging-x86_64/
  haskell-tamarin-prover-term/repos/community-staging-x86_64/PKGBUILD
(from rev 777922, haskell-tamarin-prover-term/trunk/PKGBUILD)
  haskell-tamarin-prover-term/repos/community-staging-x86_64/maude-3.1.patch
(from rev 777922, haskell-tamarin-prover-term/trunk/maude-3.1.patch)

-+
 PKGBUILD|   45 +
 maude-3.1.patch |   35 +++
 2 files changed, 80 insertions(+)

Copied: haskell-tamarin-prover-term/repos/community-staging-x86_64/PKGBUILD 
(from rev 777922, haskell-tamarin-prover-term/trunk/PKGBUILD)
===
--- community-staging-x86_64/PKGBUILD   (rev 0)
+++ community-staging-x86_64/PKGBUILD   2020-12-17 19:49:10 UTC (rev 777923)
@@ -0,0 +1,45 @@
+# Maintainer: Felix Yan 
+# Contributor: Arch Haskell Team 
+
+_hkgname=tamarin-prover-term
+pkgname=haskell-tamarin-prover-term
+pkgver=1.6.0
+pkgrel=21
+pkgdesc="Term manipulation library for the tamarin prover"
+url="http://www.infsec.ethz.ch/research/software/tamarin;
+license=("GPL")
+arch=('x86_64')
+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;
+maude-3.1.patch)
+sha512sums=('7f3569f740d63d715b92a8f073eaecb8b32efe59b910b246977d36bb9e873765440e72feb6e76c7cbafab0495b88cfc666bb1dd12f685627c60d5cbd97b2973e'
+
'1ef5e4c370a0c5f5541d50600604ba7adc566c2f5cf415cdb844842bb10b343edd00aa5aa654f8e55355c80f48a34382c87c3fba4adca0c77e726f407f3815c3')
+
+prepare() {
+cd tamarin-prover-$pkgver
+patch -p1 -i ../maude-3.1.patch
+}
+
+build() {
+cd tamarin-prover-$pkgver/lib/term
+
+runhaskell Setup configure -O --enable-shared --enable-executable-dynamic 
--disable-library-vanilla \
+--prefix=/usr --docdir=/usr/share/doc/$pkgname \
+--dynlibdir=/usr/lib --libsubdir=\$compiler/site-local/\$pkgid
+runhaskell Setup build $MAKEFLAGS
+runhaskell Setup register --gen-script
+runhaskell Setup unregister --gen-script
+sed -i -r -e "s|ghc-pkg.*update[^ ]* |&'--force' |" register.sh
+sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh
+}
+
+package() {
+cd tamarin-prover-$pkgver/lib/term
+
+install -D -m744 register.sh 
"$pkgdir"/usr/share/haskell/register/$pkgname.sh
+install -D -m744 unregister.sh 
"$pkgdir"/usr/share/haskell/unregister/$pkgname.sh
+runhaskell Setup copy --destdir="$pkgdir"
+rm -f "$pkgdir"/usr/share/doc/$pkgname/LICENSE
+}

Copied: 
haskell-tamarin-prover-term/repos/community-staging-x86_64/maude-3.1.patch 
(from rev 777922, haskell-tamarin-prover-term/trunk/maude-3.1.patch)
===
--- community-staging-x86_64/maude-3.1.patch(rev 0)
+++ community-staging-x86_64/maude-3.1.patch2020-12-17 19:49:10 UTC (rev 
777923)
@@ -0,0 +1,35 @@
+diff --git a/lib/term/src/Term/Maude/Parser.hs 
b/lib/term/src/Term/Maude/Parser.hs
+index 187c35dc..0a1d3c35 100644
+--- a/lib/term/src/Term/Maude/Parser.hs
 b/lib/term/src/Term/Maude/Parser.hs
+@@ -224,7 +224,7 @@ parseVariantsReply msig reply = flip parseOnly reply $ do
+ <* endOfLine <* string "rewrites: "
+ <* takeWhile1 isDigit <* endOfLine <* endOfInput
+   where
+-parseVariant = string "Variant #" *> takeWhile1 isDigit *> endOfLine *>
++parseVariant = string "Variant " *> optional (char '#') *> takeWhile1 
isDigit *> endOfLine *>
+string "rewrites: " *> takeWhile1 isDigit *> endOfLine *>
+parseReprintedTerm *> manyTill parseEntry endOfLine
+ parseReprintedTerm = choice [ string "TOP" *> pure LSortMsg, parseSort ]
+@@ -235,7 +235,7 @@ parseVariantsReply msig reply = flip parseOnly reply $ do
+ -- | @parseSubstitution l@ parses a single substitution returned by Maude.
+ parseSubstitution :: MaudeSig -> Parser MSubst
+ parseSubstitution msig = do
+-endOfLine *> string "Solution " *> takeWhile1 isDigit *> endOfLine
++endOfLine *> choice [string "Solution ", string "Unifier ", string 
"Matcher "] *> takeWhile1 isDigit *> endOfLine
+ choice [ string "empty substitution" *> endOfLine *> pure []
+, many1 parseEntry]
+   where 
+diff --git a/src/Main/Environment.hs b/src/Main/Environment.hs
+index ecb15d2f..1b55c2e7 100644
+--- a/src/Main/Environment.hs
 b/src/Main/Environment.hs
+@@ -175,7 +175,7 @@ ensureMaude as = do
+ 
+ --  Maude versions prior to 2.7.1 are no longer supported,
+ --  because the 'get variants' command is incompatible.
+- 

[arch-commits] Commit in haskell-tamarin-prover-term/repos (3 files)

[Felix Yan via arch-commits]

Date: Sunday, December 13, 2020 @ 14:03:12
  Author: felixonmars
Revision: 774304

archrelease: copy trunk to community-staging-x86_64

Added:
  haskell-tamarin-prover-term/repos/community-staging-x86_64/
  haskell-tamarin-prover-term/repos/community-staging-x86_64/PKGBUILD
(from rev 774303, haskell-tamarin-prover-term/trunk/PKGBUILD)
  haskell-tamarin-prover-term/repos/community-staging-x86_64/maude-3.1.patch
(from rev 774303, haskell-tamarin-prover-term/trunk/maude-3.1.patch)

-+
 PKGBUILD|   45 +
 maude-3.1.patch |   35 +++
 2 files changed, 80 insertions(+)

Copied: haskell-tamarin-prover-term/repos/community-staging-x86_64/PKGBUILD 
(from rev 774303, haskell-tamarin-prover-term/trunk/PKGBUILD)
===
--- community-staging-x86_64/PKGBUILD   (rev 0)
+++ community-staging-x86_64/PKGBUILD   2020-12-13 14:03:12 UTC (rev 774304)
@@ -0,0 +1,45 @@
+# Maintainer: Felix Yan 
+# Contributor: Arch Haskell Team 
+
+_hkgname=tamarin-prover-term
+pkgname=haskell-tamarin-prover-term
+pkgver=1.6.0
+pkgrel=20
+pkgdesc="Term manipulation library for the tamarin prover"
+url="http://www.infsec.ethz.ch/research/software/tamarin;
+license=("GPL")
+arch=('x86_64')
+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;
+maude-3.1.patch)
+sha512sums=('7f3569f740d63d715b92a8f073eaecb8b32efe59b910b246977d36bb9e873765440e72feb6e76c7cbafab0495b88cfc666bb1dd12f685627c60d5cbd97b2973e'
+
'1ef5e4c370a0c5f5541d50600604ba7adc566c2f5cf415cdb844842bb10b343edd00aa5aa654f8e55355c80f48a34382c87c3fba4adca0c77e726f407f3815c3')
+
+prepare() {
+cd tamarin-prover-$pkgver
+patch -p1 -i ../maude-3.1.patch
+}
+
+build() {
+cd tamarin-prover-$pkgver/lib/term
+
+runhaskell Setup configure -O --enable-shared --enable-executable-dynamic 
--disable-library-vanilla \
+--prefix=/usr --docdir=/usr/share/doc/$pkgname \
+--dynlibdir=/usr/lib --libsubdir=\$compiler/site-local/\$pkgid
+runhaskell Setup build $MAKEFLAGS
+runhaskell Setup register --gen-script
+runhaskell Setup unregister --gen-script
+sed -i -r -e "s|ghc-pkg.*update[^ ]* |&'--force' |" register.sh
+sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh
+}
+
+package() {
+cd tamarin-prover-$pkgver/lib/term
+
+install -D -m744 register.sh 
"$pkgdir"/usr/share/haskell/register/$pkgname.sh
+install -D -m744 unregister.sh 
"$pkgdir"/usr/share/haskell/unregister/$pkgname.sh
+runhaskell Setup copy --destdir="$pkgdir"
+rm -f "$pkgdir"/usr/share/doc/$pkgname/LICENSE
+}

Copied: 
haskell-tamarin-prover-term/repos/community-staging-x86_64/maude-3.1.patch 
(from rev 774303, haskell-tamarin-prover-term/trunk/maude-3.1.patch)
===
--- community-staging-x86_64/maude-3.1.patch(rev 0)
+++ community-staging-x86_64/maude-3.1.patch2020-12-13 14:03:12 UTC (rev 
774304)
@@ -0,0 +1,35 @@
+diff --git a/lib/term/src/Term/Maude/Parser.hs 
b/lib/term/src/Term/Maude/Parser.hs
+index 187c35dc..0a1d3c35 100644
+--- a/lib/term/src/Term/Maude/Parser.hs
 b/lib/term/src/Term/Maude/Parser.hs
+@@ -224,7 +224,7 @@ parseVariantsReply msig reply = flip parseOnly reply $ do
+ <* endOfLine <* string "rewrites: "
+ <* takeWhile1 isDigit <* endOfLine <* endOfInput
+   where
+-parseVariant = string "Variant #" *> takeWhile1 isDigit *> endOfLine *>
++parseVariant = string "Variant " *> optional (char '#') *> takeWhile1 
isDigit *> endOfLine *>
+string "rewrites: " *> takeWhile1 isDigit *> endOfLine *>
+parseReprintedTerm *> manyTill parseEntry endOfLine
+ parseReprintedTerm = choice [ string "TOP" *> pure LSortMsg, parseSort ]
+@@ -235,7 +235,7 @@ parseVariantsReply msig reply = flip parseOnly reply $ do
+ -- | @parseSubstitution l@ parses a single substitution returned by Maude.
+ parseSubstitution :: MaudeSig -> Parser MSubst
+ parseSubstitution msig = do
+-endOfLine *> string "Solution " *> takeWhile1 isDigit *> endOfLine
++endOfLine *> choice [string "Solution ", string "Unifier ", string 
"Matcher "] *> takeWhile1 isDigit *> endOfLine
+ choice [ string "empty substitution" *> endOfLine *> pure []
+, many1 parseEntry]
+   where 
+diff --git a/src/Main/Environment.hs b/src/Main/Environment.hs
+index ecb15d2f..1b55c2e7 100644
+--- a/src/Main/Environment.hs
 b/src/Main/Environment.hs
+@@ -175,7 +175,7 @@ ensureMaude as = do
+ 
+ --  Maude versions prior to 2.7.1 are no longer supported,
+ --  because the 'get variants' command is incompatible.
+-   

[arch-commits] Commit in haskell-tamarin-prover-term/repos (3 files)

[Felix Yan via arch-commits]

Date: Saturday, November 28, 2020 @ 18:52:25
  Author: felixonmars
Revision: 765439

archrelease: copy trunk to community-staging-x86_64

Added:
  haskell-tamarin-prover-term/repos/community-staging-x86_64/
  haskell-tamarin-prover-term/repos/community-staging-x86_64/PKGBUILD
(from rev 765438, haskell-tamarin-prover-term/trunk/PKGBUILD)
  haskell-tamarin-prover-term/repos/community-staging-x86_64/maude-3.1.patch
(from rev 765438, haskell-tamarin-prover-term/trunk/maude-3.1.patch)

-+
 PKGBUILD|   45 +
 maude-3.1.patch |   35 +++
 2 files changed, 80 insertions(+)

Copied: haskell-tamarin-prover-term/repos/community-staging-x86_64/PKGBUILD 
(from rev 765438, haskell-tamarin-prover-term/trunk/PKGBUILD)
===
--- community-staging-x86_64/PKGBUILD   (rev 0)
+++ community-staging-x86_64/PKGBUILD   2020-11-28 18:52:25 UTC (rev 765439)
@@ -0,0 +1,45 @@
+# Maintainer: Felix Yan 
+# Contributor: Arch Haskell Team 
+
+_hkgname=tamarin-prover-term
+pkgname=haskell-tamarin-prover-term
+pkgver=1.6.0
+pkgrel=19
+pkgdesc="Term manipulation library for the tamarin prover"
+url="http://www.infsec.ethz.ch/research/software/tamarin;
+license=("GPL")
+arch=('x86_64')
+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;
+maude-3.1.patch)
+sha512sums=('7f3569f740d63d715b92a8f073eaecb8b32efe59b910b246977d36bb9e873765440e72feb6e76c7cbafab0495b88cfc666bb1dd12f685627c60d5cbd97b2973e'
+
'1ef5e4c370a0c5f5541d50600604ba7adc566c2f5cf415cdb844842bb10b343edd00aa5aa654f8e55355c80f48a34382c87c3fba4adca0c77e726f407f3815c3')
+
+prepare() {
+cd tamarin-prover-$pkgver
+patch -p1 -i ../maude-3.1.patch
+}
+
+build() {
+cd tamarin-prover-$pkgver/lib/term
+
+runhaskell Setup configure -O --enable-shared --enable-executable-dynamic 
--disable-library-vanilla \
+--prefix=/usr --docdir=/usr/share/doc/$pkgname \
+--dynlibdir=/usr/lib --libsubdir=\$compiler/site-local/\$pkgid
+runhaskell Setup build $MAKEFLAGS
+runhaskell Setup register --gen-script
+runhaskell Setup unregister --gen-script
+sed -i -r -e "s|ghc-pkg.*update[^ ]* |&'--force' |" register.sh
+sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh
+}
+
+package() {
+cd tamarin-prover-$pkgver/lib/term
+
+install -D -m744 register.sh 
"$pkgdir"/usr/share/haskell/register/$pkgname.sh
+install -D -m744 unregister.sh 
"$pkgdir"/usr/share/haskell/unregister/$pkgname.sh
+runhaskell Setup copy --destdir="$pkgdir"
+rm -f "$pkgdir"/usr/share/doc/$pkgname/LICENSE
+}

Copied: 
haskell-tamarin-prover-term/repos/community-staging-x86_64/maude-3.1.patch 
(from rev 765438, haskell-tamarin-prover-term/trunk/maude-3.1.patch)
===
--- community-staging-x86_64/maude-3.1.patch(rev 0)
+++ community-staging-x86_64/maude-3.1.patch2020-11-28 18:52:25 UTC (rev 
765439)
@@ -0,0 +1,35 @@
+diff --git a/lib/term/src/Term/Maude/Parser.hs 
b/lib/term/src/Term/Maude/Parser.hs
+index 187c35dc..0a1d3c35 100644
+--- a/lib/term/src/Term/Maude/Parser.hs
 b/lib/term/src/Term/Maude/Parser.hs
+@@ -224,7 +224,7 @@ parseVariantsReply msig reply = flip parseOnly reply $ do
+ <* endOfLine <* string "rewrites: "
+ <* takeWhile1 isDigit <* endOfLine <* endOfInput
+   where
+-parseVariant = string "Variant #" *> takeWhile1 isDigit *> endOfLine *>
++parseVariant = string "Variant " *> optional (char '#') *> takeWhile1 
isDigit *> endOfLine *>
+string "rewrites: " *> takeWhile1 isDigit *> endOfLine *>
+parseReprintedTerm *> manyTill parseEntry endOfLine
+ parseReprintedTerm = choice [ string "TOP" *> pure LSortMsg, parseSort ]
+@@ -235,7 +235,7 @@ parseVariantsReply msig reply = flip parseOnly reply $ do
+ -- | @parseSubstitution l@ parses a single substitution returned by Maude.
+ parseSubstitution :: MaudeSig -> Parser MSubst
+ parseSubstitution msig = do
+-endOfLine *> string "Solution " *> takeWhile1 isDigit *> endOfLine
++endOfLine *> choice [string "Solution ", string "Unifier ", string 
"Matcher "] *> takeWhile1 isDigit *> endOfLine
+ choice [ string "empty substitution" *> endOfLine *> pure []
+, many1 parseEntry]
+   where 
+diff --git a/src/Main/Environment.hs b/src/Main/Environment.hs
+index ecb15d2f..1b55c2e7 100644
+--- a/src/Main/Environment.hs
 b/src/Main/Environment.hs
+@@ -175,7 +175,7 @@ ensureMaude as = do
+ 
+ --  Maude versions prior to 2.7.1 are no longer supported,
+ --  because the 'get variants' command is incompatible.
+- 

[arch-commits] Commit in haskell-tamarin-prover-term/repos (3 files)

[Felix Yan via arch-commits]

Date: Sunday, November 22, 2020 @ 18:48:13
  Author: felixonmars
Revision: 759407

archrelease: copy trunk to community-staging-x86_64

Added:
  haskell-tamarin-prover-term/repos/community-staging-x86_64/
  haskell-tamarin-prover-term/repos/community-staging-x86_64/PKGBUILD
(from rev 759406, haskell-tamarin-prover-term/trunk/PKGBUILD)
  haskell-tamarin-prover-term/repos/community-staging-x86_64/maude-3.1.patch
(from rev 759406, haskell-tamarin-prover-term/trunk/maude-3.1.patch)

-+
 PKGBUILD|   45 +
 maude-3.1.patch |   35 +++
 2 files changed, 80 insertions(+)

Copied: haskell-tamarin-prover-term/repos/community-staging-x86_64/PKGBUILD 
(from rev 759406, haskell-tamarin-prover-term/trunk/PKGBUILD)
===
--- community-staging-x86_64/PKGBUILD   (rev 0)
+++ community-staging-x86_64/PKGBUILD   2020-11-22 18:48:13 UTC (rev 759407)
@@ -0,0 +1,45 @@
+# Maintainer: Felix Yan 
+# Contributor: Arch Haskell Team 
+
+_hkgname=tamarin-prover-term
+pkgname=haskell-tamarin-prover-term
+pkgver=1.6.0
+pkgrel=18
+pkgdesc="Term manipulation library for the tamarin prover"
+url="http://www.infsec.ethz.ch/research/software/tamarin;
+license=("GPL")
+arch=('x86_64')
+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;
+maude-3.1.patch)
+sha512sums=('7f3569f740d63d715b92a8f073eaecb8b32efe59b910b246977d36bb9e873765440e72feb6e76c7cbafab0495b88cfc666bb1dd12f685627c60d5cbd97b2973e'
+
'1ef5e4c370a0c5f5541d50600604ba7adc566c2f5cf415cdb844842bb10b343edd00aa5aa654f8e55355c80f48a34382c87c3fba4adca0c77e726f407f3815c3')
+
+prepare() {
+cd tamarin-prover-$pkgver
+patch -p1 -i ../maude-3.1.patch
+}
+
+build() {
+cd tamarin-prover-$pkgver/lib/term
+
+runhaskell Setup configure -O --enable-shared --enable-executable-dynamic 
--disable-library-vanilla \
+--prefix=/usr --docdir=/usr/share/doc/$pkgname \
+--dynlibdir=/usr/lib --libsubdir=\$compiler/site-local/\$pkgid
+runhaskell Setup build $MAKEFLAGS
+runhaskell Setup register --gen-script
+runhaskell Setup unregister --gen-script
+sed -i -r -e "s|ghc-pkg.*update[^ ]* |&'--force' |" register.sh
+sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh
+}
+
+package() {
+cd tamarin-prover-$pkgver/lib/term
+
+install -D -m744 register.sh 
"$pkgdir"/usr/share/haskell/register/$pkgname.sh
+install -D -m744 unregister.sh 
"$pkgdir"/usr/share/haskell/unregister/$pkgname.sh
+runhaskell Setup copy --destdir="$pkgdir"
+rm -f "$pkgdir"/usr/share/doc/$pkgname/LICENSE
+}

Copied: 
haskell-tamarin-prover-term/repos/community-staging-x86_64/maude-3.1.patch 
(from rev 759406, haskell-tamarin-prover-term/trunk/maude-3.1.patch)
===
--- community-staging-x86_64/maude-3.1.patch(rev 0)
+++ community-staging-x86_64/maude-3.1.patch2020-11-22 18:48:13 UTC (rev 
759407)
@@ -0,0 +1,35 @@
+diff --git a/lib/term/src/Term/Maude/Parser.hs 
b/lib/term/src/Term/Maude/Parser.hs
+index 187c35dc..0a1d3c35 100644
+--- a/lib/term/src/Term/Maude/Parser.hs
 b/lib/term/src/Term/Maude/Parser.hs
+@@ -224,7 +224,7 @@ parseVariantsReply msig reply = flip parseOnly reply $ do
+ <* endOfLine <* string "rewrites: "
+ <* takeWhile1 isDigit <* endOfLine <* endOfInput
+   where
+-parseVariant = string "Variant #" *> takeWhile1 isDigit *> endOfLine *>
++parseVariant = string "Variant " *> optional (char '#') *> takeWhile1 
isDigit *> endOfLine *>
+string "rewrites: " *> takeWhile1 isDigit *> endOfLine *>
+parseReprintedTerm *> manyTill parseEntry endOfLine
+ parseReprintedTerm = choice [ string "TOP" *> pure LSortMsg, parseSort ]
+@@ -235,7 +235,7 @@ parseVariantsReply msig reply = flip parseOnly reply $ do
+ -- | @parseSubstitution l@ parses a single substitution returned by Maude.
+ parseSubstitution :: MaudeSig -> Parser MSubst
+ parseSubstitution msig = do
+-endOfLine *> string "Solution " *> takeWhile1 isDigit *> endOfLine
++endOfLine *> choice [string "Solution ", string "Unifier ", string 
"Matcher "] *> takeWhile1 isDigit *> endOfLine
+ choice [ string "empty substitution" *> endOfLine *> pure []
+, many1 parseEntry]
+   where 
+diff --git a/src/Main/Environment.hs b/src/Main/Environment.hs
+index ecb15d2f..1b55c2e7 100644
+--- a/src/Main/Environment.hs
 b/src/Main/Environment.hs
+@@ -175,7 +175,7 @@ ensureMaude as = do
+ 
+ --  Maude versions prior to 2.7.1 are no longer supported,
+ --  because the 'get variants' command is incompatible.
+-   

[arch-commits] Commit in haskell-tamarin-prover-term/repos (3 files)

[Felix Yan via arch-commits]

Date: Friday, November 20, 2020 @ 23:24:24
  Author: felixonmars
Revision: 758235

archrelease: copy trunk to community-staging-x86_64

Added:
  haskell-tamarin-prover-term/repos/community-staging-x86_64/
  haskell-tamarin-prover-term/repos/community-staging-x86_64/PKGBUILD
(from rev 758234, haskell-tamarin-prover-term/trunk/PKGBUILD)
  haskell-tamarin-prover-term/repos/community-staging-x86_64/maude-3.1.patch
(from rev 758234, haskell-tamarin-prover-term/trunk/maude-3.1.patch)

-+
 PKGBUILD|   45 +
 maude-3.1.patch |   35 +++
 2 files changed, 80 insertions(+)

Copied: haskell-tamarin-prover-term/repos/community-staging-x86_64/PKGBUILD 
(from rev 758234, haskell-tamarin-prover-term/trunk/PKGBUILD)
===
--- community-staging-x86_64/PKGBUILD   (rev 0)
+++ community-staging-x86_64/PKGBUILD   2020-11-20 23:24:24 UTC (rev 758235)
@@ -0,0 +1,45 @@
+# Maintainer: Felix Yan 
+# Contributor: Arch Haskell Team 
+
+_hkgname=tamarin-prover-term
+pkgname=haskell-tamarin-prover-term
+pkgver=1.6.0
+pkgrel=17
+pkgdesc="Term manipulation library for the tamarin prover"
+url="http://www.infsec.ethz.ch/research/software/tamarin;
+license=("GPL")
+arch=('x86_64')
+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;
+maude-3.1.patch)
+sha512sums=('7f3569f740d63d715b92a8f073eaecb8b32efe59b910b246977d36bb9e873765440e72feb6e76c7cbafab0495b88cfc666bb1dd12f685627c60d5cbd97b2973e'
+
'1ef5e4c370a0c5f5541d50600604ba7adc566c2f5cf415cdb844842bb10b343edd00aa5aa654f8e55355c80f48a34382c87c3fba4adca0c77e726f407f3815c3')
+
+prepare() {
+cd tamarin-prover-$pkgver
+patch -p1 -i ../maude-3.1.patch
+}
+
+build() {
+cd tamarin-prover-$pkgver/lib/term
+
+runhaskell Setup configure -O --enable-shared --enable-executable-dynamic 
--disable-library-vanilla \
+--prefix=/usr --docdir=/usr/share/doc/$pkgname \
+--dynlibdir=/usr/lib --libsubdir=\$compiler/site-local/\$pkgid
+runhaskell Setup build $MAKEFLAGS
+runhaskell Setup register --gen-script
+runhaskell Setup unregister --gen-script
+sed -i -r -e "s|ghc-pkg.*update[^ ]* |&'--force' |" register.sh
+sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh
+}
+
+package() {
+cd tamarin-prover-$pkgver/lib/term
+
+install -D -m744 register.sh 
"$pkgdir"/usr/share/haskell/register/$pkgname.sh
+install -D -m744 unregister.sh 
"$pkgdir"/usr/share/haskell/unregister/$pkgname.sh
+runhaskell Setup copy --destdir="$pkgdir"
+rm -f "$pkgdir"/usr/share/doc/$pkgname/LICENSE
+}

Copied: 
haskell-tamarin-prover-term/repos/community-staging-x86_64/maude-3.1.patch 
(from rev 758234, haskell-tamarin-prover-term/trunk/maude-3.1.patch)
===
--- community-staging-x86_64/maude-3.1.patch(rev 0)
+++ community-staging-x86_64/maude-3.1.patch2020-11-20 23:24:24 UTC (rev 
758235)
@@ -0,0 +1,35 @@
+diff --git a/lib/term/src/Term/Maude/Parser.hs 
b/lib/term/src/Term/Maude/Parser.hs
+index 187c35dc..0a1d3c35 100644
+--- a/lib/term/src/Term/Maude/Parser.hs
 b/lib/term/src/Term/Maude/Parser.hs
+@@ -224,7 +224,7 @@ parseVariantsReply msig reply = flip parseOnly reply $ do
+ <* endOfLine <* string "rewrites: "
+ <* takeWhile1 isDigit <* endOfLine <* endOfInput
+   where
+-parseVariant = string "Variant #" *> takeWhile1 isDigit *> endOfLine *>
++parseVariant = string "Variant " *> optional (char '#') *> takeWhile1 
isDigit *> endOfLine *>
+string "rewrites: " *> takeWhile1 isDigit *> endOfLine *>
+parseReprintedTerm *> manyTill parseEntry endOfLine
+ parseReprintedTerm = choice [ string "TOP" *> pure LSortMsg, parseSort ]
+@@ -235,7 +235,7 @@ parseVariantsReply msig reply = flip parseOnly reply $ do
+ -- | @parseSubstitution l@ parses a single substitution returned by Maude.
+ parseSubstitution :: MaudeSig -> Parser MSubst
+ parseSubstitution msig = do
+-endOfLine *> string "Solution " *> takeWhile1 isDigit *> endOfLine
++endOfLine *> choice [string "Solution ", string "Unifier ", string 
"Matcher "] *> takeWhile1 isDigit *> endOfLine
+ choice [ string "empty substitution" *> endOfLine *> pure []
+, many1 parseEntry]
+   where 
+diff --git a/src/Main/Environment.hs b/src/Main/Environment.hs
+index ecb15d2f..1b55c2e7 100644
+--- a/src/Main/Environment.hs
 b/src/Main/Environment.hs
+@@ -175,7 +175,7 @@ ensureMaude as = do
+ 
+ --  Maude versions prior to 2.7.1 are no longer supported,
+ --  because the 'get variants' command is incompatible.
+-   

[arch-commits] Commit in haskell-tamarin-prover-term/repos (3 files)

[Felix Yan via arch-commits]

Date: Monday, December 10, 2018 @ 10:08:53
  Author: felixonmars
Revision: 413967

archrelease: copy trunk to community-staging-x86_64

Added:
  haskell-tamarin-prover-term/repos/community-staging-x86_64/
  haskell-tamarin-prover-term/repos/community-staging-x86_64/PKGBUILD
(from rev 413966, haskell-tamarin-prover-term/trunk/PKGBUILD)
  haskell-tamarin-prover-term/repos/community-staging-x86_64/ghc-8.4.patch
(from rev 413966, haskell-tamarin-prover-term/trunk/ghc-8.4.patch)

---+
 PKGBUILD  |   45 +++
 ghc-8.4.patch |  221 
 2 files changed, 266 insertions(+)

Copied: haskell-tamarin-prover-term/repos/community-staging-x86_64/PKGBUILD 
(from rev 413966, haskell-tamarin-prover-term/trunk/PKGBUILD)
===
--- community-staging-x86_64/PKGBUILD   (rev 0)
+++ community-staging-x86_64/PKGBUILD   2018-12-10 10:08:53 UTC (rev 413967)
@@ -0,0 +1,45 @@
+# Maintainer: Felix Yan 
+# Contributor: Arch Haskell Team 
+
+_hkgname=tamarin-prover-term
+pkgname=haskell-tamarin-prover-term
+pkgver=1.4.0
+pkgrel=26
+pkgdesc="Term manipulation library for the tamarin prover"
+url="http://www.infsec.ethz.ch/research/software/tamarin;
+license=("GPL")
+arch=('x86_64')
+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')
+
+prepare() {
+cd tamarin-prover-$pkgver
+patch -p1 -i ../ghc-8.4.patch
+}
+
+build() {
+cd "${srcdir}/tamarin-prover-${pkgver}/lib/term"
+
+runhaskell Setup configure -O --enable-shared --enable-executable-dynamic 
--disable-library-vanilla \
+--prefix=/usr --docdir=/usr/share/doc/$pkgname \
+--dynlibdir=/usr/lib --libsubdir=\$compiler/site-local/\$pkgid
+runhaskell Setup build
+runhaskell Setup register --gen-script
+runhaskell Setup unregister --gen-script
+sed -i -r -e "s|ghc-pkg.*update[^ ]* |&'--force' |" register.sh
+sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh
+}
+
+package() {
+cd "${srcdir}/tamarin-prover-${pkgver}/lib/term"
+
+install -D -m744 register.sh 
"$pkgdir"/usr/share/haskell/register/$pkgname.sh
+install -D -m744 unregister.sh 
"$pkgdir"/usr/share/haskell/unregister/$pkgname.sh
+runhaskell Setup copy --destdir="$pkgdir"
+rm -f "${pkgdir}/usr/share/doc/${pkgname}/LICENSE"
+}

Copied: 
haskell-tamarin-prover-term/repos/community-staging-x86_64/ghc-8.4.patch (from 
rev 413966, haskell-tamarin-prover-term/trunk/ghc-8.4.patch)
===
--- community-staging-x86_64/ghc-8.4.patch  (rev 0)
+++ community-staging-x86_64/ghc-8.4.patch  2018-12-10 10:08:53 UTC (rev 
413967)
@@ -0,0 +1,221 @@
+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
+ 

[arch-commits] Commit in haskell-tamarin-prover-term/repos (3 files)

[Felix Yan via arch-commits]

Date: Saturday, December 8, 2018 @ 18:50:46
  Author: felixonmars
Revision: 412485

archrelease: copy trunk to community-staging-x86_64

Added:
  haskell-tamarin-prover-term/repos/community-staging-x86_64/
  haskell-tamarin-prover-term/repos/community-staging-x86_64/PKGBUILD
(from rev 412484, haskell-tamarin-prover-term/trunk/PKGBUILD)
  haskell-tamarin-prover-term/repos/community-staging-x86_64/ghc-8.4.patch
(from rev 412484, haskell-tamarin-prover-term/trunk/ghc-8.4.patch)

---+
 PKGBUILD  |   45 +++
 ghc-8.4.patch |  221 
 2 files changed, 266 insertions(+)

Copied: haskell-tamarin-prover-term/repos/community-staging-x86_64/PKGBUILD 
(from rev 412484, haskell-tamarin-prover-term/trunk/PKGBUILD)
===
--- community-staging-x86_64/PKGBUILD   (rev 0)
+++ community-staging-x86_64/PKGBUILD   2018-12-08 18:50:46 UTC (rev 412485)
@@ -0,0 +1,45 @@
+# Maintainer: Felix Yan 
+# Contributor: Arch Haskell Team 
+
+_hkgname=tamarin-prover-term
+pkgname=haskell-tamarin-prover-term
+pkgver=1.4.0
+pkgrel=25
+pkgdesc="Term manipulation library for the tamarin prover"
+url="http://www.infsec.ethz.ch/research/software/tamarin;
+license=("GPL")
+arch=('x86_64')
+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')
+
+prepare() {
+cd tamarin-prover-$pkgver
+patch -p1 -i ../ghc-8.4.patch
+}
+
+build() {
+cd "${srcdir}/tamarin-prover-${pkgver}/lib/term"
+
+runhaskell Setup configure -O --enable-shared --enable-executable-dynamic 
--disable-library-vanilla \
+--prefix=/usr --docdir=/usr/share/doc/$pkgname \
+--dynlibdir=/usr/lib --libsubdir=\$compiler/site-local/\$pkgid
+runhaskell Setup build
+runhaskell Setup register --gen-script
+runhaskell Setup unregister --gen-script
+sed -i -r -e "s|ghc-pkg.*update[^ ]* |&'--force' |" register.sh
+sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh
+}
+
+package() {
+cd "${srcdir}/tamarin-prover-${pkgver}/lib/term"
+
+install -D -m744 register.sh 
"$pkgdir"/usr/share/haskell/register/$pkgname.sh
+install -D -m744 unregister.sh 
"$pkgdir"/usr/share/haskell/unregister/$pkgname.sh
+runhaskell Setup copy --destdir="$pkgdir"
+rm -f "${pkgdir}/usr/share/doc/${pkgname}/LICENSE"
+}

Copied: 
haskell-tamarin-prover-term/repos/community-staging-x86_64/ghc-8.4.patch (from 
rev 412484, haskell-tamarin-prover-term/trunk/ghc-8.4.patch)
===
--- community-staging-x86_64/ghc-8.4.patch  (rev 0)
+++ community-staging-x86_64/ghc-8.4.patch  2018-12-08 18:50:46 UTC (rev 
412485)
@@ -0,0 +1,221 @@
+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
+ 

[arch-commits] Commit in haskell-tamarin-prover-term/repos (3 files)

[Felix Yan via arch-commits]

Date: Wednesday, December 5, 2018 @ 09:09:50
  Author: felixonmars
Revision: 411289

archrelease: copy trunk to community-staging-x86_64

Added:
  haskell-tamarin-prover-term/repos/community-staging-x86_64/
  haskell-tamarin-prover-term/repos/community-staging-x86_64/PKGBUILD
(from rev 411288, haskell-tamarin-prover-term/trunk/PKGBUILD)
  haskell-tamarin-prover-term/repos/community-staging-x86_64/ghc-8.4.patch
(from rev 411288, haskell-tamarin-prover-term/trunk/ghc-8.4.patch)

---+
 PKGBUILD  |   45 +++
 ghc-8.4.patch |  221 
 2 files changed, 266 insertions(+)

Copied: haskell-tamarin-prover-term/repos/community-staging-x86_64/PKGBUILD 
(from rev 411288, haskell-tamarin-prover-term/trunk/PKGBUILD)
===
--- community-staging-x86_64/PKGBUILD   (rev 0)
+++ community-staging-x86_64/PKGBUILD   2018-12-05 09:09:50 UTC (rev 411289)
@@ -0,0 +1,45 @@
+# Maintainer: Felix Yan 
+# Contributor: Arch Haskell Team 
+
+_hkgname=tamarin-prover-term
+pkgname=haskell-tamarin-prover-term
+pkgver=1.4.0
+pkgrel=24
+pkgdesc="Term manipulation library for the tamarin prover"
+url="http://www.infsec.ethz.ch/research/software/tamarin;
+license=("GPL")
+arch=('x86_64')
+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')
+
+prepare() {
+cd tamarin-prover-$pkgver
+patch -p1 -i ../ghc-8.4.patch
+}
+
+build() {
+cd "${srcdir}/tamarin-prover-${pkgver}/lib/term"
+
+runhaskell Setup configure -O --enable-shared --enable-executable-dynamic 
--disable-library-vanilla \
+--prefix=/usr --docdir=/usr/share/doc/$pkgname \
+--dynlibdir=/usr/lib --libsubdir=\$compiler/site-local/\$pkgid
+runhaskell Setup build
+runhaskell Setup register --gen-script
+runhaskell Setup unregister --gen-script
+sed -i -r -e "s|ghc-pkg.*update[^ ]* |&'--force' |" register.sh
+sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh
+}
+
+package() {
+cd "${srcdir}/tamarin-prover-${pkgver}/lib/term"
+
+install -D -m744 register.sh 
"$pkgdir"/usr/share/haskell/register/$pkgname.sh
+install -D -m744 unregister.sh 
"$pkgdir"/usr/share/haskell/unregister/$pkgname.sh
+runhaskell Setup copy --destdir="$pkgdir"
+rm -f "${pkgdir}/usr/share/doc/${pkgname}/LICENSE"
+}

Copied: 
haskell-tamarin-prover-term/repos/community-staging-x86_64/ghc-8.4.patch (from 
rev 411288, haskell-tamarin-prover-term/trunk/ghc-8.4.patch)
===
--- community-staging-x86_64/ghc-8.4.patch  (rev 0)
+++ community-staging-x86_64/ghc-8.4.patch  2018-12-05 09:09:50 UTC (rev 
411289)
@@ -0,0 +1,221 @@
+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
+ 

[arch-commits] Commit in haskell-tamarin-prover-term/repos (3 files)

[Felix Yan via arch-commits]

Date: Tuesday, November 6, 2018 @ 23:11:24
  Author: felixonmars
Revision: 402428

archrelease: copy trunk to community-staging-x86_64

Added:
  haskell-tamarin-prover-term/repos/community-staging-x86_64/
  haskell-tamarin-prover-term/repos/community-staging-x86_64/PKGBUILD
(from rev 402427, haskell-tamarin-prover-term/trunk/PKGBUILD)
  haskell-tamarin-prover-term/repos/community-staging-x86_64/ghc-8.4.patch
(from rev 402427, haskell-tamarin-prover-term/trunk/ghc-8.4.patch)

---+
 PKGBUILD  |   45 +++
 ghc-8.4.patch |  221 
 2 files changed, 266 insertions(+)

Copied: haskell-tamarin-prover-term/repos/community-staging-x86_64/PKGBUILD 
(from rev 402427, haskell-tamarin-prover-term/trunk/PKGBUILD)
===
--- community-staging-x86_64/PKGBUILD   (rev 0)
+++ community-staging-x86_64/PKGBUILD   2018-11-06 23:11:24 UTC (rev 402428)
@@ -0,0 +1,45 @@
+# Maintainer: Felix Yan 
+# Contributor: Arch Haskell Team 
+
+_hkgname=tamarin-prover-term
+pkgname=haskell-tamarin-prover-term
+pkgver=1.4.0
+pkgrel=23
+pkgdesc="Term manipulation library for the tamarin prover"
+url="http://www.infsec.ethz.ch/research/software/tamarin;
+license=("GPL")
+arch=('x86_64')
+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')
+
+prepare() {
+cd tamarin-prover-$pkgver
+patch -p1 -i ../ghc-8.4.patch
+}
+
+build() {
+cd "${srcdir}/tamarin-prover-${pkgver}/lib/term"
+
+runhaskell Setup configure -O --enable-shared --enable-executable-dynamic 
--disable-library-vanilla \
+--prefix=/usr --docdir=/usr/share/doc/$pkgname \
+--dynlibdir=/usr/lib --libsubdir=\$compiler/site-local/\$pkgid
+runhaskell Setup build
+runhaskell Setup register --gen-script
+runhaskell Setup unregister --gen-script
+sed -i -r -e "s|ghc-pkg.*update[^ ]* |&'--force' |" register.sh
+sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh
+}
+
+package() {
+cd "${srcdir}/tamarin-prover-${pkgver}/lib/term"
+
+install -D -m744 register.sh 
"$pkgdir"/usr/share/haskell/register/$pkgname.sh
+install -D -m744 unregister.sh 
"$pkgdir"/usr/share/haskell/unregister/$pkgname.sh
+runhaskell Setup copy --destdir="$pkgdir"
+rm -f "${pkgdir}/usr/share/doc/${pkgname}/LICENSE"
+}

Copied: 
haskell-tamarin-prover-term/repos/community-staging-x86_64/ghc-8.4.patch (from 
rev 402427, haskell-tamarin-prover-term/trunk/ghc-8.4.patch)
===
--- community-staging-x86_64/ghc-8.4.patch  (rev 0)
+++ community-staging-x86_64/ghc-8.4.patch  2018-11-06 23:11:24 UTC (rev 
402428)
@@ -0,0 +1,221 @@
+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
+ 

[arch-commits] Commit in haskell-tamarin-prover-term/repos (3 files)

[Felix Yan via arch-commits]

Date: Wednesday, October 31, 2018 @ 07:58:09
  Author: felixonmars
Revision: 399769

archrelease: copy trunk to community-staging-x86_64

Added:
  haskell-tamarin-prover-term/repos/community-staging-x86_64/
  haskell-tamarin-prover-term/repos/community-staging-x86_64/PKGBUILD
(from rev 399768, haskell-tamarin-prover-term/trunk/PKGBUILD)
  haskell-tamarin-prover-term/repos/community-staging-x86_64/ghc-8.4.patch
(from rev 399768, haskell-tamarin-prover-term/trunk/ghc-8.4.patch)

---+
 PKGBUILD  |   45 +++
 ghc-8.4.patch |  221 
 2 files changed, 266 insertions(+)

Copied: haskell-tamarin-prover-term/repos/community-staging-x86_64/PKGBUILD 
(from rev 399768, haskell-tamarin-prover-term/trunk/PKGBUILD)
===
--- community-staging-x86_64/PKGBUILD   (rev 0)
+++ community-staging-x86_64/PKGBUILD   2018-10-31 07:58:09 UTC (rev 399769)
@@ -0,0 +1,45 @@
+# Maintainer: Felix Yan 
+# Contributor: Arch Haskell Team 
+
+_hkgname=tamarin-prover-term
+pkgname=haskell-tamarin-prover-term
+pkgver=1.4.0
+pkgrel=22
+pkgdesc="Term manipulation library for the tamarin prover"
+url="http://www.infsec.ethz.ch/research/software/tamarin;
+license=("GPL")
+arch=('x86_64')
+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')
+
+prepare() {
+cd tamarin-prover-$pkgver
+patch -p1 -i ../ghc-8.4.patch
+}
+
+build() {
+cd "${srcdir}/tamarin-prover-${pkgver}/lib/term"
+
+runhaskell Setup configure -O --enable-shared --enable-executable-dynamic 
--disable-library-vanilla \
+--prefix=/usr --docdir="/usr/share/doc/${pkgname}" \
+--dynlibdir=/usr/lib --libsubdir=\$compiler/site-local/\$pkgid
+runhaskell Setup build
+runhaskell Setup register --gen-script
+runhaskell Setup unregister --gen-script
+sed -i -r -e "s|ghc-pkg.*update[^ ]* |&'--force' |" register.sh
+sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh
+}
+
+package() {
+cd "${srcdir}/tamarin-prover-${pkgver}/lib/term"
+
+install -D -m744 register.sh   
"${pkgdir}/usr/share/haskell/register/${pkgname}.sh"
+install -D -m744 unregister.sh 
"${pkgdir}/usr/share/haskell/unregister/${pkgname}.sh"
+runhaskell Setup copy --destdir="${pkgdir}"
+rm -f "${pkgdir}/usr/share/doc/${pkgname}/LICENSE"
+}

Copied: 
haskell-tamarin-prover-term/repos/community-staging-x86_64/ghc-8.4.patch (from 
rev 399768, haskell-tamarin-prover-term/trunk/ghc-8.4.patch)
===
--- community-staging-x86_64/ghc-8.4.patch  (rev 0)
+++ community-staging-x86_64/ghc-8.4.patch  2018-10-31 07:58:09 UTC (rev 
399769)
@@ -0,0 +1,221 @@
+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 

[arch-commits] Commit in haskell-tamarin-prover-term/repos (3 files)

[Felix Yan via arch-commits]

Date: Monday, October 15, 2018 @ 14:33:04
  Author: felixonmars
Revision: 394196

archrelease: copy trunk to community-staging-x86_64

Added:
  haskell-tamarin-prover-term/repos/community-staging-x86_64/
  haskell-tamarin-prover-term/repos/community-staging-x86_64/PKGBUILD
(from rev 394195, haskell-tamarin-prover-term/trunk/PKGBUILD)
  haskell-tamarin-prover-term/repos/community-staging-x86_64/ghc-8.4.patch
(from rev 394195, haskell-tamarin-prover-term/trunk/ghc-8.4.patch)

---+
 PKGBUILD  |   45 +++
 ghc-8.4.patch |  221 
 2 files changed, 266 insertions(+)

Copied: haskell-tamarin-prover-term/repos/community-staging-x86_64/PKGBUILD 
(from rev 394195, haskell-tamarin-prover-term/trunk/PKGBUILD)
===
--- community-staging-x86_64/PKGBUILD   (rev 0)
+++ community-staging-x86_64/PKGBUILD   2018-10-15 14:33:04 UTC (rev 394196)
@@ -0,0 +1,45 @@
+# Maintainer: Felix Yan 
+# Contributor: Arch Haskell Team 
+
+_hkgname=tamarin-prover-term
+pkgname=haskell-tamarin-prover-term
+pkgver=1.4.0
+pkgrel=21
+pkgdesc="Term manipulation library for the tamarin prover"
+url="http://www.infsec.ethz.ch/research/software/tamarin;
+license=("GPL")
+arch=('x86_64')
+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')
+
+prepare() {
+cd tamarin-prover-$pkgver
+patch -p1 -i ../ghc-8.4.patch
+}
+
+build() {
+cd "${srcdir}/tamarin-prover-${pkgver}/lib/term"
+
+runhaskell Setup configure -O --enable-shared --enable-executable-dynamic 
--disable-library-vanilla \
+--prefix=/usr --docdir="/usr/share/doc/${pkgname}" \
+--dynlibdir=/usr/lib --libsubdir=\$compiler/site-local/\$pkgid
+runhaskell Setup build
+runhaskell Setup register --gen-script
+runhaskell Setup unregister --gen-script
+sed -i -r -e "s|ghc-pkg.*update[^ ]* |&'--force' |" register.sh
+sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh
+}
+
+package() {
+cd "${srcdir}/tamarin-prover-${pkgver}/lib/term"
+
+install -D -m744 register.sh   
"${pkgdir}/usr/share/haskell/register/${pkgname}.sh"
+install -D -m744 unregister.sh 
"${pkgdir}/usr/share/haskell/unregister/${pkgname}.sh"
+runhaskell Setup copy --destdir="${pkgdir}"
+rm -f "${pkgdir}/usr/share/doc/${pkgname}/LICENSE"
+}

Copied: 
haskell-tamarin-prover-term/repos/community-staging-x86_64/ghc-8.4.patch (from 
rev 394195, haskell-tamarin-prover-term/trunk/ghc-8.4.patch)
===
--- community-staging-x86_64/ghc-8.4.patch  (rev 0)
+++ community-staging-x86_64/ghc-8.4.patch  2018-10-15 14:33:04 UTC (rev 
394196)
@@ -0,0 +1,221 @@
+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 

[arch-commits] Commit in haskell-tamarin-prover-term/repos (3 files)

[Felix Yan via arch-commits]

Date: Thursday, October 11, 2018 @ 06:58:21
  Author: felixonmars
Revision: 392194

archrelease: copy trunk to community-staging-x86_64

Added:
  haskell-tamarin-prover-term/repos/community-staging-x86_64/
  haskell-tamarin-prover-term/repos/community-staging-x86_64/PKGBUILD
(from rev 392193, haskell-tamarin-prover-term/trunk/PKGBUILD)
  haskell-tamarin-prover-term/repos/community-staging-x86_64/ghc-8.4.patch
(from rev 392193, haskell-tamarin-prover-term/trunk/ghc-8.4.patch)

---+
 PKGBUILD  |   45 +++
 ghc-8.4.patch |  221 
 2 files changed, 266 insertions(+)

Copied: haskell-tamarin-prover-term/repos/community-staging-x86_64/PKGBUILD 
(from rev 392193, haskell-tamarin-prover-term/trunk/PKGBUILD)
===
--- community-staging-x86_64/PKGBUILD   (rev 0)
+++ community-staging-x86_64/PKGBUILD   2018-10-11 06:58:21 UTC (rev 392194)
@@ -0,0 +1,45 @@
+# Maintainer: Felix Yan 
+# Contributor: Arch Haskell Team 
+
+_hkgname=tamarin-prover-term
+pkgname=haskell-tamarin-prover-term
+pkgver=1.4.0
+pkgrel=20
+pkgdesc="Term manipulation library for the tamarin prover"
+url="http://www.infsec.ethz.ch/research/software/tamarin;
+license=("GPL")
+arch=('x86_64')
+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')
+
+prepare() {
+cd tamarin-prover-$pkgver
+patch -p1 -i ../ghc-8.4.patch
+}
+
+build() {
+cd "${srcdir}/tamarin-prover-${pkgver}/lib/term"
+
+runhaskell Setup configure -O --enable-shared --enable-executable-dynamic 
--disable-library-vanilla \
+--prefix=/usr --docdir="/usr/share/doc/${pkgname}" \
+--dynlibdir=/usr/lib --libsubdir=\$compiler/site-local/\$pkgid
+runhaskell Setup build
+runhaskell Setup register --gen-script
+runhaskell Setup unregister --gen-script
+sed -i -r -e "s|ghc-pkg.*update[^ ]* |&'--force' |" register.sh
+sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh
+}
+
+package() {
+cd "${srcdir}/tamarin-prover-${pkgver}/lib/term"
+
+install -D -m744 register.sh   
"${pkgdir}/usr/share/haskell/register/${pkgname}.sh"
+install -D -m744 unregister.sh 
"${pkgdir}/usr/share/haskell/unregister/${pkgname}.sh"
+runhaskell Setup copy --destdir="${pkgdir}"
+rm -f "${pkgdir}/usr/share/doc/${pkgname}/LICENSE"
+}

Copied: 
haskell-tamarin-prover-term/repos/community-staging-x86_64/ghc-8.4.patch (from 
rev 392193, haskell-tamarin-prover-term/trunk/ghc-8.4.patch)
===
--- community-staging-x86_64/ghc-8.4.patch  (rev 0)
+++ community-staging-x86_64/ghc-8.4.patch  2018-10-11 06:58:21 UTC (rev 
392194)
@@ -0,0 +1,221 @@
+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 

[arch-commits] Commit in haskell-tamarin-prover-term/repos (3 files)

[Felix Yan via arch-commits]

Date: Friday, October 5, 2018 @ 10:28:22
  Author: felixonmars
Revision: 389785

archrelease: copy trunk to community-staging-x86_64

Added:
  haskell-tamarin-prover-term/repos/community-staging-x86_64/
  haskell-tamarin-prover-term/repos/community-staging-x86_64/PKGBUILD
(from rev 389784, haskell-tamarin-prover-term/trunk/PKGBUILD)
  haskell-tamarin-prover-term/repos/community-staging-x86_64/ghc-8.4.patch
(from rev 389784, haskell-tamarin-prover-term/trunk/ghc-8.4.patch)

---+
 PKGBUILD  |   45 +++
 ghc-8.4.patch |  221 
 2 files changed, 266 insertions(+)

Copied: haskell-tamarin-prover-term/repos/community-staging-x86_64/PKGBUILD 
(from rev 389784, haskell-tamarin-prover-term/trunk/PKGBUILD)
===
--- community-staging-x86_64/PKGBUILD   (rev 0)
+++ community-staging-x86_64/PKGBUILD   2018-10-05 10:28:22 UTC (rev 389785)
@@ -0,0 +1,45 @@
+# Maintainer: Felix Yan 
+# Contributor: Arch Haskell Team 
+
+_hkgname=tamarin-prover-term
+pkgname=haskell-tamarin-prover-term
+pkgver=1.4.0
+pkgrel=19
+pkgdesc="Term manipulation library for the tamarin prover"
+url="http://www.infsec.ethz.ch/research/software/tamarin;
+license=("GPL")
+arch=('x86_64')
+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')
+
+prepare() {
+cd tamarin-prover-$pkgver
+patch -p1 -i ../ghc-8.4.patch
+}
+
+build() {
+cd "${srcdir}/tamarin-prover-${pkgver}/lib/term"
+
+runhaskell Setup configure -O --enable-shared --enable-executable-dynamic 
--disable-library-vanilla \
+--prefix=/usr --docdir="/usr/share/doc/${pkgname}" \
+--dynlibdir=/usr/lib --libsubdir=\$compiler/site-local/\$pkgid
+runhaskell Setup build
+runhaskell Setup register --gen-script
+runhaskell Setup unregister --gen-script
+sed -i -r -e "s|ghc-pkg.*update[^ ]* |&'--force' |" register.sh
+sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh
+}
+
+package() {
+cd "${srcdir}/tamarin-prover-${pkgver}/lib/term"
+
+install -D -m744 register.sh   
"${pkgdir}/usr/share/haskell/register/${pkgname}.sh"
+install -D -m744 unregister.sh 
"${pkgdir}/usr/share/haskell/unregister/${pkgname}.sh"
+runhaskell Setup copy --destdir="${pkgdir}"
+rm -f "${pkgdir}/usr/share/doc/${pkgname}/LICENSE"
+}

Copied: 
haskell-tamarin-prover-term/repos/community-staging-x86_64/ghc-8.4.patch (from 
rev 389784, haskell-tamarin-prover-term/trunk/ghc-8.4.patch)
===
--- community-staging-x86_64/ghc-8.4.patch  (rev 0)
+++ community-staging-x86_64/ghc-8.4.patch  2018-10-05 10:28:22 UTC (rev 
389785)
@@ -0,0 +1,221 @@
+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) 

[arch-commits] Commit in haskell-tamarin-prover-term/repos (3 files)

[Felix Yan via arch-commits]

Date: Saturday, September 15, 2018 @ 05:22:39
  Author: felixonmars
Revision: 381082

archrelease: copy trunk to community-staging-x86_64

Added:
  haskell-tamarin-prover-term/repos/community-staging-x86_64/
  haskell-tamarin-prover-term/repos/community-staging-x86_64/PKGBUILD
(from rev 381081, haskell-tamarin-prover-term/trunk/PKGBUILD)
  haskell-tamarin-prover-term/repos/community-staging-x86_64/ghc-8.4.patch
(from rev 381081, haskell-tamarin-prover-term/trunk/ghc-8.4.patch)

---+
 PKGBUILD  |   45 +++
 ghc-8.4.patch |  221 
 2 files changed, 266 insertions(+)

Copied: haskell-tamarin-prover-term/repos/community-staging-x86_64/PKGBUILD 
(from rev 381081, haskell-tamarin-prover-term/trunk/PKGBUILD)
===
--- community-staging-x86_64/PKGBUILD   (rev 0)
+++ community-staging-x86_64/PKGBUILD   2018-09-15 05:22:39 UTC (rev 381082)
@@ -0,0 +1,45 @@
+# Maintainer: Felix Yan 
+# Contributor: Arch Haskell Team 
+
+_hkgname=tamarin-prover-term
+pkgname=haskell-tamarin-prover-term
+pkgver=1.4.0
+pkgrel=18
+pkgdesc="Term manipulation library for the tamarin prover"
+url="http://www.infsec.ethz.ch/research/software/tamarin;
+license=("GPL")
+arch=('x86_64')
+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')
+
+prepare() {
+cd tamarin-prover-$pkgver
+patch -p1 -i ../ghc-8.4.patch
+}
+
+build() {
+cd "${srcdir}/tamarin-prover-${pkgver}/lib/term"
+
+runhaskell Setup configure -O --enable-shared --enable-executable-dynamic 
--disable-library-vanilla \
+--prefix=/usr --docdir="/usr/share/doc/${pkgname}" \
+--dynlibdir=/usr/lib --libsubdir=\$compiler/site-local/\$pkgid
+runhaskell Setup build
+runhaskell Setup register --gen-script
+runhaskell Setup unregister --gen-script
+sed -i -r -e "s|ghc-pkg.*update[^ ]* |&'--force' |" register.sh
+sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh
+}
+
+package() {
+cd "${srcdir}/tamarin-prover-${pkgver}/lib/term"
+
+install -D -m744 register.sh   
"${pkgdir}/usr/share/haskell/register/${pkgname}.sh"
+install -D -m744 unregister.sh 
"${pkgdir}/usr/share/haskell/unregister/${pkgname}.sh"
+runhaskell Setup copy --destdir="${pkgdir}"
+rm -f "${pkgdir}/usr/share/doc/${pkgname}/LICENSE"
+}

Copied: 
haskell-tamarin-prover-term/repos/community-staging-x86_64/ghc-8.4.patch (from 
rev 381081, haskell-tamarin-prover-term/trunk/ghc-8.4.patch)
===
--- community-staging-x86_64/ghc-8.4.patch  (rev 0)
+++ community-staging-x86_64/ghc-8.4.patch  2018-09-15 05:22:39 UTC (rev 
381082)
@@ -0,0 +1,221 @@
+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 

[arch-commits] Commit in haskell-tamarin-prover-term/repos (3 files)

[Felix Yan via arch-commits]

Date: Thursday, September 13, 2018 @ 15:57:41
  Author: felixonmars
Revision: 380337

archrelease: copy trunk to community-staging-x86_64

Added:
  haskell-tamarin-prover-term/repos/community-staging-x86_64/
  haskell-tamarin-prover-term/repos/community-staging-x86_64/PKGBUILD
(from rev 380336, haskell-tamarin-prover-term/trunk/PKGBUILD)
  haskell-tamarin-prover-term/repos/community-staging-x86_64/ghc-8.4.patch
(from rev 380336, haskell-tamarin-prover-term/trunk/ghc-8.4.patch)

---+
 PKGBUILD  |   45 +++
 ghc-8.4.patch |  221 
 2 files changed, 266 insertions(+)

Copied: haskell-tamarin-prover-term/repos/community-staging-x86_64/PKGBUILD 
(from rev 380336, haskell-tamarin-prover-term/trunk/PKGBUILD)
===
--- community-staging-x86_64/PKGBUILD   (rev 0)
+++ community-staging-x86_64/PKGBUILD   2018-09-13 15:57:41 UTC (rev 380337)
@@ -0,0 +1,45 @@
+# Maintainer: Felix Yan 
+# Contributor: Arch Haskell Team 
+
+_hkgname=tamarin-prover-term
+pkgname=haskell-tamarin-prover-term
+pkgver=1.4.0
+pkgrel=17
+pkgdesc="Term manipulation library for the tamarin prover"
+url="http://www.infsec.ethz.ch/research/software/tamarin;
+license=("GPL")
+arch=('x86_64')
+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')
+
+prepare() {
+cd tamarin-prover-$pkgver
+patch -p1 -i ../ghc-8.4.patch
+}
+
+build() {
+cd "${srcdir}/tamarin-prover-${pkgver}/lib/term"
+
+runhaskell Setup configure -O --enable-shared --enable-executable-dynamic 
--disable-library-vanilla \
+--prefix=/usr --docdir="/usr/share/doc/${pkgname}" \
+--dynlibdir=/usr/lib --libsubdir=\$compiler/site-local/\$pkgid
+runhaskell Setup build
+runhaskell Setup register --gen-script
+runhaskell Setup unregister --gen-script
+sed -i -r -e "s|ghc-pkg.*update[^ ]* |&'--force' |" register.sh
+sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh
+}
+
+package() {
+cd "${srcdir}/tamarin-prover-${pkgver}/lib/term"
+
+install -D -m744 register.sh   
"${pkgdir}/usr/share/haskell/register/${pkgname}.sh"
+install -D -m744 unregister.sh 
"${pkgdir}/usr/share/haskell/unregister/${pkgname}.sh"
+runhaskell Setup copy --destdir="${pkgdir}"
+rm -f "${pkgdir}/usr/share/doc/${pkgname}/LICENSE"
+}

Copied: 
haskell-tamarin-prover-term/repos/community-staging-x86_64/ghc-8.4.patch (from 
rev 380336, haskell-tamarin-prover-term/trunk/ghc-8.4.patch)
===
--- community-staging-x86_64/ghc-8.4.patch  (rev 0)
+++ community-staging-x86_64/ghc-8.4.patch  2018-09-13 15:57:41 UTC (rev 
380337)
@@ -0,0 +1,221 @@
+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 

[arch-commits] Commit in haskell-tamarin-prover-term/repos (3 files)

[Felix Yan via arch-commits]

Date: Monday, September 10, 2018 @ 12:16:26
  Author: felixonmars
Revision: 379166

archrelease: copy trunk to community-staging-x86_64

Added:
  haskell-tamarin-prover-term/repos/community-staging-x86_64/
  haskell-tamarin-prover-term/repos/community-staging-x86_64/PKGBUILD
(from rev 379165, haskell-tamarin-prover-term/trunk/PKGBUILD)
  haskell-tamarin-prover-term/repos/community-staging-x86_64/ghc-8.4.patch
(from rev 379165, haskell-tamarin-prover-term/trunk/ghc-8.4.patch)

---+
 PKGBUILD  |   46 +++
 ghc-8.4.patch |  221 
 2 files changed, 267 insertions(+)

Copied: haskell-tamarin-prover-term/repos/community-staging-x86_64/PKGBUILD 
(from rev 379165, haskell-tamarin-prover-term/trunk/PKGBUILD)
===
--- community-staging-x86_64/PKGBUILD   (rev 0)
+++ community-staging-x86_64/PKGBUILD   2018-09-10 12:16:26 UTC (rev 379166)
@@ -0,0 +1,46 @@
+# $Id$
+# Maintainer: Felix Yan 
+# Contributor: Arch Haskell Team 
+
+_hkgname=tamarin-prover-term
+pkgname=haskell-tamarin-prover-term
+pkgver=1.4.0
+pkgrel=16
+pkgdesc="Term manipulation library for the tamarin prover"
+url="http://www.infsec.ethz.ch/research/software/tamarin;
+license=("GPL")
+arch=('x86_64')
+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')
+
+prepare() {
+cd tamarin-prover-$pkgver
+patch -p1 -i ../ghc-8.4.patch
+}
+
+build() {
+cd "${srcdir}/tamarin-prover-${pkgver}/lib/term"
+
+runhaskell Setup configure -O --enable-shared --enable-executable-dynamic 
--disable-library-vanilla \
+--prefix=/usr --docdir="/usr/share/doc/${pkgname}" \
+--dynlibdir=/usr/lib --libsubdir=\$compiler/site-local/\$pkgid
+runhaskell Setup build
+runhaskell Setup register --gen-script
+runhaskell Setup unregister --gen-script
+sed -i -r -e "s|ghc-pkg.*update[^ ]* |&'--force' |" register.sh
+sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh
+}
+
+package() {
+cd "${srcdir}/tamarin-prover-${pkgver}/lib/term"
+
+install -D -m744 register.sh   
"${pkgdir}/usr/share/haskell/register/${pkgname}.sh"
+install -D -m744 unregister.sh 
"${pkgdir}/usr/share/haskell/unregister/${pkgname}.sh"
+runhaskell Setup copy --destdir="${pkgdir}"
+rm -f "${pkgdir}/usr/share/doc/${pkgname}/LICENSE"
+}

Copied: 
haskell-tamarin-prover-term/repos/community-staging-x86_64/ghc-8.4.patch (from 
rev 379165, haskell-tamarin-prover-term/trunk/ghc-8.4.patch)
===
--- community-staging-x86_64/ghc-8.4.patch  (rev 0)
+++ community-staging-x86_64/ghc-8.4.patch  2018-09-10 12:16:26 UTC (rev 
379166)
@@ -0,0 +1,221 @@
+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 

[arch-commits] Commit in haskell-tamarin-prover-term/repos (3 files)

[Felix Yan via arch-commits]

Date: Wednesday, September 5, 2018 @ 22:25:35
  Author: felixonmars
Revision: 377126

archrelease: copy trunk to community-staging-x86_64

Added:
  haskell-tamarin-prover-term/repos/community-staging-x86_64/
  haskell-tamarin-prover-term/repos/community-staging-x86_64/PKGBUILD
(from rev 377125, haskell-tamarin-prover-term/trunk/PKGBUILD)
  haskell-tamarin-prover-term/repos/community-staging-x86_64/ghc-8.4.patch
(from rev 377125, haskell-tamarin-prover-term/trunk/ghc-8.4.patch)

---+
 PKGBUILD  |   46 +++
 ghc-8.4.patch |  221 
 2 files changed, 267 insertions(+)

Copied: haskell-tamarin-prover-term/repos/community-staging-x86_64/PKGBUILD 
(from rev 377125, haskell-tamarin-prover-term/trunk/PKGBUILD)
===
--- community-staging-x86_64/PKGBUILD   (rev 0)
+++ community-staging-x86_64/PKGBUILD   2018-09-05 22:25:35 UTC (rev 377126)
@@ -0,0 +1,46 @@
+# $Id$
+# Maintainer: Felix Yan 
+# Contributor: Arch Haskell Team 
+
+_hkgname=tamarin-prover-term
+pkgname=haskell-tamarin-prover-term
+pkgver=1.4.0
+pkgrel=15
+pkgdesc="Term manipulation library for the tamarin prover"
+url="http://www.infsec.ethz.ch/research/software/tamarin;
+license=("GPL")
+arch=('x86_64')
+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')
+
+prepare() {
+cd tamarin-prover-$pkgver
+patch -p1 -i ../ghc-8.4.patch
+}
+
+build() {
+cd "${srcdir}/tamarin-prover-${pkgver}/lib/term"
+
+runhaskell Setup configure -O --enable-shared --enable-executable-dynamic 
--disable-library-vanilla \
+--prefix=/usr --docdir="/usr/share/doc/${pkgname}" \
+--dynlibdir=/usr/lib --libsubdir=\$compiler/site-local/\$pkgid
+runhaskell Setup build
+runhaskell Setup register --gen-script
+runhaskell Setup unregister --gen-script
+sed -i -r -e "s|ghc-pkg.*update[^ ]* |&'--force' |" register.sh
+sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh
+}
+
+package() {
+cd "${srcdir}/tamarin-prover-${pkgver}/lib/term"
+
+install -D -m744 register.sh   
"${pkgdir}/usr/share/haskell/register/${pkgname}.sh"
+install -D -m744 unregister.sh 
"${pkgdir}/usr/share/haskell/unregister/${pkgname}.sh"
+runhaskell Setup copy --destdir="${pkgdir}"
+rm -f "${pkgdir}/usr/share/doc/${pkgname}/LICENSE"
+}

Copied: 
haskell-tamarin-prover-term/repos/community-staging-x86_64/ghc-8.4.patch (from 
rev 377125, haskell-tamarin-prover-term/trunk/ghc-8.4.patch)
===
--- community-staging-x86_64/ghc-8.4.patch  (rev 0)
+++ community-staging-x86_64/ghc-8.4.patch  2018-09-05 22:25:35 UTC (rev 
377126)
@@ -0,0 +1,221 @@
+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 @@ 

[arch-commits] Commit in haskell-tamarin-prover-term/repos (3 files)

[Felix Yan via arch-commits]

Date: Saturday, July 28, 2018 @ 15:23:45
  Author: felixonmars
Revision: 363826

archrelease: copy trunk to community-staging-x86_64

Added:
  haskell-tamarin-prover-term/repos/community-staging-x86_64/
  haskell-tamarin-prover-term/repos/community-staging-x86_64/PKGBUILD
(from rev 363825, haskell-tamarin-prover-term/trunk/PKGBUILD)
  haskell-tamarin-prover-term/repos/community-staging-x86_64/ghc-8.4.patch
(from rev 363825, haskell-tamarin-prover-term/trunk/ghc-8.4.patch)

---+
 PKGBUILD  |   46 +++
 ghc-8.4.patch |  221 
 2 files changed, 267 insertions(+)

Copied: haskell-tamarin-prover-term/repos/community-staging-x86_64/PKGBUILD 
(from rev 363825, haskell-tamarin-prover-term/trunk/PKGBUILD)
===
--- community-staging-x86_64/PKGBUILD   (rev 0)
+++ community-staging-x86_64/PKGBUILD   2018-07-28 15:23:45 UTC (rev 363826)
@@ -0,0 +1,46 @@
+# $Id$
+# Maintainer: Felix Yan 
+# Contributor: Arch Haskell Team 
+
+_hkgname=tamarin-prover-term
+pkgname=haskell-tamarin-prover-term
+pkgver=1.4.0
+pkgrel=14
+pkgdesc="Term manipulation library for the tamarin prover"
+url="http://www.infsec.ethz.ch/research/software/tamarin;
+license=("GPL")
+arch=('x86_64')
+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')
+
+prepare() {
+cd tamarin-prover-$pkgver
+patch -p1 -i ../ghc-8.4.patch
+}
+
+build() {
+cd "${srcdir}/tamarin-prover-${pkgver}/lib/term"
+
+runhaskell Setup configure -O --enable-shared --enable-executable-dynamic 
--disable-library-vanilla \
+--prefix=/usr --docdir="/usr/share/doc/${pkgname}" \
+--dynlibdir=/usr/lib --libsubdir=\$compiler/site-local/\$pkgid
+runhaskell Setup build
+runhaskell Setup register --gen-script
+runhaskell Setup unregister --gen-script
+sed -i -r -e "s|ghc-pkg.*update[^ ]* |&'--force' |" register.sh
+sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh
+}
+
+package() {
+cd "${srcdir}/tamarin-prover-${pkgver}/lib/term"
+
+install -D -m744 register.sh   
"${pkgdir}/usr/share/haskell/register/${pkgname}.sh"
+install -D -m744 unregister.sh 
"${pkgdir}/usr/share/haskell/unregister/${pkgname}.sh"
+runhaskell Setup copy --destdir="${pkgdir}"
+rm -f "${pkgdir}/usr/share/doc/${pkgname}/LICENSE"
+}

Copied: 
haskell-tamarin-prover-term/repos/community-staging-x86_64/ghc-8.4.patch (from 
rev 363825, haskell-tamarin-prover-term/trunk/ghc-8.4.patch)
===
--- community-staging-x86_64/ghc-8.4.patch  (rev 0)
+++ community-staging-x86_64/ghc-8.4.patch  2018-07-28 15:23:45 UTC (rev 
363826)
@@ -0,0 +1,221 @@
+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 

[arch-commits] Commit in haskell-tamarin-prover-term/repos (3 files)

[Felix Yan via arch-commits]

Date: Tuesday, July 3, 2018 @ 05:05:40
  Author: felixonmars
Revision: 350389

archrelease: copy trunk to community-staging-x86_64

Added:
  haskell-tamarin-prover-term/repos/community-staging-x86_64/
  haskell-tamarin-prover-term/repos/community-staging-x86_64/PKGBUILD
(from rev 350388, haskell-tamarin-prover-term/trunk/PKGBUILD)
  haskell-tamarin-prover-term/repos/community-staging-x86_64/ghc-8.4.patch
(from rev 350388, haskell-tamarin-prover-term/trunk/ghc-8.4.patch)

---+
 PKGBUILD  |   46 +++
 ghc-8.4.patch |  221 
 2 files changed, 267 insertions(+)

Copied: haskell-tamarin-prover-term/repos/community-staging-x86_64/PKGBUILD 
(from rev 350388, haskell-tamarin-prover-term/trunk/PKGBUILD)
===
--- community-staging-x86_64/PKGBUILD   (rev 0)
+++ community-staging-x86_64/PKGBUILD   2018-07-03 05:05:40 UTC (rev 350389)
@@ -0,0 +1,46 @@
+# $Id$
+# Maintainer: Felix Yan 
+# Contributor: Arch Haskell Team 
+
+_hkgname=tamarin-prover-term
+pkgname=haskell-tamarin-prover-term
+pkgver=1.4.0
+pkgrel=13
+pkgdesc="Term manipulation library for the tamarin prover"
+url="http://www.infsec.ethz.ch/research/software/tamarin;
+license=("GPL")
+arch=('x86_64')
+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')
+
+prepare() {
+cd tamarin-prover-$pkgver
+patch -p1 -i ../ghc-8.4.patch
+}
+
+build() {
+cd "${srcdir}/tamarin-prover-${pkgver}/lib/term"
+
+runhaskell Setup configure -O --enable-shared --enable-executable-dynamic 
--disable-library-vanilla \
+--prefix=/usr --docdir="/usr/share/doc/${pkgname}" \
+--dynlibdir=/usr/lib --libsubdir=\$compiler/site-local/\$pkgid
+runhaskell Setup build
+runhaskell Setup register --gen-script
+runhaskell Setup unregister --gen-script
+sed -i -r -e "s|ghc-pkg.*update[^ ]* |&'--force' |" register.sh
+sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh
+}
+
+package() {
+cd "${srcdir}/tamarin-prover-${pkgver}/lib/term"
+
+install -D -m744 register.sh   
"${pkgdir}/usr/share/haskell/register/${pkgname}.sh"
+install -D -m744 unregister.sh 
"${pkgdir}/usr/share/haskell/unregister/${pkgname}.sh"
+runhaskell Setup copy --destdir="${pkgdir}"
+rm -f "${pkgdir}/usr/share/doc/${pkgname}/LICENSE"
+}

Copied: 
haskell-tamarin-prover-term/repos/community-staging-x86_64/ghc-8.4.patch (from 
rev 350388, haskell-tamarin-prover-term/trunk/ghc-8.4.patch)
===
--- community-staging-x86_64/ghc-8.4.patch  (rev 0)
+++ community-staging-x86_64/ghc-8.4.patch  2018-07-03 05:05:40 UTC (rev 
350389)
@@ -0,0 +1,221 @@
+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 

[arch-commits] Commit in haskell-tamarin-prover-term/repos (3 files)

[Felix Yan via arch-commits]

Date: Sunday, June 24, 2018 @ 06:36:52
  Author: felixonmars
Revision: 344927

archrelease: copy trunk to community-staging-x86_64

Added:
  haskell-tamarin-prover-term/repos/community-staging-x86_64/
  haskell-tamarin-prover-term/repos/community-staging-x86_64/PKGBUILD
(from rev 344926, haskell-tamarin-prover-term/trunk/PKGBUILD)
  haskell-tamarin-prover-term/repos/community-staging-x86_64/ghc-8.4.patch
(from rev 344926, haskell-tamarin-prover-term/trunk/ghc-8.4.patch)

---+
 PKGBUILD  |   46 +++
 ghc-8.4.patch |  221 
 2 files changed, 267 insertions(+)

Copied: haskell-tamarin-prover-term/repos/community-staging-x86_64/PKGBUILD 
(from rev 344926, haskell-tamarin-prover-term/trunk/PKGBUILD)
===
--- community-staging-x86_64/PKGBUILD   (rev 0)
+++ community-staging-x86_64/PKGBUILD   2018-06-24 06:36:52 UTC (rev 344927)
@@ -0,0 +1,46 @@
+# $Id$
+# Maintainer: Felix Yan 
+# Contributor: Arch Haskell Team 
+
+_hkgname=tamarin-prover-term
+pkgname=haskell-tamarin-prover-term
+pkgver=1.4.0
+pkgrel=12
+pkgdesc="Term manipulation library for the tamarin prover"
+url="http://www.infsec.ethz.ch/research/software/tamarin;
+license=("GPL")
+arch=('x86_64')
+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')
+
+prepare() {
+cd tamarin-prover-$pkgver
+patch -p1 -i ../ghc-8.4.patch
+}
+
+build() {
+cd "${srcdir}/tamarin-prover-${pkgver}/lib/term"
+
+runhaskell Setup configure -O --enable-shared --enable-executable-dynamic 
--disable-library-vanilla \
+--prefix=/usr --docdir="/usr/share/doc/${pkgname}" \
+--dynlibdir=/usr/lib --libsubdir=\$compiler/site-local/\$pkgid
+runhaskell Setup build
+runhaskell Setup register --gen-script
+runhaskell Setup unregister --gen-script
+sed -i -r -e "s|ghc-pkg.*update[^ ]* |&'--force' |" register.sh
+sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh
+}
+
+package() {
+cd "${srcdir}/tamarin-prover-${pkgver}/lib/term"
+
+install -D -m744 register.sh   
"${pkgdir}/usr/share/haskell/register/${pkgname}.sh"
+install -D -m744 unregister.sh 
"${pkgdir}/usr/share/haskell/unregister/${pkgname}.sh"
+runhaskell Setup copy --destdir="${pkgdir}"
+rm -f "${pkgdir}/usr/share/doc/${pkgname}/LICENSE"
+}

Copied: 
haskell-tamarin-prover-term/repos/community-staging-x86_64/ghc-8.4.patch (from 
rev 344926, haskell-tamarin-prover-term/trunk/ghc-8.4.patch)
===
--- community-staging-x86_64/ghc-8.4.patch  (rev 0)
+++ community-staging-x86_64/ghc-8.4.patch  2018-06-24 06:36:52 UTC (rev 
344927)
@@ -0,0 +1,221 @@
+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 

[arch-commits] Commit in haskell-tamarin-prover-term/repos (3 files)

[Felix Yan via arch-commits]

Date: Sunday, June 3, 2018 @ 07:29:24
  Author: felixonmars
Revision: 338833

archrelease: copy trunk to community-staging-x86_64

Added:
  haskell-tamarin-prover-term/repos/community-staging-x86_64/
  haskell-tamarin-prover-term/repos/community-staging-x86_64/PKGBUILD
(from rev 338832, haskell-tamarin-prover-term/trunk/PKGBUILD)
  haskell-tamarin-prover-term/repos/community-staging-x86_64/ghc-8.4.patch
(from rev 338832, haskell-tamarin-prover-term/trunk/ghc-8.4.patch)

---+
 PKGBUILD  |   46 +++
 ghc-8.4.patch |  221 
 2 files changed, 267 insertions(+)

Copied: haskell-tamarin-prover-term/repos/community-staging-x86_64/PKGBUILD 
(from rev 338832, haskell-tamarin-prover-term/trunk/PKGBUILD)
===
--- community-staging-x86_64/PKGBUILD   (rev 0)
+++ community-staging-x86_64/PKGBUILD   2018-06-03 07:29:24 UTC (rev 338833)
@@ -0,0 +1,46 @@
+# $Id$
+# Maintainer: Felix Yan 
+# Contributor: Arch Haskell Team 
+
+_hkgname=tamarin-prover-term
+pkgname=haskell-tamarin-prover-term
+pkgver=1.4.0
+pkgrel=11
+pkgdesc="Term manipulation library for the tamarin prover"
+url="http://www.infsec.ethz.ch/research/software/tamarin;
+license=("GPL")
+arch=('x86_64')
+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')
+
+prepare() {
+cd tamarin-prover-$pkgver
+patch -p1 -i ../ghc-8.4.patch
+}
+
+build() {
+cd "${srcdir}/tamarin-prover-${pkgver}/lib/term"
+
+runhaskell Setup configure -O --enable-shared --enable-executable-dynamic 
--disable-library-vanilla \
+--prefix=/usr --docdir="/usr/share/doc/${pkgname}" \
+--dynlibdir=/usr/lib --libsubdir=\$compiler/site-local/\$pkgid
+runhaskell Setup build
+runhaskell Setup register --gen-script
+runhaskell Setup unregister --gen-script
+sed -i -r -e "s|ghc-pkg.*update[^ ]* |&'--force' |" register.sh
+sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh
+}
+
+package() {
+cd "${srcdir}/tamarin-prover-${pkgver}/lib/term"
+
+install -D -m744 register.sh   
"${pkgdir}/usr/share/haskell/register/${pkgname}.sh"
+install -D -m744 unregister.sh 
"${pkgdir}/usr/share/haskell/unregister/${pkgname}.sh"
+runhaskell Setup copy --destdir="${pkgdir}"
+rm -f "${pkgdir}/usr/share/doc/${pkgname}/LICENSE"
+}

Copied: 
haskell-tamarin-prover-term/repos/community-staging-x86_64/ghc-8.4.patch (from 
rev 338832, haskell-tamarin-prover-term/trunk/ghc-8.4.patch)
===
--- community-staging-x86_64/ghc-8.4.patch  (rev 0)
+++ community-staging-x86_64/ghc-8.4.patch  2018-06-03 07:29:24 UTC (rev 
338833)
@@ -0,0 +1,221 @@
+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 

[arch-commits] Commit in haskell-tamarin-prover-term/repos (3 files)

[Felix Yan via arch-commits]

Date: Saturday, June 2, 2018 @ 13:50:16
  Author: felixonmars
Revision: 337580

archrelease: copy trunk to community-staging-x86_64

Added:
  haskell-tamarin-prover-term/repos/community-staging-x86_64/
  haskell-tamarin-prover-term/repos/community-staging-x86_64/PKGBUILD
(from rev 337579, haskell-tamarin-prover-term/trunk/PKGBUILD)
  haskell-tamarin-prover-term/repos/community-staging-x86_64/ghc-8.4.patch
(from rev 337579, haskell-tamarin-prover-term/trunk/ghc-8.4.patch)

---+
 PKGBUILD  |   46 +++
 ghc-8.4.patch |  221 
 2 files changed, 267 insertions(+)

Copied: haskell-tamarin-prover-term/repos/community-staging-x86_64/PKGBUILD 
(from rev 337579, haskell-tamarin-prover-term/trunk/PKGBUILD)
===
--- community-staging-x86_64/PKGBUILD   (rev 0)
+++ community-staging-x86_64/PKGBUILD   2018-06-02 13:50:16 UTC (rev 337580)
@@ -0,0 +1,46 @@
+# $Id$
+# Maintainer: Felix Yan 
+# Contributor: Arch Haskell Team 
+
+_hkgname=tamarin-prover-term
+pkgname=haskell-tamarin-prover-term
+pkgver=1.4.0
+pkgrel=10
+pkgdesc="Term manipulation library for the tamarin prover"
+url="http://www.infsec.ethz.ch/research/software/tamarin;
+license=("GPL")
+arch=('x86_64')
+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')
+
+prepare() {
+cd tamarin-prover-$pkgver
+patch -p1 -i ../ghc-8.4.patch
+}
+
+build() {
+cd "${srcdir}/tamarin-prover-${pkgver}/lib/term"
+
+runhaskell Setup configure -O --enable-shared --enable-executable-dynamic 
--disable-library-vanilla \
+--prefix=/usr --docdir="/usr/share/doc/${pkgname}" \
+--dynlibdir=/usr/lib --libsubdir=\$compiler/site-local/\$pkgid
+runhaskell Setup build
+runhaskell Setup register --gen-script
+runhaskell Setup unregister --gen-script
+sed -i -r -e "s|ghc-pkg.*update[^ ]* |&'--force' |" register.sh
+sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh
+}
+
+package() {
+cd "${srcdir}/tamarin-prover-${pkgver}/lib/term"
+
+install -D -m744 register.sh   
"${pkgdir}/usr/share/haskell/register/${pkgname}.sh"
+install -D -m744 unregister.sh 
"${pkgdir}/usr/share/haskell/unregister/${pkgname}.sh"
+runhaskell Setup copy --destdir="${pkgdir}"
+rm -f "${pkgdir}/usr/share/doc/${pkgname}/LICENSE"
+}

Copied: 
haskell-tamarin-prover-term/repos/community-staging-x86_64/ghc-8.4.patch (from 
rev 337579, haskell-tamarin-prover-term/trunk/ghc-8.4.patch)
===
--- community-staging-x86_64/ghc-8.4.patch  (rev 0)
+++ community-staging-x86_64/ghc-8.4.patch  2018-06-02 13:50:16 UTC (rev 
337580)
@@ -0,0 +1,221 @@
+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 

[arch-commits] Commit in haskell-tamarin-prover-term/repos (3 files)

[Felix Yan via arch-commits]

Date: Friday, June 1, 2018 @ 09:42:20
  Author: felixonmars
Revision: 335805

archrelease: copy trunk to community-staging-x86_64

Added:
  haskell-tamarin-prover-term/repos/community-staging-x86_64/
  haskell-tamarin-prover-term/repos/community-staging-x86_64/PKGBUILD
(from rev 335804, haskell-tamarin-prover-term/trunk/PKGBUILD)
  haskell-tamarin-prover-term/repos/community-staging-x86_64/ghc-8.4.patch
(from rev 335804, haskell-tamarin-prover-term/trunk/ghc-8.4.patch)

---+
 PKGBUILD  |   46 +++
 ghc-8.4.patch |  221 
 2 files changed, 267 insertions(+)

Copied: haskell-tamarin-prover-term/repos/community-staging-x86_64/PKGBUILD 
(from rev 335804, haskell-tamarin-prover-term/trunk/PKGBUILD)
===
--- community-staging-x86_64/PKGBUILD   (rev 0)
+++ community-staging-x86_64/PKGBUILD   2018-06-01 09:42:20 UTC (rev 335805)
@@ -0,0 +1,46 @@
+# $Id$
+# Maintainer: Felix Yan 
+# Contributor: Arch Haskell Team 
+
+_hkgname=tamarin-prover-term
+pkgname=haskell-tamarin-prover-term
+pkgver=1.4.0
+pkgrel=9
+pkgdesc="Term manipulation library for the tamarin prover"
+url="http://www.infsec.ethz.ch/research/software/tamarin;
+license=("GPL")
+arch=('x86_64')
+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')
+
+prepare() {
+cd tamarin-prover-$pkgver
+patch -p1 -i ../ghc-8.4.patch
+}
+
+build() {
+cd "${srcdir}/tamarin-prover-${pkgver}/lib/term"
+
+runhaskell Setup configure -O --enable-shared --enable-executable-dynamic 
--disable-library-vanilla \
+--prefix=/usr --docdir="/usr/share/doc/${pkgname}" \
+--dynlibdir=/usr/lib --libsubdir=\$compiler/site-local/\$pkgid
+runhaskell Setup build
+runhaskell Setup register --gen-script
+runhaskell Setup unregister --gen-script
+sed -i -r -e "s|ghc-pkg.*update[^ ]* |&'--force' |" register.sh
+sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh
+}
+
+package() {
+cd "${srcdir}/tamarin-prover-${pkgver}/lib/term"
+
+install -D -m744 register.sh   
"${pkgdir}/usr/share/haskell/register/${pkgname}.sh"
+install -D -m744 unregister.sh 
"${pkgdir}/usr/share/haskell/unregister/${pkgname}.sh"
+runhaskell Setup copy --destdir="${pkgdir}"
+rm -f "${pkgdir}/usr/share/doc/${pkgname}/LICENSE"
+}

Copied: 
haskell-tamarin-prover-term/repos/community-staging-x86_64/ghc-8.4.patch (from 
rev 335804, haskell-tamarin-prover-term/trunk/ghc-8.4.patch)
===
--- community-staging-x86_64/ghc-8.4.patch  (rev 0)
+++ community-staging-x86_64/ghc-8.4.patch  2018-06-01 09:42:20 UTC (rev 
335805)
@@ -0,0 +1,221 @@
+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 

[arch-commits] Commit in haskell-tamarin-prover-term/repos (3 files)

[Felix Yan via arch-commits]

Date: Saturday, May 26, 2018 @ 20:45:13
  Author: felixonmars
Revision: 331156

archrelease: copy trunk to community-staging-x86_64

Added:
  haskell-tamarin-prover-term/repos/community-staging-x86_64/
  haskell-tamarin-prover-term/repos/community-staging-x86_64/PKGBUILD
(from rev 331155, haskell-tamarin-prover-term/trunk/PKGBUILD)
  haskell-tamarin-prover-term/repos/community-staging-x86_64/ghc-8.4.patch
(from rev 331155, haskell-tamarin-prover-term/trunk/ghc-8.4.patch)

---+
 PKGBUILD  |   46 +++
 ghc-8.4.patch |  221 
 2 files changed, 267 insertions(+)

Copied: haskell-tamarin-prover-term/repos/community-staging-x86_64/PKGBUILD 
(from rev 331155, haskell-tamarin-prover-term/trunk/PKGBUILD)
===
--- community-staging-x86_64/PKGBUILD   (rev 0)
+++ community-staging-x86_64/PKGBUILD   2018-05-26 20:45:13 UTC (rev 331156)
@@ -0,0 +1,46 @@
+# $Id$
+# Maintainer: Felix Yan 
+# Contributor: Arch Haskell Team 
+
+_hkgname=tamarin-prover-term
+pkgname=haskell-tamarin-prover-term
+pkgver=1.4.0
+pkgrel=8
+pkgdesc="Term manipulation library for the tamarin prover"
+url="http://www.infsec.ethz.ch/research/software/tamarin;
+license=("GPL")
+arch=('x86_64')
+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')
+
+prepare() {
+cd tamarin-prover-$pkgver
+patch -p1 -i ../ghc-8.4.patch
+}
+
+build() {
+cd "${srcdir}/tamarin-prover-${pkgver}/lib/term"
+
+runhaskell Setup configure -O --enable-shared --enable-executable-dynamic 
--disable-library-vanilla \
+--prefix=/usr --docdir="/usr/share/doc/${pkgname}" \
+--dynlibdir=/usr/lib --libsubdir=\$compiler/site-local/\$pkgid
+runhaskell Setup build
+runhaskell Setup register --gen-script
+runhaskell Setup unregister --gen-script
+sed -i -r -e "s|ghc-pkg.*update[^ ]* |&'--force' |" register.sh
+sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh
+}
+
+package() {
+cd "${srcdir}/tamarin-prover-${pkgver}/lib/term"
+
+install -D -m744 register.sh   
"${pkgdir}/usr/share/haskell/register/${pkgname}.sh"
+install -D -m744 unregister.sh 
"${pkgdir}/usr/share/haskell/unregister/${pkgname}.sh"
+runhaskell Setup copy --destdir="${pkgdir}"
+rm -f "${pkgdir}/usr/share/doc/${pkgname}/LICENSE"
+}

Copied: 
haskell-tamarin-prover-term/repos/community-staging-x86_64/ghc-8.4.patch (from 
rev 331155, haskell-tamarin-prover-term/trunk/ghc-8.4.patch)
===
--- community-staging-x86_64/ghc-8.4.patch  (rev 0)
+++ community-staging-x86_64/ghc-8.4.patch  2018-05-26 20:45:13 UTC (rev 
331156)
@@ -0,0 +1,221 @@
+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
 

[arch-commits] Commit in haskell-tamarin-prover-term/repos (3 files)

[Felix Yan via arch-commits]

Date: Wednesday, May 23, 2018 @ 08:15:53
  Author: felixonmars
Revision: 328075

archrelease: copy trunk to community-staging-x86_64

Added:
  haskell-tamarin-prover-term/repos/community-staging-x86_64/
  haskell-tamarin-prover-term/repos/community-staging-x86_64/PKGBUILD
(from rev 328074, haskell-tamarin-prover-term/trunk/PKGBUILD)
  haskell-tamarin-prover-term/repos/community-staging-x86_64/ghc-8.4.patch
(from rev 328074, haskell-tamarin-prover-term/trunk/ghc-8.4.patch)

---+
 PKGBUILD  |   46 +++
 ghc-8.4.patch |  221 
 2 files changed, 267 insertions(+)

Copied: haskell-tamarin-prover-term/repos/community-staging-x86_64/PKGBUILD 
(from rev 328074, haskell-tamarin-prover-term/trunk/PKGBUILD)
===
--- community-staging-x86_64/PKGBUILD   (rev 0)
+++ community-staging-x86_64/PKGBUILD   2018-05-23 08:15:53 UTC (rev 328075)
@@ -0,0 +1,46 @@
+# $Id$
+# Maintainer: Felix Yan 
+# Contributor: Arch Haskell Team 
+
+_hkgname=tamarin-prover-term
+pkgname=haskell-tamarin-prover-term
+pkgver=1.4.0
+pkgrel=7
+pkgdesc="Term manipulation library for the tamarin prover"
+url="http://www.infsec.ethz.ch/research/software/tamarin;
+license=("GPL")
+arch=('x86_64')
+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')
+
+prepare() {
+cd tamarin-prover-$pkgver
+patch -p1 -i ../ghc-8.4.patch
+}
+
+build() {
+cd "${srcdir}/tamarin-prover-${pkgver}/lib/term"
+
+runhaskell Setup configure -O --enable-shared --enable-executable-dynamic 
--disable-library-vanilla \
+--prefix=/usr --docdir="/usr/share/doc/${pkgname}" \
+--dynlibdir=/usr/lib --libsubdir=\$compiler/site-local/\$pkgid
+runhaskell Setup build
+runhaskell Setup register --gen-script
+runhaskell Setup unregister --gen-script
+sed -i -r -e "s|ghc-pkg.*update[^ ]* |&'--force' |" register.sh
+sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh
+}
+
+package() {
+cd "${srcdir}/tamarin-prover-${pkgver}/lib/term"
+
+install -D -m744 register.sh   
"${pkgdir}/usr/share/haskell/register/${pkgname}.sh"
+install -D -m744 unregister.sh 
"${pkgdir}/usr/share/haskell/unregister/${pkgname}.sh"
+runhaskell Setup copy --destdir="${pkgdir}"
+rm -f "${pkgdir}/usr/share/doc/${pkgname}/LICENSE"
+}

Copied: 
haskell-tamarin-prover-term/repos/community-staging-x86_64/ghc-8.4.patch (from 
rev 328074, haskell-tamarin-prover-term/trunk/ghc-8.4.patch)
===
--- community-staging-x86_64/ghc-8.4.patch  (rev 0)
+++ community-staging-x86_64/ghc-8.4.patch  2018-05-23 08:15:53 UTC (rev 
328075)
@@ -0,0 +1,221 @@
+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
 

[arch-commits] Commit in haskell-tamarin-prover-term/repos (3 files)

[Felix Yan via arch-commits]

Date: Friday, May 18, 2018 @ 07:54:43
  Author: felixonmars
Revision: 324260

archrelease: copy trunk to community-staging-x86_64

Added:
  haskell-tamarin-prover-term/repos/community-staging-x86_64/
  haskell-tamarin-prover-term/repos/community-staging-x86_64/PKGBUILD
(from rev 324259, haskell-tamarin-prover-term/trunk/PKGBUILD)
  haskell-tamarin-prover-term/repos/community-staging-x86_64/ghc-8.4.patch
(from rev 324259, haskell-tamarin-prover-term/trunk/ghc-8.4.patch)

---+
 PKGBUILD  |   46 
 ghc-8.4.patch |  208 
 2 files changed, 254 insertions(+)

Copied: haskell-tamarin-prover-term/repos/community-staging-x86_64/PKGBUILD 
(from rev 324259, haskell-tamarin-prover-term/trunk/PKGBUILD)
===
--- community-staging-x86_64/PKGBUILD   (rev 0)
+++ community-staging-x86_64/PKGBUILD   2018-05-18 07:54:43 UTC (rev 324260)
@@ -0,0 +1,46 @@
+# $Id$
+# Maintainer: Felix Yan 
+# Contributor: Arch Haskell Team 
+
+_hkgname=tamarin-prover-term
+pkgname=haskell-tamarin-prover-term
+pkgver=1.4.0
+pkgrel=4
+pkgdesc="Term manipulation library for the tamarin prover"
+url="http://www.infsec.ethz.ch/research/software/tamarin;
+license=("GPL")
+arch=('x86_64')
+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'
+
'cec9149094345c7a4ef063b64f8bae51c26692c4995461dbee01d4933a307f1912a31c8c246577eca2517b454225eeba30348fb5bf0ebbc2421509089fd7b842')
+
+prepare() {
+cd tamarin-prover-$pkgver
+patch -p1 -i ../ghc-8.4.patch
+}
+
+build() {
+cd "${srcdir}/tamarin-prover-${pkgver}/lib/term"
+
+runhaskell Setup configure -O --enable-shared --enable-executable-dynamic 
--disable-library-vanilla \
+--prefix=/usr --docdir="/usr/share/doc/${pkgname}" \
+--dynlibdir=/usr/lib --libsubdir=\$compiler/site-local/\$pkgid
+runhaskell Setup build
+runhaskell Setup register --gen-script
+runhaskell Setup unregister --gen-script
+sed -i -r -e "s|ghc-pkg.*update[^ ]* |&'--force' |" register.sh
+sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh
+}
+
+package() {
+cd "${srcdir}/tamarin-prover-${pkgver}/lib/term"
+
+install -D -m744 register.sh   
"${pkgdir}/usr/share/haskell/register/${pkgname}.sh"
+install -D -m744 unregister.sh 
"${pkgdir}/usr/share/haskell/unregister/${pkgname}.sh"
+runhaskell Setup copy --destdir="${pkgdir}"
+rm -f "${pkgdir}/usr/share/doc/${pkgname}/LICENSE"
+}

Copied: 
haskell-tamarin-prover-term/repos/community-staging-x86_64/ghc-8.4.patch (from 
rev 324259, haskell-tamarin-prover-term/trunk/ghc-8.4.patch)
===
--- community-staging-x86_64/ghc-8.4.patch  (rev 0)
+++ community-staging-x86_64/ghc-8.4.patch  2018-05-18 07:54:43 UTC (rev 
324260)
@@ -0,0 +1,208 @@
+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