From 8082dd3753e98b260a2aaa2553560fe7fae6e08c Mon Sep 17 00:00:00 2001
From: Alexander Foremny <alexanderforemny@gmail.com>
Date: Sat, 16 Mar 2013 15:33:16 +0100
Subject: [PATCH] Add haskell-stm-conduit

This adds the dependency haskell-stm-chans as well.
---
 .../libraries/haskell/stm-chans/default.nix    | 14 ++++++++++++++
 .../libraries/haskell/stm-conduit/default.nix  | 18 ++++++++++++++++++
 pkgs/top-level/haskell-packages.nix            |  4 ++++
 3 files changed, 36 insertions(+)
 create mode 100644 pkgs/development/libraries/haskell/stm-chans/default.nix
 create mode 100644 pkgs/development/libraries/haskell/stm-conduit/default.nix

diff --git a/pkgs/development/libraries/haskell/stm-chans/default.nix b/pkgs/development/libraries/haskell/stm-chans/default.nix
new file mode 100644
index 00000000000..74e121e5af9
--- /dev/null
+++ b/pkgs/development/libraries/haskell/stm-chans/default.nix
@@ -0,0 +1,14 @@
+{ cabal, stm }:
+
+cabal.mkDerivation (self: {
+  pname = "stm-chans";
+  version = "1.3.1";
+  sha256 = "15agd0d3r3zmya72hpi9pkmzqw7mj6l84946dhds0hsb6d12r6qj";
+  buildDepends = [ stm ];
+  meta = {
+    homepage = "http://code.haskell.org/~wren/";
+    description = "Additional types of channels for STM";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+  };
+})
diff --git a/pkgs/development/libraries/haskell/stm-conduit/default.nix b/pkgs/development/libraries/haskell/stm-conduit/default.nix
new file mode 100644
index 00000000000..e6c1d64857d
--- /dev/null
+++ b/pkgs/development/libraries/haskell/stm-conduit/default.nix
@@ -0,0 +1,18 @@
+{ cabal, conduit, resourcet, stm, stmChans, transformers, HUnit, QuickCheck
+, testFramework, testFrameworkHunit, testFrameworkQuickcheck2 }:
+
+cabal.mkDerivation (self: {
+  pname = "stm-conduit";
+  version = "1.0.0";
+  sha256 = "1kkx3x3qdqw5jp9vn9kxbxmmb8x0wdbp8jch08azw45pwjh3ga7v";
+  buildDepends = [
+    conduit resourcet stm stmChans transformers HUnit QuickCheck
+    testFramework testFrameworkHunit testFrameworkQuickcheck2
+  ];
+  meta = {
+    homepage = "https://github.com/wowus/stm-conduit";
+    description = "Introduces conduits to channels, and promotes using conduits concurrently";
+    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 4ffd314f3c9..52d331af75a 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -1687,6 +1687,10 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
   stm_2_4_2 = callPackage ../development/libraries/haskell/stm/2.4.2.nix {};
   stm = self.stm_2_4_2;
 
+  stmChans = callPackage ../development/libraries/haskell/stm-chans {};
+
+  stmConduit = callPackage ../development/libraries/haskell/stm-conduit {};
+
   storableComplex = callPackage ../development/libraries/haskell/storable-complex {};
 
   storableRecord = callPackage ../development/libraries/haskell/storable-record {};