From 058a04daa7dca28c123d1cab5d48d482a8caa573 Mon Sep 17 00:00:00 2001 From: Bruno Damour Date: Tue, 20 Mar 2018 14:42:34 +0100 Subject: [PATCH 1/6] Do not require old-locale if time >= 1.5 --- thyme.cabal | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/thyme.cabal b/thyme.cabal index 893de5f..2f80327 100644 --- a/thyme.cabal +++ b/thyme.cabal @@ -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 @@ -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) From 85958f3ec0d0f319218e544ca116e0d73a786c43 Mon Sep 17 00:00:00 2001 From: Bruno Damour Date: Tue, 20 Mar 2018 15:04:43 +0100 Subject: [PATCH 2/6] Fix a typo in thyme.cabal --- thyme.cabal | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/thyme.cabal b/thyme.cabal index 2f80327..4addf01 100644 --- a/thyme.cabal +++ b/thyme.cabal @@ -55,7 +55,7 @@ flag show-internal flag old-time description: pre-1.5 time library - default: false + default: False manual: False library From 9c3acb80111da275dde2d1689744207a858c9661 Mon Sep 17 00:00:00 2001 From: ruomad Date: Tue, 20 Mar 2018 15:39:06 +0100 Subject: [PATCH 3/6] Update .travis.yml --- .travis.yml | 21 +++++++++------------ 1 file changed, 9 insertions(+), 12 deletions(-) diff --git a/.travis.yml b/.travis.yml index 0b696e7..5acff86 100644 --- a/.travis.yml +++ b/.travis.yml @@ -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]}} From b57edb97ba487ff70147c1b62a6ba2c9fe7f3a08 Mon Sep 17 00:00:00 2001 From: ruomad Date: Tue, 20 Mar 2018 15:51:25 +0100 Subject: [PATCH 4/6] Update .travis.yml --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 5acff86..7c24aa4 100644 --- a/.travis.yml +++ b/.travis.yml @@ -80,7 +80,7 @@ script: - cabal build # this builds all libraries and executables (including tests/benchmarks) - cabal test - cabal check - - cabal sdist # tests that a source-distribution can be generated + - cabal sdist # tests that a source-distribution can be generated # Check that the resulting source distribution can be built & installed. # If there are no other `.tar.gz` files in `dist`, this can be even simpler: From 043cf5b1c2a1175af59dcd238d8f6131dcee9ede Mon Sep 17 00:00:00 2001 From: ruomad Date: Tue, 20 Mar 2018 15:52:53 +0100 Subject: [PATCH 5/6] Update .travis.yml --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 7c24aa4..5acff86 100644 --- a/.travis.yml +++ b/.travis.yml @@ -80,7 +80,7 @@ script: - cabal build # this builds all libraries and executables (including tests/benchmarks) - cabal test - cabal check - - cabal sdist # tests that a source-distribution can be generated + - cabal sdist # tests that a source-distribution can be generated # Check that the resulting source distribution can be built & installed. # If there are no other `.tar.gz` files in `dist`, this can be even simpler: From c39d6ace042e2d035661d9e4dd18a1a3dce4fef9 Mon Sep 17 00:00:00 2001 From: Bruno Damour Date: Tue, 20 Mar 2018 16:05:20 +0100 Subject: [PATCH 6/6] fix typo --- thyme.cabal | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/thyme.cabal b/thyme.cabal index 4addf01..4ff786d 100644 --- a/thyme.cabal +++ b/thyme.cabal @@ -54,7 +54,7 @@ flag show-internal manual: True flag old-time - description: pre-1.5 time library + description: pre-1.5 Time library default: False manual: False