Date: Saturday, September 2, 2017 @ 15:33:36 Author: felixonmars Revision: 255564
upgpkg: haskell-store 0.4.3.2-1 rebuild with store,0.4.3.2 Modified: haskell-store/trunk/PKGBUILD Deleted: haskell-store/trunk/ghc-8.2.1.patch -----------------+ PKGBUILD | 15 ++++----------- ghc-8.2.1.patch | 53 ----------------------------------------------------- 2 files changed, 4 insertions(+), 64 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2017-09-02 15:28:40 UTC (rev 255563) +++ PKGBUILD 2017-09-02 15:33:36 UTC (rev 255564) @@ -3,8 +3,8 @@ _hkgname=store pkgname=haskell-store -pkgver=0.4.3.1 -pkgrel=36 +pkgver=0.4.3.2 +pkgrel=1 pkgdesc="Fast binary serialization" url="https://github.com/fpco/store"; license=('custom:BSD3') @@ -18,16 +18,9 @@ 'haskell-th-lift' 'haskell-th-lift-instances' 'haskell-th-orphans' 'haskell-th-reify-many' 'haskell-th-utilities' 'haskell-unordered-containers' 'haskell-vector' 'haskell-void') makedepends=('ghc') -source=("https://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz"; - ghc-8.2.1.patch) -sha512sums=('fde163ef8ccc6a71c4db07681235be7dcebc5f37e2a222b194f1c34fdeef0fb9814383af56ded876a59bcb53bf2126b04a0272db1b05f28d093851cbc56a9f35' - '6b1b27bd398c2f2571ff7ee34cefb71cc00b22fab4ad1357ddba9b8a02f09f13be6d7f6ce3bf4f48202ffb5e0a81361fa6b8e1d5fdc612d22e4efed90951c4a4') +source=("https://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz";) +sha512sums=('0faa8b71cd2a078e989fb0da428d0f78cf2a7c85fb11584949e47e8a20f5f0f919d7ad82de1f6ce1e1ac33098179adc382dedb04c75db64f2654eeab60fdbb9d') -prepare() { - cd "${srcdir}/${_hkgname}-${pkgver}" - patch -p1 -i ../ghc-8.2.1.patch -} - build() { cd "${srcdir}/${_hkgname}-${pkgver}" Deleted: ghc-8.2.1.patch =================================================================== --- ghc-8.2.1.patch 2017-09-02 15:28:40 UTC (rev 255563) +++ ghc-8.2.1.patch 2017-09-02 15:33:36 UTC (rev 255564) @@ -1,53 +0,0 @@ -From 4b667d3b0a9cfa408ed0975e85ad279db543e9c5 Mon Sep 17 00:00:00 2001 -From: Douglas Wilson <douglas.wil...@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
