git.iko.soy/typeable/timezone-olson
on 22e0d60 help sign in
8 files changed+13−138
since splitsnapshots
unifiedsplit
.travis.yml−107 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+3−5
.travis.ymldeleted−107
@@ -1,107 +0,0 @@
1−# This Travis job script has been generated by a script via
2−#
3−# runghc make_travis_yml_2.hs 'timezone-olson.cabal'
4−#
5−# For more information, see https://github.com/hvr/multi-ghc-travis
6−#
7−language: c
8−sudo: false
9−
10−git:
11− submodules: false # whether to recursively clone submodules
12−
13−cache:
14− directories:
15− - $HOME/.cabal/packages
16− - $HOME/.cabal/store
17−
18−before_cache:
19− - rm -fv $HOME/.cabal/packages/hackage.haskell.org/build-reports.log
20− # remove files that are regenerated by 'cabal update'
21− - rm -fv $HOME/.cabal/packages/hackage.haskell.org/00-index.*
22− - rm -fv $HOME/.cabal/packages/hackage.haskell.org/*.json
23− - rm -fv $HOME/.cabal/packages/hackage.haskell.org/01-index.cache
24− - rm -fv $HOME/.cabal/packages/hackage.haskell.org/01-index.tar
25− - rm -fv $HOME/.cabal/packages/hackage.haskell.org/01-index.tar.idx
26−
27− - rm -rfv $HOME/.cabal/packages/head.hackage
28−
29−matrix:
30− include:
31− - compiler: "ghc-8.0.1"
32− # env: TEST=--disable-tests BENCH=--disable-benchmarks
33− addons: {apt: {packages: [ghc-ppa-tools,cabal-install-head,ghc-8.0.1], sources: [hvr-ghc]}}
34− - compiler: "ghc-8.0.2"
35− # env: TEST=--disable-tests BENCH=--disable-benchmarks
36− addons: {apt: {packages: [ghc-ppa-tools,cabal-install-head,ghc-8.0.2], sources: [hvr-ghc]}}
37− - compiler: "ghc-8.2.1"
38− # env: TEST=--disable-tests BENCH=--disable-benchmarks
39− addons: {apt: {packages: [ghc-ppa-tools,cabal-install-head,ghc-8.2.1], sources: [hvr-ghc]}}
40− - compiler: "ghc-8.2.2"
41− # env: TEST=--disable-tests BENCH=--disable-benchmarks
42− addons: {apt: {packages: [ghc-ppa-tools,cabal-install-head,ghc-8.2.2], sources: [hvr-ghc]}}
43− - compiler: "ghc-8.4.1"
44− # env: TEST=--disable-tests BENCH=--disable-benchmarks
45− addons: {apt: {packages: [ghc-ppa-tools,cabal-install-head,ghc-8.4.1], sources: [hvr-ghc]}}
46−
47−before_install:
48− - HC=${CC}
49− - HCPKG=${HC/ghc/ghc-pkg}
50− - unset CC
51− - ROOTDIR=$(pwd)
52− - mkdir -p $HOME/.local/bin
53− - "PATH=/opt/ghc/bin:/opt/ghc-ppa-tools/bin:$HOME/local/bin:$PATH"
54− - HCNUMVER=$(( $(${HC} --numeric-version|sed -E 's/([0-9]+)\.([0-9]+)\.([0-9]+).*/\1 * 10000 + \2 * 100 + \3/') ))
55− - echo $HCNUMVER
56−
57−install:
58− - cabal --version
59− - echo "$(${HC} --version) [$(${HC} --print-project-git-commit-id 2> /dev/null || echo '?')]"
60− - BENCH=${BENCH---enable-benchmarks}
61− - TEST=${TEST---enable-tests}
62− - HADDOCK=${HADDOCK-true}
63− - INSTALLED=${INSTALLED-true}
64− - GHCHEAD=${GHCHEAD-false}
65− - travis_retry cabal update -v
66− - "sed -i.bak 's/^jobs:/-- jobs:/' ${HOME}/.cabal/config"
67− - rm -fv cabal.project cabal.project.local
68− - grep -Ev -- '^\s*--' ${HOME}/.cabal/config | grep -Ev '^\s*$'
69− - "printf 'packages: \".\"\\n' > cabal.project"
70− - cat cabal.project
71− - if [ -f "./configure.ac" ]; then
72− (cd "." && autoreconf -i);
73− fi
74− - rm -f cabal.project.freeze
75− - cabal new-build -w ${HC} ${TEST} ${BENCH} --project-file="cabal.project" --dep -j2 all
76− - cabal new-build -w ${HC} --disable-tests --disable-benchmarks --project-file="cabal.project" --dep -j2 all
77− - rm -rf .ghc.environment.* "."/dist
78− - DISTDIR=$(mktemp -d /tmp/dist-test.XXXX)
79−
80−# Here starts the actual work to be performed for the package under test;
81−# any command which exits with a non-zero exit code causes the build to fail.
82−script:
83− # test that source-distributions can be generated
84− - (cd "." && cabal sdist)
85− - mv "."/dist/timezone-olson-*.tar.gz ${DISTDIR}/
86− - cd ${DISTDIR} || false
87− - find . -maxdepth 1 -name '*.tar.gz' -exec tar -xvf '{}' \;
88− - "printf 'packages: timezone-olson-*/*.cabal\\n' > cabal.project"
89− - cat cabal.project
90− # this builds all libraries and executables (without tests/benchmarks)
91− - cabal new-build -w ${HC} --disable-tests --disable-benchmarks all
92−
93− # Build with installed constraints for packages in global-db
94− - if $INSTALLED; then echo cabal new-build -w ${HC} --disable-tests --disable-benchmarks $(${HCPKG} list --global --simple-output --names-only | sed 's/\([a-zA-Z0-9-]\{1,\}\) */--constraint="\1 installed" /g') all | sh; else echo "Not building with installed constraints"; fi
95−
96− # build & run tests, build benchmarks
97− - cabal new-build -w ${HC} ${TEST} ${BENCH} all
98−
99− # cabal check
100− - (cd timezone-olson-* && cabal check)
101−
102− # haddock
103− - rm -rf ./dist-newstyle
104− - if $HADDOCK; then cabal new-haddock -w ${HC} ${TEST} ${BENCH} all; else echo "Skipping haddock generation";fi
105−
106−# REGENDATA ["timezone-olson.cabal"]
107−# EOF
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
16−{- Copyright (c) 2018 Yitzchak Gale. All rights reserved.
16+{- Copyright (c) 2010 Yitzchak Gale. All rights reserved.
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
17−{- Copyright (c) 2018 Yitzchak Gale. All rights reserved.
17+{- Copyright (c) 2010 Yitzchak Gale. All rights reserved.
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
15−{- Copyright (c) 2018ZZ Yitzchak Gale. All rights reserved.
15+{- Copyright (c) 2010 Yitzchak Gale. All rights reserved.
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
18−{- Copyright (c) 2018 Yitzchak Gale. All rights reserved.
17+{- Copyright (c) 2010 Yitzchak Gale. All rights reserved.
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 @@
1−Copyright (c) 2010-2018 Yitzchak Gale. All rights reserved.
1+Copyright (c) 2010-2015 Yitzchak Gale. All rights reserved.
22
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
22−Copyright (c) 2010-2018 Yitzchak Gale. All rights reserved.
22+Copyright (c) 2010-2015 Yitzchak Gale. All rights reserved.
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+3−5
@@ -1,5 +1,5 @@
11Name: timezone-olson
2−Version: 0.1.9
2+Version: 0.1.7
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)
@@ -20,13 +20,11 @@ License: BSD3
2020License-file: LICENSE
2121Author: Yitzchak Gale
2222Maintainer: yitz@sefer.org
23−Copyright: Copyright (c) 2010-2018 Yitzchak Gale. All rights reserved.
23+Copyright: Copyright (c) 2010-2015 Yitzchak Gale. All rights reserved.
2424Category: 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
29−
3028Source-repository HEAD
3129 type: git
3230 location: https://github.com/ygale/timezone-olson.git
@@ -39,7 +37,7 @@ Library
3937 , Data.Time.LocalTime.TimeZone.Olson.Types
4038 Build-depends: base >= 3.0 && < 5.0,
4139 timezone-series >= 0.1.0 && < 0.2,
42− time >= 1.6 && < 1.10,
40+ time >= 1.6 && < 1.9,
4341 binary >= 0.4.1 && < 0.9,
4442 bytestring >= 0.9 && < 1.0,
4543 extensible-exceptions >= 0.1.0 && < 0.2