c16ac65..master · typeable/ether

.travis.yml+16−1

since splitsnapshots

unifiedsplit

@@ -1,12 +1,19 @@

1language: nix

2

3+os:

4+ - linux

5+ - osx

6+

3env:

7env:

4 - HC=ghc822

8 - HC=ghc822

5 - HC=ghc844

9 - HC=ghc844

6 - HC=ghc861

10 - HC=ghc861

7

11

8−script:

12+before_install:

13+ - curl https://raw.githubusercontent.com/monadfix/nix-cabal/master/nix-cabal -o nix-cabal && chmod u+x nix-cabal

9 - travis_retry ./nix-cabal new-update

14 - travis_retry ./nix-cabal new-update

15+

16+script:

10 - ./nix-cabal new-test ether:regression

17 - ./nix-cabal new-test ether:regression

11 - ./nix-cabal new-bench ether:bench

18 - ./nix-cabal new-bench ether:bench

12

19

@@ -14,3 +21,11 @@ cache:

14 directories:

21 directories:

15 - ~/.cabal

22 - ~/.cabal

16 - ~/.ghc

23 - ~/.ghc

24+

25+matrix:

26+ # broken at the moment

27+ exclude:

28+ - os: osx

29+ env: HC=ghc822

30+ - os: osx

31+ env: HC=ghc861

ether.cabal+7−11

@@ -1,21 +1,17 @@

1+cabal-version: 2.2

1name: ether

2name: ether

2−version: 0.5.1.0

3+version: 0.5.2.0

3synopsis: Monad transformers and classes

4synopsis: Monad transformers and classes

4−description:

5+description: Lib

5− Ether is a Haskell library that extends @mtl@ and @transformers@ with

6− tagged monad transformers and classes in a compatible way.

7−

8− Introduction <https://int-index.github.io/ether/>

9−

10−category: Control

11−license: BSD3

6+license: BSD-3-Clause

7+-- ^ unfortunately have to change this line due to the issue with cabal2nix

12license-file: LICENSE

8license-file: LICENSE

9+category: Control

13author: Vladislav Zavialov

10author: Vladislav Zavialov

14maintainer: Vladislav Zavialov <vlad.z.4096@gmail.com>

11maintainer: Vladislav Zavialov <vlad.z.4096@gmail.com>

15homepage: https://int-index.github.io/ether/

12homepage: https://int-index.github.io/ether/

16bug-reports: https://github.com/int-index/ether/issues

13bug-reports: https://github.com/int-index/ether/issues

17build-type: Simple

14build-type: Simple

18−cabal-version: >=1.18

19extra-source-files: CHANGELOG.md

15extra-source-files: CHANGELOG.md

20

16

21source-repository head

17source-repository head

@@ -61,7 +57,7 @@ library

61 base >=4.9 && <4.13,

57 base >=4.9 && <4.13,

62 transformers >=0.5.2.0,

58 transformers >=0.5.2.0,

63 transformers-lift >=0.2.0.1,

59 transformers-lift >=0.2.0.1,

64− mtl >=2.2.1,

60+ mtl >=2.2.2,

65 mmorph >=1.0.4,

61 mmorph >=1.0.4,

66 monad-control >=1.0.0.4,

62 monad-control >=1.0.0.4,

67 transformers-base >=0.4.4,

63 transformers-base >=0.4.4,

nix-cabaldeleted−12

@@ -1,12 +0,0 @@

1−#!/usr/bin/env bash

2−

3−set -e

4−

5−if [ -z "$HC" ]; then

6− ARG_HC=""

7−else

8− ARG_HC="--argstr hc $HC"

9−fi

10−

11−CMD="cabal $@"

12−nix-shell --pure $ARG_HC --run "$CMD"

shell.nix+2−1

@@ -13,8 +13,9 @@ pkgs.stdenv.mkDerivation rec {

13 ];

14 shellHook = ''

15 export LD_LIBRARY_PATH=${pkgs.lib.makeLibraryPath buildInputs}:$LD_LIBRARY_PATH

16+ export LANG=en_US.UTF-8

16 '';

17 '';

17− LOCALE_ARCHIVES =

18+ LOCALE_ARCHIVE =

18 if pkgs.stdenv.isLinux

19 if pkgs.stdenv.isLinux

19 then "${pkgs.glibcLocales}/lib/locale/locale-archive"

20 then "${pkgs.glibcLocales}/lib/locale/locale-archive"

20 else "";

21 else "";

src/Ether/Reader.hs+2−2

@@ -139,7 +139,7 @@ readerT = coerce (T.ReaderT @r @m @a)

139-- | Runs a 'ReaderT' with the given environment

140-- and returns the final value.

141runReaderT :: forall tag r m a . ReaderT tag r m a -> r -> m a

142−runReaderT = coerce (T.runReaderT @r @_ @m @a)

142+runReaderT = coerce (T.runReaderT @r @m @a)

143

144-- | Runs a 'ReaderT' with the given environment

145-- and returns the final value.

@@ -203,7 +203,7 @@ type ReadersT r = TaggedTrans (READERS (Tags r)) (T.ReaderT r)

203type Readers r = ReadersT r Identity

204

205runReadersT :: forall p m a . ReadersT p m a -> p -> m a

206−runReadersT = coerce (T.runReaderT @p @_ @m @a)

206+runReadersT = coerce (T.runReaderT @p @m @a)

207

208runReaders :: forall p a . Readers p a -> p -> a

209runReaders = coerce (T.runReader @p @a)