summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichaelSloan <>2020-04-04 18:31:00 (GMT)
committerhdiff <hdiff@hdiff.luite.com>2020-04-04 18:31:00 (GMT)
commitaf34f1a6b3fd636f44211938fd35bfba5d5c81eb (patch)
treec394a6d4df2bc2c4baa78348ed5a6ed681b07e9e
parent8a9545e882b89f4b8876a63cf5ad495f4ef1ff30 (diff)
version 0.7.40.7.4
-rw-r--r--ChangeLog.md6
-rw-r--r--src/Data/Store/Internal.hs2
-rw-r--r--store.cabal4
3 files changed, 10 insertions, 2 deletions
diff --git a/ChangeLog.md b/ChangeLog.md
index 9577040..f42ef53 100644
--- a/ChangeLog.md
+++ b/ChangeLog.md
@@ -1,5 +1,11 @@
# ChangeLog
+## 0.7.4
+
+* Fix for compilation with `ghc-8.10` in `0.7.3` did not use enough
+ CPP, and so broke builds for older versions. This release fixes
+ that.
+
## 0.7.3
* Fixes compilation with `ghc-8.10`, particularly
diff --git a/src/Data/Store/Internal.hs b/src/Data/Store/Internal.hs
index 6ac1667..0c1ca39 100644
--- a/src/Data/Store/Internal.hs
+++ b/src/Data/Store/Internal.hs
@@ -399,6 +399,7 @@ instance Store BS.ByteString where
fp <- peekToPlainForeignPtr "Data.ByteString.ByteString" len
return (BS.PS fp 0 len)
+#if MIN_VERSION_template_haskell(2,16,0)
-- | Template Haskell Bytes are nearly identical to ByteString, but it
-- can't depend on ByteString.
instance Store Bytes where
@@ -412,6 +413,7 @@ instance Store Bytes where
len <- peek
fp <- peekToPlainForeignPtr "Data.ByteString.ByteString" (fromIntegral len)
return (Bytes fp 0 len)
+#endif
instance Store SBS.ShortByteString where
size = VarSize $ \x ->
diff --git a/store.cabal b/store.cabal
index 93f9092..7961c96 100644
--- a/store.cabal
+++ b/store.cabal
@@ -4,10 +4,10 @@ cabal-version: 1.12
--
-- see: https://github.com/sol/hpack
--
--- hash: e4f0078547f11838248333341a491371c654d004c243fe8f6b750d9988225242
+-- hash: b63dca2860ccf2f472bd33ec03365cee58303ec3d90dd34d9d62ecf1a7c3edcc
name: store
-version: 0.7.3
+version: 0.7.4
synopsis: Fast binary serialization
category: Serialization, Data
homepage: https://github.com/fpco/store#readme