master..546c9e9 · typeable/timezone-olson

git.iko.soy/typeable/timezone-olson

8 files changed+48−28

unifiedsplit

.travis.yml+36 Data/Time/LocalTime/TimeZone/Olson.hs+2−2 Data/Time/LocalTime/TimeZone/Olson/Parse.hs+2−2 Data/Time/LocalTime/TimeZone/Olson/Render.hs+2−2 Data/Time/LocalTime/TimeZone/Olson/Types.hs+2−18 LICENSE+1−1 README.md+1−1 timezone-olson.cabal+2−2

.travis.yml+36

@@ -28,6 +28,42 @@ before_cache:

2828

2929matrix:

3030 include:

31+ - compiler: "ghc-7.4.1"

32+ # env: TEST=--disable-tests BENCH=--disable-benchmarks

33+ addons: {apt: {packages: [ghc-ppa-tools,cabal-install-head,ghc-7.4.1], sources: [hvr-ghc]}}

34+ - compiler: "ghc-7.4.2"

35+ # env: TEST=--disable-tests BENCH=--disable-benchmarks

36+ addons: {apt: {packages: [ghc-ppa-tools,cabal-install-head,ghc-7.4.2], sources: [hvr-ghc]}}

37+ - compiler: "ghc-7.6.1"

38+ # env: TEST=--disable-tests BENCH=--disable-benchmarks

39+ addons: {apt: {packages: [ghc-ppa-tools,cabal-install-head,ghc-7.6.1], sources: [hvr-ghc]}}

40+ - compiler: "ghc-7.6.2"

41+ # env: TEST=--disable-tests BENCH=--disable-benchmarks

42+ addons: {apt: {packages: [ghc-ppa-tools,cabal-install-head,ghc-7.6.2], sources: [hvr-ghc]}}

43+ - compiler: "ghc-7.6.3"

44+ # env: TEST=--disable-tests BENCH=--disable-benchmarks

45+ addons: {apt: {packages: [ghc-ppa-tools,cabal-install-head,ghc-7.6.3], sources: [hvr-ghc]}}

46+ - compiler: "ghc-7.8.1"

47+ # env: TEST=--disable-tests BENCH=--disable-benchmarks

48+ addons: {apt: {packages: [ghc-ppa-tools,cabal-install-head,ghc-7.8.1], sources: [hvr-ghc]}}

49+ - compiler: "ghc-7.8.2"

50+ # env: TEST=--disable-tests BENCH=--disable-benchmarks

51+ addons: {apt: {packages: [ghc-ppa-tools,cabal-install-head,ghc-7.8.2], sources: [hvr-ghc]}}

52+ - compiler: "ghc-7.8.3"

53+ # env: TEST=--disable-tests BENCH=--disable-benchmarks

54+ addons: {apt: {packages: [ghc-ppa-tools,cabal-install-head,ghc-7.8.3], sources: [hvr-ghc]}}

55+ - compiler: "ghc-7.8.4"

56+ # env: TEST=--disable-tests BENCH=--disable-benchmarks

57+ addons: {apt: {packages: [ghc-ppa-tools,cabal-install-head,ghc-7.8.4], sources: [hvr-ghc]}}

58+ - compiler: "ghc-7.10.1"

59+ # env: TEST=--disable-tests BENCH=--disable-benchmarks

60+ addons: {apt: {packages: [ghc-ppa-tools,cabal-install-head,ghc-7.10.1], sources: [hvr-ghc]}}

61+ - compiler: "ghc-7.10.2"

62+ # env: TEST=--disable-tests BENCH=--disable-benchmarks

63+ addons: {apt: {packages: [ghc-ppa-tools,cabal-install-head,ghc-7.10.2], sources: [hvr-ghc]}}

64+ - compiler: "ghc-7.10.3"

65+ # env: TEST=--disable-tests BENCH=--disable-benchmarks

66+ addons: {apt: {packages: [ghc-ppa-tools,cabal-install-head,ghc-7.10.3], sources: [hvr-ghc]}}

3167 - compiler: "ghc-8.0.1"

3268 # env: TEST=--disable-tests BENCH=--disable-benchmarks

3369 addons: {apt: {packages: [ghc-ppa-tools,cabal-install-head,ghc-8.0.1], sources: [hvr-ghc]}}

Data/Time/LocalTime/TimeZone/Olson.hs+2−2

@@ -1,7 +1,7 @@

11-----------------------------------------------------------------------------

22-- |

33-- Module : Data.Time.LocalTime.TimeZone.Olson

4−-- Copyright : Yitzchak Gale 2018

4+-- Copyright : Yitzchak Gale 2010

55--

66-- Maintainer : Yitzchak Gale <gale@sefer.org>

77-- Portability : portable

@@ -13,7 +13,7 @@

1313-- converting the parsed data into @TimeZoneSeries@ and @TimeZone@

1414-- objects.

1515

1717For licensing information, see the BSD3-style license in the file

1818LICENSE that was originally distributed by the author together with

1919this file. -}

Data/Time/LocalTime/TimeZone/Olson/Parse.hs+2−2

@@ -3,7 +3,7 @@

33-----------------------------------------------------------------------------

44-- |

55-- Module : Data.Time.LocalTime.TimeZone.Olson.Parse

6−-- Copyright : Yitzchak Gale 2018

6+-- Copyright : Yitzchak Gale 2010

77--

88-- Maintainer : Yitzchak Gale <gale@sefer.org>

99-- Portability : portable

@@ -14,7 +14,7 @@

1414-- <http://www.twinsun.com/tz/tz-link.htm>. Functions are provided for

1515-- converting the parsed data into 'TimeZoneSeries' objects.

1616

1818For licensing information, see the BSD3-style license in the file

1919LICENSE that was originally distributed by the author together with

2020this file. -}

Data/Time/LocalTime/TimeZone/Olson/Render.hs+2−2

@@ -2,7 +2,7 @@

22-----------------------------------------------------------------------------

33-- |

44-- Module : Data.Time.LocalTime.TimeZone.Olson.Render

5−-- Copyright : Yitzchak Gale 2018

5+-- Copyright : Yitzchak Gale 2010

66--

77-- Maintainer : Yitzchak Gale <gale@sefer.org>

88-- Portability : portable

@@ -12,7 +12,7 @@

1212-- Unix-like systems. For more information about this format, see

1313-- <http://www.twinsun.com/tz/tz-link.htm>.

1414

1616For licensing information, see the BSD3-style license in the file

1717LICENSE that was originally distributed by the author together with

1818this file. -}

Data/Time/LocalTime/TimeZone/Olson/Types.hs+2−18

@@ -1,9 +1,8 @@

11{-# OPTIONS_HADDOCK hide #-}

2−{-# LANGUAGE CPP #-}

32-----------------------------------------------------------------------------

43-- |

54-- Module : Data.Time.LocalTime.TimeZone.Olson.Types

6−-- Copyright : Yitzchak Gale 2018

5+-- Copyright : Yitzchak Gale 2010

76--

87-- Maintainer : Yitzchak Gale <gale@sefer.org>

98-- Portability : portable

@@ -15,7 +14,7 @@

1514--

1615-- Both Version 1 and Version 2 timezone data can be represented.

1716

1918For licensing information, see the BSD3-style license in the file

2019LICENSE that was originally distributed by the author together with

2120this file. -}

@@ -37,9 +36,6 @@ module Data.Time.LocalTime.TimeZone.Olson.Types

3736)

3837where

3938

40−#if MIN_VERSION_base(4,11,0)

41−import Data.Semigroup (Semigroup(..))

42−#endif

4339import Data.Monoid (Monoid(..))

4440import Control.Monad (mplus)

4541

@@ -75,17 +71,6 @@ data OlsonData =

7571 }

7672 deriving (Eq, Show)

7773

78−#if MIN_VERSION_base(4,11,0)

79−instance Semigroup OlsonData where

80− OlsonData a b c d <> OlsonData a' b' c' d' =

81− OlsonData (a ++ map (shiftBy $ length b) a')

82− (b ++ b') (c ++ c') (d `mplus` d')

83− where

84− shiftBy n trans = trans {transIndex = n + transIndex trans}

85−

86−instance Monoid OlsonData where

87− mempty = OlsonData [] [] [] Nothing

88−#else

8974instance Monoid OlsonData where

9075 mempty = OlsonData [] [] [] Nothing

9176 mappend (OlsonData a b c d ) (OlsonData a' b' c' d') =

@@ -93,7 +78,6 @@ instance Monoid OlsonData where

9378 (b ++ b') (c ++ c') (d `mplus` d')

9479 where

9580 shiftBy n trans = trans {transIndex = n + transIndex trans}

96−#endif

9781

9882-- | A @Transition@ represents a moment when the clocks change in a

9983-- timezone. It consists of a Unix timestamp value that indicates the

LICENSE+1−1

@@ -1,4 +1,4 @@

33Redistribution and use in source and binary forms, with or without

44modification, are permitted provided that the following conditions are

README.md+1−1

@@ -19,7 +19,7 @@ See also the

1919package for a way to include timezone informaton from a binary Olson

2020timezone file at compile time.

2121

2323

2424For licensing information, see the BSD3-style license in the file

2525LICENSE that was originally distributed by the author together with

timezone-olson.cabal+2−2

@@ -1,5 +1,5 @@

11Name: timezone-olson

2−Version: 0.1.9

2+Version: 0.1.8

33Synopsis: A pure Haskell parser and renderer for binary Olson timezone files

44Description: A parser and renderer for binary Olson timezone

55 files whose format is specified by the tzfile(5)

@@ -25,7 +25,7 @@ Category: Data

2525Build-type: Simple

2626Extra-source-files: README.md, catTZ.hs, hzdump.hs

2727Cabal-version: >=1.10

28−Tested-with: GHC > 8.0 && < 8.5

28+Tested-with: GHC > 7.4 && < 8.5

2929

3030Source-repository HEAD

3131 type: git