diff --git a/bin/penny-main.hs b/bin/penny-main.hs --- a/bin/penny-main.hs +++ b/bin/penny-main.hs @@ -1,6 +1,7 @@ module Main where import Penny +import Data.Monoid import qualified Paths_penny as PPB -- | This type contains settings for all the reports, as well as diff --git a/current-versions.txt b/current-versions.txt --- a/current-versions.txt +++ b/current-versions.txt @@ -1,7 +1,7 @@ This package was tested to work with these dependency versions and compiler version. These are the default versions fetched by cabal install. -Tested as of: 2014-03-01 19:18:06.035563 UTC +Tested as of: 2014-03-08 16:59:06.573315 UTC Path to compiler: ghc-7.6.3 Compiler description: 7.6.3 @@ -32,7 +32,7 @@ time-1.4.0.1 unix-2.6.0.1 -/home/massysett/penny/sunlight-31079/db: +/home/massysett/penny/sunlight-15431/db: MonadRandom-0.1.13 QuickCheck-2.6 action-permutations-0.0.0.0 @@ -52,10 +52,10 @@ nats-0.1.2 ofx-0.4.0.2 parsec-3.1.5 - penny-0.32.0.4 + penny-0.32.0.6 prednote-0.18.0.4 pretty-show-1.6.7 - rainbow-0.6.0.4 + rainbow-0.12.0.0 random-1.0.1.1 random-shuffle-0.0.4 semigroupoids-4.0 @@ -63,7 +63,7 @@ split-0.2.2 tagged-0.7 terminfo-0.4.0.0 - text-1.1.0.0 + text-1.1.0.1 transformers-0.3.0.0 transformers-base-0.4.1 transformers-compat-0.1.1.1 diff --git a/lib/Penny/Wheat.hs b/lib/Penny/Wheat.hs --- a/lib/Penny/Wheat.hs +++ b/lib/Penny/Wheat.hs @@ -166,7 +166,10 @@ main ver getWc = do rt <- S.runtime (conf, args) <- parseArgs ver (getWc rt) - term <- Rb.smartTermFromEnv (colorToFile conf) IO.stdout + term <- + if colorToFile conf + then Rb.termFromEnv + else Rb.smartTermFromEnv IO.stdout items <- Cop.open args let pstgs = getItems items formatter = formatQty conf items diff --git a/minimum-versions.txt b/minimum-versions.txt --- a/minimum-versions.txt +++ b/minimum-versions.txt @@ -1,7 +1,7 @@ This package was tested to work with these dependency versions and compiler version. These are the minimum versions given in the .cabal file. -Tested as of: 2014-03-01 19:18:06.035563 UTC +Tested as of: 2014-03-08 16:59:06.573315 UTC Path to compiler: ghc-7.4.1 Compiler description: 7.4.1 @@ -33,7 +33,7 @@ time-1.4 unix-2.5.1.0 -/home/massysett/penny/sunlight-31079/db: +/home/massysett/penny/sunlight-15431/db: MonadRandom-0.1.13 QuickCheck-2.5 action-permutations-0.0.0.0 @@ -49,10 +49,10 @@ nats-0.1.2 ofx-0.4.0.2 parsec-3.1.3 - penny-0.32.0.4 + penny-0.32.0.6 prednote-0.18.0.4 pretty-show-1.5 - rainbow-0.6.0.4 + rainbow-0.12.0.0 random-1.0.0.0 random-shuffle-0.0.4 semigroupoids-3.1 diff --git a/penny.cabal b/penny.cabal --- a/penny.cabal +++ b/penny.cabal @@ -3,7 +3,7 @@ -- penny.cabal for you. Name: penny -Version: 0.32.0.4 +Version: 0.32.0.6 Cabal-version: >=1.8 Build-Type: Simple License: BSD3 @@ -69,7 +69,7 @@ , multiarg >= 0.24.0.4 && < 0.25.0.0 , ofx >= 0.4.0.2 , prednote >= 0.18.0.4 && < 0.19.0.0 - , rainbow >= 0.6.0.4 + , rainbow >= 0.12.0.0 -- Other packages -- Package Version @@ -183,7 +183,7 @@ -- http://stackoverflow.com/questions/6711151 build-depends: - penny == 0.32.0.4 + penny == 0.32.0.6 , base >= 4.5.0.0 && < 5 -- Packages I maintain @@ -210,7 +210,7 @@ if flag(build-gibberish) build-depends: - penny == 0.32.0.4 + penny == 0.32.0.6 , base >= 4.5.0.0 && < 5 -- Packages I maintain @@ -236,7 +236,7 @@ Executable penny Build-depends: - penny ==0.32.0.4 + penny ==0.32.0.6 , base >= 4.5.0.0 && < 5 hs-source-dirs: bin @@ -255,7 +255,7 @@ Executable penny-selloff Build-depends: - penny == 0.32.0.4 + penny == 0.32.0.6 , base >= 4.5.0.0 && < 5 other-modules: Paths_penny @@ -274,7 +274,7 @@ Executable penny-diff Build-depends: - penny == 0.32.0.4 + penny == 0.32.0.6 , base >= 4.5.0.0 && < 5 hs-source-dirs: bin @@ -293,7 +293,7 @@ Executable penny-reprint Build-depends: - penny == 0.32.0.4 + penny == 0.32.0.6 , base >= 4.5.0.0 && < 5 hs-source-dirs: bin @@ -309,7 +309,7 @@ Executable penny-reconcile Build-depends: - penny == 0.32.0.4 + penny == 0.32.0.6 , base >= 4.5.0.0 && < 5 hs-source-dirs: bin diff --git a/versions.m4 b/versions.m4 --- a/versions.m4 +++ b/versions.m4 @@ -1,7 +1,7 @@ divert(-1) # Penny version -define(`pv_penny', `0.32.0.4') +define(`pv_penny', `0.32.0.6') # Haskell Platform define(`pv_base', `4.5.0.0') @@ -25,7 +25,7 @@ define(`pv_ofx', `0.4.0.2') define(`pv_prednote', `0.18.0.4') define(`pv_prednote_max', `0.19.0.0') -define(`pv_rainbow', `0.6.0.4') +define(`pv_rainbow', `0.12.0.0') # Other packages define(`pv_action_permutations', `0.0.0.0')