From d1859b4eb90aed4895a57537fd8e23ee8d349b9e Mon Sep 17 00:00:00 2001 From: Peter Harpending Date: Sat, 25 Apr 2015 16:22:27 -0600 Subject: [PATCH 1/3] Fix https://github.com/jwiegley/github/issues/99 --- Github/Data.hs | 1 - Github/Issues.hs | 2 +- Github/Private.hs | 2 +- 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/Github/Data.hs b/Github/Data.hs index 26926da7..ff39529a 100644 --- a/Github/Data.hs +++ b/Github/Data.hs @@ -11,7 +11,6 @@ import Control.Applicative import Control.Monad import qualified Data.Text as T import Data.Aeson.Types -import System.Locale (defaultTimeLocale) import qualified Data.Vector as V import qualified Data.HashMap.Lazy as Map import Data.Hashable (Hashable) diff --git a/Github/Issues.hs b/Github/Issues.hs index 88bea3fa..9934f004 100644 --- a/Github/Issues.hs +++ b/Github/Issues.hs @@ -16,8 +16,8 @@ module Github.Issues ( import Github.Data import Github.Private import Data.List (intercalate) +import Data.Time (defaultTimeLocale) import Data.Time.Format (formatTime) -import System.Locale (defaultTimeLocale) import Data.Time.Clock (UTCTime(..)) -- | A data structure for describing how to filter issues. This is used by diff --git a/Github/Private.hs b/Github/Private.hs index 3ede8800..ebb296fd 100644 --- a/Github/Private.hs +++ b/Github/Private.hs @@ -1,5 +1,5 @@ {-# LANGUAGE OverloadedStrings, StandaloneDeriving, DeriveDataTypeable #-} -{-# LANGUAGE CPP #-} +{-# LANGUAGE CPP, FlexibleContexts #-} module Github.Private where import Github.Data From 90a28e4a2b5d76e2ec2335bbae91735527776352 Mon Sep 17 00:00:00 2001 From: Peter Harpending Date: Sat, 25 Apr 2015 16:33:38 -0600 Subject: [PATCH 2/3] Use CPP for backward compatibility. --- Github/Data.hs | 10 ++++++++-- Github/Issues.hs | 7 ++++++- 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/Github/Data.hs b/Github/Data.hs index ff39529a..f9d24c8c 100644 --- a/Github/Data.hs +++ b/Github/Data.hs @@ -1,4 +1,4 @@ -{-# LANGUAGE DeriveDataTypeable, OverloadedStrings #-} +{-# LANGUAGE CPP, DeriveDataTypeable, OverloadedStrings #-} -- | This module re-exports the @Github.Data.Definitions@ module, adding -- instances of @FromJSON@ to it. If you wish to use the data without the @@ -6,7 +6,6 @@ module Github.Data (module Github.Data.Definitions) where -import Data.Time import Control.Applicative import Control.Monad import qualified Data.Text as T @@ -15,6 +14,13 @@ import qualified Data.Vector as V import qualified Data.HashMap.Lazy as Map import Data.Hashable (Hashable) +#if MIN_VERSION_base(4,8,0) +import Data.Time +#else +import Data.Time +import System.Locale (defaultTimeLocale) +#endif + import Github.Data.Definitions instance FromJSON GithubDate where diff --git a/Github/Issues.hs b/Github/Issues.hs index 9934f004..6bd03bcc 100644 --- a/Github/Issues.hs +++ b/Github/Issues.hs @@ -1,4 +1,4 @@ -{-# LANGUAGE OverloadedStrings #-} +{-# LANGUAGE CPP, OverloadedStrings #-} -- | The issues API as described on . module Github.Issues ( issue @@ -16,7 +16,12 @@ module Github.Issues ( import Github.Data import Github.Private import Data.List (intercalate) +#if MIN_VERSION_base(4, 8, 0) import Data.Time (defaultTimeLocale) +#else +import System.Locale (defaultTimeLocale) +#endif + import Data.Time.Format (formatTime) import Data.Time.Clock (UTCTime(..)) From 5c720f5183f1aeb58073fa258d7e3dafb5d25f6e Mon Sep 17 00:00:00 2001 From: Peter Harpending Date: Sat, 25 Apr 2015 18:26:47 -0600 Subject: [PATCH 3/3] Bump up version number --- github.cabal | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/github.cabal b/github.cabal index da76af0d..494a04f2 100644 --- a/github.cabal +++ b/github.cabal @@ -7,7 +7,7 @@ Name: github -- The package version. See the Haskell package versioning policy -- (http://www.haskell.org/haskellwiki/Package_versioning_policy) for -- standards guiding when and how versions should be incremented. -Version: 0.13.1 +Version: 0.13.2 -- A short (one-line) description of the package. Synopsis: Access to the Github API, v3.