summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEdwardKmett <>2015-07-06 18:52:00 (GMT)
committerhdiff <hdiff@hdiff.luite.com>2015-07-06 18:52:00 (GMT)
commitd12977831b2246cd74342d5871f8e4f7da20ff9e (patch)
treec0156cce8b963cfedd047816d579bc8a49c0fec3
parent65d45b9aec95dbae175bbcadf264c127f7a37aa7 (diff)
version 0.15.0.10.15.0.1
-rw-r--r--CHANGELOG.markdown5
-rw-r--r--bytes.cabal19
-rw-r--r--src/Data/Bytes/Get.hs2
-rw-r--r--src/Data/Bytes/Put.hs2
4 files changed, 13 insertions, 15 deletions
diff --git a/CHANGELOG.markdown b/CHANGELOG.markdown
index 5efee79..094f293 100644
--- a/CHANGELOG.markdown
+++ b/CHANGELOG.markdown
@@ -1,3 +1,8 @@
+0.15.0.1
+--------
+* Updated github URLs in the .cabal file.
+* We now compile without warnings on GHC 7.10.
+
0.15
----
* Fixed a serious bug in the semantics of generic `Serial1` generation for the recursive case and improved `Generic1` support for `:.:`.
diff --git a/bytes.cabal b/bytes.cabal
index c1243ab..c42dc7a 100644
--- a/bytes.cabal
+++ b/bytes.cabal
@@ -1,14 +1,14 @@
name: bytes
category: Data, Serialization
-version: 0.15
+version: 0.15.0.1
license: BSD3
cabal-version: >= 1.8
license-file: LICENSE
author: Edward A. Kmett
maintainer: Edward A. Kmett <ekmett@gmail.com>
stability: experimental
-homepage: http://github.com/analytics/bytes
-bug-reports: http://github.com/analytics/bytes/issues
+homepage: https://github.com/ekmett/bytes
+bug-reports: https://github.com/ekmett/bytes/issues
copyright: Copyright (C) 2013-2015 Edward A. Kmett
build-type: Custom
tested-with: GHC == 7.4.1, GHC == 7.6.1
@@ -28,7 +28,7 @@ extra-source-files:
source-repository head
type: git
- location: git://github.com/analytics/bytes.git
+ location: git://github.com/ekmett/bytes.git
-- You can disable the doctests test suite with -f-test-doctests
flag test-doctests
@@ -37,11 +37,6 @@ flag test-doctests
default: True
manual: True
-flag lib-Werror
- description: Treat warnings as errors when building.
- default: False
- manual: True
-
library
build-depends:
base >= 4.3 && < 5,
@@ -66,9 +61,6 @@ library
Data.Bytes.Signed
Data.Bytes.VarInt
- if flag(lib-Werror)
- ghc-options: -Werror
-
ghc-options: -Wall -fwarn-tabs -O2
c-sources: cbits/i2d.c
hs-source-dirs: src
@@ -88,6 +80,3 @@ test-suite doctests
directory >= 1.0,
doctest >= 0.9.1,
filepath >= 1.2
-
- if impl(ghc<7.6.1)
- ghc-options: -Werror
diff --git a/src/Data/Bytes/Get.hs b/src/Data/Bytes/Get.hs
index df81428..816a6be 100644
--- a/src/Data/Bytes/Get.hs
+++ b/src/Data/Bytes/Get.hs
@@ -25,7 +25,9 @@ module Data.Bytes.Get
, runGetS
) where
+#if __GLASGOW_HASKELL__ < 710
import Control.Applicative
+#endif
import Control.Monad.Reader
import Control.Monad.Trans.Except as Except
import Control.Monad.RWS.Lazy as Lazy
diff --git a/src/Data/Bytes/Put.hs b/src/Data/Bytes/Put.hs
index da3d407..4cd7ad3 100644
--- a/src/Data/Bytes/Put.hs
+++ b/src/Data/Bytes/Put.hs
@@ -27,7 +27,9 @@ module Data.Bytes.Put
, runPutS
) where
+#if __GLASGOW_HASKELL__ < 710
import Control.Applicative
+#endif
import Control.Monad.Reader
import Control.Monad.Trans.Except as Except
import Control.Monad.RWS.Lazy as Lazy