Fix #1 by removing errors dependency.

goldfirere · Aug 27, 2015 · 0b3cbc6 · 0b3cbc6
1 parent 23934bb
commit 0b3cbc6
Show file tree

Hide file tree

Showing 7 changed files with 16 additions and 7 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -6,6 +6,7 @@ env:
  - CABALVER=1.18 GHCVER=7.8.3
  - CABALVER=1.18 GHCVER=7.8.4
  - CABALVER=1.22 GHCVER=7.10.1
+ - CABALVER=1.22 GHCVER=7.10.2
  - CABALVER=head GHCVER=head
 
 matrix:

diff --git a/CHANGES.md b/CHANGES.md
@@ -1,6 +1,11 @@
 Release notes for glambda
 =========================
 
+1.0.1
+-----
+
+Update package dependencies to drop dependency on `errors`.
+
 1.0
 ---
 

diff --git a/glambda.cabal b/glambda.cabal
@@ -1,5 +1,5 @@
 name:           glambda
-version:        1.0
+version:        1.0.1
 cabal-version:  >= 1.10
 synopsis:       A simply typed lambda calculus interpreter, written with GADTs
 homepage:       https://github.com/goldfirere/glambda
@@ -22,12 +22,13 @@ description:
 source-repository this
   type:     git
   location: https://github.com/goldfirere/glambda.git
-  tag:      v1.0
+  tag:      v1.0.1
 
 library
   build-depends:      base == 4.*
                     , ansi-wl-pprint >= 0.6.7.1
-                    , errors >= 1.4.6 && < 2.0
+                    , transformers >= 0.3.0.0
+                    , either >= 4.0
                     , mtl >= 2.1.3.1
                     , containers >= 0.5
                     , parsec >= 3.1
@@ -80,7 +81,7 @@ test-suite tests
                     , glambda
                     , template-haskell
                     , ansi-wl-pprint >= 0.6.7.1
-                    , errors >= 1.4.6 && < 2.0
+                    , either >= 4.0
                     , mtl >= 2.1.3.1
                     , parsec >= 3.1
                     , tasty >= 0.8.1

diff --git a/pres/notes.txt b/pres/notes.txt
@@ -14,7 +14,7 @@ I. Intro  (0:02-0:07)
   - goals
   - working toward glambda
 
-II. Simple GADTs  (0:07-0:18)
+II. Simple GADTs  (0:07-0:18)7
   - emacs with STy with Int + Bool + Maybe
   - back to slides
 

diff --git a/pres/slides.pdf b/pres/slides.pdf
diff --git a/src/Language/Glambda/Monad.hs b/src/Language/Glambda/Monad.hs
@@ -33,7 +33,8 @@ import System.Console.Haskeline
 
 import Text.PrettyPrint.ANSI.Leijen
 
-import Control.Error
+import Control.Monad.Trans.Maybe
+import Control.Monad.Trans.Either
 import Control.Monad.Reader
 import Control.Monad.Error
 import Control.Monad.State

diff --git a/tests/Tests/Check.hs b/tests/Tests/Check.hs
@@ -13,11 +13,12 @@ import Language.Glambda.Eval
 import Language.Glambda.Globals
 import Language.Glambda.Util
 
-import Control.Error
+import Control.Monad.Trans.Either
 import Control.Monad.Reader
 
 import Text.PrettyPrint.ANSI.Leijen
 
+import Data.Maybe
 import Data.List as List
 import Control.Arrow as Arrow