From cdba8df4d5e452782762b24a279148f86a3b184b Mon Sep 17 00:00:00 2001
From: Oliver Charles <ollie@ocharles.org.uk>
Date: Tue, 4 Jun 2013 10:52:25 +0100
Subject: [PATCH 1/2] haskell-pipes: Add pipes 3.3.0

---
 .../development/libraries/haskell/pipes/default.nix | 13 +++++++++++++
 pkgs/top-level/haskell-packages.nix                 |  2 ++
 2 files changed, 15 insertions(+)
 create mode 100644 pkgs/development/libraries/haskell/pipes/default.nix

diff --git a/pkgs/development/libraries/haskell/pipes/default.nix b/pkgs/development/libraries/haskell/pipes/default.nix
new file mode 100644
index 000000000000..87c173850f9b
--- /dev/null
+++ b/pkgs/development/libraries/haskell/pipes/default.nix
@@ -0,0 +1,13 @@
+{ cabal, mmorph, transformers }:
+
+cabal.mkDerivation (self: {
+  pname = "pipes";
+  version = "3.3.0";
+  sha256 = "1bgznfv7hxqwj5f7vkm8d41phw63bl2swzr0wrz0pcqxlr42likb";
+  buildDepends = [ mmorph transformers ];
+  meta = {
+    description = "Compositional pipelines";
+    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 acd91ee6f600..bcb8c94855fa 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -1551,6 +1551,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
 
   pgm = callPackage ../development/libraries/haskell/pgm {};
 
+  pipes = callPackage ../development/libraries/haskell/pipes {};
+
   polyparse = callPackage ../development/libraries/haskell/polyparse {};
 
   poolConduit = callPackage ../development/libraries/haskell/pool-conduit {};

From a4d69deca4d338394fe57263d839a6aef2b198e5 Mon Sep 17 00:00:00 2001
From: Oliver Charles <ollie@ocharles.org.uk>
Date: Tue, 4 Jun 2013 10:57:21 +0100
Subject: [PATCH 2/2] haskell-pipes: Add pipes-concurrency, pipes-parse and
 pipes-safe

---
 .../libraries/haskell/pipes-concurrency/default.nix | 13 +++++++++++++
 .../libraries/haskell/pipes-parse/default.nix       | 13 +++++++++++++
 .../libraries/haskell/pipes-safe/default.nix        | 13 +++++++++++++
 pkgs/top-level/haskell-packages.nix                 |  6 ++++++
 4 files changed, 45 insertions(+)
 create mode 100644 pkgs/development/libraries/haskell/pipes-concurrency/default.nix
 create mode 100644 pkgs/development/libraries/haskell/pipes-parse/default.nix
 create mode 100644 pkgs/development/libraries/haskell/pipes-safe/default.nix

diff --git a/pkgs/development/libraries/haskell/pipes-concurrency/default.nix b/pkgs/development/libraries/haskell/pipes-concurrency/default.nix
new file mode 100644
index 000000000000..702853766a7e
--- /dev/null
+++ b/pkgs/development/libraries/haskell/pipes-concurrency/default.nix
@@ -0,0 +1,13 @@
+{ cabal, pipes, stm, transformers }:
+
+cabal.mkDerivation (self: {
+  pname = "pipes-concurrency";
+  version = "1.1.0";
+  sha256 = "05xpwxhf08yf88ya89f8gcy4vphi6qxyccf2yiyi5zrf6c2pkr00";
+  buildDepends = [ pipes stm transformers ];
+  meta = {
+    description = "Concurrency for the pipes ecosystem";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+  };
+})
diff --git a/pkgs/development/libraries/haskell/pipes-parse/default.nix b/pkgs/development/libraries/haskell/pipes-parse/default.nix
new file mode 100644
index 000000000000..2a5e62926b92
--- /dev/null
+++ b/pkgs/development/libraries/haskell/pipes-parse/default.nix
@@ -0,0 +1,13 @@
+{ cabal, pipes }:
+
+cabal.mkDerivation (self: {
+  pname = "pipes-parse";
+  version = "1.0.0";
+  sha256 = "0fk39a6d0ik5ghwyj6yyi9d0cj2sp22812fin7amcxcafrplf88w";
+  buildDepends = [ pipes ];
+  meta = {
+    description = "Parsing infrastructure for the pipes ecosystem";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+  };
+})
diff --git a/pkgs/development/libraries/haskell/pipes-safe/default.nix b/pkgs/development/libraries/haskell/pipes-safe/default.nix
new file mode 100644
index 000000000000..09c58f0a0179
--- /dev/null
+++ b/pkgs/development/libraries/haskell/pipes-safe/default.nix
@@ -0,0 +1,13 @@
+{ cabal, pipes, transformers }:
+
+cabal.mkDerivation (self: {
+  pname = "pipes-safe";
+  version = "1.2.0";
+  sha256 = "0ki9i9378j8kgw5dd91b38r686pcr9fl2vf9dfgfshia072ppggj";
+  buildDepends = [ pipes transformers ];
+  meta = {
+    description = "Safety for the pipes ecosystem";
+    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 bcb8c94855fa..5d4c626ade6a 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -1553,6 +1553,12 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
 
   pipes = callPackage ../development/libraries/haskell/pipes {};
 
+  pipes-concurrency = callPackage ../development/libraries/haskell/pipes-concurrency {};
+
+  pipes-parse = callPackage ../development/libraries/haskell/pipes-parse {};
+
+  pipes-safe = callPackage ../development/libraries/haskell/pipes-safe {};
+
   polyparse = callPackage ../development/libraries/haskell/polyparse {};
 
   poolConduit = callPackage ../development/libraries/haskell/pool-conduit {};