diff --git a/changelog.md b/changelog.md --- a/changelog.md +++ b/changelog.md @@ -1,5 +1,9 @@ # Change Log +## [1.6.0.1] +- Get building with earlier GHC versions +- Set lower bound of base correctly + ## [1.6] ### Added diff --git a/configure b/configure --- a/configure +++ b/configure @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for Haskell time package 1.4.0.2. +# Generated by GNU Autoconf 2.69 for Haskell time package 1.6.0.1. # # Report bugs to . # @@ -580,8 +580,8 @@ # Identity of this package. PACKAGE_NAME='Haskell time package' PACKAGE_TARNAME='time' -PACKAGE_VERSION='1.4.0.2' -PACKAGE_STRING='Haskell time package 1.4.0.2' +PACKAGE_VERSION='1.6.0.1' +PACKAGE_STRING='Haskell time package 1.6.0.1' PACKAGE_BUGREPORT='ashley@semantic.org' PACKAGE_URL='' @@ -1228,7 +1228,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures Haskell time package 1.4.0.2 to adapt to many kinds of systems. +\`configure' configures Haskell time package 1.6.0.1 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1289,7 +1289,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of Haskell time package 1.4.0.2:";; + short | recursive ) echo "Configuration of Haskell time package 1.6.0.1:";; esac cat <<\_ACEOF @@ -1376,7 +1376,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -Haskell time package configure 1.4.0.2 +Haskell time package configure 1.6.0.1 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -1848,7 +1848,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by Haskell time package $as_me 1.4.0.2, which was +It was created by Haskell time package $as_me 1.6.0.1, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -4125,7 +4125,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by Haskell time package $as_me 1.4.0.2, which was +This file was extended by Haskell time package $as_me 1.6.0.1, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -4178,7 +4178,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -Haskell time package config.status 1.4.0.2 +Haskell time package config.status 1.6.0.1 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff --git a/configure.ac b/configure.ac --- a/configure.ac +++ b/configure.ac @@ -1,14 +1,15 @@ -AC_INIT([Haskell time package], [1.6], [ashley@semantic.org], [time]) +AC_INIT([Haskell time package], [1.6.0.1], [ashley@semantic.org], [time]) # Safety check: Ensure that we are in the correct source directory. AC_CONFIG_SRCDIR([lib/include/HsTime.h]) -AC_ARG_WITH([cc], - [C compiler], - [CC=$withval]) +# These are to silence warnings with older Cabal versions AC_ARG_WITH([gcc],[Gnu C compiler]) AC_ARG_WITH([compiler],[Haskell compiler]) + AC_PROG_CC() + +AC_USE_SYSTEM_EXTENSIONS AC_CONFIG_HEADERS([lib/include/HsTimeConfig.h]) diff --git a/lib/Data/Time/Format/Parse.hs b/lib/Data/Time/Format/Parse.hs --- a/lib/Data/Time/Format/Parse.hs +++ b/lib/Data/Time/Format/Parse.hs @@ -27,6 +27,9 @@ import Data.Time.LocalTime.TimeOfDay import Data.Time.LocalTime.LocalTime +#if !MIN_VERSION_base(4,8,0) +import Control.Applicative ((<$>),(<*>)) +#endif #if LANGUAGE_Rank2Types import Control.Monad #endif diff --git a/lib/include/HsTimeConfig.h b/lib/include/HsTimeConfig.h --- a/lib/include/HsTimeConfig.h +++ b/lib/include/HsTimeConfig.h @@ -69,7 +69,7 @@ #define PACKAGE_NAME "Haskell time package" /* Define to the full name and version of this package. */ -#define PACKAGE_STRING "Haskell time package 1.4.0.2" +#define PACKAGE_STRING "Haskell time package 1.6.0.1" /* Define to the one symbol short name of this package. */ #define PACKAGE_TARNAME "time" @@ -78,7 +78,7 @@ #define PACKAGE_URL "" /* Define to the version of this package. */ -#define PACKAGE_VERSION "1.4.0.2" +#define PACKAGE_VERSION "1.6.0.1" /* Define to 1 if you have the ANSI C header files. */ #define STDC_HEADERS 1 diff --git a/time.cabal b/time.cabal --- a/time.cabal +++ b/time.cabal @@ -1,5 +1,5 @@ name: time -version: 1.6 +version: 1.6.0.1 stability: stable license: BSD3 license-file: LICENSE @@ -12,6 +12,7 @@ category: System build-type: Configure cabal-version: >=1.10 +tested-with: GHC == 8.0.1, GHC == 7.10.3, GHC == 7.8.4 x-follows-version-policy: extra-source-files: @@ -49,7 +50,7 @@ cpp-options: -DLANGUAGE_Rank2Types ghc-options: -Wall -fwarn-tabs build-depends: - base >= 4.3 && < 5, + base >= 4.7 && < 5, deepseq >= 1.1 if os(windows) build-depends: Win32 @@ -99,7 +100,7 @@ ghc-options: -Wall -fwarn-tabs build-depends: base, - time == 1.6 + time == 1.6.0.1 main-is: ShowDefaultTZAbbreviations.hs test-suite tests @@ -121,7 +122,7 @@ build-depends: base, deepseq, - time == 1.6, + time == 1.6.0.1, QuickCheck >= 2.5.1, test-framework >= 0.8, test-framework-quickcheck2 >= 0.3,