From f9f9921d7cf42ac19dc7d731d02ea26e3232fb8c Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 10 Dec 2012 11:24:10 +0100
Subject: [PATCH] Add haskell-either version 3.0.2 and haskell-errors version
 1.3.1.

---
 .../libraries/haskell/either/default.nix           | 14 ++++++++++++++
 .../libraries/haskell/errors/default.nix           | 13 +++++++++++++
 pkgs/top-level/haskell-packages.nix                |  4 ++++
 3 files changed, 31 insertions(+)
 create mode 100644 pkgs/development/libraries/haskell/either/default.nix
 create mode 100644 pkgs/development/libraries/haskell/errors/default.nix

diff --git a/pkgs/development/libraries/haskell/either/default.nix b/pkgs/development/libraries/haskell/either/default.nix
new file mode 100644
index 00000000000..3d293d3b86e
--- /dev/null
+++ b/pkgs/development/libraries/haskell/either/default.nix
@@ -0,0 +1,14 @@
+{ cabal, semigroupoids, semigroups, transformers }:
+
+cabal.mkDerivation (self: {
+  pname = "either";
+  version = "3.0.2";
+  sha256 = "1s3rpxxqc9052hrmiznwqwxhl4826qzbgpivpv5acxfhm0w06lhg";
+  buildDepends = [ semigroupoids semigroups transformers ];
+  meta = {
+    homepage = "http://github.com/ekmett/either/";
+    description = "Haskell 98 either monad transformer";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+  };
+})
diff --git a/pkgs/development/libraries/haskell/errors/default.nix b/pkgs/development/libraries/haskell/errors/default.nix
new file mode 100644
index 00000000000..d2e68670eb0
--- /dev/null
+++ b/pkgs/development/libraries/haskell/errors/default.nix
@@ -0,0 +1,13 @@
+{ cabal, either, safe, transformers }:
+
+cabal.mkDerivation (self: {
+  pname = "errors";
+  version = "1.3.1";
+  sha256 = "0vfpnpkiz362bvjyaf35spfk3h6vw7xi1x3f8agzs7kmxrdvrfik";
+  buildDepends = [ either safe transformers ];
+  meta = {
+    description = "Simplified error-handling";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+  };
+})
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index 6cdb7bd3468..c94267e1491 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -750,6 +750,10 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
 
   erf = callPackage ../development/libraries/haskell/erf {};
 
+  errors = callPackage ../development/libraries/haskell/errors {};
+
+  either = callPackage ../development/libraries/haskell/either {};
+
   exceptionMtl = callPackage ../development/libraries/haskell/exception-mtl {};
 
   exceptionTransformers = callPackage ../development/libraries/haskell/exception-transformers {};