From bbdadcd8c6748dd0c8f3de43da4fb9e21b9e25e8 Mon Sep 17 00:00:00 2001
From: Oliver Charles <ollie@ocharles.org.uk>
Date: Thu, 12 Jun 2014 14:36:26 +0100
Subject: [PATCH] haskellPackages.hedis: New expression

---
 .../libraries/haskell/BoundedChan/default.nix | 12 ++++++++++
 .../libraries/haskell/hedis/default.nix       | 22 +++++++++++++++++++
 pkgs/top-level/haskell-packages.nix           |  4 ++++
 3 files changed, 38 insertions(+)
 create mode 100644 pkgs/development/libraries/haskell/BoundedChan/default.nix
 create mode 100644 pkgs/development/libraries/haskell/hedis/default.nix

diff --git a/pkgs/development/libraries/haskell/BoundedChan/default.nix b/pkgs/development/libraries/haskell/BoundedChan/default.nix
new file mode 100644
index 000000000000..0ce294c2258c
--- /dev/null
+++ b/pkgs/development/libraries/haskell/BoundedChan/default.nix
@@ -0,0 +1,12 @@
+{ cabal }:
+
+cabal.mkDerivation (self: {
+  pname = "BoundedChan";
+  version = "1.0.1.0";
+  sha256 = "1v4lmp3j8lzk1m2pv5l90j80y0c6yxm6gb1ww9ffsz2jxfzz8vd8";
+  meta = {
+    description = "Implementation of bounded channels";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+  };
+})
diff --git a/pkgs/development/libraries/haskell/hedis/default.nix b/pkgs/development/libraries/haskell/hedis/default.nix
new file mode 100644
index 000000000000..c4e34b2d3612
--- /dev/null
+++ b/pkgs/development/libraries/haskell/hedis/default.nix
@@ -0,0 +1,22 @@
+{ cabal, attoparsec, BoundedChan, bytestringLexing, HUnit, mtl
+, network, resourcePool, testFramework, testFrameworkHunit, time
+, vector
+}:
+
+cabal.mkDerivation (self: {
+  pname = "hedis";
+  version = "0.6.5";
+  sha256 = "1kn8i49yxms1bpjwpy4m8vyycgi755zvy4zc66w068nmnd1kiykh";
+  buildDepends = [
+    attoparsec BoundedChan bytestringLexing mtl network resourcePool
+    time vector
+  ];
+  testDepends = [ HUnit mtl testFramework testFrameworkHunit time ];
+  meta = {
+    homepage = "https://github.com/informatikr/hedis";
+    description = "Client library for the Redis datastore: supports full command set, pipelining";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+  };
+  doCheck = false;
+})
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index b1ea4059da50..ddc483e66bbe 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -286,6 +286,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in
   boundingboxes_0_2 = callPackage ../development/libraries/haskell/boundingboxes/0.2.nix {};
   boundingboxes = self.boundingboxes_0_2;
 
+  BoundedChan = callPackage ../development/libraries/haskell/BoundedChan {};
+
   brainfuck = callPackage ../development/libraries/haskell/brainfuck {};
 
   bson = callPackage ../development/libraries/haskell/bson {};
@@ -1002,6 +1004,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in
 
   hcltest = callPackage ../development/libraries/haskell/hcltest {};
 
+  hedis = callPackage ../development/libraries/haskell/hedis {};
+
   heredoc = callPackage ../development/libraries/haskell/heredoc {};
 
   hexpat = callPackage ../development/libraries/haskell/hexpat {};