e950d6e · typeable/yaml

git.iko.soy/typeable/yaml

Bumped transformers version

commite950d6eded55d17e552c159ffc0240f61bfb4e28 authorMichael Snoyman <michael@snoyman.com> dateMon 10 May 2010, 08:14 (16 years ago) parent6a9c6e3

3 files changed+14−16

compare with master

unifiedsplit

Text/Libyaml.hs+5 runtests.hs+7−1 yaml.cabal+2−15

Text/Libyaml.hs+5

@@ -7,6 +7,7 @@

77{-# LANGUAGE PackageImports #-}

88{-# LANGUAGE GeneralizedNewtypeDeriving #-}

99{-# LANGUAGE RankNTypes #-}

10+{-# LANGUAGE CPP #-}

1011

1112module Text.Libyaml

1213 ( -- * The event stream

@@ -45,7 +46,11 @@ import Foreign.C

4546import Foreign.Ptr

4647import Foreign.ForeignPtr

4748import Foreign.Marshal.Alloc

49+#if MIN_VERSION_transformers(0,2,0)

50+import "transformers" Control.Monad.IO.Class

51+#else

4852import "transformers" Control.Monad.Trans

53+#endif

4954import Control.Monad.Failure.Transformers

5055import qualified Control.Monad.Trans.Error as ErrorT

5156import Control.Monad.Trans.Reader

runtests.hs+7−1

@@ -1,8 +1,14 @@

1+{-# LANGUAGE CPP #-}

2+{-# LANGUAGE PackageImports #-}

13import Test.Framework (defaultMain)

35import Text.Libyaml

46import qualified Data.ByteString.Char8 as B8

5−import Control.Monad.Trans

7+#if MIN_VERSION_transformers(0,2,0)

8+import "transformers" Control.Monad.Trans.Class

9+#else

10+import "transformers" Control.Monad.Trans

11+#endif

612

713--import Test.Framework (testGroup, Test)

814import Test.Framework.Providers.HUnit

yaml.cabal+2−15

@@ -18,17 +18,10 @@ extra-source-files: c/helper.h,

1818flag buildtests

1919 description: Build the executable to run unit tests

2020 default: False

21−flag nolib

22− description: Skip building of the library

23− default: False

2421

2522library

26− if flag(nolib)

27− Buildable: False

28− else

29− Buildable: True

3023 build-depends: base >= 4 && < 5,

31− transformers >= 0.1 && < 0.2,

24+ transformers >= 0.1 && < 0.3,

3225 control-monad-failure >= 0.6.0 && < 0.7,

3326 bytestring >= 0.9.1.4 && < 0.10

3427 exposed-modules: Text.Libyaml

@@ -49,14 +42,8 @@ executable runtests

4942 Buildable: True

5043 cpp-options: -DTEST

5144 build-depends: test-framework,

52− test-framework-quickcheck,

5345 test-framework-hunit,

54− HUnit,

55− QuickCheck >= 1 && < 2,

56− base >= 4 && < 5,

57− transformers >= 0.1 && < 0.2,

58− control-monad-failure >= 0.6.0 && < 0.7,

59− bytestring >= 0.9.1.4 && < 0.10

46+ HUnit

6047 else

6148 Buildable: False

6249 ghc-options: -Wall