haskell-path-pieces: added version 0.1.0

haskell-attoparsec-conduit: added version 0.0.0
haskell-blaze-builder-conduit: added version 0.0.0
haskell-conduit: added version 0.0.0.1
haskell-http-conduit: added version 1.0.0
haskell-lifted-base: added version 0.1.0.2
haskell-xml-conduit: added version 0.5.0
haskell-zlib-conduit: added version 0.0.0

svn path=/nixpkgs/trunk/; revision=31141

10 files changed, 196 insertions, 4 deletions

diff --git a/pkgs/development/libraries/haskell/attoparsec-conduit/default.nix b/pkgs/development/libraries/haskell/attoparsec-conduit/default.nix
new file mode 100644
index 00000000000..fd11df19905
--- /dev/null
+++ b/pkgs/development/libraries/haskell/attoparsec-conduit/default.nix
@@ -0,0 +1,18 @@
+{ cabal, attoparsec, conduit, text, transformers }:
+
+cabal.mkDerivation (self: {
+  pname = "attoparsec-conduit";
+  version = "0.0.0";
+  sha256 = "1cwmi86faisg10l15w8mz3619phvrn2hl10blr6pziv1k8c3ncj7";
+  buildDepends = [ attoparsec conduit text transformers ];
+  meta = {
+    homepage = "http://github.com/snoyberg/conduit";
+    description = "Turn attoparsec parsers into sinks";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
+  };
+})
diff --git a/pkgs/development/libraries/haskell/blaze-builder-conduit/default.nix b/pkgs/development/libraries/haskell/blaze-builder-conduit/default.nix
new file mode 100644
index 00000000000..40e4ec9a121
--- /dev/null
+++ b/pkgs/development/libraries/haskell/blaze-builder-conduit/default.nix
@@ -0,0 +1,18 @@
+{ cabal, blazeBuilder, conduit, text, transformers }:
+
+cabal.mkDerivation (self: {
+  pname = "blaze-builder-conduit";
+  version = "0.0.0";
+  sha256 = "022j78sj9cs4xcbvxz0f2lga0rhxcwaj1mkxn0019rbx3lix1nh3";
+  buildDepends = [ blazeBuilder conduit text transformers ];
+  meta = {
+    homepage = "http://github.com/snoyberg/conduit";
+    description = "Convert streams of builders to streams of bytestrings";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
+  };
+})
diff --git a/pkgs/development/libraries/haskell/conduit/default.nix b/pkgs/development/libraries/haskell/conduit/default.nix
new file mode 100644
index 00000000000..76a7130ecb1
--- /dev/null
+++ b/pkgs/development/libraries/haskell/conduit/default.nix
@@ -0,0 +1,22 @@
+{ cabal, liftedBase, monadControl, text, transformers
+, transformersBase
+}:
+
+cabal.mkDerivation (self: {
+  pname = "conduit";
+  version = "0.0.0.1";
+  sha256 = "0l3q9jj0dpbn2ixjx6d9m6ss92dmfgd5xc7wgfpb9d0kfk2li0sv";
+  buildDepends = [
+    liftedBase monadControl text transformers transformersBase
+  ];
+  meta = {
+    homepage = "http://github.com/snoyberg/conduit";
+    description = "A pull-based approach to streaming data";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
+  };
+})
diff --git a/pkgs/development/libraries/haskell/http-conduit/default.nix b/pkgs/development/libraries/haskell/http-conduit/default.nix
new file mode 100644
index 00000000000..ab011d5c87b
--- /dev/null
+++ b/pkgs/development/libraries/haskell/http-conduit/default.nix
@@ -0,0 +1,31 @@
+{ cabal, asn1Data, attoparsec, attoparsecConduit, base64Bytestring
+, blazeBuilder, blazeBuilderConduit, caseInsensitive, certificate
+, conduit, cprngAes, dataDefault, failure, httpTypes, liftedBase
+, monadControl, network, text, tls, tlsExtra, transformers
+, transformersBase, utf8String, zlibConduit, zlibEnum
+}:
+
+cabal.mkDerivation (self: {
+  pname = "http-conduit";
+  version = "1.0.0";
+  sha256 = "1ix2qx6zqp8g7hjg2ygwivzg4hhz2ac22rbybh9adzvzw0q2yvgk";
+  isLibrary = true;
+  isExecutable = true;
+  buildDepends = [
+    asn1Data attoparsec attoparsecConduit base64Bytestring blazeBuilder
+    blazeBuilderConduit caseInsensitive certificate conduit cprngAes
+    dataDefault failure httpTypes liftedBase monadControl network text
+    tls tlsExtra transformers transformersBase utf8String zlibConduit
+    zlibEnum
+  ];
+  meta = {
+    homepage = "http://github.com/snoyberg/http-enumerator";
+    description = "HTTP client package with conduit interface and HTTPS support";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
+  };
+})
diff --git a/pkgs/development/libraries/haskell/lifted-base/default.nix b/pkgs/development/libraries/haskell/lifted-base/default.nix
new file mode 100644
index 00000000000..48822d777bc
--- /dev/null
+++ b/pkgs/development/libraries/haskell/lifted-base/default.nix
@@ -0,0 +1,20 @@
+{ cabal, baseUnicodeSymbols, monadControl, transformersBase }:
+
+cabal.mkDerivation (self: {
+  pname = "lifted-base";
+  version = "0.1.0.2";
+  sha256 = "1j810pdkhl6kpc368081ar1k9342k3bl4cmx294zdyd0j00n23zx";
+  buildDepends = [
+    baseUnicodeSymbols monadControl transformersBase
+  ];
+  meta = {
+    homepage = "https://github.com/basvandijk/lifted-base";
+    description = "lifted IO operations from the base library";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
+  };
+})
diff --git a/pkgs/development/libraries/haskell/path-pieces/default.nix b/pkgs/development/libraries/haskell/path-pieces/0.0.0.nix
index 6230ac2e8a3..6230ac2e8a3 100755
--- a/pkgs/development/libraries/haskell/path-pieces/default.nix
+++ b/pkgs/development/libraries/haskell/path-pieces/0.0.0.nix
diff --git a/pkgs/development/libraries/haskell/path-pieces/0.1.0.nix b/pkgs/development/libraries/haskell/path-pieces/0.1.0.nix
new file mode 100755
index 00000000000..9c3c8dbc79a
--- /dev/null
+++ b/pkgs/development/libraries/haskell/path-pieces/0.1.0.nix
@@ -0,0 +1,18 @@
+{ cabal, text }:
+
+cabal.mkDerivation (self: {
+  pname = "path-pieces";
+  version = "0.1.0";
+  sha256 = "12dgiq2pz94pwa5v5wv96ps0nl5w23r44nnp4lm4cdhl063c9w8d";
+  buildDepends = [ text ];
+  meta = {
+    homepage = "http://github.com/snoyberg/path-pieces";
+    description = "Components of paths";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
+  };
+})
diff --git a/pkgs/development/libraries/haskell/xml-conduit/default.nix b/pkgs/development/libraries/haskell/xml-conduit/default.nix
new file mode 100644
index 00000000000..79f10512b46
--- /dev/null
+++ b/pkgs/development/libraries/haskell/xml-conduit/default.nix
@@ -0,0 +1,25 @@
+{ cabal, attoparsec, attoparsecConduit, blazeBuilder
+, blazeBuilderConduit, conduit, dataDefault, failure
+, systemFilepath, text, transformers, xmlTypes
+}:
+
+cabal.mkDerivation (self: {
+  pname = "xml-conduit";
+  version = "0.5.0";
+  sha256 = "008rrqglxajihcf3yp9cwif67dnabyjjiymxvssznrl8ljz4yn8y";
+  buildDepends = [
+    attoparsec attoparsecConduit blazeBuilder blazeBuilderConduit
+    conduit dataDefault failure systemFilepath text transformers
+    xmlTypes
+  ];
+  meta = {
+    homepage = "http://github.com/snoyberg/xml";
+    description = "Pure-Haskell utilities for dealing with XML with the conduit package";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
+  };
+})
diff --git a/pkgs/development/libraries/haskell/zlib-conduit/default.nix b/pkgs/development/libraries/haskell/zlib-conduit/default.nix
new file mode 100644
index 00000000000..306475a81b4
--- /dev/null
+++ b/pkgs/development/libraries/haskell/zlib-conduit/default.nix
@@ -0,0 +1,18 @@
+{ cabal, conduit, transformers, zlibBindings }:
+
+cabal.mkDerivation (self: {
+  pname = "zlib-conduit";
+  version = "0.0.0";
+  sha256 = "1nqcw809xqlycggn4nqys205gv3kjwws16910xlx2b8b9f8ayxjg";
+  buildDepends = [ conduit transformers zlibBindings ];
+  meta = {
+    homepage = "http://github.com/snoyberg/conduit";
+    description = "Streaming compression/decompression via conduits";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
+  };
+})
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index 8cc83cf4853..5e1fef0215f 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -439,6 +439,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
 
   attoparsec = callPackage ../development/libraries/haskell/attoparsec {};
 
+  attoparsecConduit = callPackage ../development/libraries/haskell/attoparsec-conduit {};
+
   attoparsecEnumerator = callPackage ../development/libraries/haskell/attoparsec/enumerator.nix {};
 
   authenticate = callPackage ../development/libraries/haskell/authenticate {};
@@ -467,6 +469,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
 
   blazeBuilder = callPackage ../development/libraries/haskell/blaze-builder {};
 
+  blazeBuilderConduit = callPackage ../development/libraries/haskell/blaze-builder-conduit {};
+
   blazeBuilderEnumerator = callPackage ../development/libraries/haskell/blaze-builder-enumerator {};
 
   blazeHtml = callPackage ../development/libraries/haskell/blaze-html {};
@@ -529,6 +533,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
 
   compactStringFix = callPackage ../development/libraries/haskell/compact-string-fix {};
 
+  conduit = callPackage ../development/libraries/haskell/conduit {};
+
   ConfigFile = callPackage ../development/libraries/haskell/ConfigFile {};
 
   controlMonadAttempt = callPackage ../development/libraries/haskell/control-monad-attempt {};
@@ -840,6 +846,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
   html_1_0_1_2 = callPackage ../development/libraries/haskell/html/1.0.1.2.nix {};
   html = self.html_1_0_1_2;
 
+  httpConduit = callPackage ../development/libraries/haskell/http-conduit {};
+
   httpdShed = callPackage ../development/libraries/haskell/httpd-shed {};
 
   httpDate = callPackage ../development/libraries/haskell/http-date {};
@@ -899,6 +907,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
 
   libmpd = callPackage ../development/libraries/haskell/libmpd {};
 
+  liftedBase = callPackage ../development/libraries/haskell/lifted-base {};
+
   ListLike = callPackage ../development/libraries/haskell/ListLike {};
 
   ltk = callPackage ../development/libraries/haskell/ltk {};
@@ -997,7 +1007,9 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
 
   OpenGLRaw = callPackage ../development/libraries/haskell/OpenGLRaw {};
 
-  pathPieces = callPackage ../development/libraries/haskell/path-pieces {};
+  pathPieces_0_0_0 = callPackage ../development/libraries/haskell/path-pieces/0.0.0.nix {};
+  pathPieces_0_1_0 = callPackage ../development/libraries/haskell/path-pieces/0.1.0.nix {};
+  pathPieces = self.pathPieces_0_1_0;
 
   pandoc = callPackage ../development/libraries/haskell/pandoc/default.nix {};
 
@@ -1029,7 +1041,9 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
 
   pcreLight = callPackage ../development/libraries/haskell/pcre-light {};
 
-  persistent = callPackage ../development/libraries/haskell/persistent {};
+  persistent = callPackage ../development/libraries/haskell/persistent {
+    pathPieces = self.pathPieces_0_0_0;
+  };
 
   persistentTemplate = callPackage ../development/libraries/haskell/persistent-template {};
 
@@ -1372,7 +1386,9 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
 
   webRoutes = callPackage ../development/libraries/haskell/web-routes {};
 
-  webRoutesQuasi = callPackage ../development/libraries/haskell/web-routes-quasi {};
+  webRoutesQuasi = callPackage ../development/libraries/haskell/web-routes-quasi {
+    pathPieces = self.pathPieces_0_0_0;
+  };
 
   CouchDB = callPackage ../development/libraries/haskell/CouchDB {};
 
@@ -1396,6 +1412,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
 
   xml = callPackage ../development/libraries/haskell/xml {};
 
+  xmlConduit = callPackage ../development/libraries/haskell/xml-conduit {};
+
   xmlEnumerator = callPackage ../development/libraries/haskell/xml-enumerator {};
 
   xmlTypes = callPackage ../development/libraries/haskell/xml-types {};
@@ -1410,7 +1428,9 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
 
   yesodAuth = callPackage ../development/libraries/haskell/yesod-auth {};
 
-  yesodCore = callPackage ../development/libraries/haskell/yesod-core {};
+  yesodCore = callPackage ../development/libraries/haskell/yesod-core {
+    pathPieces = self.pathPieces_0_0_0;
+  };
 
   yesodForm = callPackage ../development/libraries/haskell/yesod-form {};
 
@@ -1441,6 +1461,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
 
   zlibBindings = callPackage ../development/libraries/haskell/zlib-bindings {};
 
+  zlibConduit = callPackage ../development/libraries/haskell/zlib-conduit {};
+
   zlibEnum = callPackage ../development/libraries/haskell/zlib-enum {};
 
   Zwaluw = callPackage ../development/libraries/haskell/Zwaluw {};