Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Do not require old-locale if time >= 1.5 #65

Open
wants to merge 7 commits into
base: master
Choose a base branch
from
Open

Do not require old-locale if time >= 1.5 #65

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
058a04d
Do not require old-locale if time >= 1.5
ruomad Mar 20, 2018
85958f3
Fix a typo in thyme.cabal
ruomad Mar 20, 2018
9c3acb8
Update .travis.yml
ruomad Mar 20, 2018
b57edb9
Update .travis.yml
ruomad Mar 20, 2018
043cf5b
Update .travis.yml
ruomad Mar 20, 2018
c39d6ac
fix typo
ruomad Mar 20, 2018
d54c3ad
Merge branch 'master' of https://github.com/ruomad/thyme
ruomad Mar 20, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 9 additions & 12 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,21 +13,18 @@ before_cache:

matrix:
include:
- env: CABALVER=1.16 GHCVER=7.6.3
compiler: ": #GHC 7.6.3"
addons: {apt: {packages: [cabal-install-1.16,ghc-7.6.3], sources: [hvr-ghc]}}
- env: CABALVER=1.18 GHCVER=7.8.4
compiler: ": #GHC 7.8.4"
addons: {apt: {packages: [cabal-install-1.18,ghc-7.8.4], sources: [hvr-ghc]}}
- env: CABALVER=1.22 GHCVER=7.10.2
compiler: ": #GHC 7.10.2"
addons: {apt: {packages: [cabal-install-1.22,ghc-7.10.2], sources: [hvr-ghc]}}
- env: CABALVER=1.22 GHCVER=7.10.3
compiler: ": #GHC 7.10.3"
addons: {apt: {packages: [cabal-install-1.22,ghc-7.10.3], sources: [hvr-ghc]}}
- env: CABALVER=1.24 GHCVER=8.0.1
compiler: ": #GHC 8.0.1"
addons: {apt: {packages: [cabal-install-1.24,ghc-8.0.1], sources: [hvr-ghc]}}
- env: CABALVER=1.24 GHCVER=8.0.2
compiler: ": #GHC 8.0.2"
addons: {apt: {packages: [cabal-install-1.24,ghc-8.0.2], sources: [hvr-ghc]}}
- env: CABALVER=2.0 GHCVER=8.2.2
compiler: ": #GHC 8.2.2"
addons: {apt: {packages: [cabal-install-2.0,ghc-8.2.2], sources: [hvr-ghc]}}
- env: CABALVER=2.2 GHCVER=8.4.1
compiler: ": #GHC 8.4.1"
addons: {apt: {packages: [cabal-install-2.2,ghc-8.4.1], sources: [hvr-ghc]}}
- env: CABALVER=head GHCVER=head
compiler: ": #GHC head"
addons: {apt: {packages: [cabal-install-head,ghc-head], sources: [hvr-ghc]}}
Expand Down
14 changes: 12 additions & 2 deletions thyme.cabal
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,11 @@ flag show-internal
default: False
manual: True

flag old-time
description: pre-1.5 Time library
default: False
manual: False

library
default-language: Haskell2010
include-dirs: include
Expand Down Expand Up @@ -93,14 +98,19 @@ library
deepseq >= 1.2,
hashable >= 1.2,
mtl >= 1.1,
old-locale >= 1.0,
random,
text >= 0.11,
time >= 1.4,
true-name >= 0.1.0.1,
vector >= 0.9,
vector-th-unbox >= 0.2.1.0,
vector-space >= 0.8
if flag(old-time)
build-depends:
time < 1.5,
old-locale >= 1.0
else
build-depends:
time >= 1.5
if os(windows)
build-depends: Win32
if os(darwin) || os(freebsd)
Expand Down