subject:"\[arch\-commits\] Commit in haskell\-tamarin\-prover\-theory\/repos \(3 files\)"

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

2019-01-19 Thread Felix Yan via arch-commits

Date: Saturday, January 19, 2019 @ 10:44:09
  Author: felixonmars
Revision: 424447

archrelease: copy trunk to community-staging-x86_64

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

---+
 PKGBUILD  |   49 
 ghc-8.4.patch |  329 
 2 files changed, 378 insertions(+)

Copied: haskell-tamarin-prover-theory/repos/community-staging-x86_64/PKGBUILD 
(from rev 424446, haskell-tamarin-prover-theory/trunk/PKGBUILD)
===
--- community-staging-x86_64/PKGBUILD   (rev 0)
+++ community-staging-x86_64/PKGBUILD   2019-01-19 10:44:09 UTC (rev 424447)
@@ -0,0 +1,49 @@
+# Maintainer: Felix Yan 
+# Contributor: Arch Haskell Team 
+
+_hkgname=tamarin-prover-theory
+pkgname=haskell-tamarin-prover-theory
+pkgver=1.4.0
+pkgrel=51
+pkgdesc="Security protocol types and constraint solver library for the tamarin 
prover"
+url="http://www.infsec.ethz.ch/research/software/tamarin";
+license=("GPL")
+arch=('x86_64')
+depends=('ghc-libs' 'haskell-aeson' 'haskell-aeson-pretty' 'haskell-dlist' 
'haskell-fclabels'
+ 'haskell-parallel' 'haskell-safe'
+ 'haskell-uniplate' 'haskell-tamarin-prover-utils' 
'haskell-tamarin-prover-term')
+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'
+
'5e18015155a1ac940591d7c28f3741cf56d9dd36f530895b3d9fec7865563db5c10524252d496b3d4a59c9f1ad2a9db4e2a56f31b73cf91ce1a2e698c3d6dadf')
+
+prepare() {
+cd tamarin-prover-$pkgver
+patch -p1 -i ../ghc-8.4.patch
+
+sed -i '1i{-# language NoMonadFailDesugaring #-}' 
lib/theory/src/Theory/Constraint/System/Guarded.hs
+}
+
+build() {
+cd "${srcdir}/tamarin-prover-${pkgver}/lib/theory"
+
+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
+# haddock failed to generate
+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/theory"
+
+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-theory/repos/community-staging-x86_64/ghc-8.4.patch 
(from rev 424446, haskell-tamarin-prover-theory/trunk/ghc-8.4.patch)
===
--- community-staging-x86_64/ghc-8.4.patch  (rev 0)
+++ community-staging-x86_64/ghc-8.4.patch  2019-01-19 10:44:09 UTC (rev 
424447)
@@ -0,0 +1,329 @@
+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 sym

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

2018-12-30 Thread Felix Yan via arch-commits

Date: Sunday, December 30, 2018 @ 11:30:55
  Author: felixonmars
Revision: 419133

archrelease: copy trunk to community-staging-x86_64

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

---+
 PKGBUILD  |   49 
 ghc-8.4.patch |  329 
 2 files changed, 378 insertions(+)

Copied: haskell-tamarin-prover-theory/repos/community-staging-x86_64/PKGBUILD 
(from rev 419132, haskell-tamarin-prover-theory/trunk/PKGBUILD)
===
--- community-staging-x86_64/PKGBUILD   (rev 0)
+++ community-staging-x86_64/PKGBUILD   2018-12-30 11:30:55 UTC (rev 419133)
@@ -0,0 +1,49 @@
+# Maintainer: Felix Yan 
+# Contributor: Arch Haskell Team 
+
+_hkgname=tamarin-prover-theory
+pkgname=haskell-tamarin-prover-theory
+pkgver=1.4.0
+pkgrel=50
+pkgdesc="Security protocol types and constraint solver library for the tamarin 
prover"
+url="http://www.infsec.ethz.ch/research/software/tamarin";
+license=("GPL")
+arch=('x86_64')
+depends=('ghc-libs' 'haskell-aeson' 'haskell-aeson-pretty' 'haskell-dlist' 
'haskell-fclabels'
+ 'haskell-parallel' 'haskell-safe'
+ 'haskell-uniplate' 'haskell-tamarin-prover-utils' 
'haskell-tamarin-prover-term')
+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'
+
'5e18015155a1ac940591d7c28f3741cf56d9dd36f530895b3d9fec7865563db5c10524252d496b3d4a59c9f1ad2a9db4e2a56f31b73cf91ce1a2e698c3d6dadf')
+
+prepare() {
+cd tamarin-prover-$pkgver
+patch -p1 -i ../ghc-8.4.patch
+
+sed -i '1i{-# language NoMonadFailDesugaring #-}' 
lib/theory/src/Theory/Constraint/System/Guarded.hs
+}
+
+build() {
+cd "${srcdir}/tamarin-prover-${pkgver}/lib/theory"
+
+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
+# haddock failed to generate
+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/theory"
+
+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-theory/repos/community-staging-x86_64/ghc-8.4.patch 
(from rev 419132, haskell-tamarin-prover-theory/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-30 11:30:55 UTC (rev 
419133)
@@ -0,0 +1,329 @@
+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 symb

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

2018-12-10 Thread Felix Yan via arch-commits

Date: Monday, December 10, 2018 @ 10:13:34
  Author: felixonmars
Revision: 413987

archrelease: copy trunk to community-staging-x86_64

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

---+
 PKGBUILD  |   49 
 ghc-8.4.patch |  329 
 2 files changed, 378 insertions(+)

Copied: haskell-tamarin-prover-theory/repos/community-staging-x86_64/PKGBUILD 
(from rev 413986, haskell-tamarin-prover-theory/trunk/PKGBUILD)
===
--- community-staging-x86_64/PKGBUILD   (rev 0)
+++ community-staging-x86_64/PKGBUILD   2018-12-10 10:13:34 UTC (rev 413987)
@@ -0,0 +1,49 @@
+# Maintainer: Felix Yan 
+# Contributor: Arch Haskell Team 
+
+_hkgname=tamarin-prover-theory
+pkgname=haskell-tamarin-prover-theory
+pkgver=1.4.0
+pkgrel=49
+pkgdesc="Security protocol types and constraint solver library for the tamarin 
prover"
+url="http://www.infsec.ethz.ch/research/software/tamarin";
+license=("GPL")
+arch=('x86_64')
+depends=('ghc-libs' 'haskell-aeson' 'haskell-aeson-pretty' 'haskell-dlist' 
'haskell-fclabels'
+ 'haskell-parallel' 'haskell-safe'
+ 'haskell-uniplate' 'haskell-tamarin-prover-utils' 
'haskell-tamarin-prover-term')
+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'
+
'5e18015155a1ac940591d7c28f3741cf56d9dd36f530895b3d9fec7865563db5c10524252d496b3d4a59c9f1ad2a9db4e2a56f31b73cf91ce1a2e698c3d6dadf')
+
+prepare() {
+cd tamarin-prover-$pkgver
+patch -p1 -i ../ghc-8.4.patch
+
+sed -i '1i{-# language NoMonadFailDesugaring #-}' 
lib/theory/src/Theory/Constraint/System/Guarded.hs
+}
+
+build() {
+cd "${srcdir}/tamarin-prover-${pkgver}/lib/theory"
+
+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
+# haddock failed to generate
+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/theory"
+
+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-theory/repos/community-staging-x86_64/ghc-8.4.patch 
(from rev 413986, haskell-tamarin-prover-theory/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:13:34 UTC (rev 
413987)
@@ -0,0 +1,329 @@
+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 symb

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

2018-12-08 Thread Felix Yan via arch-commits

Date: Saturday, December 8, 2018 @ 18:53:47
  Author: felixonmars
Revision: 412487

archrelease: copy trunk to community-staging-x86_64

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

---+
 PKGBUILD  |   49 
 ghc-8.4.patch |  329 
 2 files changed, 378 insertions(+)

Copied: haskell-tamarin-prover-theory/repos/community-staging-x86_64/PKGBUILD 
(from rev 412486, haskell-tamarin-prover-theory/trunk/PKGBUILD)
===
--- community-staging-x86_64/PKGBUILD   (rev 0)
+++ community-staging-x86_64/PKGBUILD   2018-12-08 18:53:47 UTC (rev 412487)
@@ -0,0 +1,49 @@
+# Maintainer: Felix Yan 
+# Contributor: Arch Haskell Team 
+
+_hkgname=tamarin-prover-theory
+pkgname=haskell-tamarin-prover-theory
+pkgver=1.4.0
+pkgrel=48
+pkgdesc="Security protocol types and constraint solver library for the tamarin 
prover"
+url="http://www.infsec.ethz.ch/research/software/tamarin";
+license=("GPL")
+arch=('x86_64')
+depends=('ghc-libs' 'haskell-aeson' 'haskell-aeson-pretty' 'haskell-dlist' 
'haskell-fclabels'
+ 'haskell-parallel' 'haskell-safe'
+ 'haskell-uniplate' 'haskell-tamarin-prover-utils' 
'haskell-tamarin-prover-term')
+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'
+
'5e18015155a1ac940591d7c28f3741cf56d9dd36f530895b3d9fec7865563db5c10524252d496b3d4a59c9f1ad2a9db4e2a56f31b73cf91ce1a2e698c3d6dadf')
+
+prepare() {
+cd tamarin-prover-$pkgver
+patch -p1 -i ../ghc-8.4.patch
+
+sed -i '1i{-# language NoMonadFailDesugaring #-}' 
lib/theory/src/Theory/Constraint/System/Guarded.hs
+}
+
+build() {
+cd "${srcdir}/tamarin-prover-${pkgver}/lib/theory"
+
+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
+# haddock failed to generate
+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/theory"
+
+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-theory/repos/community-staging-x86_64/ghc-8.4.patch 
(from rev 412486, haskell-tamarin-prover-theory/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:53:47 UTC (rev 
412487)
@@ -0,0 +1,329 @@
+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 sym

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

2018-12-05 Thread Felix Yan via arch-commits

Date: Wednesday, December 5, 2018 @ 09:12:48
  Author: felixonmars
Revision: 411291

archrelease: copy trunk to community-staging-x86_64

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

---+
 PKGBUILD  |   49 
 ghc-8.4.patch |  329 
 2 files changed, 378 insertions(+)

Copied: haskell-tamarin-prover-theory/repos/community-staging-x86_64/PKGBUILD 
(from rev 411290, haskell-tamarin-prover-theory/trunk/PKGBUILD)
===
--- community-staging-x86_64/PKGBUILD   (rev 0)
+++ community-staging-x86_64/PKGBUILD   2018-12-05 09:12:48 UTC (rev 411291)
@@ -0,0 +1,49 @@
+# Maintainer: Felix Yan 
+# Contributor: Arch Haskell Team 
+
+_hkgname=tamarin-prover-theory
+pkgname=haskell-tamarin-prover-theory
+pkgver=1.4.0
+pkgrel=47
+pkgdesc="Security protocol types and constraint solver library for the tamarin 
prover"
+url="http://www.infsec.ethz.ch/research/software/tamarin";
+license=("GPL")
+arch=('x86_64')
+depends=('ghc-libs' 'haskell-aeson' 'haskell-aeson-pretty' 'haskell-dlist' 
'haskell-fclabels'
+ 'haskell-parallel' 'haskell-safe'
+ 'haskell-uniplate' 'haskell-tamarin-prover-utils' 
'haskell-tamarin-prover-term')
+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'
+
'5e18015155a1ac940591d7c28f3741cf56d9dd36f530895b3d9fec7865563db5c10524252d496b3d4a59c9f1ad2a9db4e2a56f31b73cf91ce1a2e698c3d6dadf')
+
+prepare() {
+cd tamarin-prover-$pkgver
+patch -p1 -i ../ghc-8.4.patch
+
+sed -i '1i{-# language NoMonadFailDesugaring #-}' 
lib/theory/src/Theory/Constraint/System/Guarded.hs
+}
+
+build() {
+cd "${srcdir}/tamarin-prover-${pkgver}/lib/theory"
+
+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
+# haddock failed to generate
+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/theory"
+
+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-theory/repos/community-staging-x86_64/ghc-8.4.patch 
(from rev 411290, haskell-tamarin-prover-theory/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:12:48 UTC (rev 
411291)
@@ -0,0 +1,329 @@
+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 sy

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

2018-11-27 Thread Felix Yan via arch-commits

Date: Tuesday, November 27, 2018 @ 16:43:37
  Author: felixonmars
Revision: 410043

archrelease: copy trunk to community-staging-x86_64

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

---+
 PKGBUILD  |   49 
 ghc-8.4.patch |  329 
 2 files changed, 378 insertions(+)

Copied: haskell-tamarin-prover-theory/repos/community-staging-x86_64/PKGBUILD 
(from rev 410042, haskell-tamarin-prover-theory/trunk/PKGBUILD)
===
--- community-staging-x86_64/PKGBUILD   (rev 0)
+++ community-staging-x86_64/PKGBUILD   2018-11-27 16:43:37 UTC (rev 410043)
@@ -0,0 +1,49 @@
+# Maintainer: Felix Yan 
+# Contributor: Arch Haskell Team 
+
+_hkgname=tamarin-prover-theory
+pkgname=haskell-tamarin-prover-theory
+pkgver=1.4.0
+pkgrel=46
+pkgdesc="Security protocol types and constraint solver library for the tamarin 
prover"
+url="http://www.infsec.ethz.ch/research/software/tamarin";
+license=("GPL")
+arch=('x86_64')
+depends=('ghc-libs' 'haskell-aeson' 'haskell-aeson-pretty' 'haskell-dlist' 
'haskell-fclabels'
+ 'haskell-parallel' 'haskell-safe'
+ 'haskell-uniplate' 'haskell-tamarin-prover-utils' 
'haskell-tamarin-prover-term')
+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'
+
'5e18015155a1ac940591d7c28f3741cf56d9dd36f530895b3d9fec7865563db5c10524252d496b3d4a59c9f1ad2a9db4e2a56f31b73cf91ce1a2e698c3d6dadf')
+
+prepare() {
+cd tamarin-prover-$pkgver
+patch -p1 -i ../ghc-8.4.patch
+
+sed -i '1i{-# language NoMonadFailDesugaring #-}' 
lib/theory/src/Theory/Constraint/System/Guarded.hs
+}
+
+build() {
+cd "${srcdir}/tamarin-prover-${pkgver}/lib/theory"
+
+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
+# haddock failed to generate
+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/theory"
+
+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-theory/repos/community-staging-x86_64/ghc-8.4.patch 
(from rev 410042, haskell-tamarin-prover-theory/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-27 16:43:37 UTC (rev 
410043)
@@ -0,0 +1,329 @@
+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 sym

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

2018-11-07 Thread Felix Yan via arch-commits

Date: Wednesday, November 7, 2018 @ 11:10:28
  Author: felixonmars
Revision: 402723

archrelease: copy trunk to community-staging-x86_64

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

---+
 PKGBUILD  |   49 
 ghc-8.4.patch |  329 
 2 files changed, 378 insertions(+)

Copied: haskell-tamarin-prover-theory/repos/community-staging-x86_64/PKGBUILD 
(from rev 402722, haskell-tamarin-prover-theory/trunk/PKGBUILD)
===
--- community-staging-x86_64/PKGBUILD   (rev 0)
+++ community-staging-x86_64/PKGBUILD   2018-11-07 11:10:28 UTC (rev 402723)
@@ -0,0 +1,49 @@
+# Maintainer: Felix Yan 
+# Contributor: Arch Haskell Team 
+
+_hkgname=tamarin-prover-theory
+pkgname=haskell-tamarin-prover-theory
+pkgver=1.4.0
+pkgrel=45
+pkgdesc="Security protocol types and constraint solver library for the tamarin 
prover"
+url="http://www.infsec.ethz.ch/research/software/tamarin";
+license=("GPL")
+arch=('x86_64')
+depends=('ghc-libs' 'haskell-aeson' 'haskell-aeson-pretty' 'haskell-dlist' 
'haskell-fclabels'
+ 'haskell-parallel' 'haskell-safe'
+ 'haskell-uniplate' 'haskell-tamarin-prover-utils' 
'haskell-tamarin-prover-term')
+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'
+
'5e18015155a1ac940591d7c28f3741cf56d9dd36f530895b3d9fec7865563db5c10524252d496b3d4a59c9f1ad2a9db4e2a56f31b73cf91ce1a2e698c3d6dadf')
+
+prepare() {
+cd tamarin-prover-$pkgver
+patch -p1 -i ../ghc-8.4.patch
+
+sed -i '1i{-# language NoMonadFailDesugaring #-}' 
lib/theory/src/Theory/Constraint/System/Guarded.hs
+}
+
+build() {
+cd "${srcdir}/tamarin-prover-${pkgver}/lib/theory"
+
+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
+# haddock failed to generate
+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/theory"
+
+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-theory/repos/community-staging-x86_64/ghc-8.4.patch 
(from rev 402722, haskell-tamarin-prover-theory/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-07 11:10:28 UTC (rev 
402723)
@@ -0,0 +1,329 @@
+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 sy

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

2018-10-31 Thread Felix Yan via arch-commits

Date: Wednesday, October 31, 2018 @ 11:20:55
  Author: felixonmars
Revision: 400042

archrelease: copy trunk to community-staging-x86_64

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

---+
 PKGBUILD  |   49 
 ghc-8.4.patch |  329 
 2 files changed, 378 insertions(+)

Copied: haskell-tamarin-prover-theory/repos/community-staging-x86_64/PKGBUILD 
(from rev 400041, haskell-tamarin-prover-theory/trunk/PKGBUILD)
===
--- community-staging-x86_64/PKGBUILD   (rev 0)
+++ community-staging-x86_64/PKGBUILD   2018-10-31 11:20:55 UTC (rev 400042)
@@ -0,0 +1,49 @@
+# Maintainer: Felix Yan 
+# Contributor: Arch Haskell Team 
+
+_hkgname=tamarin-prover-theory
+pkgname=haskell-tamarin-prover-theory
+pkgver=1.4.0
+pkgrel=44
+pkgdesc="Security protocol types and constraint solver library for the tamarin 
prover"
+url="http://www.infsec.ethz.ch/research/software/tamarin";
+license=("GPL")
+arch=('x86_64')
+depends=('ghc-libs' 'haskell-aeson' 'haskell-aeson-pretty' 'haskell-dlist' 
'haskell-fclabels'
+ 'haskell-parallel' 'haskell-safe'
+ 'haskell-uniplate' 'haskell-tamarin-prover-utils' 
'haskell-tamarin-prover-term')
+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'
+
'5e18015155a1ac940591d7c28f3741cf56d9dd36f530895b3d9fec7865563db5c10524252d496b3d4a59c9f1ad2a9db4e2a56f31b73cf91ce1a2e698c3d6dadf')
+
+prepare() {
+cd tamarin-prover-$pkgver
+patch -p1 -i ../ghc-8.4.patch
+
+sed -i '1i{-# language NoMonadFailDesugaring #-}' 
lib/theory/src/Theory/Constraint/System/Guarded.hs
+}
+
+build() {
+cd "${srcdir}/tamarin-prover-${pkgver}/lib/theory"
+
+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
+# haddock failed to generate
+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/theory"
+
+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-theory/repos/community-staging-x86_64/ghc-8.4.patch 
(from rev 400041, haskell-tamarin-prover-theory/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 11:20:55 UTC (rev 
400042)
@@ -0,0 +1,329 @@
+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
+ 
+ -- | No

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

2018-10-18 Thread Felix Yan via arch-commits

Date: Friday, October 19, 2018 @ 04:24:49
  Author: felixonmars
Revision: 397070

archrelease: copy trunk to community-staging-x86_64

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

---+
 PKGBUILD  |   49 
 ghc-8.4.patch |  329 
 2 files changed, 378 insertions(+)

Copied: haskell-tamarin-prover-theory/repos/community-staging-x86_64/PKGBUILD 
(from rev 397069, haskell-tamarin-prover-theory/trunk/PKGBUILD)
===
--- community-staging-x86_64/PKGBUILD   (rev 0)
+++ community-staging-x86_64/PKGBUILD   2018-10-19 04:24:49 UTC (rev 397070)
@@ -0,0 +1,49 @@
+# Maintainer: Felix Yan 
+# Contributor: Arch Haskell Team 
+
+_hkgname=tamarin-prover-theory
+pkgname=haskell-tamarin-prover-theory
+pkgver=1.4.0
+pkgrel=43
+pkgdesc="Security protocol types and constraint solver library for the tamarin 
prover"
+url="http://www.infsec.ethz.ch/research/software/tamarin";
+license=("GPL")
+arch=('x86_64')
+depends=('ghc-libs' 'haskell-aeson' 'haskell-aeson-pretty' 'haskell-dlist' 
'haskell-fclabels'
+ 'haskell-parallel' 'haskell-safe'
+ 'haskell-uniplate' 'haskell-tamarin-prover-utils' 
'haskell-tamarin-prover-term')
+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'
+
'5e18015155a1ac940591d7c28f3741cf56d9dd36f530895b3d9fec7865563db5c10524252d496b3d4a59c9f1ad2a9db4e2a56f31b73cf91ce1a2e698c3d6dadf')
+
+prepare() {
+cd tamarin-prover-$pkgver
+patch -p1 -i ../ghc-8.4.patch
+
+sed -i '1i{-# language NoMonadFailDesugaring #-}' 
lib/theory/src/Theory/Constraint/System/Guarded.hs
+}
+
+build() {
+cd "${srcdir}/tamarin-prover-${pkgver}/lib/theory"
+
+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
+# haddock failed to generate
+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/theory"
+
+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-theory/repos/community-staging-x86_64/ghc-8.4.patch 
(from rev 397069, haskell-tamarin-prover-theory/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-19 04:24:49 UTC (rev 
397070)
@@ -0,0 +1,329 @@
+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-A

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

2018-10-16 Thread Felix Yan via arch-commits

Date: Tuesday, October 16, 2018 @ 07:43:57
  Author: felixonmars
Revision: 394515

archrelease: copy trunk to community-staging-x86_64

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

---+
 PKGBUILD  |   49 
 ghc-8.4.patch |  329 
 2 files changed, 378 insertions(+)

Copied: haskell-tamarin-prover-theory/repos/community-staging-x86_64/PKGBUILD 
(from rev 394514, haskell-tamarin-prover-theory/trunk/PKGBUILD)
===
--- community-staging-x86_64/PKGBUILD   (rev 0)
+++ community-staging-x86_64/PKGBUILD   2018-10-16 07:43:57 UTC (rev 394515)
@@ -0,0 +1,49 @@
+# Maintainer: Felix Yan 
+# Contributor: Arch Haskell Team 
+
+_hkgname=tamarin-prover-theory
+pkgname=haskell-tamarin-prover-theory
+pkgver=1.4.0
+pkgrel=42
+pkgdesc="Security protocol types and constraint solver library for the tamarin 
prover"
+url="http://www.infsec.ethz.ch/research/software/tamarin";
+license=("GPL")
+arch=('x86_64')
+depends=('ghc-libs' 'haskell-aeson' 'haskell-aeson-pretty' 'haskell-dlist' 
'haskell-fclabels'
+ 'haskell-parallel' 'haskell-safe'
+ 'haskell-uniplate' 'haskell-tamarin-prover-utils' 
'haskell-tamarin-prover-term')
+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'
+
'5e18015155a1ac940591d7c28f3741cf56d9dd36f530895b3d9fec7865563db5c10524252d496b3d4a59c9f1ad2a9db4e2a56f31b73cf91ce1a2e698c3d6dadf')
+
+prepare() {
+cd tamarin-prover-$pkgver
+patch -p1 -i ../ghc-8.4.patch
+
+sed -i '1i{-# language NoMonadFailDesugaring #-}' 
lib/theory/src/Theory/Constraint/System/Guarded.hs
+}
+
+build() {
+cd "${srcdir}/tamarin-prover-${pkgver}/lib/theory"
+
+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
+# haddock failed to generate
+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/theory"
+
+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-theory/repos/community-staging-x86_64/ghc-8.4.patch 
(from rev 394514, haskell-tamarin-prover-theory/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-16 07:43:57 UTC (rev 
394515)
@@ -0,0 +1,329 @@
+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-

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

2018-10-11 Thread Felix Yan via arch-commits

Date: Thursday, October 11, 2018 @ 10:26:01
  Author: felixonmars
Revision: 392322

archrelease: copy trunk to community-staging-x86_64

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

---+
 PKGBUILD  |   47 
 ghc-8.4.patch |  329 
 2 files changed, 376 insertions(+)

Copied: haskell-tamarin-prover-theory/repos/community-staging-x86_64/PKGBUILD 
(from rev 392321, haskell-tamarin-prover-theory/trunk/PKGBUILD)
===
--- community-staging-x86_64/PKGBUILD   (rev 0)
+++ community-staging-x86_64/PKGBUILD   2018-10-11 10:26:01 UTC (rev 392322)
@@ -0,0 +1,47 @@
+# Maintainer: Felix Yan 
+# Contributor: Arch Haskell Team 
+
+_hkgname=tamarin-prover-theory
+pkgname=haskell-tamarin-prover-theory
+pkgver=1.4.0
+pkgrel=41
+pkgdesc="Security protocol types and constraint solver library for the tamarin 
prover"
+url="http://www.infsec.ethz.ch/research/software/tamarin";
+license=("GPL")
+arch=('x86_64')
+depends=('ghc-libs' 'haskell-aeson' 'haskell-aeson-pretty' 'haskell-dlist' 
'haskell-fclabels'
+ 'haskell-parallel' 'haskell-safe'
+ 'haskell-uniplate' 'haskell-tamarin-prover-utils' 
'haskell-tamarin-prover-term')
+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'
+
'5e18015155a1ac940591d7c28f3741cf56d9dd36f530895b3d9fec7865563db5c10524252d496b3d4a59c9f1ad2a9db4e2a56f31b73cf91ce1a2e698c3d6dadf')
+
+prepare() {
+cd tamarin-prover-$pkgver
+patch -p1 -i ../ghc-8.4.patch
+}
+
+build() {
+cd "${srcdir}/tamarin-prover-${pkgver}/lib/theory"
+
+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
+# haddock failed to generate
+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/theory"
+
+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-theory/repos/community-staging-x86_64/ghc-8.4.patch 
(from rev 392321, haskell-tamarin-prover-theory/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 10:26:01 UTC (rev 
392322)
@@ -0,0 +1,329 @@
+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

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

2018-10-05 Thread Felix Yan via arch-commits

Date: Friday, October 5, 2018 @ 11:36:44
  Author: felixonmars
Revision: 389901

archrelease: copy trunk to community-staging-x86_64

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

---+
 PKGBUILD  |   47 
 ghc-8.4.patch |  329 
 2 files changed, 376 insertions(+)

Copied: haskell-tamarin-prover-theory/repos/community-staging-x86_64/PKGBUILD 
(from rev 389900, haskell-tamarin-prover-theory/trunk/PKGBUILD)
===
--- community-staging-x86_64/PKGBUILD   (rev 0)
+++ community-staging-x86_64/PKGBUILD   2018-10-05 11:36:44 UTC (rev 389901)
@@ -0,0 +1,47 @@
+# Maintainer: Felix Yan 
+# Contributor: Arch Haskell Team 
+
+_hkgname=tamarin-prover-theory
+pkgname=haskell-tamarin-prover-theory
+pkgver=1.4.0
+pkgrel=40
+pkgdesc="Security protocol types and constraint solver library for the tamarin 
prover"
+url="http://www.infsec.ethz.ch/research/software/tamarin";
+license=("GPL")
+arch=('x86_64')
+depends=('ghc-libs' 'haskell-aeson' 'haskell-aeson-pretty' 'haskell-dlist' 
'haskell-fclabels'
+ 'haskell-parallel' 'haskell-safe'
+ 'haskell-uniplate' 'haskell-tamarin-prover-utils' 
'haskell-tamarin-prover-term')
+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'
+
'5e18015155a1ac940591d7c28f3741cf56d9dd36f530895b3d9fec7865563db5c10524252d496b3d4a59c9f1ad2a9db4e2a56f31b73cf91ce1a2e698c3d6dadf')
+
+prepare() {
+cd tamarin-prover-$pkgver
+patch -p1 -i ../ghc-8.4.patch
+}
+
+build() {
+cd "${srcdir}/tamarin-prover-${pkgver}/lib/theory"
+
+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
+# haddock failed to generate
+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/theory"
+
+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-theory/repos/community-staging-x86_64/ghc-8.4.patch 
(from rev 389900, haskell-tamarin-prover-theory/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 11:36:44 UTC (rev 
389901)
@@ -0,0 +1,329 @@
+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/De

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

2018-09-27 Thread Felix Yan via arch-commits

Date: Friday, September 28, 2018 @ 06:14:55
  Author: felixonmars
Revision: 386794

archrelease: copy trunk to community-staging-x86_64

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

---+
 PKGBUILD  |   47 
 ghc-8.4.patch |  329 
 2 files changed, 376 insertions(+)

Copied: haskell-tamarin-prover-theory/repos/community-staging-x86_64/PKGBUILD 
(from rev 386792, haskell-tamarin-prover-theory/trunk/PKGBUILD)
===
--- community-staging-x86_64/PKGBUILD   (rev 0)
+++ community-staging-x86_64/PKGBUILD   2018-09-28 06:14:55 UTC (rev 386794)
@@ -0,0 +1,47 @@
+# Maintainer: Felix Yan 
+# Contributor: Arch Haskell Team 
+
+_hkgname=tamarin-prover-theory
+pkgname=haskell-tamarin-prover-theory
+pkgver=1.4.0
+pkgrel=39
+pkgdesc="Security protocol types and constraint solver library for the tamarin 
prover"
+url="http://www.infsec.ethz.ch/research/software/tamarin";
+license=("GPL")
+arch=('x86_64')
+depends=('ghc-libs' 'haskell-aeson' 'haskell-aeson-pretty' 'haskell-dlist' 
'haskell-fclabels'
+ 'haskell-parallel' 'haskell-safe'
+ 'haskell-uniplate' 'haskell-tamarin-prover-utils' 
'haskell-tamarin-prover-term')
+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'
+
'5e18015155a1ac940591d7c28f3741cf56d9dd36f530895b3d9fec7865563db5c10524252d496b3d4a59c9f1ad2a9db4e2a56f31b73cf91ce1a2e698c3d6dadf')
+
+prepare() {
+cd tamarin-prover-$pkgver
+patch -p1 -i ../ghc-8.4.patch
+}
+
+build() {
+cd "${srcdir}/tamarin-prover-${pkgver}/lib/theory"
+
+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
+# haddock failed to generate
+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/theory"
+
+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-theory/repos/community-staging-x86_64/ghc-8.4.patch 
(from rev 386793, haskell-tamarin-prover-theory/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-28 06:14:55 UTC (rev 
386794)
@@ -0,0 +1,329 @@
+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

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

2018-09-27 Thread Felix Yan via arch-commits

Date: Thursday, September 27, 2018 @ 11:20:53
  Author: felixonmars
Revision: 386201

archrelease: copy trunk to community-staging-x86_64

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

---+
 PKGBUILD  |   47 
 ghc-8.4.patch |  329 
 2 files changed, 376 insertions(+)

Copied: haskell-tamarin-prover-theory/repos/community-staging-x86_64/PKGBUILD 
(from rev 386200, haskell-tamarin-prover-theory/trunk/PKGBUILD)
===
--- community-staging-x86_64/PKGBUILD   (rev 0)
+++ community-staging-x86_64/PKGBUILD   2018-09-27 11:20:53 UTC (rev 386201)
@@ -0,0 +1,47 @@
+# Maintainer: Felix Yan 
+# Contributor: Arch Haskell Team 
+
+_hkgname=tamarin-prover-theory
+pkgname=haskell-tamarin-prover-theory
+pkgver=1.4.0
+pkgrel=38
+pkgdesc="Security protocol types and constraint solver library for the tamarin 
prover"
+url="http://www.infsec.ethz.ch/research/software/tamarin";
+license=("GPL")
+arch=('x86_64')
+depends=('ghc-libs' 'haskell-aeson' 'haskell-aeson-pretty' 'haskell-dlist' 
'haskell-fclabels'
+ 'haskell-parallel' 'haskell-safe'
+ 'haskell-uniplate' 'haskell-tamarin-prover-utils' 
'haskell-tamarin-prover-term')
+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'
+
'5e18015155a1ac940591d7c28f3741cf56d9dd36f530895b3d9fec7865563db5c10524252d496b3d4a59c9f1ad2a9db4e2a56f31b73cf91ce1a2e698c3d6dadf')
+
+prepare() {
+cd tamarin-prover-$pkgver
+patch -p1 -i ../ghc-8.4.patch
+}
+
+build() {
+cd "${srcdir}/tamarin-prover-${pkgver}/lib/theory"
+
+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
+# haddock failed to generate
+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/theory"
+
+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-theory/repos/community-staging-x86_64/ghc-8.4.patch 
(from rev 386200, haskell-tamarin-prover-theory/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-27 11:20:53 UTC (rev 
386201)
@@ -0,0 +1,329 @@
+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/Rewriti

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

2018-09-26 Thread Felix Yan via arch-commits

Date: Wednesday, September 26, 2018 @ 15:12:38
  Author: felixonmars
Revision: 385407

archrelease: copy trunk to community-staging-x86_64

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

---+
 PKGBUILD  |   47 
 ghc-8.4.patch |  329 
 2 files changed, 376 insertions(+)

Copied: haskell-tamarin-prover-theory/repos/community-staging-x86_64/PKGBUILD 
(from rev 385406, haskell-tamarin-prover-theory/trunk/PKGBUILD)
===
--- community-staging-x86_64/PKGBUILD   (rev 0)
+++ community-staging-x86_64/PKGBUILD   2018-09-26 15:12:38 UTC (rev 385407)
@@ -0,0 +1,47 @@
+# Maintainer: Felix Yan 
+# Contributor: Arch Haskell Team 
+
+_hkgname=tamarin-prover-theory
+pkgname=haskell-tamarin-prover-theory
+pkgver=1.4.0
+pkgrel=37
+pkgdesc="Security protocol types and constraint solver library for the tamarin 
prover"
+url="http://www.infsec.ethz.ch/research/software/tamarin";
+license=("GPL")
+arch=('x86_64')
+depends=('ghc-libs' 'haskell-aeson' 'haskell-aeson-pretty' 'haskell-dlist' 
'haskell-fclabels'
+ 'haskell-parallel' 'haskell-safe'
+ 'haskell-uniplate' 'haskell-tamarin-prover-utils' 
'haskell-tamarin-prover-term')
+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'
+
'5e18015155a1ac940591d7c28f3741cf56d9dd36f530895b3d9fec7865563db5c10524252d496b3d4a59c9f1ad2a9db4e2a56f31b73cf91ce1a2e698c3d6dadf')
+
+prepare() {
+cd tamarin-prover-$pkgver
+patch -p1 -i ../ghc-8.4.patch
+}
+
+build() {
+cd "${srcdir}/tamarin-prover-${pkgver}/lib/theory"
+
+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
+# haddock failed to generate
+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/theory"
+
+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-theory/repos/community-staging-x86_64/ghc-8.4.patch 
(from rev 385406, haskell-tamarin-prover-theory/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-26 15:12:38 UTC (rev 
385407)
@@ -0,0 +1,329 @@
+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/Rewrit

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

2018-09-15 Thread Felix Yan via arch-commits

Date: Saturday, September 15, 2018 @ 08:08:18
  Author: felixonmars
Revision: 381340

archrelease: copy trunk to community-staging-x86_64

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

---+
 PKGBUILD  |   47 
 ghc-8.4.patch |  329 
 2 files changed, 376 insertions(+)

Copied: haskell-tamarin-prover-theory/repos/community-staging-x86_64/PKGBUILD 
(from rev 381339, haskell-tamarin-prover-theory/trunk/PKGBUILD)
===
--- community-staging-x86_64/PKGBUILD   (rev 0)
+++ community-staging-x86_64/PKGBUILD   2018-09-15 08:08:18 UTC (rev 381340)
@@ -0,0 +1,47 @@
+# Maintainer: Felix Yan 
+# Contributor: Arch Haskell Team 
+
+_hkgname=tamarin-prover-theory
+pkgname=haskell-tamarin-prover-theory
+pkgver=1.4.0
+pkgrel=36
+pkgdesc="Security protocol types and constraint solver library for the tamarin 
prover"
+url="http://www.infsec.ethz.ch/research/software/tamarin";
+license=("GPL")
+arch=('x86_64')
+depends=('ghc-libs' 'haskell-aeson' 'haskell-aeson-pretty' 'haskell-dlist' 
'haskell-fclabels'
+ 'haskell-parallel' 'haskell-safe'
+ 'haskell-uniplate' 'haskell-tamarin-prover-utils' 
'haskell-tamarin-prover-term')
+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'
+
'5e18015155a1ac940591d7c28f3741cf56d9dd36f530895b3d9fec7865563db5c10524252d496b3d4a59c9f1ad2a9db4e2a56f31b73cf91ce1a2e698c3d6dadf')
+
+prepare() {
+cd tamarin-prover-$pkgver
+patch -p1 -i ../ghc-8.4.patch
+}
+
+build() {
+cd "${srcdir}/tamarin-prover-${pkgver}/lib/theory"
+
+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
+# haddock failed to generate
+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/theory"
+
+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-theory/repos/community-staging-x86_64/ghc-8.4.patch 
(from rev 381339, haskell-tamarin-prover-theory/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 08:08:18 UTC (rev 
381340)
@@ -0,0 +1,329 @@
+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/Rewriti

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

2018-09-13 Thread Felix Yan via arch-commits

Date: Thursday, September 13, 2018 @ 16:00:57
  Author: felixonmars
Revision: 380339

archrelease: copy trunk to community-staging-x86_64

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

---+
 PKGBUILD  |   47 
 ghc-8.4.patch |  329 
 2 files changed, 376 insertions(+)

Copied: haskell-tamarin-prover-theory/repos/community-staging-x86_64/PKGBUILD 
(from rev 380338, haskell-tamarin-prover-theory/trunk/PKGBUILD)
===
--- community-staging-x86_64/PKGBUILD   (rev 0)
+++ community-staging-x86_64/PKGBUILD   2018-09-13 16:00:57 UTC (rev 380339)
@@ -0,0 +1,47 @@
+# Maintainer: Felix Yan 
+# Contributor: Arch Haskell Team 
+
+_hkgname=tamarin-prover-theory
+pkgname=haskell-tamarin-prover-theory
+pkgver=1.4.0
+pkgrel=35
+pkgdesc="Security protocol types and constraint solver library for the tamarin 
prover"
+url="http://www.infsec.ethz.ch/research/software/tamarin";
+license=("GPL")
+arch=('x86_64')
+depends=('ghc-libs' 'haskell-aeson' 'haskell-aeson-pretty' 'haskell-dlist' 
'haskell-fclabels'
+ 'haskell-parallel' 'haskell-safe'
+ 'haskell-uniplate' 'haskell-tamarin-prover-utils' 
'haskell-tamarin-prover-term')
+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'
+
'5e18015155a1ac940591d7c28f3741cf56d9dd36f530895b3d9fec7865563db5c10524252d496b3d4a59c9f1ad2a9db4e2a56f31b73cf91ce1a2e698c3d6dadf')
+
+prepare() {
+cd tamarin-prover-$pkgver
+patch -p1 -i ../ghc-8.4.patch
+}
+
+build() {
+cd "${srcdir}/tamarin-prover-${pkgver}/lib/theory"
+
+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
+# haddock failed to generate
+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/theory"
+
+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-theory/repos/community-staging-x86_64/ghc-8.4.patch 
(from rev 380338, haskell-tamarin-prover-theory/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 16:00:57 UTC (rev 
380339)
@@ -0,0 +1,329 @@
+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/Rewriti

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

2018-09-10 Thread Felix Yan via arch-commits

Date: Monday, September 10, 2018 @ 12:19:33
  Author: felixonmars
Revision: 379168

archrelease: copy trunk to community-staging-x86_64

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

---+
 PKGBUILD  |   48 
 ghc-8.4.patch |  329 
 2 files changed, 377 insertions(+)

Copied: haskell-tamarin-prover-theory/repos/community-staging-x86_64/PKGBUILD 
(from rev 379167, haskell-tamarin-prover-theory/trunk/PKGBUILD)
===
--- community-staging-x86_64/PKGBUILD   (rev 0)
+++ community-staging-x86_64/PKGBUILD   2018-09-10 12:19:33 UTC (rev 379168)
@@ -0,0 +1,48 @@
+# $Id$
+# Maintainer: Felix Yan 
+# Contributor: Arch Haskell Team 
+
+_hkgname=tamarin-prover-theory
+pkgname=haskell-tamarin-prover-theory
+pkgver=1.4.0
+pkgrel=34
+pkgdesc="Security protocol types and constraint solver library for the tamarin 
prover"
+url="http://www.infsec.ethz.ch/research/software/tamarin";
+license=("GPL")
+arch=('x86_64')
+depends=('ghc-libs' 'haskell-aeson' 'haskell-aeson-pretty' 'haskell-dlist' 
'haskell-fclabels'
+ 'haskell-parallel' 'haskell-safe'
+ 'haskell-uniplate' 'haskell-tamarin-prover-utils' 
'haskell-tamarin-prover-term')
+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'
+
'5e18015155a1ac940591d7c28f3741cf56d9dd36f530895b3d9fec7865563db5c10524252d496b3d4a59c9f1ad2a9db4e2a56f31b73cf91ce1a2e698c3d6dadf')
+
+prepare() {
+cd tamarin-prover-$pkgver
+patch -p1 -i ../ghc-8.4.patch
+}
+
+build() {
+cd "${srcdir}/tamarin-prover-${pkgver}/lib/theory"
+
+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
+# haddock failed to generate
+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/theory"
+
+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-theory/repos/community-staging-x86_64/ghc-8.4.patch 
(from rev 379167, haskell-tamarin-prover-theory/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:19:33 UTC (rev 
379168)
@@ -0,0 +1,329 @@
+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/R

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

2018-09-06 Thread Felix Yan via arch-commits

Date: Thursday, September 6, 2018 @ 09:06:33
  Author: felixonmars
Revision: 377434

archrelease: copy trunk to community-staging-x86_64

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

---+
 PKGBUILD  |   48 
 ghc-8.4.patch |  329 
 2 files changed, 377 insertions(+)

Copied: haskell-tamarin-prover-theory/repos/community-staging-x86_64/PKGBUILD 
(from rev 377433, haskell-tamarin-prover-theory/trunk/PKGBUILD)
===
--- community-staging-x86_64/PKGBUILD   (rev 0)
+++ community-staging-x86_64/PKGBUILD   2018-09-06 09:06:33 UTC (rev 377434)
@@ -0,0 +1,48 @@
+# $Id$
+# Maintainer: Felix Yan 
+# Contributor: Arch Haskell Team 
+
+_hkgname=tamarin-prover-theory
+pkgname=haskell-tamarin-prover-theory
+pkgver=1.4.0
+pkgrel=33
+pkgdesc="Security protocol types and constraint solver library for the tamarin 
prover"
+url="http://www.infsec.ethz.ch/research/software/tamarin";
+license=("GPL")
+arch=('x86_64')
+depends=('ghc-libs' 'haskell-aeson' 'haskell-aeson-pretty' 'haskell-dlist' 
'haskell-fclabels'
+ 'haskell-parallel' 'haskell-safe'
+ 'haskell-uniplate' 'haskell-tamarin-prover-utils' 
'haskell-tamarin-prover-term')
+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'
+
'5e18015155a1ac940591d7c28f3741cf56d9dd36f530895b3d9fec7865563db5c10524252d496b3d4a59c9f1ad2a9db4e2a56f31b73cf91ce1a2e698c3d6dadf')
+
+prepare() {
+cd tamarin-prover-$pkgver
+patch -p1 -i ../ghc-8.4.patch
+}
+
+build() {
+cd "${srcdir}/tamarin-prover-${pkgver}/lib/theory"
+
+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
+# haddock failed to generate
+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/theory"
+
+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-theory/repos/community-staging-x86_64/ghc-8.4.patch 
(from rev 377433, haskell-tamarin-prover-theory/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-06 09:06:33 UTC (rev 
377434)
@@ -0,0 +1,329 @@
+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/

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

2018-08-26 Thread Felix Yan via arch-commits

Date: Sunday, August 26, 2018 @ 15:29:59
  Author: felixonmars
Revision: 374372

archrelease: copy trunk to community-staging-x86_64

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

---+
 PKGBUILD  |   48 
 ghc-8.4.patch |  329 
 2 files changed, 377 insertions(+)

Copied: haskell-tamarin-prover-theory/repos/community-staging-x86_64/PKGBUILD 
(from rev 374371, haskell-tamarin-prover-theory/trunk/PKGBUILD)
===
--- community-staging-x86_64/PKGBUILD   (rev 0)
+++ community-staging-x86_64/PKGBUILD   2018-08-26 15:29:59 UTC (rev 374372)
@@ -0,0 +1,48 @@
+# $Id$
+# Maintainer: Felix Yan 
+# Contributor: Arch Haskell Team 
+
+_hkgname=tamarin-prover-theory
+pkgname=haskell-tamarin-prover-theory
+pkgver=1.4.0
+pkgrel=32
+pkgdesc="Security protocol types and constraint solver library for the tamarin 
prover"
+url="http://www.infsec.ethz.ch/research/software/tamarin";
+license=("GPL")
+arch=('x86_64')
+depends=('ghc-libs' 'haskell-aeson' 'haskell-aeson-pretty' 'haskell-dlist' 
'haskell-fclabels'
+ 'haskell-parallel' 'haskell-safe'
+ 'haskell-uniplate' 'haskell-tamarin-prover-utils' 
'haskell-tamarin-prover-term')
+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'
+
'5e18015155a1ac940591d7c28f3741cf56d9dd36f530895b3d9fec7865563db5c10524252d496b3d4a59c9f1ad2a9db4e2a56f31b73cf91ce1a2e698c3d6dadf')
+
+prepare() {
+cd tamarin-prover-$pkgver
+patch -p1 -i ../ghc-8.4.patch
+}
+
+build() {
+cd "${srcdir}/tamarin-prover-${pkgver}/lib/theory"
+
+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
+# haddock failed to generate
+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/theory"
+
+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-theory/repos/community-staging-x86_64/ghc-8.4.patch 
(from rev 374371, haskell-tamarin-prover-theory/trunk/ghc-8.4.patch)
===
--- community-staging-x86_64/ghc-8.4.patch  (rev 0)
+++ community-staging-x86_64/ghc-8.4.patch  2018-08-26 15:29:59 UTC (rev 
374372)
@@ -0,0 +1,329 @@
+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/Rewr

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

2018-08-07 Thread Felix Yan via arch-commits

Date: Tuesday, August 7, 2018 @ 16:56:53
  Author: felixonmars
Revision: 370145

archrelease: copy trunk to community-staging-x86_64

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

---+
 PKGBUILD  |   48 
 ghc-8.4.patch |  329 
 2 files changed, 377 insertions(+)

Copied: haskell-tamarin-prover-theory/repos/community-staging-x86_64/PKGBUILD 
(from rev 370144, haskell-tamarin-prover-theory/trunk/PKGBUILD)
===
--- community-staging-x86_64/PKGBUILD   (rev 0)
+++ community-staging-x86_64/PKGBUILD   2018-08-07 16:56:53 UTC (rev 370145)
@@ -0,0 +1,48 @@
+# $Id$
+# Maintainer: Felix Yan 
+# Contributor: Arch Haskell Team 
+
+_hkgname=tamarin-prover-theory
+pkgname=haskell-tamarin-prover-theory
+pkgver=1.4.0
+pkgrel=31
+pkgdesc="Security protocol types and constraint solver library for the tamarin 
prover"
+url="http://www.infsec.ethz.ch/research/software/tamarin";
+license=("GPL")
+arch=('x86_64')
+depends=('ghc-libs' 'haskell-aeson' 'haskell-aeson-pretty' 'haskell-dlist' 
'haskell-fclabels'
+ 'haskell-parallel' 'haskell-safe'
+ 'haskell-uniplate' 'haskell-tamarin-prover-utils' 
'haskell-tamarin-prover-term')
+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'
+
'5e18015155a1ac940591d7c28f3741cf56d9dd36f530895b3d9fec7865563db5c10524252d496b3d4a59c9f1ad2a9db4e2a56f31b73cf91ce1a2e698c3d6dadf')
+
+prepare() {
+cd tamarin-prover-$pkgver
+patch -p1 -i ../ghc-8.4.patch
+}
+
+build() {
+cd "${srcdir}/tamarin-prover-${pkgver}/lib/theory"
+
+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
+# haddock failed to generate
+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/theory"
+
+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-theory/repos/community-staging-x86_64/ghc-8.4.patch 
(from rev 370144, haskell-tamarin-prover-theory/trunk/ghc-8.4.patch)
===
--- community-staging-x86_64/ghc-8.4.patch  (rev 0)
+++ community-staging-x86_64/ghc-8.4.patch  2018-08-07 16:56:53 UTC (rev 
370145)
@@ -0,0 +1,329 @@
+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/Rewr

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

2018-07-28 Thread Felix Yan via arch-commits

Date: Sunday, July 29, 2018 @ 03:55:13
  Author: felixonmars
Revision: 363996

archrelease: copy trunk to community-staging-x86_64

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

---+
 PKGBUILD  |   48 
 ghc-8.4.patch |  329 
 2 files changed, 377 insertions(+)

Copied: haskell-tamarin-prover-theory/repos/community-staging-x86_64/PKGBUILD 
(from rev 363995, haskell-tamarin-prover-theory/trunk/PKGBUILD)
===
--- community-staging-x86_64/PKGBUILD   (rev 0)
+++ community-staging-x86_64/PKGBUILD   2018-07-29 03:55:13 UTC (rev 363996)
@@ -0,0 +1,48 @@
+# $Id$
+# Maintainer: Felix Yan 
+# Contributor: Arch Haskell Team 
+
+_hkgname=tamarin-prover-theory
+pkgname=haskell-tamarin-prover-theory
+pkgver=1.4.0
+pkgrel=30
+pkgdesc="Security protocol types and constraint solver library for the tamarin 
prover"
+url="http://www.infsec.ethz.ch/research/software/tamarin";
+license=("GPL")
+arch=('x86_64')
+depends=('ghc-libs' 'haskell-aeson' 'haskell-aeson-pretty' 'haskell-dlist' 
'haskell-fclabels'
+ 'haskell-parallel' 'haskell-safe'
+ 'haskell-uniplate' 'haskell-tamarin-prover-utils' 
'haskell-tamarin-prover-term')
+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'
+
'5e18015155a1ac940591d7c28f3741cf56d9dd36f530895b3d9fec7865563db5c10524252d496b3d4a59c9f1ad2a9db4e2a56f31b73cf91ce1a2e698c3d6dadf')
+
+prepare() {
+cd tamarin-prover-$pkgver
+patch -p1 -i ../ghc-8.4.patch
+}
+
+build() {
+cd "${srcdir}/tamarin-prover-${pkgver}/lib/theory"
+
+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
+# haddock failed to generate
+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/theory"
+
+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-theory/repos/community-staging-x86_64/ghc-8.4.patch 
(from rev 363995, haskell-tamarin-prover-theory/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-29 03:55:13 UTC (rev 
363996)
@@ -0,0 +1,329 @@
+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/Rewrit

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

2018-07-17 Thread Felix Yan via arch-commits

Date: Tuesday, July 17, 2018 @ 10:41:36
  Author: felixonmars
Revision: 360626

archrelease: copy trunk to community-staging-x86_64

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

---+
 PKGBUILD  |   48 
 ghc-8.4.patch |  329 
 2 files changed, 377 insertions(+)

Copied: haskell-tamarin-prover-theory/repos/community-staging-x86_64/PKGBUILD 
(from rev 360625, haskell-tamarin-prover-theory/trunk/PKGBUILD)
===
--- community-staging-x86_64/PKGBUILD   (rev 0)
+++ community-staging-x86_64/PKGBUILD   2018-07-17 10:41:36 UTC (rev 360626)
@@ -0,0 +1,48 @@
+# $Id$
+# Maintainer: Felix Yan 
+# Contributor: Arch Haskell Team 
+
+_hkgname=tamarin-prover-theory
+pkgname=haskell-tamarin-prover-theory
+pkgver=1.4.0
+pkgrel=29
+pkgdesc="Security protocol types and constraint solver library for the tamarin 
prover"
+url="http://www.infsec.ethz.ch/research/software/tamarin";
+license=("GPL")
+arch=('x86_64')
+depends=('ghc-libs' 'haskell-aeson' 'haskell-aeson-pretty' 'haskell-dlist' 
'haskell-fclabels'
+ 'haskell-parallel' 'haskell-safe'
+ 'haskell-uniplate' 'haskell-tamarin-prover-utils' 
'haskell-tamarin-prover-term')
+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'
+
'5e18015155a1ac940591d7c28f3741cf56d9dd36f530895b3d9fec7865563db5c10524252d496b3d4a59c9f1ad2a9db4e2a56f31b73cf91ce1a2e698c3d6dadf')
+
+prepare() {
+cd tamarin-prover-$pkgver
+patch -p1 -i ../ghc-8.4.patch
+}
+
+build() {
+cd "${srcdir}/tamarin-prover-${pkgver}/lib/theory"
+
+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
+# haddock failed to generate
+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/theory"
+
+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-theory/repos/community-staging-x86_64/ghc-8.4.patch 
(from rev 360625, haskell-tamarin-prover-theory/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-17 10:41:36 UTC (rev 
360626)
@@ -0,0 +1,329 @@
+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/Rewri

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

2018-07-14 Thread Felix Yan via arch-commits

Date: Saturday, July 14, 2018 @ 17:46:31
  Author: felixonmars
Revision: 359361

archrelease: copy trunk to community-staging-x86_64

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

---+
 PKGBUILD  |   48 
 ghc-8.4.patch |  329 
 2 files changed, 377 insertions(+)

Copied: haskell-tamarin-prover-theory/repos/community-staging-x86_64/PKGBUILD 
(from rev 359360, haskell-tamarin-prover-theory/trunk/PKGBUILD)
===
--- community-staging-x86_64/PKGBUILD   (rev 0)
+++ community-staging-x86_64/PKGBUILD   2018-07-14 17:46:31 UTC (rev 359361)
@@ -0,0 +1,48 @@
+# $Id$
+# Maintainer: Felix Yan 
+# Contributor: Arch Haskell Team 
+
+_hkgname=tamarin-prover-theory
+pkgname=haskell-tamarin-prover-theory
+pkgver=1.4.0
+pkgrel=28
+pkgdesc="Security protocol types and constraint solver library for the tamarin 
prover"
+url="http://www.infsec.ethz.ch/research/software/tamarin";
+license=("GPL")
+arch=('x86_64')
+depends=('ghc-libs' 'haskell-aeson' 'haskell-aeson-pretty' 'haskell-dlist' 
'haskell-fclabels'
+ 'haskell-parallel' 'haskell-safe'
+ 'haskell-uniplate' 'haskell-tamarin-prover-utils' 
'haskell-tamarin-prover-term')
+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'
+
'5e18015155a1ac940591d7c28f3741cf56d9dd36f530895b3d9fec7865563db5c10524252d496b3d4a59c9f1ad2a9db4e2a56f31b73cf91ce1a2e698c3d6dadf')
+
+prepare() {
+cd tamarin-prover-$pkgver
+patch -p1 -i ../ghc-8.4.patch
+}
+
+build() {
+cd "${srcdir}/tamarin-prover-${pkgver}/lib/theory"
+
+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
+# haddock failed to generate
+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/theory"
+
+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-theory/repos/community-staging-x86_64/ghc-8.4.patch 
(from rev 359360, haskell-tamarin-prover-theory/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-14 17:46:31 UTC (rev 
359361)
@@ -0,0 +1,329 @@
+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/Rewr

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

2018-07-11 Thread Felix Yan via arch-commits

Date: Wednesday, July 11, 2018 @ 09:24:53
  Author: felixonmars
Revision: 357095

archrelease: copy trunk to community-staging-x86_64

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

---+
 PKGBUILD  |   48 
 ghc-8.4.patch |  329 
 2 files changed, 377 insertions(+)

Copied: haskell-tamarin-prover-theory/repos/community-staging-x86_64/PKGBUILD 
(from rev 357094, haskell-tamarin-prover-theory/trunk/PKGBUILD)
===
--- community-staging-x86_64/PKGBUILD   (rev 0)
+++ community-staging-x86_64/PKGBUILD   2018-07-11 09:24:53 UTC (rev 357095)
@@ -0,0 +1,48 @@
+# $Id$
+# Maintainer: Felix Yan 
+# Contributor: Arch Haskell Team 
+
+_hkgname=tamarin-prover-theory
+pkgname=haskell-tamarin-prover-theory
+pkgver=1.4.0
+pkgrel=27
+pkgdesc="Security protocol types and constraint solver library for the tamarin 
prover"
+url="http://www.infsec.ethz.ch/research/software/tamarin";
+license=("GPL")
+arch=('x86_64')
+depends=('ghc-libs' 'haskell-aeson' 'haskell-aeson-pretty' 'haskell-dlist' 
'haskell-fclabels'
+ 'haskell-parallel' 'haskell-safe'
+ 'haskell-uniplate' 'haskell-tamarin-prover-utils' 
'haskell-tamarin-prover-term')
+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'
+
'5e18015155a1ac940591d7c28f3741cf56d9dd36f530895b3d9fec7865563db5c10524252d496b3d4a59c9f1ad2a9db4e2a56f31b73cf91ce1a2e698c3d6dadf')
+
+prepare() {
+cd tamarin-prover-$pkgver
+patch -p1 -i ../ghc-8.4.patch
+}
+
+build() {
+cd "${srcdir}/tamarin-prover-${pkgver}/lib/theory"
+
+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
+# haddock failed to generate
+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/theory"
+
+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-theory/repos/community-staging-x86_64/ghc-8.4.patch 
(from rev 357094, haskell-tamarin-prover-theory/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-11 09:24:53 UTC (rev 
357095)
@@ -0,0 +1,329 @@
+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/Rew

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

2018-07-10 Thread Felix Yan via arch-commits

Date: Tuesday, July 10, 2018 @ 14:45:32
  Author: felixonmars
Revision: 356143

archrelease: copy trunk to community-staging-x86_64

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

---+
 PKGBUILD  |   48 
 ghc-8.4.patch |  329 
 2 files changed, 377 insertions(+)

Copied: haskell-tamarin-prover-theory/repos/community-staging-x86_64/PKGBUILD 
(from rev 356142, haskell-tamarin-prover-theory/trunk/PKGBUILD)
===
--- community-staging-x86_64/PKGBUILD   (rev 0)
+++ community-staging-x86_64/PKGBUILD   2018-07-10 14:45:32 UTC (rev 356143)
@@ -0,0 +1,48 @@
+# $Id$
+# Maintainer: Felix Yan 
+# Contributor: Arch Haskell Team 
+
+_hkgname=tamarin-prover-theory
+pkgname=haskell-tamarin-prover-theory
+pkgver=1.4.0
+pkgrel=26
+pkgdesc="Security protocol types and constraint solver library for the tamarin 
prover"
+url="http://www.infsec.ethz.ch/research/software/tamarin";
+license=("GPL")
+arch=('x86_64')
+depends=('ghc-libs' 'haskell-aeson' 'haskell-aeson-pretty' 'haskell-dlist' 
'haskell-fclabels'
+ 'haskell-parallel' 'haskell-safe'
+ 'haskell-uniplate' 'haskell-tamarin-prover-utils' 
'haskell-tamarin-prover-term')
+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'
+
'5e18015155a1ac940591d7c28f3741cf56d9dd36f530895b3d9fec7865563db5c10524252d496b3d4a59c9f1ad2a9db4e2a56f31b73cf91ce1a2e698c3d6dadf')
+
+prepare() {
+cd tamarin-prover-$pkgver
+patch -p1 -i ../ghc-8.4.patch
+}
+
+build() {
+cd "${srcdir}/tamarin-prover-${pkgver}/lib/theory"
+
+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
+# haddock failed to generate
+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/theory"
+
+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-theory/repos/community-staging-x86_64/ghc-8.4.patch 
(from rev 356142, haskell-tamarin-prover-theory/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-10 14:45:32 UTC (rev 
356143)
@@ -0,0 +1,329 @@
+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/Rewri

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

2018-07-06 Thread Felix Yan via arch-commits

Date: Friday, July 6, 2018 @ 14:12:55
  Author: felixonmars
Revision: 353682

archrelease: copy trunk to community-staging-x86_64

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

---+
 PKGBUILD  |   48 
 ghc-8.4.patch |  329 
 2 files changed, 377 insertions(+)

Copied: haskell-tamarin-prover-theory/repos/community-staging-x86_64/PKGBUILD 
(from rev 353681, haskell-tamarin-prover-theory/trunk/PKGBUILD)
===
--- community-staging-x86_64/PKGBUILD   (rev 0)
+++ community-staging-x86_64/PKGBUILD   2018-07-06 14:12:55 UTC (rev 353682)
@@ -0,0 +1,48 @@
+# $Id$
+# Maintainer: Felix Yan 
+# Contributor: Arch Haskell Team 
+
+_hkgname=tamarin-prover-theory
+pkgname=haskell-tamarin-prover-theory
+pkgver=1.4.0
+pkgrel=25
+pkgdesc="Security protocol types and constraint solver library for the tamarin 
prover"
+url="http://www.infsec.ethz.ch/research/software/tamarin";
+license=("GPL")
+arch=('x86_64')
+depends=('ghc-libs' 'haskell-aeson' 'haskell-aeson-pretty' 'haskell-dlist' 
'haskell-fclabels'
+ 'haskell-parallel' 'haskell-safe'
+ 'haskell-uniplate' 'haskell-tamarin-prover-utils' 
'haskell-tamarin-prover-term')
+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'
+
'5e18015155a1ac940591d7c28f3741cf56d9dd36f530895b3d9fec7865563db5c10524252d496b3d4a59c9f1ad2a9db4e2a56f31b73cf91ce1a2e698c3d6dadf')
+
+prepare() {
+cd tamarin-prover-$pkgver
+patch -p1 -i ../ghc-8.4.patch
+}
+
+build() {
+cd "${srcdir}/tamarin-prover-${pkgver}/lib/theory"
+
+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
+# haddock failed to generate
+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/theory"
+
+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-theory/repos/community-staging-x86_64/ghc-8.4.patch 
(from rev 353681, haskell-tamarin-prover-theory/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-06 14:12:55 UTC (rev 
353682)
@@ -0,0 +1,329 @@
+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/Rewriti

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

2018-07-04 Thread Felix Yan via arch-commits

Date: Wednesday, July 4, 2018 @ 17:39:42
  Author: felixonmars
Revision: 351945

archrelease: copy trunk to community-staging-x86_64

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

---+
 PKGBUILD  |   48 
 ghc-8.4.patch |  329 
 2 files changed, 377 insertions(+)

Copied: haskell-tamarin-prover-theory/repos/community-staging-x86_64/PKGBUILD 
(from rev 351944, haskell-tamarin-prover-theory/trunk/PKGBUILD)
===
--- community-staging-x86_64/PKGBUILD   (rev 0)
+++ community-staging-x86_64/PKGBUILD   2018-07-04 17:39:42 UTC (rev 351945)
@@ -0,0 +1,48 @@
+# $Id$
+# Maintainer: Felix Yan 
+# Contributor: Arch Haskell Team 
+
+_hkgname=tamarin-prover-theory
+pkgname=haskell-tamarin-prover-theory
+pkgver=1.4.0
+pkgrel=24
+pkgdesc="Security protocol types and constraint solver library for the tamarin 
prover"
+url="http://www.infsec.ethz.ch/research/software/tamarin";
+license=("GPL")
+arch=('x86_64')
+depends=('ghc-libs' 'haskell-aeson' 'haskell-aeson-pretty' 'haskell-dlist' 
'haskell-fclabels'
+ 'haskell-parallel' 'haskell-safe'
+ 'haskell-uniplate' 'haskell-tamarin-prover-utils' 
'haskell-tamarin-prover-term')
+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'
+
'5e18015155a1ac940591d7c28f3741cf56d9dd36f530895b3d9fec7865563db5c10524252d496b3d4a59c9f1ad2a9db4e2a56f31b73cf91ce1a2e698c3d6dadf')
+
+prepare() {
+cd tamarin-prover-$pkgver
+patch -p1 -i ../ghc-8.4.patch
+}
+
+build() {
+cd "${srcdir}/tamarin-prover-${pkgver}/lib/theory"
+
+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
+# haddock failed to generate
+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/theory"
+
+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-theory/repos/community-staging-x86_64/ghc-8.4.patch 
(from rev 351944, haskell-tamarin-prover-theory/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-04 17:39:42 UTC (rev 
351945)
@@ -0,0 +1,329 @@
+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/Rewr

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

2018-07-02 Thread Felix Yan via arch-commits

Date: Tuesday, July 3, 2018 @ 06:59:35
  Author: felixonmars
Revision: 350497

archrelease: copy trunk to community-staging-x86_64

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

---+
 PKGBUILD  |   48 
 ghc-8.4.patch |  329 
 2 files changed, 377 insertions(+)

Copied: haskell-tamarin-prover-theory/repos/community-staging-x86_64/PKGBUILD 
(from rev 350496, haskell-tamarin-prover-theory/trunk/PKGBUILD)
===
--- community-staging-x86_64/PKGBUILD   (rev 0)
+++ community-staging-x86_64/PKGBUILD   2018-07-03 06:59:35 UTC (rev 350497)
@@ -0,0 +1,48 @@
+# $Id$
+# Maintainer: Felix Yan 
+# Contributor: Arch Haskell Team 
+
+_hkgname=tamarin-prover-theory
+pkgname=haskell-tamarin-prover-theory
+pkgver=1.4.0
+pkgrel=23
+pkgdesc="Security protocol types and constraint solver library for the tamarin 
prover"
+url="http://www.infsec.ethz.ch/research/software/tamarin";
+license=("GPL")
+arch=('x86_64')
+depends=('ghc-libs' 'haskell-aeson' 'haskell-aeson-pretty' 'haskell-dlist' 
'haskell-fclabels'
+ 'haskell-parallel' 'haskell-safe'
+ 'haskell-uniplate' 'haskell-tamarin-prover-utils' 
'haskell-tamarin-prover-term')
+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'
+
'5e18015155a1ac940591d7c28f3741cf56d9dd36f530895b3d9fec7865563db5c10524252d496b3d4a59c9f1ad2a9db4e2a56f31b73cf91ce1a2e698c3d6dadf')
+
+prepare() {
+cd tamarin-prover-$pkgver
+patch -p1 -i ../ghc-8.4.patch
+}
+
+build() {
+cd "${srcdir}/tamarin-prover-${pkgver}/lib/theory"
+
+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
+# haddock failed to generate
+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/theory"
+
+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-theory/repos/community-staging-x86_64/ghc-8.4.patch 
(from rev 350496, haskell-tamarin-prover-theory/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 06:59:35 UTC (rev 
350497)
@@ -0,0 +1,329 @@
+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/Rewrit

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

2018-06-30 Thread Felix Yan via arch-commits

Date: Saturday, June 30, 2018 @ 20:08:43
  Author: felixonmars
Revision: 349174

archrelease: copy trunk to community-staging-x86_64

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

---+
 PKGBUILD  |   48 
 ghc-8.4.patch |  329 
 2 files changed, 377 insertions(+)

Copied: haskell-tamarin-prover-theory/repos/community-staging-x86_64/PKGBUILD 
(from rev 349173, haskell-tamarin-prover-theory/trunk/PKGBUILD)
===
--- community-staging-x86_64/PKGBUILD   (rev 0)
+++ community-staging-x86_64/PKGBUILD   2018-06-30 20:08:43 UTC (rev 349174)
@@ -0,0 +1,48 @@
+# $Id$
+# Maintainer: Felix Yan 
+# Contributor: Arch Haskell Team 
+
+_hkgname=tamarin-prover-theory
+pkgname=haskell-tamarin-prover-theory
+pkgver=1.4.0
+pkgrel=22
+pkgdesc="Security protocol types and constraint solver library for the tamarin 
prover"
+url="http://www.infsec.ethz.ch/research/software/tamarin";
+license=("GPL")
+arch=('x86_64')
+depends=('ghc-libs' 'haskell-aeson' 'haskell-aeson-pretty' 'haskell-dlist' 
'haskell-fclabels'
+ 'haskell-parallel' 'haskell-safe'
+ 'haskell-uniplate' 'haskell-tamarin-prover-utils' 
'haskell-tamarin-prover-term')
+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'
+
'5e18015155a1ac940591d7c28f3741cf56d9dd36f530895b3d9fec7865563db5c10524252d496b3d4a59c9f1ad2a9db4e2a56f31b73cf91ce1a2e698c3d6dadf')
+
+prepare() {
+cd tamarin-prover-$pkgver
+patch -p1 -i ../ghc-8.4.patch
+}
+
+build() {
+cd "${srcdir}/tamarin-prover-${pkgver}/lib/theory"
+
+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
+# haddock failed to generate
+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/theory"
+
+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-theory/repos/community-staging-x86_64/ghc-8.4.patch 
(from rev 349173, haskell-tamarin-prover-theory/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-30 20:08:43 UTC (rev 
349174)
@@ -0,0 +1,329 @@
+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/Rewr

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

2018-06-28 Thread Felix Yan via arch-commits

Date: Thursday, June 28, 2018 @ 20:16:56
  Author: felixonmars
Revision: 347616

archrelease: copy trunk to community-staging-x86_64

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

---+
 PKGBUILD  |   48 
 ghc-8.4.patch |  329 
 2 files changed, 377 insertions(+)

Copied: haskell-tamarin-prover-theory/repos/community-staging-x86_64/PKGBUILD 
(from rev 347615, haskell-tamarin-prover-theory/trunk/PKGBUILD)
===
--- community-staging-x86_64/PKGBUILD   (rev 0)
+++ community-staging-x86_64/PKGBUILD   2018-06-28 20:16:56 UTC (rev 347616)
@@ -0,0 +1,48 @@
+# $Id$
+# Maintainer: Felix Yan 
+# Contributor: Arch Haskell Team 
+
+_hkgname=tamarin-prover-theory
+pkgname=haskell-tamarin-prover-theory
+pkgver=1.4.0
+pkgrel=21
+pkgdesc="Security protocol types and constraint solver library for the tamarin 
prover"
+url="http://www.infsec.ethz.ch/research/software/tamarin";
+license=("GPL")
+arch=('x86_64')
+depends=('ghc-libs' 'haskell-aeson' 'haskell-aeson-pretty' 'haskell-dlist' 
'haskell-fclabels'
+ 'haskell-parallel' 'haskell-safe'
+ 'haskell-uniplate' 'haskell-tamarin-prover-utils' 
'haskell-tamarin-prover-term')
+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'
+
'5e18015155a1ac940591d7c28f3741cf56d9dd36f530895b3d9fec7865563db5c10524252d496b3d4a59c9f1ad2a9db4e2a56f31b73cf91ce1a2e698c3d6dadf')
+
+prepare() {
+cd tamarin-prover-$pkgver
+patch -p1 -i ../ghc-8.4.patch
+}
+
+build() {
+cd "${srcdir}/tamarin-prover-${pkgver}/lib/theory"
+
+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
+# haddock failed to generate
+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/theory"
+
+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-theory/repos/community-staging-x86_64/ghc-8.4.patch 
(from rev 347615, haskell-tamarin-prover-theory/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-28 20:16:56 UTC (rev 
347616)
@@ -0,0 +1,329 @@
+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/Rewr

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

2018-06-28 Thread Felix Yan via arch-commits

Date: Thursday, June 28, 2018 @ 13:09:20
  Author: felixonmars
Revision: 346724

archrelease: copy trunk to community-staging-x86_64

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

---+
 PKGBUILD  |   48 
 ghc-8.4.patch |  329 
 2 files changed, 377 insertions(+)

Copied: haskell-tamarin-prover-theory/repos/community-staging-x86_64/PKGBUILD 
(from rev 346723, haskell-tamarin-prover-theory/trunk/PKGBUILD)
===
--- community-staging-x86_64/PKGBUILD   (rev 0)
+++ community-staging-x86_64/PKGBUILD   2018-06-28 13:09:20 UTC (rev 346724)
@@ -0,0 +1,48 @@
+# $Id$
+# Maintainer: Felix Yan 
+# Contributor: Arch Haskell Team 
+
+_hkgname=tamarin-prover-theory
+pkgname=haskell-tamarin-prover-theory
+pkgver=1.4.0
+pkgrel=20
+pkgdesc="Security protocol types and constraint solver library for the tamarin 
prover"
+url="http://www.infsec.ethz.ch/research/software/tamarin";
+license=("GPL")
+arch=('x86_64')
+depends=('ghc-libs' 'haskell-aeson' 'haskell-aeson-pretty' 'haskell-dlist' 
'haskell-fclabels'
+ 'haskell-parallel' 'haskell-safe'
+ 'haskell-uniplate' 'haskell-tamarin-prover-utils' 
'haskell-tamarin-prover-term')
+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'
+
'5e18015155a1ac940591d7c28f3741cf56d9dd36f530895b3d9fec7865563db5c10524252d496b3d4a59c9f1ad2a9db4e2a56f31b73cf91ce1a2e698c3d6dadf')
+
+prepare() {
+cd tamarin-prover-$pkgver
+patch -p1 -i ../ghc-8.4.patch
+}
+
+build() {
+cd "${srcdir}/tamarin-prover-${pkgver}/lib/theory"
+
+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
+# haddock failed to generate
+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/theory"
+
+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-theory/repos/community-staging-x86_64/ghc-8.4.patch 
(from rev 346723, haskell-tamarin-prover-theory/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-28 13:09:20 UTC (rev 
346724)
@@ -0,0 +1,329 @@
+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/Rewr

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

2018-06-24 Thread Felix Yan via arch-commits

Date: Sunday, June 24, 2018 @ 07:27:37
  Author: felixonmars
Revision: 345029

archrelease: copy trunk to community-staging-x86_64

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

---+
 PKGBUILD  |   48 
 ghc-8.4.patch |  329 
 2 files changed, 377 insertions(+)

Copied: haskell-tamarin-prover-theory/repos/community-staging-x86_64/PKGBUILD 
(from rev 345028, haskell-tamarin-prover-theory/trunk/PKGBUILD)
===
--- community-staging-x86_64/PKGBUILD   (rev 0)
+++ community-staging-x86_64/PKGBUILD   2018-06-24 07:27:37 UTC (rev 345029)
@@ -0,0 +1,48 @@
+# $Id$
+# Maintainer: Felix Yan 
+# Contributor: Arch Haskell Team 
+
+_hkgname=tamarin-prover-theory
+pkgname=haskell-tamarin-prover-theory
+pkgver=1.4.0
+pkgrel=19
+pkgdesc="Security protocol types and constraint solver library for the tamarin 
prover"
+url="http://www.infsec.ethz.ch/research/software/tamarin";
+license=("GPL")
+arch=('x86_64')
+depends=('ghc-libs' 'haskell-aeson' 'haskell-aeson-pretty' 'haskell-dlist' 
'haskell-fclabels'
+ 'haskell-parallel' 'haskell-safe'
+ 'haskell-uniplate' 'haskell-tamarin-prover-utils' 
'haskell-tamarin-prover-term')
+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'
+
'5e18015155a1ac940591d7c28f3741cf56d9dd36f530895b3d9fec7865563db5c10524252d496b3d4a59c9f1ad2a9db4e2a56f31b73cf91ce1a2e698c3d6dadf')
+
+prepare() {
+cd tamarin-prover-$pkgver
+patch -p1 -i ../ghc-8.4.patch
+}
+
+build() {
+cd "${srcdir}/tamarin-prover-${pkgver}/lib/theory"
+
+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
+# haddock failed to generate
+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/theory"
+
+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-theory/repos/community-staging-x86_64/ghc-8.4.patch 
(from rev 345028, haskell-tamarin-prover-theory/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 07:27:37 UTC (rev 
345029)
@@ -0,0 +1,329 @@
+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/Rewrit

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

2018-06-17 Thread Felix Yan via arch-commits

Date: Monday, June 18, 2018 @ 06:45:37
  Author: felixonmars
Revision: 343609

archrelease: copy trunk to community-staging-x86_64

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

---+
 PKGBUILD  |   48 
 ghc-8.4.patch |  329 
 2 files changed, 377 insertions(+)

Copied: haskell-tamarin-prover-theory/repos/community-staging-x86_64/PKGBUILD 
(from rev 343608, haskell-tamarin-prover-theory/trunk/PKGBUILD)
===
--- community-staging-x86_64/PKGBUILD   (rev 0)
+++ community-staging-x86_64/PKGBUILD   2018-06-18 06:45:37 UTC (rev 343609)
@@ -0,0 +1,48 @@
+# $Id$
+# Maintainer: Felix Yan 
+# Contributor: Arch Haskell Team 
+
+_hkgname=tamarin-prover-theory
+pkgname=haskell-tamarin-prover-theory
+pkgver=1.4.0
+pkgrel=18
+pkgdesc="Security protocol types and constraint solver library for the tamarin 
prover"
+url="http://www.infsec.ethz.ch/research/software/tamarin";
+license=("GPL")
+arch=('x86_64')
+depends=('ghc-libs' 'haskell-aeson' 'haskell-aeson-pretty' 'haskell-dlist' 
'haskell-fclabels'
+ 'haskell-parallel' 'haskell-safe'
+ 'haskell-uniplate' 'haskell-tamarin-prover-utils' 
'haskell-tamarin-prover-term')
+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'
+
'5e18015155a1ac940591d7c28f3741cf56d9dd36f530895b3d9fec7865563db5c10524252d496b3d4a59c9f1ad2a9db4e2a56f31b73cf91ce1a2e698c3d6dadf')
+
+prepare() {
+cd tamarin-prover-$pkgver
+patch -p1 -i ../ghc-8.4.patch
+}
+
+build() {
+cd "${srcdir}/tamarin-prover-${pkgver}/lib/theory"
+
+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
+# haddock failed to generate
+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/theory"
+
+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-theory/repos/community-staging-x86_64/ghc-8.4.patch 
(from rev 343608, haskell-tamarin-prover-theory/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-18 06:45:37 UTC (rev 
343609)
@@ -0,0 +1,329 @@
+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/Rewrit

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

2018-06-03 Thread Felix Yan via arch-commits

Date: Sunday, June 3, 2018 @ 07:31:42
  Author: felixonmars
Revision: 338835

archrelease: copy trunk to community-staging-x86_64

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

---+
 PKGBUILD  |   48 
 ghc-8.4.patch |  329 
 2 files changed, 377 insertions(+)

Copied: haskell-tamarin-prover-theory/repos/community-staging-x86_64/PKGBUILD 
(from rev 338834, haskell-tamarin-prover-theory/trunk/PKGBUILD)
===
--- community-staging-x86_64/PKGBUILD   (rev 0)
+++ community-staging-x86_64/PKGBUILD   2018-06-03 07:31:42 UTC (rev 338835)
@@ -0,0 +1,48 @@
+# $Id$
+# Maintainer: Felix Yan 
+# Contributor: Arch Haskell Team 
+
+_hkgname=tamarin-prover-theory
+pkgname=haskell-tamarin-prover-theory
+pkgver=1.4.0
+pkgrel=17
+pkgdesc="Security protocol types and constraint solver library for the tamarin 
prover"
+url="http://www.infsec.ethz.ch/research/software/tamarin";
+license=("GPL")
+arch=('x86_64')
+depends=('ghc-libs' 'haskell-aeson' 'haskell-aeson-pretty' 'haskell-dlist' 
'haskell-fclabels'
+ 'haskell-parallel' 'haskell-safe'
+ 'haskell-uniplate' 'haskell-tamarin-prover-utils' 
'haskell-tamarin-prover-term')
+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'
+
'5e18015155a1ac940591d7c28f3741cf56d9dd36f530895b3d9fec7865563db5c10524252d496b3d4a59c9f1ad2a9db4e2a56f31b73cf91ce1a2e698c3d6dadf')
+
+prepare() {
+cd tamarin-prover-$pkgver
+patch -p1 -i ../ghc-8.4.patch
+}
+
+build() {
+cd "${srcdir}/tamarin-prover-${pkgver}/lib/theory"
+
+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
+# haddock failed to generate
+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/theory"
+
+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-theory/repos/community-staging-x86_64/ghc-8.4.patch 
(from rev 338834, haskell-tamarin-prover-theory/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:31:42 UTC (rev 
338835)
@@ -0,0 +1,329 @@
+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/Rewriti

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

2018-06-02 Thread Felix Yan via arch-commits

Date: Saturday, June 2, 2018 @ 13:52:18
  Author: felixonmars
Revision: 337582

archrelease: copy trunk to community-staging-x86_64

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

---+
 PKGBUILD  |   48 
 ghc-8.4.patch |  329 
 2 files changed, 377 insertions(+)

Copied: haskell-tamarin-prover-theory/repos/community-staging-x86_64/PKGBUILD 
(from rev 337581, haskell-tamarin-prover-theory/trunk/PKGBUILD)
===
--- community-staging-x86_64/PKGBUILD   (rev 0)
+++ community-staging-x86_64/PKGBUILD   2018-06-02 13:52:18 UTC (rev 337582)
@@ -0,0 +1,48 @@
+# $Id$
+# Maintainer: Felix Yan 
+# Contributor: Arch Haskell Team 
+
+_hkgname=tamarin-prover-theory
+pkgname=haskell-tamarin-prover-theory
+pkgver=1.4.0
+pkgrel=16
+pkgdesc="Security protocol types and constraint solver library for the tamarin 
prover"
+url="http://www.infsec.ethz.ch/research/software/tamarin";
+license=("GPL")
+arch=('x86_64')
+depends=('ghc-libs' 'haskell-aeson' 'haskell-aeson-pretty' 'haskell-dlist' 
'haskell-fclabels'
+ 'haskell-parallel' 'haskell-safe'
+ 'haskell-uniplate' 'haskell-tamarin-prover-utils' 
'haskell-tamarin-prover-term')
+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'
+
'5e18015155a1ac940591d7c28f3741cf56d9dd36f530895b3d9fec7865563db5c10524252d496b3d4a59c9f1ad2a9db4e2a56f31b73cf91ce1a2e698c3d6dadf')
+
+prepare() {
+cd tamarin-prover-$pkgver
+patch -p1 -i ../ghc-8.4.patch
+}
+
+build() {
+cd "${srcdir}/tamarin-prover-${pkgver}/lib/theory"
+
+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
+# haddock failed to generate
+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/theory"
+
+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-theory/repos/community-staging-x86_64/ghc-8.4.patch 
(from rev 337581, haskell-tamarin-prover-theory/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:52:18 UTC (rev 
337582)
@@ -0,0 +1,329 @@
+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/Rewri

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

2018-06-01 Thread Felix Yan via arch-commits

Date: Friday, June 1, 2018 @ 11:24:04
  Author: felixonmars
Revision: 336000

archrelease: copy trunk to community-staging-x86_64

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

---+
 PKGBUILD  |   48 
 ghc-8.4.patch |  329 
 2 files changed, 377 insertions(+)

Copied: haskell-tamarin-prover-theory/repos/community-staging-x86_64/PKGBUILD 
(from rev 335999, haskell-tamarin-prover-theory/trunk/PKGBUILD)
===
--- community-staging-x86_64/PKGBUILD   (rev 0)
+++ community-staging-x86_64/PKGBUILD   2018-06-01 11:24:04 UTC (rev 336000)
@@ -0,0 +1,48 @@
+# $Id$
+# Maintainer: Felix Yan 
+# Contributor: Arch Haskell Team 
+
+_hkgname=tamarin-prover-theory
+pkgname=haskell-tamarin-prover-theory
+pkgver=1.4.0
+pkgrel=15
+pkgdesc="Security protocol types and constraint solver library for the tamarin 
prover"
+url="http://www.infsec.ethz.ch/research/software/tamarin";
+license=("GPL")
+arch=('x86_64')
+depends=('ghc-libs' 'haskell-aeson' 'haskell-aeson-pretty' 'haskell-dlist' 
'haskell-fclabels'
+ 'haskell-parallel' 'haskell-safe'
+ 'haskell-uniplate' 'haskell-tamarin-prover-utils' 
'haskell-tamarin-prover-term')
+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'
+
'5e18015155a1ac940591d7c28f3741cf56d9dd36f530895b3d9fec7865563db5c10524252d496b3d4a59c9f1ad2a9db4e2a56f31b73cf91ce1a2e698c3d6dadf')
+
+prepare() {
+cd tamarin-prover-$pkgver
+patch -p1 -i ../ghc-8.4.patch
+}
+
+build() {
+cd "${srcdir}/tamarin-prover-${pkgver}/lib/theory"
+
+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
+# haddock failed to generate
+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/theory"
+
+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-theory/repos/community-staging-x86_64/ghc-8.4.patch 
(from rev 335999, haskell-tamarin-prover-theory/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 11:24:04 UTC (rev 
336000)
@@ -0,0 +1,329 @@
+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/Rewriti

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

2018-05-30 Thread Felix Yan via arch-commits

Date: Thursday, May 31, 2018 @ 04:43:45
  Author: felixonmars
Revision: 334113

archrelease: copy trunk to community-staging-x86_64

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

---+
 PKGBUILD  |   48 
 ghc-8.4.patch |  329 
 2 files changed, 377 insertions(+)

Copied: haskell-tamarin-prover-theory/repos/community-staging-x86_64/PKGBUILD 
(from rev 334112, haskell-tamarin-prover-theory/trunk/PKGBUILD)
===
--- community-staging-x86_64/PKGBUILD   (rev 0)
+++ community-staging-x86_64/PKGBUILD   2018-05-31 04:43:45 UTC (rev 334113)
@@ -0,0 +1,48 @@
+# $Id$
+# Maintainer: Felix Yan 
+# Contributor: Arch Haskell Team 
+
+_hkgname=tamarin-prover-theory
+pkgname=haskell-tamarin-prover-theory
+pkgver=1.4.0
+pkgrel=14
+pkgdesc="Security protocol types and constraint solver library for the tamarin 
prover"
+url="http://www.infsec.ethz.ch/research/software/tamarin";
+license=("GPL")
+arch=('x86_64')
+depends=('ghc-libs' 'haskell-aeson' 'haskell-aeson-pretty' 'haskell-dlist' 
'haskell-fclabels'
+ 'haskell-parallel' 'haskell-safe'
+ 'haskell-uniplate' 'haskell-tamarin-prover-utils' 
'haskell-tamarin-prover-term')
+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'
+
'5e18015155a1ac940591d7c28f3741cf56d9dd36f530895b3d9fec7865563db5c10524252d496b3d4a59c9f1ad2a9db4e2a56f31b73cf91ce1a2e698c3d6dadf')
+
+prepare() {
+cd tamarin-prover-$pkgver
+patch -p1 -i ../ghc-8.4.patch
+}
+
+build() {
+cd "${srcdir}/tamarin-prover-${pkgver}/lib/theory"
+
+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
+# haddock failed to generate
+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/theory"
+
+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-theory/repos/community-staging-x86_64/ghc-8.4.patch 
(from rev 334112, haskell-tamarin-prover-theory/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-31 04:43:45 UTC (rev 
334113)
@@ -0,0 +1,329 @@
+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/Rewri

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

2018-05-28 Thread Felix Yan via arch-commits

Date: Monday, May 28, 2018 @ 13:02:50
  Author: felixonmars
Revision: 332587

archrelease: copy trunk to community-staging-x86_64

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

---+
 PKGBUILD  |   48 
 ghc-8.4.patch |  329 
 2 files changed, 377 insertions(+)

Copied: haskell-tamarin-prover-theory/repos/community-staging-x86_64/PKGBUILD 
(from rev 332586, haskell-tamarin-prover-theory/trunk/PKGBUILD)
===
--- community-staging-x86_64/PKGBUILD   (rev 0)
+++ community-staging-x86_64/PKGBUILD   2018-05-28 13:02:50 UTC (rev 332587)
@@ -0,0 +1,48 @@
+# $Id$
+# Maintainer: Felix Yan 
+# Contributor: Arch Haskell Team 
+
+_hkgname=tamarin-prover-theory
+pkgname=haskell-tamarin-prover-theory
+pkgver=1.4.0
+pkgrel=13
+pkgdesc="Security protocol types and constraint solver library for the tamarin 
prover"
+url="http://www.infsec.ethz.ch/research/software/tamarin";
+license=("GPL")
+arch=('x86_64')
+depends=('ghc-libs' 'haskell-aeson' 'haskell-aeson-pretty' 'haskell-dlist' 
'haskell-fclabels'
+ 'haskell-parallel' 'haskell-safe'
+ 'haskell-uniplate' 'haskell-tamarin-prover-utils' 
'haskell-tamarin-prover-term')
+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'
+
'5e18015155a1ac940591d7c28f3741cf56d9dd36f530895b3d9fec7865563db5c10524252d496b3d4a59c9f1ad2a9db4e2a56f31b73cf91ce1a2e698c3d6dadf')
+
+prepare() {
+cd tamarin-prover-$pkgver
+patch -p1 -i ../ghc-8.4.patch
+}
+
+build() {
+cd "${srcdir}/tamarin-prover-${pkgver}/lib/theory"
+
+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
+# haddock failed to generate
+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/theory"
+
+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-theory/repos/community-staging-x86_64/ghc-8.4.patch 
(from rev 332586, haskell-tamarin-prover-theory/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-28 13:02:50 UTC (rev 
332587)
@@ -0,0 +1,329 @@
+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/Rewriti

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

2018-05-26 Thread Felix Yan via arch-commits

Date: Saturday, May 26, 2018 @ 21:45:20
  Author: felixonmars
Revision: 331263

archrelease: copy trunk to community-staging-x86_64

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

---+
 PKGBUILD  |   48 
 ghc-8.4.patch |  329 
 2 files changed, 377 insertions(+)

Copied: haskell-tamarin-prover-theory/repos/community-staging-x86_64/PKGBUILD 
(from rev 331262, haskell-tamarin-prover-theory/trunk/PKGBUILD)
===
--- community-staging-x86_64/PKGBUILD   (rev 0)
+++ community-staging-x86_64/PKGBUILD   2018-05-26 21:45:20 UTC (rev 331263)
@@ -0,0 +1,48 @@
+# $Id$
+# Maintainer: Felix Yan 
+# Contributor: Arch Haskell Team 
+
+_hkgname=tamarin-prover-theory
+pkgname=haskell-tamarin-prover-theory
+pkgver=1.4.0
+pkgrel=12
+pkgdesc="Security protocol types and constraint solver library for the tamarin 
prover"
+url="http://www.infsec.ethz.ch/research/software/tamarin";
+license=("GPL")
+arch=('x86_64')
+depends=('ghc-libs' 'haskell-aeson' 'haskell-aeson-pretty' 'haskell-dlist' 
'haskell-fclabels'
+ 'haskell-parallel' 'haskell-safe'
+ 'haskell-uniplate' 'haskell-tamarin-prover-utils' 
'haskell-tamarin-prover-term')
+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'
+
'5e18015155a1ac940591d7c28f3741cf56d9dd36f530895b3d9fec7865563db5c10524252d496b3d4a59c9f1ad2a9db4e2a56f31b73cf91ce1a2e698c3d6dadf')
+
+prepare() {
+cd tamarin-prover-$pkgver
+patch -p1 -i ../ghc-8.4.patch
+}
+
+build() {
+cd "${srcdir}/tamarin-prover-${pkgver}/lib/theory"
+
+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
+# haddock failed to generate
+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/theory"
+
+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-theory/repos/community-staging-x86_64/ghc-8.4.patch 
(from rev 331262, haskell-tamarin-prover-theory/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 21:45:20 UTC (rev 
331263)
@@ -0,0 +1,329 @@
+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/Rewri

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

2018-05-25 Thread Felix Yan via arch-commits

Date: Friday, May 25, 2018 @ 18:44:11
  Author: felixonmars
Revision: 329548

archrelease: copy trunk to community-staging-x86_64

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

---+
 PKGBUILD  |   48 
 ghc-8.4.patch |  329 
 2 files changed, 377 insertions(+)

Copied: haskell-tamarin-prover-theory/repos/community-staging-x86_64/PKGBUILD 
(from rev 329547, haskell-tamarin-prover-theory/trunk/PKGBUILD)
===
--- community-staging-x86_64/PKGBUILD   (rev 0)
+++ community-staging-x86_64/PKGBUILD   2018-05-25 18:44:11 UTC (rev 329548)
@@ -0,0 +1,48 @@
+# $Id$
+# Maintainer: Felix Yan 
+# Contributor: Arch Haskell Team 
+
+_hkgname=tamarin-prover-theory
+pkgname=haskell-tamarin-prover-theory
+pkgver=1.4.0
+pkgrel=11
+pkgdesc="Security protocol types and constraint solver library for the tamarin 
prover"
+url="http://www.infsec.ethz.ch/research/software/tamarin";
+license=("GPL")
+arch=('x86_64')
+depends=('ghc-libs' 'haskell-aeson' 'haskell-aeson-pretty' 'haskell-dlist' 
'haskell-fclabels'
+ 'haskell-parallel' 'haskell-safe'
+ 'haskell-uniplate' 'haskell-tamarin-prover-utils' 
'haskell-tamarin-prover-term')
+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'
+
'5e18015155a1ac940591d7c28f3741cf56d9dd36f530895b3d9fec7865563db5c10524252d496b3d4a59c9f1ad2a9db4e2a56f31b73cf91ce1a2e698c3d6dadf')
+
+prepare() {
+cd tamarin-prover-$pkgver
+patch -p1 -i ../ghc-8.4.patch
+}
+
+build() {
+cd "${srcdir}/tamarin-prover-${pkgver}/lib/theory"
+
+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
+# haddock failed to generate
+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/theory"
+
+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-theory/repos/community-staging-x86_64/ghc-8.4.patch 
(from rev 329547, haskell-tamarin-prover-theory/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-25 18:44:11 UTC (rev 
329548)
@@ -0,0 +1,329 @@
+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/Rewriti

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

2018-05-24 Thread Felix Yan via arch-commits

Date: Thursday, May 24, 2018 @ 13:31:25
  Author: felixonmars
Revision: 328728

archrelease: copy trunk to community-staging-x86_64

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

---+
 PKGBUILD  |   48 
 ghc-8.4.patch |  329 
 2 files changed, 377 insertions(+)

Copied: haskell-tamarin-prover-theory/repos/community-staging-x86_64/PKGBUILD 
(from rev 328727, haskell-tamarin-prover-theory/trunk/PKGBUILD)
===
--- community-staging-x86_64/PKGBUILD   (rev 0)
+++ community-staging-x86_64/PKGBUILD   2018-05-24 13:31:25 UTC (rev 328728)
@@ -0,0 +1,48 @@
+# $Id$
+# Maintainer: Felix Yan 
+# Contributor: Arch Haskell Team 
+
+_hkgname=tamarin-prover-theory
+pkgname=haskell-tamarin-prover-theory
+pkgver=1.4.0
+pkgrel=10
+pkgdesc="Security protocol types and constraint solver library for the tamarin 
prover"
+url="http://www.infsec.ethz.ch/research/software/tamarin";
+license=("GPL")
+arch=('x86_64')
+depends=('ghc-libs' 'haskell-aeson' 'haskell-aeson-pretty' 'haskell-dlist' 
'haskell-fclabels'
+ 'haskell-parallel' 'haskell-safe'
+ 'haskell-uniplate' 'haskell-tamarin-prover-utils' 
'haskell-tamarin-prover-term')
+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'
+
'5e18015155a1ac940591d7c28f3741cf56d9dd36f530895b3d9fec7865563db5c10524252d496b3d4a59c9f1ad2a9db4e2a56f31b73cf91ce1a2e698c3d6dadf')
+
+prepare() {
+cd tamarin-prover-$pkgver
+patch -p1 -i ../ghc-8.4.patch
+}
+
+build() {
+cd "${srcdir}/tamarin-prover-${pkgver}/lib/theory"
+
+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
+# haddock failed to generate
+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/theory"
+
+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-theory/repos/community-staging-x86_64/ghc-8.4.patch 
(from rev 328727, haskell-tamarin-prover-theory/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-24 13:31:25 UTC (rev 
328728)
@@ -0,0 +1,329 @@
+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/Rewri

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

2018-05-23 Thread Felix Yan via arch-commits

Date: Wednesday, May 23, 2018 @ 08:52:47
  Author: felixonmars
Revision: 328113

archrelease: copy trunk to community-staging-x86_64

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

---+
 PKGBUILD  |   48 
 ghc-8.4.patch |  329 
 2 files changed, 377 insertions(+)

Copied: haskell-tamarin-prover-theory/repos/community-staging-x86_64/PKGBUILD 
(from rev 328112, haskell-tamarin-prover-theory/trunk/PKGBUILD)
===
--- community-staging-x86_64/PKGBUILD   (rev 0)
+++ community-staging-x86_64/PKGBUILD   2018-05-23 08:52:47 UTC (rev 328113)
@@ -0,0 +1,48 @@
+# $Id$
+# Maintainer: Felix Yan 
+# Contributor: Arch Haskell Team 
+
+_hkgname=tamarin-prover-theory
+pkgname=haskell-tamarin-prover-theory
+pkgver=1.4.0
+pkgrel=9
+pkgdesc="Security protocol types and constraint solver library for the tamarin 
prover"
+url="http://www.infsec.ethz.ch/research/software/tamarin";
+license=("GPL")
+arch=('x86_64')
+depends=('ghc-libs' 'haskell-aeson' 'haskell-aeson-pretty' 'haskell-dlist' 
'haskell-fclabels'
+ 'haskell-parallel' 'haskell-safe'
+ 'haskell-uniplate' 'haskell-tamarin-prover-utils' 
'haskell-tamarin-prover-term')
+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'
+
'5e18015155a1ac940591d7c28f3741cf56d9dd36f530895b3d9fec7865563db5c10524252d496b3d4a59c9f1ad2a9db4e2a56f31b73cf91ce1a2e698c3d6dadf')
+
+prepare() {
+cd tamarin-prover-$pkgver
+patch -p1 -i ../ghc-8.4.patch
+}
+
+build() {
+cd "${srcdir}/tamarin-prover-${pkgver}/lib/theory"
+
+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
+# haddock failed to generate
+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/theory"
+
+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-theory/repos/community-staging-x86_64/ghc-8.4.patch 
(from rev 328112, haskell-tamarin-prover-theory/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:52:47 UTC (rev 
328113)
@@ -0,0 +1,329 @@
+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/Rewri

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

2018-05-18 Thread Felix Yan via arch-commits

Date: Friday, May 18, 2018 @ 08:22:09
  Author: felixonmars
Revision: 324262

archrelease: copy trunk to community-staging-x86_64

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

---+
 PKGBUILD  |   48 
 ghc-8.4.patch |  329 
 2 files changed, 377 insertions(+)

Copied: haskell-tamarin-prover-theory/repos/community-staging-x86_64/PKGBUILD 
(from rev 324261, haskell-tamarin-prover-theory/trunk/PKGBUILD)
===
--- community-staging-x86_64/PKGBUILD   (rev 0)
+++ community-staging-x86_64/PKGBUILD   2018-05-18 08:22:09 UTC (rev 324262)
@@ -0,0 +1,48 @@
+# $Id$
+# Maintainer: Felix Yan 
+# Contributor: Arch Haskell Team 
+
+_hkgname=tamarin-prover-theory
+pkgname=haskell-tamarin-prover-theory
+pkgver=1.4.0
+pkgrel=5
+pkgdesc="Security protocol types and constraint solver library for the tamarin 
prover"
+url="http://www.infsec.ethz.ch/research/software/tamarin";
+license=("GPL")
+arch=('x86_64')
+depends=('ghc-libs' 'haskell-aeson' 'haskell-aeson-pretty' 'haskell-dlist' 
'haskell-fclabels'
+ 'haskell-parallel' 'haskell-safe'
+ 'haskell-uniplate' 'haskell-tamarin-prover-utils' 
'haskell-tamarin-prover-term')
+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'
+
'5e18015155a1ac940591d7c28f3741cf56d9dd36f530895b3d9fec7865563db5c10524252d496b3d4a59c9f1ad2a9db4e2a56f31b73cf91ce1a2e698c3d6dadf')
+
+prepare() {
+cd tamarin-prover-$pkgver
+patch -p1 -i ../ghc-8.4.patch
+}
+
+build() {
+cd "${srcdir}/tamarin-prover-${pkgver}/lib/theory"
+
+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
+# haddock failed to generate
+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/theory"
+
+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-theory/repos/community-staging-x86_64/ghc-8.4.patch 
(from rev 324261, haskell-tamarin-prover-theory/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 08:22:09 UTC (rev 
324262)
@@ -0,0 +1,329 @@
+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/Rewritin

44 matches

Mail list logo