From 5c12df46cf97f30b9e640f2a31fe964d1fbe40c1 Mon Sep 17 00:00:00 2001
From: Dmitry Malikov <color404051h@gmail.com>
Date: Sun, 15 Jul 2012 01:21:01 +0200
Subject: [PATCH 01/13] Add haskell-lambdabot

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

diff --git a/pkgs/development/libraries/haskell/lambdabot/default.nix b/pkgs/development/libraries/haskell/lambdabot/default.nix
new file mode 100644
index 00000000000..49fdf743e2a
--- /dev/null
+++ b/pkgs/development/libraries/haskell/lambdabot/default.nix
@@ -0,0 +1,26 @@
+{ cabal, arrows, binary, brainfuck, dataMemocombinators, filepath
+, haskellSrc, haskellSrcExts, HTTP, IOSpec, lambdabotUtils, logict
+, MonadRandom, mtl, network, numbers, oeis, parsec, random
+, readline, regexCompat, show, syb, tagsoup, unlambda, utf8String
+, vectorSpace
+}:
+
+cabal.mkDerivation (self: {
+  pname = "lambdabot";
+  version = "4.2.3.2";
+  sha256 = "0jy48s4z1yn0wiaxzi3pws7j9j4ih2vqr8gr8md2i35g4bwxmxp2";
+  isLibrary = true;
+  isExecutable = true;
+  buildDepends = [
+    arrows binary brainfuck dataMemocombinators filepath haskellSrc
+    haskellSrcExts HTTP IOSpec lambdabotUtils logict MonadRandom mtl
+    network numbers oeis parsec random readline regexCompat show syb
+    tagsoup unlambda utf8String vectorSpace
+  ];
+  meta = {
+    homepage = "http://haskell.org/haskellwiki/Lambdabot";
+    description = "Lambdabot is a development tool and advanced IRC bot";
+    license = "GPL";
+    platforms = self.ghc.meta.platforms;
+  };
+})
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index ddfbdac9469..7824b4ab188 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -961,6 +961,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
 
   languageHaskellExtract = callPackage ../development/libraries/haskell/language-haskell-extract {};
 
+  lambdabot = callPackage ../development/libraries/haskell/lambdabot/default.nix {};
+
   largeword = callPackage ../development/libraries/haskell/largeword {};
 
   lazysmallcheck = callPackage ../development/libraries/haskell/lazysmallcheck {};

From cac9051fbff2753f385bc31e10a852550cb91d80 Mon Sep 17 00:00:00 2001
From: Dmitry Malikov <color404051h@gmail.com>
Date: Mon, 16 Jul 2012 21:34:53 +0200
Subject: [PATCH 02/13] Add brainfuck

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

diff --git a/pkgs/development/libraries/haskell/brainfuck/default.nix b/pkgs/development/libraries/haskell/brainfuck/default.nix
new file mode 100644
index 00000000000..86a90f5d1b0
--- /dev/null
+++ b/pkgs/development/libraries/haskell/brainfuck/default.nix
@@ -0,0 +1,13 @@
+cabal.mkDerivation (self: {
+  pname = "brainfuck";
+  version = "0.1";
+  sha256 = "0lsw62g4ir8idjjadsdf46p8mqd88mysn0b499bk3x5l5js858z3";
+  isLibrary = true;
+  isExecutable = true;
+  buildDepends = [ mtl ];
+  meta = {
+    description = "Brainfuck interpreter";
+    license = "GPL";
+    platforms = self.ghc.meta.platforms;
+  };
+})
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index 7824b4ab188..7a0cdcd2153 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -473,6 +473,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
 
   Boolean = callPackage ../development/libraries/haskell/Boolean {};
 
+  brainfuck = callPackage ../development/libraries/haskell/brainfuck/default.nix {};
+
   bson = callPackage ../development/libraries/haskell/bson {};
 
   byteorder = callPackage ../development/libraries/haskell/byteorder {};

From 4c50696a1bcd9dc5b546c9c4dc974c38c620f639 Mon Sep 17 00:00:00 2001
From: Dmitry Malikov <color404051h@gmail.com>
Date: Mon, 16 Jul 2012 21:45:10 +0200
Subject: [PATCH 03/13] Add haskell/data-memocombinators

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

diff --git a/pkgs/development/libraries/haskell/default.nix b/pkgs/development/libraries/haskell/default.nix
new file mode 100644
index 00000000000..1fb2118c363
--- /dev/null
+++ b/pkgs/development/libraries/haskell/default.nix
@@ -0,0 +1,12 @@
+cabal.mkDerivation (self: {
+  pname = "data-memocombinators";
+  version = "0.4.3";
+  sha256 = "0mzvjgccm23y7mfaz9iwdy64amf69d7i8yq9fc9mjx1nyzxdrgsc";
+  buildDepends = [ dataInttrie ];
+  meta = {
+    homepage = "http://github.com/luqui/data-memocombinators";
+    description = "Combinators for building memo tables";
+    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 7a0cdcd2153..8823445bbc5 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -586,6 +586,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
 
   dataenc = callPackage ../development/libraries/haskell/dataenc {};
 
+  dataMemocombinators = callPackage ../development/libraries/haskell/data-memocombinators {};
+
   dataReify = callPackage ../development/libraries/haskell/data-reify {};
 
   datetime = callPackage ../development/libraries/haskell/datetime {};

From 269f013d90924a2054a40e8e570e2a5d1fd90103 Mon Sep 17 00:00:00 2001
From: Dmitry Malikov <color404051h@gmail.com>
Date: Mon, 16 Jul 2012 21:53:30 +0200
Subject: [PATCH 04/13] Add haskell-IOSpec

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

diff --git a/pkgs/development/libraries/haskell/IOSpec/default.nix b/pkgs/development/libraries/haskell/IOSpec/default.nix
new file mode 100644
index 00000000000..46211614c4c
--- /dev/null
+++ b/pkgs/development/libraries/haskell/IOSpec/default.nix
@@ -0,0 +1,13 @@
+{ cabal, mtl, QuickCheck, Stream }:
+
+cabal.mkDerivation (self: {
+  pname = "IOSpec";
+  version = "0.2.5";
+  sha256 = "0r6vqg39h6vzwlb33cvk72k4mh6jd8rpdcnkqsfxdqmsk7h8x84j";
+  buildDepends = [ mtl QuickCheck Stream ];
+  meta = {
+    description = "A pure specification of the IO monad";
+    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 8823445bbc5..e748d4400a0 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -932,6 +932,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
 
   IORefCAS = callPackage ../development/libraries/haskell/IORefCAS {};
 
+  IOSpec = callPackage ../development/libraries/haskell/IOSpec {};
+
   ioStorage = callPackage ../development/libraries/haskell/io-storage {};
 
   irc = callPackage ../development/libraries/haskell/irc {

From 0a5a20d365ac70c0fda708e7083032500bc014e4 Mon Sep 17 00:00:00 2001
From: Dmitry Malikov <color404051h@gmail.com>
Date: Mon, 16 Jul 2012 21:56:38 +0200
Subject: [PATCH 05/13] Add haskell/lambdabot-utils

---
 .../haskell/lambdabot-utils/default.nix       | 19 +++++++++++++++++++
 pkgs/top-level/haskell-packages.nix           |  2 ++
 2 files changed, 21 insertions(+)
 create mode 100644 pkgs/development/libraries/haskell/lambdabot-utils/default.nix

diff --git a/pkgs/development/libraries/haskell/lambdabot-utils/default.nix b/pkgs/development/libraries/haskell/lambdabot-utils/default.nix
new file mode 100644
index 00000000000..9d2aa186264
--- /dev/null
+++ b/pkgs/development/libraries/haskell/lambdabot-utils/default.nix
@@ -0,0 +1,19 @@
+{ cabal, binary, haskellSrc, mtl, network, random, regexCompat
+, regexPosix, syb, tagsoup, utf8String, zlib
+}:
+
+cabal.mkDerivation (self: {
+  pname = "lambdabot-utils";
+  version = "4.2.1";
+  sha256 = "1a5rj8zjvfhziwldikgki92lg9bwv6h9ysp6yqip6lja18h4lilx";
+  buildDepends = [
+    binary haskellSrc mtl network random regexCompat regexPosix syb
+    tagsoup utf8String zlib
+  ];
+  meta = {
+    homepage = "http://haskell.org/haskellwiki/Lambdabot";
+    description = "Utility libraries for the advanced IRC bot, Lambdabot";
+    license = "GPL";
+    platforms = self.ghc.meta.platforms;
+  };
+})
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index e748d4400a0..faeb631834f 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -969,6 +969,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
 
   lambdabot = callPackage ../development/libraries/haskell/lambdabot/default.nix {};
 
+  lambdabotUtils = callPackage ../development/libraries/haskell/lambdabot-utils {};
+
   largeword = callPackage ../development/libraries/haskell/largeword {};
 
   lazysmallcheck = callPackage ../development/libraries/haskell/lazysmallcheck {};

From d972bae84fe5463b119e6408a0c8ec6dbe665a3e Mon Sep 17 00:00:00 2001
From: Dmitry Malikov <color404051h@gmail.com>
Date: Mon, 16 Jul 2012 21:59:10 +0200
Subject: [PATCH 06/13] Add haskell/logict

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

diff --git a/pkgs/development/libraries/haskell/logict/default.nix b/pkgs/development/libraries/haskell/logict/default.nix
new file mode 100644
index 00000000000..f67e82fbfa2
--- /dev/null
+++ b/pkgs/development/libraries/haskell/logict/default.nix
@@ -0,0 +1,14 @@
+{ cabal, mtl }:
+
+cabal.mkDerivation (self: {
+  pname = "logict";
+  version = "0.5.0.1";
+  sha256 = "0k3acw6fwhqz4qaz7k85fx5b43hwc926il0mljc69gjrgw0c8nzv";
+  buildDepends = [ mtl ];
+  meta = {
+    homepage = "http://code.haskell.org/~dolio/logict";
+    description = "A backtracking logic-programming monad";
+    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 faeb631834f..e13a98cbbd2 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -987,6 +987,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
 
   logfloat = callPackage ../development/libraries/haskell/logfloat {};
 
+  logict = callPackage ../development/libraries/haskell/logict {};
+
   mathFunctions = callPackage ../development/libraries/haskell/math-functions {};
 
   mainlandPretty = callPackage ../development/libraries/haskell/mainland-pretty {};

From 67e105efd013f8ca5e980158e2b3d56cd3d138e0 Mon Sep 17 00:00:00 2001
From: Dmitry Malikov <color404051h@gmail.com>
Date: Mon, 16 Jul 2012 22:04:06 +0200
Subject: [PATCH 07/13] Add haskell/numbers

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

diff --git a/pkgs/development/libraries/haskell/numbers/default.nix b/pkgs/development/libraries/haskell/numbers/default.nix
new file mode 100644
index 00000000000..6c9056e140f
--- /dev/null
+++ b/pkgs/development/libraries/haskell/numbers/default.nix
@@ -0,0 +1,13 @@
+{ cabal }:
+
+cabal.mkDerivation (self: {
+  pname = "numbers";
+  version = "3000.0.0.0";
+  sha256 = "073xjrnbv6z16va2h3arlxq3z8kywb961dwh4jcm8g7w5m84b2xb";
+  meta = {
+    homepage = "https://github.com/DanBurton/numbers";
+    description = "Various number types";
+    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 e13a98cbbd2..fbdbbe6b251 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -1080,6 +1080,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
 
   NumInstances = callPackage ../development/libraries/haskell/NumInstances {};
 
+  numbers = callPackage ../development/libraries/haskell/numbers {};
+
   numtype = callPackage ../development/libraries/haskell/numtype {};
 
   OneTuple = callPackage ../development/libraries/haskell/OneTuple {};

From f3319f0cf6f7a306a11a5812c50f8636325f2b3c Mon Sep 17 00:00:00 2001
From: Dmitry Malikov <color404051h@gmail.com>
Date: Mon, 16 Jul 2012 22:06:53 +0200
Subject: [PATCH 08/13] Add haskell/oeis

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

diff --git a/pkgs/development/libraries/haskell/oeis/default.nix b/pkgs/development/libraries/haskell/oeis/default.nix
new file mode 100644
index 00000000000..48692cd7edf
--- /dev/null
+++ b/pkgs/development/libraries/haskell/oeis/default.nix
@@ -0,0 +1,13 @@
+{ cabal, HTTP, network }:
+
+cabal.mkDerivation (self: {
+  pname = "oeis";
+  version = "0.3.1";
+  sha256 = "0kxs25b1z0b807vhrn8v7chsdsw8civqiym8767fy2rk5si0i4w2";
+  buildDepends = [ HTTP network ];
+  meta = {
+    description = "Interface to the Online Encyclopedia of Integer Sequences";
+    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 fbdbbe6b251..b1fef22aff5 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -1088,6 +1088,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
 
   ObjectName = callPackage ../development/libraries/haskell/ObjectName {};
 
+  oeis = callPackage ../development/libraries/haskell/oeis {};
+
   OpenAL = callPackage ../development/libraries/haskell/OpenAL {};
 
   OpenGL_2_2_1_1 = callPackage ../development/libraries/haskell/OpenGL/2.2.1.1.nix {};

From 0e8b4cd7addcb54325e4401a9d560084f5b7c1eb Mon Sep 17 00:00:00 2001
From: Dmitry Malikov <color404051h@gmail.com>
Date: Mon, 16 Jul 2012 22:09:27 +0200
Subject: [PATCH 09/13] Add haskell/show

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

diff --git a/pkgs/development/libraries/haskell/show/default.nix b/pkgs/development/libraries/haskell/show/default.nix
new file mode 100644
index 00000000000..4700a8c17c8
--- /dev/null
+++ b/pkgs/development/libraries/haskell/show/default.nix
@@ -0,0 +1,13 @@
+{ cabal, QuickCheck, random, smallcheck, syb }:
+
+cabal.mkDerivation (self: {
+  pname = "show";
+  version = "0.4.1.2";
+  sha256 = "1qaphxjaxng7d0kcn3vvxbvqljzzs1hvmsrdsm3pbi19qlsavd5w";
+  buildDepends = [ QuickCheck random smallcheck syb ];
+  meta = {
+    description = "'Show' instances for Lambdabot";
+    license = "GPL";
+    platforms = self.ghc.meta.platforms;
+  };
+})
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index b1fef22aff5..975871ec412 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -1357,6 +1357,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
 
   ShellacReadline = callPackage ../development/libraries/haskell/Shellac/Shellac-readline.nix {};
 
+  show = callPackage ../development/libraries/haskell/show {};
+
   SMTPClient = callPackage ../development/libraries/haskell/SMTPClient {};
 
   split = callPackage ../development/libraries/haskell/split {};

From d16ef6d18221e22392236d31eea1c495ac7d1e53 Mon Sep 17 00:00:00 2001
From: Dmitry Malikov <color404051h@gmail.com>
Date: Mon, 16 Jul 2012 22:12:01 +0200
Subject: [PATCH 10/13] Add haskell/unlambda

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

diff --git a/pkgs/development/libraries/haskell/unlambda/default.nix b/pkgs/development/libraries/haskell/unlambda/default.nix
new file mode 100644
index 00000000000..4bdc1183586
--- /dev/null
+++ b/pkgs/development/libraries/haskell/unlambda/default.nix
@@ -0,0 +1,15 @@
+{ cabal, mtl }:
+
+cabal.mkDerivation (self: {
+  pname = "unlambda";
+  version = "0.1";
+  sha256 = "0xmn5w5vza6z2i3fs2hv2jgmb1lyk918viknsx3lk36i1dbyivgi";
+  isLibrary = true;
+  isExecutable = true;
+  buildDepends = [ mtl ];
+  meta = {
+    description = "Unlambda interpreter";
+    license = "GPL";
+    platforms = self.ghc.meta.platforms;
+  };
+})
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index 975871ec412..e6c01fa40f9 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -1471,6 +1471,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
 
   unixCompat = callPackage ../development/libraries/haskell/unix-compat {};
 
+  unlambda = callPackage ../development/libraries/haskell/unlambda {};
+
   unorderedContainers = callPackage ../development/libraries/haskell/unordered-containers {};
 
   url = callPackage ../development/libraries/haskell/url {};

From 71be80e8e98d53788740fedfd50fa9fe5566979c Mon Sep 17 00:00:00 2001
From: Dmitry Malikov <color404051h@gmail.com>
Date: Mon, 16 Jul 2012 22:17:49 +0200
Subject: [PATCH 11/13] Some correctness

---
 pkgs/development/libraries/haskell/brainfuck/default.nix      | 3 +++
 .../libraries/haskell/{ => data-memocombinators}/default.nix  | 3 +++
 pkgs/top-level/haskell-packages.nix                           | 4 ++--
 3 files changed, 8 insertions(+), 2 deletions(-)
 rename pkgs/development/libraries/haskell/{ => data-memocombinators}/default.nix (94%)

diff --git a/pkgs/development/libraries/haskell/brainfuck/default.nix b/pkgs/development/libraries/haskell/brainfuck/default.nix
index 86a90f5d1b0..6501df58481 100644
--- a/pkgs/development/libraries/haskell/brainfuck/default.nix
+++ b/pkgs/development/libraries/haskell/brainfuck/default.nix
@@ -1,3 +1,5 @@
+{ cabal, mtl }:
+
 cabal.mkDerivation (self: {
   pname = "brainfuck";
   version = "0.1";
@@ -11,3 +13,4 @@ cabal.mkDerivation (self: {
     platforms = self.ghc.meta.platforms;
   };
 })
+
diff --git a/pkgs/development/libraries/haskell/default.nix b/pkgs/development/libraries/haskell/data-memocombinators/default.nix
similarity index 94%
rename from pkgs/development/libraries/haskell/default.nix
rename to pkgs/development/libraries/haskell/data-memocombinators/default.nix
index 1fb2118c363..d02cdab7110 100644
--- a/pkgs/development/libraries/haskell/default.nix
+++ b/pkgs/development/libraries/haskell/data-memocombinators/default.nix
@@ -1,3 +1,5 @@
+{ cabal, dataInttrie }:
+
 cabal.mkDerivation (self: {
   pname = "data-memocombinators";
   version = "0.4.3";
@@ -10,3 +12,4 @@ cabal.mkDerivation (self: {
     platforms = self.ghc.meta.platforms;
   };
 })
+
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index e6c01fa40f9..03eb341b699 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -473,7 +473,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
 
   Boolean = callPackage ../development/libraries/haskell/Boolean {};
 
-  brainfuck = callPackage ../development/libraries/haskell/brainfuck/default.nix {};
+  brainfuck = callPackage ../development/libraries/haskell/brainfuck {};
 
   bson = callPackage ../development/libraries/haskell/bson {};
 
@@ -967,7 +967,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
 
   languageHaskellExtract = callPackage ../development/libraries/haskell/language-haskell-extract {};
 
-  lambdabot = callPackage ../development/libraries/haskell/lambdabot/default.nix {};
+  lambdabot = callPackage ../development/libraries/haskell/lambdabot {};
 
   lambdabotUtils = callPackage ../development/libraries/haskell/lambdabot-utils {};
 

From c145369e3c20c04b576fa2c653c927f319b40e87 Mon Sep 17 00:00:00 2001
From: Dmitry Malikov <color404051h@gmail.com>
Date: Mon, 16 Jul 2012 22:20:06 +0200
Subject: [PATCH 12/13] Add haskell/dataInttrie

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

diff --git a/pkgs/development/libraries/haskell/data-inttrie/default.nix b/pkgs/development/libraries/haskell/data-inttrie/default.nix
new file mode 100644
index 00000000000..6b5f013a709
--- /dev/null
+++ b/pkgs/development/libraries/haskell/data-inttrie/default.nix
@@ -0,0 +1,13 @@
+{ cabal }:
+
+cabal.mkDerivation (self: {
+  pname = "data-inttrie";
+  version = "0.0.7";
+  sha256 = "19d586p2pj38pirrkip9z6yxrdbpiqsbnczmnyvd8slndilqz0ip";
+  meta = {
+    homepage = "http://github.com/luqui/data-inttrie";
+    description = "A lazy, infinite trie of integers";
+    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 03eb341b699..50ad0496bbf 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -586,6 +586,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
 
   dataenc = callPackage ../development/libraries/haskell/dataenc {};
 
+  dataInttrie = callPackage ../development/libraries/haskell/data-inttrie {};
+
   dataMemocombinators = callPackage ../development/libraries/haskell/data-memocombinators {};
 
   dataReify = callPackage ../development/libraries/haskell/data-reify {};

From 18c6e6c9d6290eb8ec4110eaddfa4b4af6fd9010 Mon Sep 17 00:00:00 2001
From: Dmitry Malikov <color404051h@gmail.com>
Date: Wed, 18 Jul 2012 08:56:41 +0200
Subject: [PATCH 13/13] Bump lambdabot version

---
 pkgs/development/libraries/haskell/lambdabot/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/lambdabot/default.nix b/pkgs/development/libraries/haskell/lambdabot/default.nix
index 49fdf743e2a..2af512ef3ea 100644
--- a/pkgs/development/libraries/haskell/lambdabot/default.nix
+++ b/pkgs/development/libraries/haskell/lambdabot/default.nix
@@ -7,8 +7,8 @@
 
 cabal.mkDerivation (self: {
   pname = "lambdabot";
-  version = "4.2.3.2";
-  sha256 = "0jy48s4z1yn0wiaxzi3pws7j9j4ih2vqr8gr8md2i35g4bwxmxp2";
+  version = "4.2.3.3";
+  sha256 = "1fxxmrm390pnqpf7v4kap2asaqh02sphl8r6inq4sdy1zs2rxrvk";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [