diff --git a/.travis.yml b/.travis.yml --- a/.travis.yml +++ b/.travis.yml @@ -1,23 +1,33 @@ -env: - - GHCVER=7.4.2 CABALVER=1.16 - - GHCVER=7.6.3 CABALVER=1.18 - - GHCVER=7.8.2 CABALVER=1.20 - - GHCVER=7.10.1 CABALVER=1.22 - -before_install: - - sudo add-apt-repository -y ppa:hvr/ghc - - sudo apt-get update - - sudo apt-get install cabal-install-$CABALVER ghc-$GHCVER hlint - - cabal-$CABALVER update - - cabal-$CABALVER install happy -j - - export PATH=/opt/ghc/$GHCVER/bin:~/.cabal/bin:$PATH - -install: - - cabal-$CABALVER install --only-dependencies --enable-tests --enable-benchmarks -j - -script: - - travis/script.sh - - hlint src - +language: c +sudo: false +cache: + directories: + - $HOME/.cabsnap + - $HOME/.cabal/packages + - $HOME/tools +before_cache: + - rm -f $HOME/.cabal/packages/hackage.haskell.org/build-reports.log + - rm -f $HOME/.cabal/packages/hackage.haskell.org/00-index.tar +before_install: source travis/setup.sh +install: travis/install.sh +script: travis/script.sh matrix: + include: + - env: GHCVER=7.4.2 CABALVER=1.16 + compiler: ": #GHC 7.4.2" + addons: {apt: {packages: [cabal-install-1.16, ghc-7.4.2, alex-3.1.4, happy-1.19.5], sources: [hvr-ghc]}} + - env: GHCVER=7.6.3 CABALVER=1.18 + compiler: ": #GHC 7.6.3" + addons: {apt: {packages: [cabal-install-1.18, ghc-7.6.3, alex-3.1.4, happy-1.19.5], sources: [hvr-ghc]}} + - env: GHCVER=7.8.4 CABALVER=1.18 + compiler: ": #GHC 7.8.4" + addons: {apt: {packages: [cabal-install-1.18, ghc-7.8.4, alex-3.1.4, happy-1.19.5], sources: [hvr-ghc]}} + - env: GHCVER=7.10.2 CABALVER=1.22 ROOT=1 + compiler: ": #GHC 7.10.2" + addons: {apt: {packages: [cabal-install-1.22, ghc-7.10.2, alex-3.1.4, happy-1.19.5], sources: [hvr-ghc]}} + - env: GHCVER=head CABALVER=head ALLOW_NEWER="template-haskell" + compiler: ": #GHC head" + addons: {apt: {packages: [cabal-install-head, ghc-head, alex-3.1.4, happy-1.19.5], sources: [hvr-ghc]}} + allow_failures: + - compiler: ": #GHC head" fast_finish: true diff --git a/.vim.custom b/.vim.custom deleted file mode 100644 --- a/.vim.custom +++ /dev/null @@ -1,31 +0,0 @@ -" Add the following to your .vimrc to automatically load this on startup - -" if filereadable(".vim.custom") -" so .vim.custom -" endif - -function StripTrailingWhitespace() - let myline=line(".") - let mycolumn = col(".") - silent %s/ *$// - call cursor(myline, mycolumn) -endfunction - -" enable syntax highlighting -syntax on - -" search for the tags file anywhere between here and / -set tags=TAGS;/ - -" highlight tabs and trailing spaces -set listchars=tab:‗‗,trail:‗ -set list - -" f2 runs hasktags -map :exec ":!hasktags -x -c --ignore src" - -" strip trailing whitespace before saving -" au BufWritePre *.hs,*.markdown silent! cal StripTrailingWhitespace() - -" rebuild hasktags after saving -au BufWritePost *.hs silent! :exec ":!hasktags -x -c --ignore src" diff --git a/LICENSE b/LICENSE --- a/LICENSE +++ b/LICENSE @@ -1,4 +1,4 @@ -Copyright 2013-2014 Benno Fünfstück +Copyright 2013-2015 Benno Fünfstück All rights reserved. diff --git a/src/Instances/TH/Lift.hs b/src/Instances/TH/Lift.hs --- a/src/Instances/TH/Lift.hs +++ b/src/Instances/TH/Lift.hs @@ -46,7 +46,8 @@ ) where -import Language.Haskell.TH.Lift +import Language.Haskell.TH.Lift (deriveLift) +import Language.Haskell.TH.Syntax (Lift(..)) import qualified Data.Foldable as F diff --git a/th-lift-instances.cabal b/th-lift-instances.cabal --- a/th-lift-instances.cabal +++ b/th-lift-instances.cabal @@ -1,75 +1,72 @@ -name: th-lift-instances -version: 0.1.5 -license: BSD3 -cabal-version: >= 1.10 -license-file: LICENSE -author: Benno Fünfstück -maintainer: Benno Fünfstück -stability: experimental -homepage: http://github.com/bennofs/th-lift-instances/ -bug-reports: http://github.com/bennofs/th-lift-instances/issues -copyright: Copyright (C) 2013-2014 Benno Fünfstück -synopsis: Lift instances for template-haskell for common data types. -description: Most data types in haskell platform do not have Lift instances. This package provides orphan instances - for containers, text, bytestring and vector. -build-type: Custom -category: Template Haskell - +name: th-lift-instances +version: 0.1.6 +cabal-version: >=1.10 +build-type: Custom +license: BSD3 +license-file: LICENSE +copyright: Copyright (C) 2013-2015 Benno Fünfstück +maintainer: Benno Fünfstück +stability: experimental +homepage: http://github.com/bennofs/th-lift-instances/ +bug-reports: http://github.com/bennofs/th-lift-instances/issues +synopsis: Lift instances for template-haskell for common data types. +description: + Most data types in haskell platform do not have Lift instances. This package provides orphan instances + for containers, text, bytestring and vector. +category: Template Haskell +author: Benno Fünfstück extra-source-files: - .ghci - .gitignore - .travis.yml - .vim.custom - README.md + .ghci + .gitignore + .travis.yml + README.md source-repository head - type: git - location: https://github.com/bennofs/th-lift-instances.git + type: git + location: https://github.com/bennofs/th-lift-instances.git library - hs-source-dirs: src - default-language: Haskell2010 - ghc-options: -Wall -fwarn-tabs - build-depends: - base >= 4.4 && < 5 - , template-haskell - , th-lift - , containers >= 0.4 && < 0.6 - , vector >= 0.9 && < 0.11 - , text >= 0.11 && < 1.3 - , bytestring >= 0.9 && < 0.11 - exposed-modules: - Instances.TH.Lift - other-extensions: TemplateHaskell + exposed-modules: + Instances.TH.Lift + build-depends: + base >=4.4 && <4.9, + template-haskell, + th-lift <0.8, + containers >=0.4 && <0.6, + vector >=0.9 && <0.12, + text >=0.11 && <1.3, + bytestring >=0.9 && <0.11 + default-language: Haskell2010 + other-extensions: TemplateHaskell + hs-source-dirs: src + ghc-options: -Wall -fwarn-tabs test-suite tests - type: exitcode-stdio-1.0 - main-is: Main.hs - other-modules: - Data - default-language: Haskell2010 - build-depends: - base - , template-haskell - , containers >= 0.4 && < 0.6 - , vector >= 0.9 && < 0.11 - , text >= 0.11 && < 1.3 - , bytestring >= 0.9 && < 0.11 - , th-lift-instances - , QuickCheck >= 2.6 && < 2.8 - hs-source-dirs: tests - other-extensions: TemplateHaskell + type: exitcode-stdio-1.0 + main-is: Main.hs + build-depends: + base <4.9, + template-haskell, + containers >=0.4 && <0.6, + vector >=0.9 && <0.12, + text >=0.11 && <1.3, + bytestring >=0.9 && <0.12, + th-lift-instances -any, + QuickCheck >=2.6 && <2.9 + default-language: Haskell2010 + other-extensions: TemplateHaskell + hs-source-dirs: tests + other-modules: + Data test-suite doctests - type: exitcode-stdio-1.0 - main-is: doctests.hs - default-language: Haskell2010 - build-depends: - base - , directory >= 1.0 - , doctest >= 0.9.1 - , filepath - ghc-options: -Wall -threaded - if impl(ghc<7.6.1) - ghc-options: -Werror - hs-source-dirs: tests + type: exitcode-stdio-1.0 + main-is: doctests.hs + build-depends: + base <4.9, + directory >=1.0 && <1.3, + doctest >=0.9.1 && <0.11, + filepath <1.5 + default-language: Haskell2010 + hs-source-dirs: tests + ghc-options: -Wall -threaded