From b97d6b0318c98e2b2324ec633a7a54486138ec5f Mon Sep 17 00:00:00 2001
From: Mihaly Barasz <klao@nilcons.com>
Date: Tue, 4 Mar 2014 16:42:52 +0100
Subject: [PATCH 1/2] Add lens-family-core Haskell package

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

diff --git a/pkgs/development/libraries/haskell/lens-family-core/default.nix b/pkgs/development/libraries/haskell/lens-family-core/default.nix
new file mode 100644
index 00000000000..7bfb401c756
--- /dev/null
+++ b/pkgs/development/libraries/haskell/lens-family-core/default.nix
@@ -0,0 +1,13 @@
+{ cabal, transformers }:
+
+cabal.mkDerivation (self: {
+  pname = "lens-family-core";
+  version = "1.0.0";
+  sha256 = "149wfxddw58h5q42r3nknmac8wsc9c8xzsw6vrlfb4yasg7bhw53";
+  buildDepends = [ transformers ];
+  meta = {
+    description = "Haskell 98 Lens Families";
+    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 ec624fa361e..d98b90debb4 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -1592,6 +1592,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
 
   lensDatetime = callPackage ../development/libraries/haskell/lens-datetime {};
 
+  lensFamilyCore = callPackage ../development/libraries/haskell/lens-family-core {};
+
   lenses = callPackage ../development/libraries/haskell/lenses {};
 
   libffi = callPackage ../development/libraries/haskell/libffi {

From 66c9ac3b7716860a3374eccaa31794ef6ad3b197 Mon Sep 17 00:00:00 2001
From: Mihaly Barasz <klao@nilcons.com>
Date: Tue, 4 Mar 2014 17:35:22 +0100
Subject: [PATCH 2/2] Add pipes-binary Haskell package

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

diff --git a/pkgs/development/libraries/haskell/pipes-binary/default.nix b/pkgs/development/libraries/haskell/pipes-binary/default.nix
new file mode 100644
index 00000000000..33f9482ca3f
--- /dev/null
+++ b/pkgs/development/libraries/haskell/pipes-binary/default.nix
@@ -0,0 +1,24 @@
+{ cabal, binary, lensFamilyCore, pipes, pipesBytestring, pipesParse
+, smallcheck, tasty, tastyHunit, tastySmallcheck, transformers
+}:
+
+cabal.mkDerivation (self: {
+  pname = "pipes-binary";
+  version = "0.4.0";
+  sha256 = "021shl5czrr82b06awy7biy93qf6nh0wwiadhr7qsawzdnzqz2vc";
+  buildDepends = [
+    binary pipes pipesBytestring pipesParse transformers
+  ];
+  testDepends = [
+    binary lensFamilyCore pipes pipesParse smallcheck tasty tastyHunit
+    tastySmallcheck transformers
+  ];
+  # Depends on an out-of-date version of smallcheck
+  doCheck = false;
+  meta = {
+    homepage = "https://github.com/k0001/pipes-binary";
+    description = "Encode and decode binary streams using the pipes and binary libraries";
+    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 d98b90debb4..e006f66938b 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -1929,6 +1929,10 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
 
   pipesAttoparsec = callPackage ../development/libraries/haskell/pipes-attoparsec {};
 
+  pipesBinary = callPackage ../development/libraries/haskell/pipes-binary {
+    binary = self.binary_0_7_1_0;
+  };
+
   pipesBytestring = callPackage ../development/libraries/haskell/pipes-bytestring {};
 
   pipesConcurrency = callPackage ../development/libraries/haskell/pipes-concurrency {};