[arch-commits] Commit in haskell-store/trunk (PKGBUILD ghc-8.2.1.patch)

Felix Yan felixonmars at archlinux.org
Thu Aug 17 08:01:08 UTC 2017


    Date: Thursday, August 17, 2017 @ 08:01:07
  Author: felixonmars
Revision: 251617

upgpkg: haskell-store 0.4.3.1-36

GHC 8.2.1 rebuild

Added:
  haskell-store/trunk/ghc-8.2.1.patch
Modified:
  haskell-store/trunk/PKGBUILD

-----------------+
 PKGBUILD        |   19 ++++++++++++-------
 ghc-8.2.1.patch |   53 +++++++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 65 insertions(+), 7 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2017-08-17 07:51:31 UTC (rev 251616)
+++ PKGBUILD	2017-08-17 08:01:07 UTC (rev 251617)
@@ -4,12 +4,12 @@
 _hkgname=store
 pkgname=haskell-store
 pkgver=0.4.3.1
-pkgrel=35
+pkgrel=36
 pkgdesc="Fast binary serialization"
 url="https://github.com/fpco/store"
 license=('custom:BSD3')
 arch=('i686' 'x86_64')
-depends=('ghc' 'haskell-async' 'haskell-base-orphans' 'haskell-base64-bytestring'
+depends=('ghc-libs' 'haskell-async' 'haskell-base-orphans' 'haskell-base64-bytestring'
          'haskell-conduit' 'haskell-contravariant' 'haskell-cryptohash' 'haskell-free'
          'haskell-hashable' 'haskell-hspec' 'haskell-hspec-smallcheck' 'haskell-lifted-base'
          'haskell-monad-control' 'haskell-mono-traversable' 'haskell-network' 'haskell-primitive'
@@ -17,9 +17,17 @@
          'haskell-streaming-commons' 'haskell-store-core' 'haskell-syb' 'haskell-text'
          'haskell-th-lift' 'haskell-th-lift-instances' 'haskell-th-orphans' 'haskell-th-reify-many'
          'haskell-th-utilities' 'haskell-unordered-containers' 'haskell-vector' 'haskell-void')
-source=(https://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz)
-sha512sums=('fde163ef8ccc6a71c4db07681235be7dcebc5f37e2a222b194f1c34fdeef0fb9814383af56ded876a59bcb53bf2126b04a0272db1b05f28d093851cbc56a9f35')
+makedepends=('ghc')
+source=("https://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz"
+        ghc-8.2.1.patch)
+sha512sums=('fde163ef8ccc6a71c4db07681235be7dcebc5f37e2a222b194f1c34fdeef0fb9814383af56ded876a59bcb53bf2126b04a0272db1b05f28d093851cbc56a9f35'
+            '6b1b27bd398c2f2571ff7ee34cefb71cc00b22fab4ad1357ddba9b8a02f09f13be6d7f6ce3bf4f48202ffb5e0a81361fa6b8e1d5fdc612d22e4efed90951c4a4')
 
+prepare() {
+    cd "${srcdir}/${_hkgname}-${pkgver}"
+    patch -p1 -i ../ghc-8.2.1.patch
+}
+
 build() {
     cd "${srcdir}/${_hkgname}-${pkgver}"
 
@@ -28,7 +36,6 @@
         --dynlibdir=/usr/lib --libsubdir=\$compiler/site-local/\$pkgid \
             -f-comparison-bench -f-small-bench
     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
@@ -40,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/${_hkgname}"
     runhaskell Setup copy --destdir="${pkgdir}"
     install -D -m644 "LICENSE" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
     rm -f "${pkgdir}/usr/share/doc/${pkgname}/LICENSE"

Added: ghc-8.2.1.patch
===================================================================
--- ghc-8.2.1.patch	                        (rev 0)
+++ ghc-8.2.1.patch	2017-08-17 08:01:07 UTC (rev 251617)
@@ -0,0 +1,53 @@
+From 4b667d3b0a9cfa408ed0975e85ad279db543e9c5 Mon Sep 17 00:00:00 2001
+From: Douglas Wilson <douglas.wilson at gmail.com>
+Date: Thu, 13 Jul 2017 12:09:41 +1200
+Subject: [PATCH] Remove imports of Data.Typeable.Internal
+
+This module is removed from base in ghc-8.2. Luckily, it doesn't appear to have
+been strictly necessary.
+---
+ src/Data/Store/Internal.hs |  2 +-
+ src/Data/Store/Version.hs  | 10 +++-------
+ 2 files changed, 4 insertions(+), 8 deletions(-)
+
+diff --git a/src/Data/Store/Internal.hs b/src/Data/Store/Internal.hs
+index aa05625..7cee122 100644
+--- a/src/Data/Store/Internal.hs
++++ b/src/Data/Store/Internal.hs
+@@ -108,7 +108,7 @@ import qualified Data.Text.Array as TA
+ import qualified Data.Text.Foreign as T
+ import qualified Data.Text.Internal as T
+ import qualified Data.Time as Time
+-import           Data.Typeable.Internal (Typeable)
++import           Data.Typeable (Typeable)
+ import qualified Data.Vector as V
+ import qualified Data.Vector.Mutable as MV
+ import qualified Data.Vector.Storable as SV
+diff --git a/src/Data/Store/Version.hs b/src/Data/Store/Version.hs
+index 575a7ac..e378978 100644
+--- a/src/Data/Store/Version.hs
++++ b/src/Data/Store/Version.hs
+@@ -44,7 +44,6 @@ import qualified Data.Text as T
+ import           Data.Text.Encoding (encodeUtf8, decodeUtf8, decodeUtf8With)
+ import           Data.Text.Encoding.Error (lenientDecode)
+ import qualified Data.Text.IO as T
+-import           Data.Typeable.Internal (TypeRep(..))
+ import           Data.Word (Word32)
+ import           GHC.Generics (Generic)
+ import           Language.Haskell.TH
+@@ -230,12 +229,9 @@ getStructureInfo' ignore renames _ = do
+                 return (error "unexpected evaluation")
+ 
+ showsQualTypeRep :: M.Map String String -> Int -> TypeRep -> ShowS
+-#if MIN_VERSION_base(4,8,0)
+-showsQualTypeRep renames p (TypeRep _ tycon _ tys) =
+-#else
+-showsQualTypeRep renames p (TypeRep _ tycon tys) =
+-#endif
+-    case tys of
++showsQualTypeRep renames p tyrep =
++  let (tycon, tys) = splitTyConApp tyrep
++  in case tys of
+         [] -> showsQualTyCon renames tycon
+         [x] | tycon == tcList -> showChar '[' . showsQualTypeRep renames 0 x . showChar ']'
+           where



More information about the arch-commits mailing list