[arch-commits] Commit in idris/trunk (PKGBUILD cheapskate-0.1.1.patch)

[Felix Yan]

    Date: Thursday, August 17, 2017 @ 10:19:16
  Author: felixonmars
Revision: 251680

upgpkg: idris 1.1.1-1

GHC 8.2.1 rebuild

Modified:
  idris/trunk/PKGBUILD
Deleted:
  idris/trunk/cheapskate-0.1.1.patch

------------------------+
 PKGBUILD               |   21 ++++++---------------
 cheapskate-0.1.1.patch |   36 ------------------------------------
 2 files changed, 6 insertions(+), 51 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2017-08-17 09:46:44 UTC (rev 251679)
+++ PKGBUILD	2017-08-17 10:19:16 UTC (rev 251680)
@@ -3,13 +3,13 @@
 # Contributor: Arch Haskell Team <arch-haskell at haskell.org>
 
 pkgname=idris
-pkgver=1.1.0
-pkgrel=12
+pkgver=1.1.1
+pkgrel=1
 pkgdesc="Functional Programming Language with Dependent Types"
 url="http://www.idris-lang.org/"
 license=("custom:BSD3")
 arch=('i686' 'x86_64')
-depends=('ghc' "haskell-aeson" "haskell-annotated-wl-pprint" "haskell-ansi-terminal"
+depends=('ghc-libs' "haskell-aeson" "haskell-annotated-wl-pprint" "haskell-ansi-terminal"
          "haskell-ansi-wl-pprint" "haskell-async" "haskell-base64-bytestring" "haskell-blaze-html"
          "haskell-blaze-markup" "haskell-cheapskate" "haskell-code-page" "haskell-fingertree"
          "haskell-fsnotify" "haskell-ieee754" "haskell-mtl" "haskell-libffi" "haskell-network"
@@ -17,19 +17,13 @@
          "haskell-split" "haskell-terminal-size" "haskell-text" "haskell-transformers-compat"
          "haskell-trifecta" "haskell-uniplate" "haskell-unordered-containers" "haskell-utf8-string"
          "haskell-vector" "haskell-vector-binary-instances" "haskell-zip-archive")
-source=("$pkgname-$pkgver.tar.gz::https://github.com/idris-lang/Idris-dev/archive/v$pkgver.tar.gz"
-        cheapskate-0.1.1.patch)
-sha512sums=('689f98315a835a623d5bfdb8419ff6888ab82e357f243f0adad47f496ee388cf521172d147855ccf63f5d95c6d4ef0977b1ec99c61b755772bd316d49daa1c44'
-            'bbde8342befd769657e5b1e19e52abd190d18c4512bec26a8431090d9e9bb97b59c4395ad89fa54990332c34b2933aee0643e46f3b37a1f747d2e12c30e549a0')
+makedepends=('ghc')
+source=("$pkgname-$pkgver.tar.gz::https://github.com/idris-lang/Idris-dev/archive/v$pkgver.tar.gz")
+sha512sums=('5768705f0ae22053214e62e79720d6d70e4bda55a8ddff45302c7b4f6c484999102100ee8146a7ec3abd823e028a7a3fecb82d67be49a9401219ef26cf7aa946')
 
 prepare() {
     cd Idris-dev-$pkgver
-    patch -p1 -i ../cheapskate-0.1.1.patch
 
-    sed -e 's/, trifecta >= 1.6 && < 1.7/, trifecta >= 1.6 \&\& < 1.8/' \
-        -e 's/, aeson >= 0.6 && < 1.2/, aeson >= 0.6 \&\& < 1.3/' \
-        -i idris.cabal
-
     sed -i '1ioverride IDRIS := env LD_PRELOAD=$(shell ls ../../dist/build/libHSidris-*-ghc*.so) $(IDRIS)' \
         libs/*/Makefile
 }
@@ -42,7 +36,6 @@
         --dynlibdir=/usr/lib --libsubdir=\$compiler/site-local/\$pkgid \
             -fFFI -fGMP -frelease -f-freestanding -f-CI -f-execonly
     LC_CTYPE=en_US.UTF-8 runhaskell Setup build
-    runhaskell Setup haddock --hoogle --html
     runhaskell Setup register --gen-script
     runhaskell Setup unregister --gen-script
     sed -i -r -e "s|ghc-pkg.*update[^ ]* |&'--force' |" register.sh
@@ -54,8 +47,6 @@
 
     install -D -m744 register.sh   "${pkgdir}/usr/share/haskell/register/${pkgname}.sh"
     install -D -m744 unregister.sh "${pkgdir}/usr/share/haskell/unregister/${pkgname}.sh"
-    install -d -m755 "${pkgdir}/usr/share/doc/ghc/html/libraries"
-    ln -s "/usr/share/doc/${pkgname}/html" "${pkgdir}/usr/share/doc/ghc/html/libraries/${pkgname}"
     runhaskell Setup copy --destdir="${pkgdir}"
     install -D -m644 "LICENSE" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
     rm -f "${pkgdir}/usr/share/doc/${pkgname}/LICENSE"

Deleted: cheapskate-0.1.1.patch
===================================================================
--- cheapskate-0.1.1.patch	2017-08-17 09:46:44 UTC (rev 251679)
+++ cheapskate-0.1.1.patch	2017-08-17 10:19:16 UTC (rev 251680)
@@ -1,36 +0,0 @@
-commit eb932ec422ecbe9ce7835b5143a40c0be882ccb7
-Author: Felix Yan <felixonmars at archlinux.org>
-Date:   Thu Aug 3 21:17:39 2017 +0800
-
-    Fix compatibility with cheapskate-0.1.1
-    
-    Only define instances for older cheapskate
-
-diff --git a/src/Idris/DeepSeq.hs b/src/Idris/DeepSeq.hs
-index 8d44075e..234e5ce6 100644
---- a/src/Idris/DeepSeq.hs
-+++ b/src/Idris/DeepSeq.hs
-@@ -5,6 +5,7 @@ Copyright   :
- License     : BSD3
- Maintainer  : The Idris Community.
- -}
-+{-# LANGUAGE CPP #-}
- {-# OPTIONS_GHC -fwarn-incomplete-patterns #-}
- 
- module Idris.DeepSeq(
-@@ -29,6 +30,7 @@ import Control.DeepSeq
- import Network.Socket (PortNumber)
- 
- -- These types don't have Generic instances
-+#if !MIN_VERSION_cheapskate(0,1,1)
- instance NFData CT.Options where
-   rnf (CT.Options x1 x2 x3 x4) = rnf x1 `seq` rnf x2 `seq` rnf x3 `seq` rnf x4 `seq` ()
- 
-@@ -42,6 +44,7 @@ instance NFData CT.CodeAttr where
- instance NFData CT.NumWrapper where
-   rnf CT.PeriodFollowing = ()
-   rnf CT.ParenFollowing = ()
-+#endif
- 
- instance NFData DynamicLib where
-     rnf (Lib x _) = rnf x `seq` ()