Merge trunk

svn path=/nixpkgs/branches/stdenv-updates/; revision=31207

56 files changed, 488 insertions, 167 deletions

diff --git a/pkgs/development/compilers/clean/default.nix b/pkgs/development/compilers/clean/default.nix
index fa61f8bfc75a..bd051a95699e 100644
--- a/pkgs/development/compilers/clean/default.nix
+++ b/pkgs/development/compilers/clean/default.nix
@@ -1,16 +1,16 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "clean-2.3";
+  name = "clean-2.4";
 
   src =
     if stdenv.system == "i686-linux" then (fetchurl {
-      url = "http://clean.cs.ru.nl/download/Clean23/linux/clean2.3_boot.tar.gz";
-      sha256 = "0rrjpqdbqwbx7n8v35wi3wpm6lpv9zd1n5q50byb2h0ljqw31j9h";
+      url = "http://clean.cs.ru.nl/download/Clean24/linux/clean2.4_boot.tar.gz";
+      sha256 = "1w8vvmkwzq8g51639r62apcy75sj69nm08082a34xvqm9ymfgkq5";
     })
     else if stdenv.system == "x86_64-linux" then (fetchurl {
-        url = "http://clean.cs.ru.nl/download/Clean23/linux/clean2.3_64_boot.tar.gz";
-        sha256 = "0bvkaiwcaa1p6h1bl4bgnia1yd0j8nq6sb1yiwar74y2m1wwmjqj";
+        url = "http://clean.cs.ru.nl/download/Clean24/linux/clean2.4_64_boot.tar.gz";
+        sha256 = "08gsa1pjl5wyzh4ah8ccfx8a7mdcn6ycsn1lzkrr9adygv1gmm7r";
     })
     else throw "Architecture not supported";
 
diff --git a/pkgs/development/compilers/ghc/head.nix b/pkgs/development/compilers/ghc/head.nix
index 330165437d5b..0d3301df60a3 100644
--- a/pkgs/development/compilers/ghc/head.nix
+++ b/pkgs/development/compilers/ghc/head.nix
@@ -1,13 +1,13 @@
 {stdenv, fetchurl, ghc, perl, gmp, ncurses, darwinInstallNameToolUtility}:
 
 stdenv.mkDerivation rec {
-  version = "7.3.20111212";
+  version = "7.4.0.20111219";
 
   name = "ghc-${version}";
 
   src = fetchurl {
-    url = "http://haskell.org/ghc/dist/current/dist/${name}-src.tar.bz2";
-    sha256 = "1i8zw3qaihzbgygdlip9d5g5321wv1yhashf8nrinwgy5649rsyf";
+    url = "http://haskell.org/ghc/dist/7.4.1-rc1/${name}-src.tar.bz2";
+    sha256 = "11imfag07wr9s5vf12yh6bz4hjfbw20i1c7n8py9fa4vx7va676n";
   };
 
   buildInputs = [ghc perl gmp ncurses] ++
diff --git a/pkgs/development/libraries/haskell/HTTP/4000.2.2.nix b/pkgs/development/libraries/haskell/HTTP/4000.2.2.nix
new file mode 100644
index 000000000000..082c3ddc3ac6
--- /dev/null
+++ b/pkgs/development/libraries/haskell/HTTP/4000.2.2.nix
@@ -0,0 +1,18 @@
+{ cabal, mtl, network, parsec }:
+
+cabal.mkDerivation (self: {
+  pname = "HTTP";
+  version = "4000.2.2";
+  sha256 = "0qrr9wdj25sdfxifppmw0w14g8skpgf42ic4iqcqylxxzfa8v7vh";
+  buildDepends = [ mtl network parsec ];
+  meta = {
+    homepage = "https://github.com/haskell/HTTP";
+    description = "A library for client-side HTTP";
+    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/aeson/default.nix b/pkgs/development/libraries/haskell/aeson/default.nix
index 04a94c222c6d..b8ead39671e6 100644
--- a/pkgs/development/libraries/haskell/aeson/default.nix
+++ b/pkgs/development/libraries/haskell/aeson/default.nix
@@ -1,14 +1,14 @@
-{ cabal, attoparsec, blazeBuilder, blazeTextual, deepseq, dlist
-, hashable, mtl, syb, text, time, unorderedContainers, vector
+{ cabal, attoparsec, blazeBuilder, deepseq, dlist, hashable, mtl
+, syb, text, time, unorderedContainers, vector
 }:
 
 cabal.mkDerivation (self: {
   pname = "aeson";
-  version = "0.4.0.1";
-  sha256 = "15aq3r36vda8v1fn3pn0k638w32kzy15kbrf97krvg3xdwrvybky";
+  version = "0.5.0.0";
+  sha256 = "1n7c0kf6rdf5p76mjcxlqrzhnfz4b1zkkbxk9w94hibb0s4kwxv6";
   buildDepends = [
-    attoparsec blazeBuilder blazeTextual deepseq dlist hashable mtl syb
-    text time unorderedContainers vector
+    attoparsec blazeBuilder deepseq dlist hashable mtl syb text time
+    unorderedContainers vector
   ];
   meta = {
     homepage = "https://github.com/bos/aeson";
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 000000000000..fd11df199053
--- /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 000000000000..40e4ec9a1218
--- /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/blaze-html/default.nix b/pkgs/development/libraries/haskell/blaze-html/default.nix
index dbeb4721f331..0231b9e8e00c 100644
--- a/pkgs/development/libraries/haskell/blaze-html/default.nix
+++ b/pkgs/development/libraries/haskell/blaze-html/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "blaze-html";
-  version = "0.4.3.0";
-  sha256 = "1018mfsc1cqbyxlil136171n9qi9sypchlmmfqawf3aa1sjskmfg";
+  version = "0.4.3.1";
+  sha256 = "0yhwlwmjy3jagxscz2i0yjfy6akqpamn9c35ffxcgpr0kj6qlpfp";
   buildDepends = [ blazeBuilder text ];
   meta = {
     homepage = "http://jaspervdj.be/blaze";
diff --git a/pkgs/development/libraries/haskell/byteorder/default.nix b/pkgs/development/libraries/haskell/byteorder/default.nix
new file mode 100644
index 000000000000..d3af223418bb
--- /dev/null
+++ b/pkgs/development/libraries/haskell/byteorder/default.nix
@@ -0,0 +1,17 @@
+{ cabal }:
+
+cabal.mkDerivation (self: {
+  pname = "byteorder";
+  version = "1.0.3";
+  sha256 = "056jb47r4pkimi6z2z49prnsmjnhnijk57zm0divl1k55igi5way";
+  meta = {
+    homepage = "http://community.haskell.org/~aslatter/code/byteorder";
+    description = "Exposes the native endianness or byte ordering of the system";
+    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 000000000000..76a7130ecb17
--- /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/data-accessor/data-accessor.nix b/pkgs/development/libraries/haskell/data-accessor/data-accessor.nix
index f6b48befd5d6..76bee6c05a8e 100644
--- a/pkgs/development/libraries/haskell/data-accessor/data-accessor.nix
+++ b/pkgs/development/libraries/haskell/data-accessor/data-accessor.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "data-accessor";
-  version = "0.2.2";
-  sha256 = "1jqd0qlv1yab83d5pdbzjw6q4a2kvbsar6kgczq0f0xn9gxm0qci";
+  version = "0.2.2.1";
+  sha256 = "1zb7z9fnlnxxlvjd655vadfscanzq9msvjv21cjmdric0ja24hxb";
   buildDepends = [ transformers ];
   meta = {
     homepage = "http://www.haskell.org/haskellwiki/Record_access";
diff --git a/pkgs/development/libraries/haskell/data-object-yaml/default.nix b/pkgs/development/libraries/haskell/data-object-yaml/default.nix
index a29ba40b823e..1669f4be73ee 100644
--- a/pkgs/development/libraries/haskell/data-object-yaml/default.nix
+++ b/pkgs/development/libraries/haskell/data-object-yaml/default.nix
@@ -1,20 +1,19 @@
-{ cabal, convertibleText, dataObject, enumerator, failure, text
+{ cabal, conduit, convertibleText, dataObject, failure, text
 , transformers, yaml
 }:
 
 cabal.mkDerivation (self: {
   pname = "data-object-yaml";
-  version = "0.3.3.6";
-  sha256 = "0hha52nrxb539bvdz6ksn9sxmksfwmjhh7h8mp223s340vxrlpk3";
+  version = "0.3.4";
+  sha256 = "1wx6m7mjmdks8ym6dh117bhkdks4d1jlfchqif0svcwg04qnfczd";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [
-    convertibleText dataObject enumerator failure text transformers
-    yaml
+    conduit convertibleText dataObject failure text transformers yaml
   ];
   meta = {
     homepage = "http://github.com/snoyberg/data-object-yaml";
-    description = "Serialize data to and from Yaml files";
+    description = "Serialize data to and from Yaml files (deprecated)";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
     maintainers = [
diff --git a/pkgs/development/libraries/haskell/derive/default.nix b/pkgs/development/libraries/haskell/derive/default.nix
index 7f28ad8b10da..c98ddb04cd5b 100644
--- a/pkgs/development/libraries/haskell/derive/default.nix
+++ b/pkgs/development/libraries/haskell/derive/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "derive";
-  version = "2.5.4";
-  sha256 = "0gmj24qzh3vyvp0a44v4mf1qpkrg4d9q0m15d0yfbyzrimyjx1c7";
+  version = "2.5.5";
+  sha256 = "1vv7y2jfyxq2abh4avyjwia309a6rylbyiqia1m0ka7zwv2rxd6y";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [ haskellSrcExts syb transformers uniplate ];
diff --git a/pkgs/development/libraries/haskell/dstring/default.nix b/pkgs/development/libraries/haskell/dstring/default.nix
new file mode 100644
index 000000000000..0b979e179f44
--- /dev/null
+++ b/pkgs/development/libraries/haskell/dstring/default.nix
@@ -0,0 +1,18 @@
+{ cabal, baseUnicodeSymbols, dlist }:
+
+cabal.mkDerivation (self: {
+  pname = "dstring";
+  version = "0.4.0.3";
+  sha256 = "0wzj1wzls7w79ac84sc5msblh2dmfmcxm77drpdqdirl1pwdlq9c";
+  buildDepends = [ baseUnicodeSymbols dlist ];
+  meta = {
+    homepage = "https://github.com/basvandijk/dstring";
+    description = "Difference strings";
+    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/enumerator/default.nix b/pkgs/development/libraries/haskell/enumerator/default.nix
index 12e801516a6f..58e5ab4b62db 100644
--- a/pkgs/development/libraries/haskell/enumerator/default.nix
+++ b/pkgs/development/libraries/haskell/enumerator/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "enumerator";
-  version = "0.4.16";
-  sha256 = "16556x3km4si7gvprf7xmsiqw1ygjwavhbgh32fmzf7709bpqnhs";
+  version = "0.4.17";
+  sha256 = "009h9phdgnkbvz5fri81b895y2hbmw5x7z67rnn31j87khbhnfz9";
   buildDepends = [ text transformers ];
   meta = {
     homepage = "https://john-millikin.com/software/enumerator/";
diff --git a/pkgs/development/libraries/haskell/fast-logger/default.nix b/pkgs/development/libraries/haskell/fast-logger/default.nix
new file mode 100644
index 000000000000..68bc8ca60055
--- /dev/null
+++ b/pkgs/development/libraries/haskell/fast-logger/default.nix
@@ -0,0 +1,17 @@
+{ cabal, blazeBuilder }:
+
+cabal.mkDerivation (self: {
+  pname = "fast-logger";
+  version = "0.0.1";
+  sha256 = "19ff2dhkh62i1ljsl90wnsblzk30dz0yx4kw5gk1hb22md7hakim";
+  buildDepends = [ blazeBuilder ];
+  meta = {
+    description = "A fast logging system";
+    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/gloss/default.nix b/pkgs/development/libraries/haskell/gloss/default.nix
index 1b9fbb03da48..47425ae2536c 100644
--- a/pkgs/development/libraries/haskell/gloss/default.nix
+++ b/pkgs/development/libraries/haskell/gloss/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "gloss";
-  version = "1.5.2.1";
-  sha256 = "1mwk9gnkbjr76f9g79ixxlwzpsvmhflp5c8a0584fyypjg2r33n3";
+  version = "1.6.0.1";
+  sha256 = "0yy8yl2s3n0kyr14bcxp1hjzh3wlrhc0xp2ngl3wbz1hbzyrsdlf";
   buildDepends = [ bmp GLUT OpenGL ];
   meta = {
     homepage = "http://gloss.ouroborus.net";
diff --git a/pkgs/development/libraries/haskell/hamlet/default.nix b/pkgs/development/libraries/haskell/hamlet/default.nix
index 15d219830a47..98132edfdb26 100644
--- a/pkgs/development/libraries/haskell/hamlet/default.nix
+++ b/pkgs/development/libraries/haskell/hamlet/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "hamlet";
-  version = "0.10.5";
-  sha256 = "0kizy0qij6zbayrbb3gr4iqys1551ax5c8w5lvh6chg3ypl1i1m3";
+  version = "0.10.6";
+  sha256 = "0ai00jwbq5nnrgcfhz3sxm2jm2jvz7qbj56lr0wlc3z818a22ams";
   buildDepends = [
     blazeBuilder blazeHtml failure parsec shakespeare text
   ];
diff --git a/pkgs/development/libraries/haskell/hmatrix/default.nix b/pkgs/development/libraries/haskell/hmatrix/default.nix
index 84866e026fd3..c60c7dc1591e 100644
--- a/pkgs/development/libraries/haskell/hmatrix/default.nix
+++ b/pkgs/development/libraries/haskell/hmatrix/default.nix
@@ -1,14 +1,10 @@
-{ cabal, binary, blas, gsl, HUnit, liblapack, QuickCheck, random
-, storableComplex, vector
-}:
+{ cabal, binary, blas, gsl, liblapack, storableComplex, vector }:
 
 cabal.mkDerivation (self: {
   pname = "hmatrix";
-  version = "0.12.0.2";
-  sha256 = "08i3vi0vs6wpyvjsjpqrxp8lw0f89cgzwv1j27y7i2yfp4xmrw8d";
-  buildDepends = [
-    binary HUnit QuickCheck random storableComplex vector
-  ];
+  version = "0.13.0.0";
+  sha256 = "1jlibgg2nrgajw2ny0dq88f5mhrffi7kda9bb8sp9szf4a0kd4wd";
+  buildDepends = [ binary storableComplex vector ];
   extraLibraries = [ blas gsl liblapack ];
   configureFlags = "-fvector";
   meta = {
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 000000000000..ab011d5c87b4
--- /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/http-enumerator/default.nix b/pkgs/development/libraries/haskell/http-enumerator/default.nix
index 14109cd1c113..2a285965f9cb 100644
--- a/pkgs/development/libraries/haskell/http-enumerator/default.nix
+++ b/pkgs/development/libraries/haskell/http-enumerator/default.nix
@@ -7,8 +7,8 @@
 
 cabal.mkDerivation (self: {
   pname = "http-enumerator";
-  version = "0.7.2";
-  sha256 = "096rwnfm8bqn0pq9cs4i2kr1ljmawk2l17afw301zqfg79q97crc";
+  version = "0.7.2.1";
+  sha256 = "1qbarxi9268yzb3phnfgvnszbkzs6r63gqzy63h69kpi0k0wl84i";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [
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 000000000000..48822d777bcb
--- /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/multirec/default.nix b/pkgs/development/libraries/haskell/multirec/default.nix
index e5a1b2a85a96..c001783a13ba 100644
--- a/pkgs/development/libraries/haskell/multirec/default.nix
+++ b/pkgs/development/libraries/haskell/multirec/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "multirec";
-  version = "0.7";
-  sha256 = "1n196qqggfnk8fa1x296rdbyb77a6ykhy01z8x2glgdimzpxsiay";
+  version = "0.7.1";
+  sha256 = "1a3snlv6lr9mi4nrl4cyc5ilk6flbdn0ck2sqla6dyb2zdlgf5ph";
   noHaddock = true;
   meta = {
     homepage = "http://www.cs.uu.nl/wiki/GenericProgramming/Multirec";
diff --git a/pkgs/development/libraries/haskell/path-pieces/default.nix b/pkgs/development/libraries/haskell/path-pieces/0.0.0.nix
index 6230ac2e8a36..6230ac2e8a36 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 000000000000..9c3c8dbc79af
--- /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/persistent/default.nix b/pkgs/development/libraries/haskell/persistent/default.nix
index 527bbf9f2ae7..59fe42ff65eb 100644
--- a/pkgs/development/libraries/haskell/persistent/default.nix
+++ b/pkgs/development/libraries/haskell/persistent/default.nix
@@ -5,8 +5,8 @@
 
 cabal.mkDerivation (self: {
   pname = "persistent";
-  version = "0.6.4.3";
-  sha256 = "0j4agwm8hcphrmzmc7d7al57cwp3i5iy7d8yhqw9m8pcx61sqkg4";
+  version = "0.6.4.4";
+  sha256 = "0n4zl0r8nmp3pwsgc0kiy7fgk2dfvdvagv1gvjxrs8545c5ycggv";
   buildDepends = [
     blazeHtml dataObject enumerator monadControl mtl pathPieces pool
     text time transformers transformersBase
diff --git a/pkgs/development/libraries/haskell/regular/default.nix b/pkgs/development/libraries/haskell/regular/default.nix
index 4b4e5458df25..0085d8665675 100644
--- a/pkgs/development/libraries/haskell/regular/default.nix
+++ b/pkgs/development/libraries/haskell/regular/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "regular";
-  version = "0.3.3";
-  sha256 = "1xlpp60nvdiqkcn66dnpww72hcawyc1w7cd9zk9kk88x574kqzf7";
+  version = "0.3.4";
+  sha256 = "10gfid99xcqv3i9rp4x8hykk91qq3h7b7lxzsl7ii58vmifa4kgq";
   meta = {
     description = "Generic programming library for regular datatypes";
     license = self.stdenv.lib.licenses.bsd3;
diff --git a/pkgs/development/libraries/haskell/repr/default.nix b/pkgs/development/libraries/haskell/repr/default.nix
new file mode 100644
index 000000000000..bad1e93d6b95
--- /dev/null
+++ b/pkgs/development/libraries/haskell/repr/default.nix
@@ -0,0 +1,20 @@
+{ cabal, baseUnicodeSymbols, dstring, random, stringCombinators }:
+
+cabal.mkDerivation (self: {
+  pname = "repr";
+  version = "0.4.1.2";
+  sha256 = "09rv23p1hvvfw5wnhiawgrpqgqa4i0d00skyj9z1jj6bfxk5avjs";
+  buildDepends = [
+    baseUnicodeSymbols dstring random stringCombinators
+  ];
+  meta = {
+    homepage = "https://github.com/basvandijk/repr";
+    description = "Render overloaded expressions to their textual representation";
+    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/shakespeare-css/default.nix b/pkgs/development/libraries/haskell/shakespeare-css/default.nix
index 1cef979c01e6..b0d70a8fbfde 100644
--- a/pkgs/development/libraries/haskell/shakespeare-css/default.nix
+++ b/pkgs/development/libraries/haskell/shakespeare-css/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "shakespeare-css";
-  version = "0.10.4";
-  sha256 = "006ndbhzxkr2zw6gs13bm5pfq7i301bbg6nhagm3h9nnzp155snz";
+  version = "0.10.5";
+  sha256 = "1cnv9qgp1llrrvcqp64mq207wdsxpqza9yq5nzlsgrh6qlzvm4hs";
   buildDepends = [ parsec shakespeare text ];
   meta = {
     homepage = "http://www.yesodweb.com/book/templates";
diff --git a/pkgs/development/libraries/haskell/shakespeare-i18n/default.nix b/pkgs/development/libraries/haskell/shakespeare-i18n/default.nix
new file mode 100644
index 000000000000..1a1e4f1d20b0
--- /dev/null
+++ b/pkgs/development/libraries/haskell/shakespeare-i18n/default.nix
@@ -0,0 +1,18 @@
+{ cabal, parsec, shakespeare, text }:
+
+cabal.mkDerivation (self: {
+  pname = "shakespeare-i18n";
+  version = "0.0.0";
+  sha256 = "1zyr63ncd92c30afh0sf4lq7p253jd3gjvcv65f7i0njqpc1lg9y";
+  buildDepends = [ parsec shakespeare text ];
+  meta = {
+    homepage = "http://www.yesodweb.com/book/i18n";
+    description = "A type-based approach to internationalization";
+    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/shakespeare-js/default.nix b/pkgs/development/libraries/haskell/shakespeare-js/default.nix
index a4a20c98b197..d127725a73e3 100644
--- a/pkgs/development/libraries/haskell/shakespeare-js/default.nix
+++ b/pkgs/development/libraries/haskell/shakespeare-js/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "shakespeare-js";
-  version = "0.10.3";
-  sha256 = "1xz4jf91dfz60dji31d3hyy1k01hk0v41pb8qmi598jylk9iz1r2";
+  version = "0.10.4";
+  sha256 = "15mh93d38qpqnrgxvaq659zwl2mks9xhkynhlpjrf8zb234knxjw";
   buildDepends = [ shakespeare text ];
   meta = {
     homepage = "http://www.yesodweb.com/book/templates";
diff --git a/pkgs/development/libraries/haskell/simple-sendfile/default.nix b/pkgs/development/libraries/haskell/simple-sendfile/default.nix
index f66eb3bb5910..d4f814b21116 100644
--- a/pkgs/development/libraries/haskell/simple-sendfile/default.nix
+++ b/pkgs/development/libraries/haskell/simple-sendfile/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "simple-sendfile";
-  version = "0.1.3";
-  sha256 = "0n78d6bn2hsm3p6r2kc2cr5nf9v1vqs6v5i9x71f910r3kk2grm8";
+  version = "0.2.0";
+  sha256 = "1rsbmlnks4q8gsfzwqwcj901b8hzcrfb85z7wy3szj4h0axw4264";
   buildDepends = [ network ];
   meta = {
     description = "Cross platform library for the sendfile system call";
diff --git a/pkgs/development/libraries/haskell/string-combinators/default.nix b/pkgs/development/libraries/haskell/string-combinators/default.nix
new file mode 100644
index 000000000000..3371c56ceb22
--- /dev/null
+++ b/pkgs/development/libraries/haskell/string-combinators/default.nix
@@ -0,0 +1,18 @@
+{ cabal, baseUnicodeSymbols }:
+
+cabal.mkDerivation (self: {
+  pname = "string-combinators";
+  version = "0.6.0.2";
+  sha256 = "1bsnli6376nq5dmcx8da2fakj7h73plqz6v1myzhkz1f6r3qcjfi";
+  buildDepends = [ baseUnicodeSymbols ];
+  meta = {
+    homepage = "https://github.com/basvandijk/string-combinators";
+    description = "Polymorphic functions to build and combine stringlike values";
+    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/syb/syb-with-class.nix b/pkgs/development/libraries/haskell/syb/syb-with-class.nix
index 980c24b2d459..79b90feaa851 100644
--- a/pkgs/development/libraries/haskell/syb/syb-with-class.nix
+++ b/pkgs/development/libraries/haskell/syb/syb-with-class.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "syb-with-class";
-  version = "0.6.1.2";
-  sha256 = "1hzwhfpl4w5nblkr2l4l4i7xxkvv7n5adr3i9miqmw1krlxs852d";
+  version = "0.6.1.3";
+  sha256 = "0dmj9ah7az5lckamvm46pff0595p6v4pvzdv0lqq97gjs5i59y9d";
   meta = {
     description = "Scrap Your Boilerplate With Class";
     license = self.stdenv.lib.licenses.bsd3;
diff --git a/pkgs/development/libraries/haskell/texmath/default.nix b/pkgs/development/libraries/haskell/texmath/default.nix
index d25c80a18103..032f79ce077e 100644
--- a/pkgs/development/libraries/haskell/texmath/default.nix
+++ b/pkgs/development/libraries/haskell/texmath/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "texmath";
-  version = "0.5.0.3";
-  sha256 = "0pw3b5qvsngy0wdny8y3widkaphvjksg7mnpa8yzqfsw0rl36s0p";
+  version = "0.5.0.4";
+  sha256 = "0wi7zix10p73hb8aiyq47d27k5hi0l0ba5p6h7kdbhia9xm5w5w5";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [ parsec syb xml ];
diff --git a/pkgs/development/libraries/haskell/wai-extra/default.nix b/pkgs/development/libraries/haskell/wai-extra/default.nix
index a0a736deeef3..a2840ad66ce3 100644
--- a/pkgs/development/libraries/haskell/wai-extra/default.nix
+++ b/pkgs/development/libraries/haskell/wai-extra/default.nix
@@ -1,15 +1,15 @@
 { cabal, blazeBuilder, blazeBuilderEnumerator, caseInsensitive
-, dataDefault, enumerator, httpTypes, network, text, time
-, transformers, wai, zlibBindings, zlibEnum
+, dataDefault, enumerator, fastLogger, httpTypes, network, text
+, time, transformers, wai, zlibBindings, zlibEnum
 }:
 
 cabal.mkDerivation (self: {
   pname = "wai-extra";
-  version = "0.4.5.2";
-  sha256 = "05gq22il1jnvw5rcqr6gassxj29f8l4536zm6bpgk1kff8cxa3g1";
+  version = "0.4.6";
+  sha256 = "1wpdfzw5qzbd33iypgppp4822vn7vhja6y26dnkb17n08r83vvhv";
   buildDepends = [
     blazeBuilder blazeBuilderEnumerator caseInsensitive dataDefault
-    enumerator httpTypes network text time transformers wai
+    enumerator fastLogger httpTypes network text time transformers wai
     zlibBindings zlibEnum
   ];
   meta = {
diff --git a/pkgs/development/libraries/haskell/wai-logger/default.nix b/pkgs/development/libraries/haskell/wai-logger/default.nix
new file mode 100644
index 000000000000..d99bd1a0442c
--- /dev/null
+++ b/pkgs/development/libraries/haskell/wai-logger/default.nix
@@ -0,0 +1,22 @@
+{ cabal, blazeBuilder, byteorder, caseInsensitive, fastLogger
+, httpTypes, network, time, wai
+}:
+
+cabal.mkDerivation (self: {
+  pname = "wai-logger";
+  version = "0.1.2";
+  sha256 = "0pzbdjy0xkjqkzc5w1v0hh18jgbxlkllsjwxabswkh8gl73mp7d9";
+  buildDepends = [
+    blazeBuilder byteorder caseInsensitive fastLogger httpTypes network
+    time wai
+  ];
+  meta = {
+    description = "A logging system for WAI";
+    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/warp/default.nix b/pkgs/development/libraries/haskell/warp/default.nix
index 5ff960513071..95caf840ad0c 100644
--- a/pkgs/development/libraries/haskell/warp/default.nix
+++ b/pkgs/development/libraries/haskell/warp/default.nix
@@ -5,8 +5,8 @@
 
 cabal.mkDerivation (self: {
   pname = "warp";
-  version = "0.4.6.2";
-  sha256 = "1ja9w3440j69w7638wrjd6067svqcsaqdl1zklr6jx20zyadww94";
+  version = "0.4.6.3";
+  sha256 = "1gfjhp1s42ynpi3kh8fr6fp5nwirxz0gasr7zs7q2qwwvlq9pzm6";
   buildDepends = [
     blazeBuilder blazeBuilderEnumerator caseInsensitive enumerator
     httpTypes network simpleSendfile transformers unixCompat wai
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 000000000000..79f10512b46e
--- /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/yaml/default.nix b/pkgs/development/libraries/haskell/yaml/default.nix
index 76010bb4f868..2b25768aa69d 100644
--- a/pkgs/development/libraries/haskell/yaml/default.nix
+++ b/pkgs/development/libraries/haskell/yaml/default.nix
@@ -1,12 +1,15 @@
-{ cabal, enumerator, transformers }:
+{ cabal, aeson, attoparsec, conduit, text, transformers
+, unorderedContainers, vector
+}:
 
 cabal.mkDerivation (self: {
   pname = "yaml";
-  version = "0.4.1.2";
-  sha256 = "1c7ffs5gkwk0l0vg7amsflra1j8ifd9cvvbqx9jzkqsay8hbr4vb";
-  isLibrary = true;
-  isExecutable = true;
-  buildDepends = [ enumerator transformers ];
+  version = "0.5.1.1";
+  sha256 = "1l3f1rbdajdf9944kwbf90a1wxv00g2jcgjkg54k6c3iqbx956w2";
+  buildDepends = [
+    aeson attoparsec conduit text transformers unorderedContainers
+    vector
+  ];
   meta = {
     homepage = "http://github.com/snoyberg/yaml/";
     description = "Low-level binding to the libyaml C library";
diff --git a/pkgs/development/libraries/haskell/yesod-auth/default.nix b/pkgs/development/libraries/haskell/yesod-auth/default.nix
index ce9c3c29808b..2ed7486eff45 100644
--- a/pkgs/development/libraries/haskell/yesod-auth/default.nix
+++ b/pkgs/development/libraries/haskell/yesod-auth/default.nix
@@ -7,8 +7,8 @@
 
 cabal.mkDerivation (self: {
   pname = "yesod-auth";
-  version = "0.7.8";
-  sha256 = "1v3mvb22g56frvwb82l73k7cqrl926hg133x5idl5q66fp8h94q0";
+  version = "0.7.9";
+  sha256 = "08vlj61y3czv0v8dnfdkyfww5sccia6j0fxnn1hxk44zghwhy214";
   buildDepends = [
     aeson authenticate blazeHtml controlMonadAttempt hamlet
     httpEnumerator mimeMail persistent persistentTemplate pureMD5
diff --git a/pkgs/development/libraries/haskell/yesod-core/default.nix b/pkgs/development/libraries/haskell/yesod-core/default.nix
index c894a5138e69..4e81d54979b4 100644
--- a/pkgs/development/libraries/haskell/yesod-core/default.nix
+++ b/pkgs/development/libraries/haskell/yesod-core/default.nix
@@ -1,21 +1,21 @@
 { cabal, aeson, blazeBuilder, blazeHtml, caseInsensitive, cereal
 , clientsession, cookie, dataObject, dataObjectYaml, enumerator
-, failure, hamlet, httpTypes, monadControl, parsec, pathPieces
-, random, shakespeare, shakespeareCss, shakespeareJs
-, strictConcurrency, text, time, transformers, transformersBase
-, vector, wai, waiExtra
+, failure, fastLogger, hamlet, httpTypes, monadControl, parsec
+, pathPieces, random, shakespeare, shakespeareCss, shakespeareI18n
+, shakespeareJs, text, time, transformers, transformersBase, vector
+, wai, waiExtra, waiLogger
 }:
 
 cabal.mkDerivation (self: {
   pname = "yesod-core";
-  version = "0.9.3.6";
-  sha256 = "00h1ylrr5wrid9vn3jhspibprx0175j9rcwdb1hd7ya5gwmzlhjs";
+  version = "0.9.4";
+  sha256 = "1m9cxm3pngg4pq7j3p1sh7lrjp5gslnn6zcimc5ln8yldxx01c6g";
   buildDepends = [
     aeson blazeBuilder blazeHtml caseInsensitive cereal clientsession
-    cookie dataObject dataObjectYaml enumerator failure hamlet
-    httpTypes monadControl parsec pathPieces random shakespeare
-    shakespeareCss shakespeareJs strictConcurrency text time
-    transformers transformersBase vector wai waiExtra
+    cookie dataObject dataObjectYaml enumerator failure fastLogger
+    hamlet httpTypes monadControl parsec pathPieces random shakespeare
+    shakespeareCss shakespeareI18n shakespeareJs text time transformers
+    transformersBase vector wai waiExtra waiLogger
   ];
   meta = {
     homepage = "http://www.yesodweb.com/";
diff --git a/pkgs/development/libraries/haskell/yesod-form/default.nix b/pkgs/development/libraries/haskell/yesod-form/default.nix
index c6ce1d024c1b..2f384e2e878c 100644
--- a/pkgs/development/libraries/haskell/yesod-form/default.nix
+++ b/pkgs/development/libraries/haskell/yesod-form/default.nix
@@ -5,8 +5,8 @@
 
 cabal.mkDerivation (self: {
   pname = "yesod-form";
-  version = "0.3.4.1";
-  sha256 = "0khkc4bpqfgfs0zl753x4l5qpkfr8hv0kwzz6qpry5skxa326q6i";
+  version = "0.3.4.2";
+  sha256 = "1ahkbycxvjh1yvxfbf8wg6mlklmwm8hmy15x0b07g2xq7h1jmc5i";
   buildDepends = [
     blazeBuilder blazeHtml dataDefault emailValidate hamlet network
     persistent shakespeareCss shakespeareJs text time transformers wai
diff --git a/pkgs/development/libraries/haskell/yesod-json/default.nix b/pkgs/development/libraries/haskell/yesod-json/default.nix
index 167ead39dd5e..379d7319b120 100644
--- a/pkgs/development/libraries/haskell/yesod-json/default.nix
+++ b/pkgs/development/libraries/haskell/yesod-json/default.nix
@@ -1,13 +1,14 @@
-{ cabal, aeson, shakespeareJs, text, unorderedContainers, vector
-, yesodCore
+{ cabal, aeson, attoparsecEnumerator, blazeBuilder, shakespeareJs
+, text, transformers, unorderedContainers, vector, yesodCore
 }:
 
 cabal.mkDerivation (self: {
   pname = "yesod-json";
-  version = "0.2.2.1";
-  sha256 = "16l5ygj9xsg2lzw3mkn1kmq543n9w5z1g6lyl8nw5bblp66lfxq3";
+  version = "0.2.3";
+  sha256 = "0bd75zzxqrarqk8b2v515jv0zbi5x27fmb9cbj3g57l9ig57lqy5";
   buildDepends = [
-    aeson shakespeareJs text unorderedContainers vector yesodCore
+    aeson attoparsecEnumerator blazeBuilder shakespeareJs text
+    transformers unorderedContainers vector yesodCore
   ];
   meta = {
     homepage = "http://www.yesodweb.com/";
diff --git a/pkgs/development/libraries/haskell/yesod-static/default.nix b/pkgs/development/libraries/haskell/yesod-static/default.nix
index 65cb54931817..46f989c53a53 100644
--- a/pkgs/development/libraries/haskell/yesod-static/default.nix
+++ b/pkgs/development/libraries/haskell/yesod-static/default.nix
@@ -5,8 +5,8 @@
 
 cabal.mkDerivation (self: {
   pname = "yesod-static";
-  version = "0.3.2";
-  sha256 = "0m0fws0bwhf1cyw1a3cg85mhdjr9pv35a39671jsqkkvmmxiixlf";
+  version = "0.3.2.1";
+  sha256 = "0gggavj5bxb12axlfl8kmqizgg55nmcrr6z5za60n3bp70sq4vn4";
   buildDepends = [
     base64Bytestring cereal enumerator fileEmbed httpTypes pureMD5 text
     transformers unixCompat wai waiAppStatic yesodCore
diff --git a/pkgs/development/libraries/haskell/yesod/default.nix b/pkgs/development/libraries/haskell/yesod/default.nix
index ecd7dc012aa4..ab0bc9f89dd9 100644
--- a/pkgs/development/libraries/haskell/yesod/default.nix
+++ b/pkgs/development/libraries/haskell/yesod/default.nix
@@ -7,8 +7,8 @@
 
 cabal.mkDerivation (self: {
   pname = "yesod";
-  version = "0.9.3.4";
-  sha256 = "1iw6qf1dywss8w4ig3dr04cyi01jq9frvmkbqgj5jq8v11y55x6v";
+  version = "0.9.4.1";
+  sha256 = "0dcd4m91liash046i0qaq51s447sl4fn55gsg7mi807lffik436q";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [
diff --git a/pkgs/development/libraries/haskell/zipper/default.nix b/pkgs/development/libraries/haskell/zipper/default.nix
index 2ade79bffa13..c36def2683c1 100644
--- a/pkgs/development/libraries/haskell/zipper/default.nix
+++ b/pkgs/development/libraries/haskell/zipper/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "zipper";
-  version = "0.4";
-  sha256 = "0s3gw883kwxgmz9sk3638ba8i1zb5dirv2hanc3caf6pfay6caks";
+  version = "0.4.1";
+  sha256 = "19xgvqznf200akzf19mp40fg75c0gzpp38wq3n671nm90r08lgvi";
   buildDepends = [ multirec ];
   meta = {
     homepage = "http://www.cs.uu.nl/wiki/GenericProgramming/Multirec";
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 000000000000..306475a81b43
--- /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/development/libraries/libdbusmenu-qt/default.nix b/pkgs/development/libraries/libdbusmenu-qt/default.nix
index 3c138cca4162..4c12880f5578 100644
--- a/pkgs/development/libraries/libdbusmenu-qt/default.nix
+++ b/pkgs/development/libraries/libdbusmenu-qt/default.nix
@@ -1,8 +1,8 @@
-{ stdenv, fetchurl, qt4, cmake, doxygen }:
+{ stdenv, fetchurl, qt4, cmake }:
 
 let
   baseName = "libdbusmenu-qt";
-  v = "0.8.3";
+  v = "0.9.0";
 in
 
 stdenv.mkDerivation rec {
@@ -10,10 +10,13 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "http://launchpad.net/${baseName}/trunk/${v}/+download/${name}.tar.bz2";
-    sha256 = "1fkw6wpxjmmx4p8779z662qphip3pgdcsn6cyb0frryfj4sa32ka";
+    sha256 = "0xdicb3fmwgbyhc6cpcmdkwysdg18m5rcqc3izpwv6brq4aq4787";
   };
 
-  buildInputs = [ cmake qt4 doxygen ];
+  buildInputs = [ qt4 ];
+  buildNativeInputs = [ cmake ];
+
+  cmakeFlags = "-DWITH_DOC=OFF";
   
   meta = with stdenv.lib; {
     description = "Provides a Qt implementation of the DBusMenu spec";
diff --git a/pkgs/development/libraries/libev/src-for-default.nix b/pkgs/development/libraries/libev/src-for-default.nix
index c7b37ce18912..52c8e65bc4f6 100644
--- a/pkgs/development/libraries/libev/src-for-default.nix
+++ b/pkgs/development/libraries/libev/src-for-default.nix
@@ -1,8 +1,8 @@
 rec {
-  advertisedUrl="http://dist.schmorp.de/libev/Attic/libev-3.8.tar.gz";
-  version = "3.8";
-  url="http://dist.schmorp.de/libev/Attic/libev-3.8.tar.gz";
-  hash = "1512n6c5q9ykqmk5zbwyb1na9qb9shd900kf4xhl5g07aypm7qr5";
-  name = "libev-3.8";
+  advertisedUrl="http://dist.schmorp.de/libev/Attic/libev-4.04.tar.gz";
+  version = "4.04";
+  url="http://dist.schmorp.de/libev/Attic/libev-4.04.tar.gz";
+  hash = "ab3a09e967e3b868055cd9363fd236aa093f8643d19cc7042e90e0dfe905b012";
+  name = "libev-4.04";
   
 }
diff --git a/pkgs/development/libraries/popt/default.nix b/pkgs/development/libraries/popt/default.nix
index 82fa564fa01e..03f917daa23f 100644
--- a/pkgs/development/libraries/popt/default.nix
+++ b/pkgs/development/libraries/popt/default.nix
@@ -1,10 +1,14 @@
 {stdenv, fetchurl}:
 
-stdenv.mkDerivation {
-  name = "popt-1.15";
+stdenv.mkDerivation rec {
+  name = "popt-1.16";
   
   src = fetchurl {
-    url = http://rpm5.org/files/popt/popt-1.15.tar.gz;
-    sha256 = "1wqbcimg4zlfp7261i89s1918a46fjfbvq1a4ij4a6prk27576q6";
+    url = "http://rpm5.org/files/popt/${name}.tar.gz";
+    sha256 = "1j2c61nn2n351nhj4d25mnf3vpiddcykq005w2h6kw79dwlysa77";
+  };
+
+  meta = {
+    description = "command line option parsing library";
   };
 }
diff --git a/pkgs/development/libraries/qt-4.x/4.8/default.nix b/pkgs/development/libraries/qt-4.x/4.8/default.nix
index 8ef507775228..dfaf63e67257 100644
--- a/pkgs/development/libraries/qt-4.x/4.8/default.nix
+++ b/pkgs/development/libraries/qt-4.x/4.8/default.nix
@@ -85,7 +85,8 @@ stdenv.mkDerivation rec {
 
   # The following libraries are only used in plugins
   buildInputs = [ cups # Qt dlopen's libcups instead of linking to it
-    mysql postgresql sqlite libjpeg libmng libtiff icu ];
+    mysql postgresql sqlite libjpeg libmng libtiff icu ]
+    ++ stdenv.lib.optionals gtkStyle [ gtk gdk_pixbuf ];
 
   buildNativeInputs = [ perl pkgconfig which ];
 
diff --git a/pkgs/development/libraries/soprano/default.nix b/pkgs/development/libraries/soprano/default.nix
index 49e6e6b96df9..40fd36840fd2 100644
--- a/pkgs/development/libraries/soprano/default.nix
+++ b/pkgs/development/libraries/soprano/default.nix
@@ -1,26 +1,20 @@
-{ stdenv, fetchurl, cmake, qt4, clucene_core, librdf_redland, libiodbc }:
+{ stdenv, fetchurl, cmake, qt4, clucene_core, librdf_redland, libiodbc
+, pkgconfig }:
 
 stdenv.mkDerivation rec {
-  name = "soprano-2.7.0";
+  name = "soprano-2.7.4";
 
   src = fetchurl {
     url = "mirror://sourceforge/soprano/${name}.tar.bz2";
-    sha256 = "1ki92wg0i9nhn1fh5mdcls5h9h3lf2k5r66snsags4x7zw0dmv2z";
+    sha256 = "0f6kg39bi4h4iblfs9ny88cs951sigm50yr6w50afc3f1nqzdmhp";
   };
 
-  patches =
-    [ (fetchurl { # Applied upstream, remove if upgrading
-        url = https://git.reviewboard.kde.org/r/102466/diff/raw/;
-        name = "soprano-virtuoso-restart.patch";
-        sha256 = "0jk038fp7ii6847mbxdajhhc7f6ap6lriaklxcqqxf6ddj37gf3y";
-      })
-      ./find-virtuoso.patch 
-    ];
+  patches = [ ./find-virtuoso.patch ];
 
   # We disable the Java backend, since we do not need them and they make the closure size much bigger
   buildInputs = [ qt4 clucene_core librdf_redland libiodbc ];
 
-  buildNativeInputs = [ cmake ];
+  buildNativeInputs = [ cmake pkgconfig ];
 
   meta = {
     homepage = http://soprano.sourceforge.net/;
diff --git a/pkgs/development/libraries/startup-notification/default.nix b/pkgs/development/libraries/startup-notification/default.nix
index d989c4059e6c..2683a01a2902 100644
--- a/pkgs/development/libraries/startup-notification/default.nix
+++ b/pkgs/development/libraries/startup-notification/default.nix
@@ -1,13 +1,13 @@
 {stdenv, fetchurl, libX11, libxcb, pkgconfig, xcbutil}:
 
 let
-  version = "0.10";
+  version = "0.12";
 in
 stdenv.mkDerivation {
   name = "libstartup-notification-${version}";
   src = fetchurl {
     url = "http://www.freedesktop.org/software/startup-notification/releases/startup-notification-${version}.tar.gz";
-    sha256 = "0nalaay0yj3gq85insp9l31hsv5zp390m4nn37y235v151ffpfv4";
+    sha256 = "3c391f7e930c583095045cd2d10eb73a64f085c7fde9d260f2652c7cb3cfbe4a";
   };
 
   buildInputs = [ libX11 libxcb pkgconfig xcbutil ];
diff --git a/pkgs/development/libraries/strigi/default.nix b/pkgs/development/libraries/strigi/default.nix
index 1888ef2aab64..6d7212f5c5c6 100644
--- a/pkgs/development/libraries/strigi/default.nix
+++ b/pkgs/development/libraries/strigi/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, cmake, qt4, perl, bzip2, libxml2, exiv2
-, clucene_core, fam, zlib, dbus_tools
+, clucene_core, fam, zlib, dbus_tools, pkgconfig
 }:
 
 stdenv.mkDerivation rec {
@@ -16,7 +16,9 @@ stdenv.mkDerivation rec {
   CLUCENE_HOME = clucene_core;
 
   buildInputs =
-    [ cmake perl zlib bzip2 stdenv.gcc.libc libxml2 qt4 exiv2 clucene_core fam dbus_tools ];
+    [ zlib bzip2 stdenv.gcc.libc libxml2 qt4 exiv2 clucene_core fam dbus_tools ];
+
+  buildNativeInputs = [ cmake pkgconfig perl ];
 
   enableParallelBuilding = true;
 
diff --git a/pkgs/development/python-modules/pil/default.nix b/pkgs/development/python-modules/pil/default.nix
index e4586762527d..4cf4576c0ce4 100644
--- a/pkgs/development/python-modules/pil/default.nix
+++ b/pkgs/development/python-modules/pil/default.nix
@@ -1,41 +1,41 @@
-{ fetchurl, stdenv, python
-, libjpeg, zlib, freetype }:
-
-let version = "1.1.6";
-in
-  stdenv.mkDerivation {
-    name = "python-imaging-${version}";
-    src = fetchurl {
-      url = "http://effbot.org/downloads/Imaging-${version}.tar.gz";
-      sha256 = "141zidl3s9v4vfi3nsbg42iq1lc2a932gprqr1kij5hrnn53bmvx";
-    };
-
-    buildInputs = [ python libjpeg zlib freetype ];
-
-    doCheck = true;
-
-    configurePhase = ''
-      sed -i "setup.py" \
-          -e 's|^FREETYPE_ROOT =.*$|FREETYPE_ROOT = libinclude("${freetype}")|g ;
-              s|^JPEG_ROOT =.*$|JPEG_ROOT = libinclude("${libjpeg}")|g ;
-              s|^ZLIB_ROOT =.*$|ZLIB_ROOT = libinclude("${zlib}")|g ;'
+{ fetchurl, stdenv, python, libjpeg, zlib, freetype }:
+
+let version = "1.1.7"; in
+
+stdenv.mkDerivation {
+  name = "python-imaging-${version}";
+  
+  src = fetchurl {
+    url = "http://effbot.org/downloads/Imaging-${version}.tar.gz";
+    sha256 = "04aj80jhfbmxqzvmq40zfi4z3cw6vi01m3wkk6diz3lc971cfnw9";
+  };
+
+  buildInputs = [ python libjpeg zlib freetype ];
+
+  doCheck = true;
+
+  configurePhase = ''
+    sed -i "setup.py" \
+        -e 's|^FREETYPE_ROOT =.*$|FREETYPE_ROOT = libinclude("${freetype}")|g ;
+            s|^JPEG_ROOT =.*$|JPEG_ROOT = libinclude("${libjpeg}")|g ;
+            s|^ZLIB_ROOT =.*$|ZLIB_ROOT = libinclude("${zlib}")|g ;'
+  '';
+
+  buildPhase   = "python setup.py build_ext -i";
+  checkPhase   = "python selftest.py";
+  installPhase = "python setup.py install --prefix=$out";
+
+  meta = {
+    homepage = http://www.pythonware.com/products/pil/;
+    description = "The Python Imaging Library (PIL)";
+
+    longDescription = ''
+      The Python Imaging Library (PIL) adds image processing
+      capabilities to your Python interpreter.  This library
+      supports many file formats, and provides powerful image
+      processing and graphics capabilities.
     '';
 
-    buildPhase   = "python setup.py build_ext -i";
-    checkPhase   = "python selftest.py";
-    installPhase = "python setup.py install --prefix=$out";
-
-    meta = {
-      homepage = http://www.pythonware.com/products/pil/;
-      description = "The Python Imaging Library (PIL)";
-
-      longDescription = ''
-        The Python Imaging Library (PIL) adds image processing
-        capabilities to your Python interpreter.  This library
-        supports many file formats, and provides powerful image
-        processing and graphics capabilities.
-      '';
-
-      license = "http://www.pythonware.com/products/pil/license.htm";
-    };
-  }
+    license = "http://www.pythonware.com/products/pil/license.htm";
+  };
+}
diff --git a/pkgs/development/tools/haskell/cabal2nix/default.nix b/pkgs/development/tools/haskell/cabal2nix/default.nix
index c8753ea367be..1b98d7821e52 100644
--- a/pkgs/development/tools/haskell/cabal2nix/default.nix
+++ b/pkgs/development/tools/haskell/cabal2nix/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "cabal2nix";
-  version = "1.21";
-  sha256 = "00gsayb7axxm8z9jrngckb7c666x1kibvln67g2rpchi6djg6wn7";
+  version = "1.23";
+  sha256 = "1rnvnzwb4n89hq4wpyq1h6x773r7y23clqj5slsfnas7j3alzz8c";
   isLibrary = false;
   isExecutable = true;
   buildDepends = [ hackageDb HTTP mtl nixosTypes regexPosix ];