git.iko.soy/typeable/ether
on c16ac65 help sign in
7b3583a
swap
0 ahead, 7 behind
5 files changed+27−27
since splitsnapshots
unifiedsplit
.travis.yml+1−16 ether.cabal+11−7 nix-cabal+12 shell.nix+1−2 src/Ether/Reader.hs+2−2
.travis.yml+1−16
@@ -1,19 +1,12 @@
11language: nix
22
3−os:
4− - linux
5− - osx
6−
73env:
84 - HC=ghc822
95 - HC=ghc844
106 - HC=ghc861
117
12−before_install:
13− - curl https://raw.githubusercontent.com/monadfix/nix-cabal/master/nix-cabal -o nix-cabal && chmod u+x nix-cabal
14− - travis_retry ./nix-cabal new-update
15−
168script:
9+ - travis_retry ./nix-cabal new-update
1710 - ./nix-cabal new-test ether:regression
1811 - ./nix-cabal new-bench ether:bench
1912
@@ -21,11 +14,3 @@ cache:
2114 directories:
2215 - ~/.cabal
2316 - ~/.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+11−7
@@ -1,17 +1,21 @@
1−cabal-version: 2.2
21name: ether
3−version: 0.5.2.0
2+version: 0.5.1.0
43synopsis: Monad transformers and classes
5−description: Lib
6−license: BSD-3-Clause
7−-- ^ unfortunately have to change this line due to the issue with cabal2nix
8−license-file: LICENSE
4+description:
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+
910category: Control
11+license: BSD3
12+license-file: LICENSE
1013author: Vladislav Zavialov
1114maintainer: Vladislav Zavialov <vlad.z.4096@gmail.com>
1215homepage: https://int-index.github.io/ether/
1316bug-reports: https://github.com/int-index/ether/issues
1417build-type: Simple
18+cabal-version: >=1.18
1519extra-source-files: CHANGELOG.md
1620
1721source-repository head
@@ -57,7 +61,7 @@ library
5761 base >=4.9 && <4.13,
5862 transformers >=0.5.2.0,
5963 transformers-lift >=0.2.0.1,
60− mtl >=2.2.2,
64+ mtl >=2.2.1,
6165 mmorph >=1.0.4,
6266 monad-control >=1.0.0.4,
6367 transformers-base >=0.4.4,
nix-cabalnew file+12
@@ -0,0 +1,12 @@
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+1−2
@@ -13,9 +13,8 @@ pkgs.stdenv.mkDerivation rec {
1313 ];
1414 shellHook = ''
1515 export LD_LIBRARY_PATH=${pkgs.lib.makeLibraryPath buildInputs}:$LD_LIBRARY_PATH
16− export LANG=en_US.UTF-8
1716 '';
18− LOCALE_ARCHIVE =
17+ LOCALE_ARCHIVES =
1918 if pkgs.stdenv.isLinux
2019 then "${pkgs.glibcLocales}/lib/locale/locale-archive"
2120 else "";
src/Ether/Reader.hs+2−2
@@ -139,7 +139,7 @@ readerT = coerce (T.ReaderT @r @m @a)
139139-- | Runs a 'ReaderT' with the given environment
140140-- and returns the final value.
141141runReaderT :: 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)
143143
144144-- | Runs a 'ReaderT' with the given environment
145145-- and returns the final value.
@@ -203,7 +203,7 @@ type ReadersT r = TaggedTrans (READERS (Tags r)) (T.ReaderT r)
203203type Readers r = ReadersT r Identity
204204
205205runReadersT :: 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)
207207
208208runReaders :: forall p a . Readers p a -> p -> a
209209runReaders = coerce (T.runReader @p @a)