[arch-commits] Commit in tamarin-prover/trunk (PKGBUILD)

[Felix Yan]

    Date: Wednesday, September 16, 2020 @ 15:12:57
  Author: felixonmars
Revision: 708086

upgpkg: tamarin-prover 1.6.0-1

Modified:
  tamarin-prover/trunk/PKGBUILD

----------+
 PKGBUILD |   30 +++++++++++++-----------------
 1 file changed, 13 insertions(+), 17 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2020-09-16 15:00:47 UTC (rev 708085)
+++ PKGBUILD	2020-09-16 15:12:57 UTC (rev 708086)
@@ -2,35 +2,31 @@
 # Contributor: Arch Haskell Team <arch-haskell at haskell.org>
 
 pkgname=tamarin-prover
-pkgver=1.4.1
-pkgrel=425
+pkgver=1.6.0
+pkgrel=1
 pkgdesc="The Tamarin prover for security protocol analysis"
 url="https://tamarin-prover.github.io"
 license=("GPL")
 arch=('x86_64')
-depends=('ghc-libs' 'graphviz' 'maude' 'haskell-hunit' 'haskell-binary-instances' 'haskell-binary-orphans'
+depends=('ghc-libs' 'graphviz' 'maude' 'haskell-hunit' 'haskell-binary-orphans' 'haskell-binary-instances'
          'haskell-blaze-builder' 'haskell-blaze-html' 'haskell-cmdargs' 'haskell-conduit'
          'haskell-fclabels' 'haskell-file-embed' 'haskell-gitrev' 'haskell-http-types'
-         'haskell-lifted-base' 'haskell-monad-unlift'
-         'haskell-resourcet' 'haskell-safe' 'haskell-shakespeare' 'haskell-threads'
-         'haskell-wai' 'haskell-warp' 'haskell-yesod-core' 'haskell-yesod-static'
-         'haskell-tamarin-prover-utils' 'haskell-tamarin-prover-term'
-         'haskell-tamarin-prover-theory')
+         'haskell-lifted-base' 'haskell-monad-unlift' 'haskell-resourcet' 'haskell-safe'
+         'haskell-shakespeare' 'haskell-threads' 'haskell-wai' 'haskell-warp' 'haskell-yesod-core'
+         'haskell-yesod-static' 'haskell-tamarin-prover-utils' 'haskell-tamarin-prover-term'
+         'haskell-tamarin-prover-theory' 'haskell-tamarin-prover-sapic')
 optdepends=('ocaml: for sapic support')
 makedepends=('ghc' 'ocaml>=4.11.0')
 source=("tamarin-prover-$pkgver.tar.gz::https://github.com/tamarin-prover/tamarin-prover/archive/$pkgver.tar.gz")
-sha512sums=('4d3aeae02be5d430bff6c55d78656e3c9a648674d235bfeb36ce227a39abd3054a132b99ff8040abf05d8e26506fe85d21ecfb6fce73062dd45b5ba98d941144')
+sha512sums=('7f3569f740d63d715b92a8f073eaecb8b32efe59b910b246977d36bb9e873765440e72feb6e76c7cbafab0495b88cfc666bb1dd12f685627c60d5cbd97b2973e')
 
 prepare() {
-    cd "${srcdir}/${pkgname}-${pkgver}"
+    cd $pkgname-$pkgver
     sed -i '/cp sapic/d' plugins/sapic/Makefile
-
-    sed -i 's/binary-orphans/binary-instances/' $pkgname.cabal
-    sed -i 's/Data.Binary.Orphans/Data.Binary.Instances/' src/Web/Types.hs
 }
 
 build() {
-    cd "${srcdir}/${pkgname}-${pkgver}"
+    cd $pkgname-$pkgver
 
     runhaskell Setup configure -O --enable-executable-dynamic --prefix=/usr \
         --docdir="/usr/share/doc/${pkgname}" --datasubdir="$pkgname" \
@@ -42,12 +38,12 @@
 }
 
 package() {
-    cd "${srcdir}/${pkgname}-${pkgver}"
+    cd $pkgname-$pkgver
     runhaskell Setup copy --destdir="${pkgdir}"
 
     install -Dm644 etc/filetype.vim "$pkgdir"/usr/share/vim/vimfiles/ftdetect/tamarin.vim
-    install -Dm644 etc/spthy.vim "$pkgdir"/usr/share/vim/vimfiles/syntax/spthy.vim
-    install -Dm644 etc/sapic.vim "$pkgdir"/usr/share/vim/vimfiles/syntax/sapic.vim
+    install -Dm644 etc/syntax/spthy.vim "$pkgdir"/usr/share/vim/vimfiles/syntax/spthy.vim
+    ln -s spthy.vim "$pkgdir"/usr/share/vim/vimfiles/syntax/sapic.vim
 
     cd plugins/sapic
     install -Dm755 sapic "$pkgdir"/usr/bin/sapic