Updated Haskell packages.

 - HTTP: added version 4000.2.3
 - RSA: updated to version 1.2.0.0
 - RepLib: updated to version 0.5.2.1
 - conduit: updated to version 0.4.1.1
 - data-accessor: updated to version 0.2.2.2
 - deepseq-th: updated to version 0.1.0.3
 - explicit-exception: updated to version 0.1.7
 - ghc-mod: updated to version 1.10.15
 - gitit: updated to version 0.9.0.1
 - hakyll: updated to version 3.2.7.2
 - hjsmin: updated to version 0.0.16
 - http-conduit: updated to version 1.4.1
 - iteratee: updated to version 0.8.8.2
 - language-javascript: updated to version 0.5.0
 - reactive-banana: updated to version 0.5.0.1
 - repa: updated to version 3.1.1.1
 - rvar: updated to version 0.2.0.1
 - semigroups: updated to version 0.8.3
 - simple-sendfile: updated to version 0.2.3
 - storable-record: updated to version 0.0.2.5
 - unbound: updated to version 0.4.0.2
 - wxc: added version 0.90.0.2

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

22 files changed, 82 insertions, 54 deletions

diff --git a/pkgs/development/libraries/haskell/HTTP/4000.2.3.nix b/pkgs/development/libraries/haskell/HTTP/4000.2.3.nix
new file mode 100644
index 00000000000..cff762864bc
--- /dev/null
+++ b/pkgs/development/libraries/haskell/HTTP/4000.2.3.nix
@@ -0,0 +1,15 @@
+{ cabal, mtl, network, parsec }:
+
+cabal.mkDerivation (self: {
+  pname = "HTTP";
+  version = "4000.2.3";
+  sha256 = "1z7s5rkyljwdl95cwqbqg64i207wjwxgpksrdmvcv82k39srzx80";
+  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 ];
+  };
+})
diff --git a/pkgs/development/libraries/haskell/RSA/default.nix b/pkgs/development/libraries/haskell/RSA/default.nix
index 173ddc31495..3f9b3753595 100644
--- a/pkgs/development/libraries/haskell/RSA/default.nix
+++ b/pkgs/development/libraries/haskell/RSA/default.nix
@@ -1,12 +1,12 @@
-{ cabal, binary, pureMD5, random, SHA }:
+{ cabal, binary, cryptoApi, monadcryptorandom, pureMD5, SHA }:
 
 cabal.mkDerivation (self: {
   pname = "RSA";
-  version = "1.0.6.3";
-  sha256 = "0lk3nsh6nvacv1xzrg2pxxhd5gglmy40dkb8a47c9r9px0q6yjpj";
+  version = "1.2.0.0";
+  sha256 = "0x4wa0yq4k43ccdakqcmy0mxvdlvrkfg6kc1j2hv7hh8b4vjisms";
   isLibrary = true;
   isExecutable = true;
-  buildDepends = [ binary pureMD5 random SHA ];
+  buildDepends = [ binary cryptoApi monadcryptorandom pureMD5 SHA ];
   meta = {
     description = "Implementation of RSA, using the padding schemes of PKCS#1 v2.1.";
     license = self.stdenv.lib.licenses.bsd3;
diff --git a/pkgs/development/libraries/haskell/RepLib/default.nix b/pkgs/development/libraries/haskell/RepLib/default.nix
index b070301f4e7..1be11a557f8 100644
--- a/pkgs/development/libraries/haskell/RepLib/default.nix
+++ b/pkgs/development/libraries/haskell/RepLib/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "RepLib";
-  version = "0.5.2";
-  sha256 = "1wcxvl40wlnva2x7z13pm95485lwxbpy5di1mb1din3id8dprxfr";
+  version = "0.5.2.1";
+  sha256 = "133zpiszfdb8s4hqd1xpgsiac98v04dclk3hivzxcg0h77m7qpcc";
   buildDepends = [ mtl typeEquality ];
   meta = {
     homepage = "http://code.google.com/p/replib/";
diff --git a/pkgs/development/libraries/haskell/conduit/default.nix b/pkgs/development/libraries/haskell/conduit/default.nix
index 7c303a09a4b..89b06d1164f 100644
--- a/pkgs/development/libraries/haskell/conduit/default.nix
+++ b/pkgs/development/libraries/haskell/conduit/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "conduit";
-  version = "0.4.0.1";
-  sha256 = "1n4a42ayww55hvvsnis6gdfwfciwxpzz0wxa0b3ybvmyr0jsidiq";
+  version = "0.4.1.1";
+  sha256 = "1y5bccjd3r1kakwiq0nlp3dk2jwrdsm3f8dncnfsmnlk093ajyxa";
   buildDepends = [
     liftedBase monadControl resourcet text transformers
     transformersBase void
diff --git a/pkgs/development/libraries/haskell/data-accessor/data-accessor.nix b/pkgs/development/libraries/haskell/data-accessor/data-accessor.nix
index b3bb3408bcf..6f73cc48817 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.1";
-  sha256 = "1zb7z9fnlnxxlvjd655vadfscanzq9msvjv21cjmdric0ja24hxb";
+  version = "0.2.2.2";
+  sha256 = "1q9hx2bkp7dknr9ygx39lj93i846x8g9j7lkhkjijvsicih28yyi";
   buildDepends = [ transformers ];
   meta = {
     homepage = "http://www.haskell.org/haskellwiki/Record_access";
diff --git a/pkgs/development/libraries/haskell/deepseq-th/default.nix b/pkgs/development/libraries/haskell/deepseq-th/default.nix
index 36ab9f8a8e9..1072bcb9ca7 100644
--- a/pkgs/development/libraries/haskell/deepseq-th/default.nix
+++ b/pkgs/development/libraries/haskell/deepseq-th/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "deepseq-th";
-  version = "0.1.0.2";
-  sha256 = "0f2hrp2rjb3iailnxh47wl1imgq6jqr9qj31vi7k8lgp5pwa90mc";
+  version = "0.1.0.3";
+  sha256 = "1xx88i55iskyxrpxbdg0srb64y5siqs1b8qj7bh3i1893qs9sha2";
   buildDepends = [ deepseq ];
   meta = {
     description = "Template Haskell based deriver for optimised NFData instances";
diff --git a/pkgs/development/libraries/haskell/explicit-exception/default.nix b/pkgs/development/libraries/haskell/explicit-exception/default.nix
index 47c0f57252b..86d4cc50c3b 100644
--- a/pkgs/development/libraries/haskell/explicit-exception/default.nix
+++ b/pkgs/development/libraries/haskell/explicit-exception/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "explicit-exception";
-  version = "0.1.6";
-  sha256 = "0pgdbaav952bwcmbfwg0fgvc15k57rlnw131bs3pnp8rqdbxfv39";
+  version = "0.1.7";
+  sha256 = "0pqh97fxs55554bd16dknggkr0yayqj1dz0sddp9b2svjy2q4vrm";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [ transformers ];
diff --git a/pkgs/development/libraries/haskell/ghc-mod/default.nix b/pkgs/development/libraries/haskell/ghc-mod/default.nix
index 248387cf64c..b95d1e6d73b 100644
--- a/pkgs/development/libraries/haskell/ghc-mod/default.nix
+++ b/pkgs/development/libraries/haskell/ghc-mod/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "ghc-mod";
-  version = "1.10.12";
-  sha256 = "1r06phm9fjrzwga63065lzdd7dn24sqn3g4fkyh8s30n531672rg";
+  version = "1.10.15";
+  sha256 = "1ywsv8nxd5040k3v5r9kf4zb0myicnjg6yckxmp6xnvf5glylylm";
   isLibrary = false;
   isExecutable = true;
   buildDepends = [
diff --git a/pkgs/development/libraries/haskell/gitit/default.nix b/pkgs/development/libraries/haskell/gitit/default.nix
index 61251bfabc3..14951eebbd5 100644
--- a/pkgs/development/libraries/haskell/gitit/default.nix
+++ b/pkgs/development/libraries/haskell/gitit/default.nix
@@ -1,5 +1,5 @@
-{ cabal, blazeHtml, cgi, ConfigFile, feed, filepath, filestore
-, ghcPaths, happstackServer, happstackUtil, highlightingKate
+{ cabal, base64Bytestring, blazeHtml, cgi, ConfigFile, feed
+, filepath, filestore, ghcPaths, happstackServer, highlightingKate
 , hslogger, HStringTemplate, HTTP, json, mtl, network, pandoc
 , pandocTypes, parsec, random, recaptcha, safe, SHA, syb, tagsoup
 , text, time, url, utf8String, xhtml, xml, xssSanitize, zlib
@@ -7,16 +7,16 @@
 
 cabal.mkDerivation (self: {
   pname = "gitit";
-  version = "0.9";
-  sha256 = "00kjfmczj5m3b8r8djdpad8d27s44z7pf76yyc0sdja1f3bd4mlp";
+  version = "0.9.0.1";
+  sha256 = "1k1z6qvp72c61yhrfma3340wf4ysjkb80f8lqapaqsyhp96qjl3m";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [
-    blazeHtml cgi ConfigFile feed filepath filestore ghcPaths
-    happstackServer happstackUtil highlightingKate hslogger
-    HStringTemplate HTTP json mtl network pandoc pandocTypes parsec
-    random recaptcha safe SHA syb tagsoup text time url utf8String
-    xhtml xml xssSanitize zlib
+    base64Bytestring blazeHtml cgi ConfigFile feed filepath filestore
+    ghcPaths happstackServer highlightingKate hslogger HStringTemplate
+    HTTP json mtl network pandoc pandocTypes parsec random recaptcha
+    safe SHA syb tagsoup text time url utf8String xhtml xml xssSanitize
+    zlib
   ];
   meta = {
     homepage = "http://gitit.net";
diff --git a/pkgs/development/libraries/haskell/hakyll/default.nix b/pkgs/development/libraries/haskell/hakyll/default.nix
index 053fce65ce2..04375877bca 100644
--- a/pkgs/development/libraries/haskell/hakyll/default.nix
+++ b/pkgs/development/libraries/haskell/hakyll/default.nix
@@ -5,15 +5,12 @@
 
 cabal.mkDerivation (self: {
   pname = "hakyll";
-  version = "3.2.7.1";
-  sha256 = "07d7a8l2phb787wgqyh1rci1v9hzwxw35arg03hkal072sacif0c";
+  version = "3.2.7.2";
+  sha256 = "1l37w3q2jhcxjkq3h0nh8hl21vscgvsj6jkkd2hni62kfzfrgqhw";
   buildDepends = [
     binary blazeHtml citeprocHs cryptohash filepath hamlet mtl pandoc
     parsec regexBase regexTdfa snapCore snapServer tagsoup time
   ];
-  patchPhase = ''
-    sed -i 's|hamlet      >= 0.10.3 && < 0.11|hamlet|' hakyll.cabal
-  '';
   meta = {
     homepage = "http://jaspervdj.be/hakyll";
     description = "A static website compiler library";
diff --git a/pkgs/development/libraries/haskell/hjsmin/default.nix b/pkgs/development/libraries/haskell/hjsmin/default.nix
index 46aebc66e24..a224e846a40 100644
--- a/pkgs/development/libraries/haskell/hjsmin/default.nix
+++ b/pkgs/development/libraries/haskell/hjsmin/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "hjsmin";
-  version = "0.0.15";
-  sha256 = "1bik3bvaz4zjhyx8nyghhs61l14zm71hndfhj4k0xvkw3h6hlj9k";
+  version = "0.0.16";
+  sha256 = "0svpmhrzhra3yhc1bzwga9d13k4kd8vw6va1q9866pkw385j5jr4";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [ blazeBuilder languageJavascript text ];
diff --git a/pkgs/development/libraries/haskell/http-conduit/default.nix b/pkgs/development/libraries/haskell/http-conduit/default.nix
index 6490d14711d..50a7188cbad 100644
--- a/pkgs/development/libraries/haskell/http-conduit/default.nix
+++ b/pkgs/development/libraries/haskell/http-conduit/default.nix
@@ -8,8 +8,8 @@
 
 cabal.mkDerivation (self: {
   pname = "http-conduit";
-  version = "1.4.0.2";
-  sha256 = "1zhsz9zqa4h5f18yalihcqa5p4ji50b8cw7h88i9s46q3fwcrbhh";
+  version = "1.4.1";
+  sha256 = "1jv5nk2h17hf2fp1r6ych9grnlx2hsclxgn10d5f1vx21xbd0hkl";
   buildDepends = [
     asn1Data attoparsec attoparsecConduit base64Bytestring blazeBuilder
     blazeBuilderConduit caseInsensitive certificate conduit cookie
diff --git a/pkgs/development/libraries/haskell/iteratee/default.nix b/pkgs/development/libraries/haskell/iteratee/default.nix
index 901f3c5e81a..2a2708f70ac 100644
--- a/pkgs/development/libraries/haskell/iteratee/default.nix
+++ b/pkgs/development/libraries/haskell/iteratee/default.nix
@@ -3,8 +3,8 @@
 
 cabal.mkDerivation (self: {
   pname = "iteratee";
-  version = "0.8.8.1";
-  sha256 = "1d6b83j3k2idpa9xcii8h9wa6mvxngp7rymb4xy6w8lvrmi7rmwz";
+  version = "0.8.8.2";
+  sha256 = "1d76an95y8svaja5ksx8p05fk22z62hp3gfwnd1d917qccffw6ry";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [
diff --git a/pkgs/development/libraries/haskell/language-javascript/default.nix b/pkgs/development/libraries/haskell/language-javascript/default.nix
index 053bbef01eb..5d7f6d9edf5 100644
--- a/pkgs/development/libraries/haskell/language-javascript/default.nix
+++ b/pkgs/development/libraries/haskell/language-javascript/default.nix
@@ -1,12 +1,12 @@
-{ cabal, happy, mtl, utf8Light }:
+{ cabal, blazeBuilder, happy, mtl, utf8Light, utf8String }:
 
 cabal.mkDerivation (self: {
   pname = "language-javascript";
-  version = "0.4.10";
-  sha256 = "1bk5xrhj5cpacz2bcfjz28sldizdadg05daalppxq8vs830sdx5h";
+  version = "0.5.0";
+  sha256 = "0fx087z8sa360bsbd22g7jsnzz0dzvm6pfr59d4vamfwc0zg2yg9";
   isLibrary = true;
   isExecutable = true;
-  buildDepends = [ mtl utf8Light ];
+  buildDepends = [ blazeBuilder mtl utf8Light utf8String ];
   buildTools = [ happy ];
   meta = {
     homepage = "http://github.com/alanz/language-javascript";
diff --git a/pkgs/development/libraries/haskell/reactive-banana/default.nix b/pkgs/development/libraries/haskell/reactive-banana/default.nix
index 72046994a87..7d0f08a6d2e 100644
--- a/pkgs/development/libraries/haskell/reactive-banana/default.nix
+++ b/pkgs/development/libraries/haskell/reactive-banana/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "reactive-banana";
-  version = "0.5.0.0";
-  sha256 = "1dabyzdkc8imm397cj7i18r3784233a45jlli3y6ch8zg2kl1iri";
+  version = "0.5.0.1";
+  sha256 = "04mr1pb0q1ks29q3mzy3apk5ki1sbzlslavbldfnrrq3g2s90366";
   buildDepends = [
     fclabels hashable QuickCheck transformers unorderedContainers vault
   ];
diff --git a/pkgs/development/libraries/haskell/repa/default.nix b/pkgs/development/libraries/haskell/repa/default.nix
index cd98b9a9c1b..2584107dc36 100644
--- a/pkgs/development/libraries/haskell/repa/default.nix
+++ b/pkgs/development/libraries/haskell/repa/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "repa";
-  version = "3.1.0.1";
-  sha256 = "0dcx2n7bqw8rrr1aaxnrbmjv0c89lvxl6fgccrw0qci5rzwccnp2";
+  version = "3.1.1.1";
+  sha256 = "0r78xd8caqpjvf1wxlv9mp13n5as8k98j76sni6wyrj2i55sx7ls";
   buildDepends = [ QuickCheck vector ];
   meta = {
     homepage = "http://repa.ouroborus.net";
diff --git a/pkgs/development/libraries/haskell/rvar/default.nix b/pkgs/development/libraries/haskell/rvar/default.nix
index 3f2f3915ddf..6f2ed95ab63 100644
--- a/pkgs/development/libraries/haskell/rvar/default.nix
+++ b/pkgs/development/libraries/haskell/rvar/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "rvar";
-  version = "0.2";
-  sha256 = "1in2qn1clv9b7ijyllhjflh9zdkna31hpyclhlkfnsc6899z3y1f";
+  version = "0.2.0.1";
+  sha256 = "17wgd4gc1hn04dck168nkyzn9jyipgbysxsznyzy2z36vafqqqbm";
   buildDepends = [ MonadPrompt mtl randomSource transformers ];
   meta = {
     homepage = "https://github.com/mokus0/random-fu";
diff --git a/pkgs/development/libraries/haskell/semigroups/default.nix b/pkgs/development/libraries/haskell/semigroups/default.nix
index d622018e588..4c2def192b4 100644
--- a/pkgs/development/libraries/haskell/semigroups/default.nix
+++ b/pkgs/development/libraries/haskell/semigroups/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "semigroups";
-  version = "0.8.2";
-  sha256 = "1vxavkpg68qfs5arhi76liafds1jd8prircnp66ykhkj40z5aix0";
+  version = "0.8.3";
+  sha256 = "179m5vvhf8rf01fnq8b2lg7v8i70yx6yq975jiazghm0qnsm32ji";
   meta = {
     homepage = "http://github.com/ekmett/semigroups/";
     description = "Haskell 98 semigroups";
diff --git a/pkgs/development/libraries/haskell/simple-sendfile/default.nix b/pkgs/development/libraries/haskell/simple-sendfile/default.nix
index 82d316e4d76..19ccce16ab2 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.2.2";
-  sha256 = "0id3d6ynl2xz4w0vcxm3wyj1kxjnchcl3h0xa4prh3s0giap8yax";
+  version = "0.2.3";
+  sha256 = "1i3jx90kwq504fdl2qbhz25psjvq9ldvwgx5cij82ajjqi61pfrv";
   buildDepends = [ network ];
   meta = {
     description = "Cross platform library for the sendfile system call";
diff --git a/pkgs/development/libraries/haskell/storable-record/default.nix b/pkgs/development/libraries/haskell/storable-record/default.nix
index 61085b1c719..455d860ba5e 100644
--- a/pkgs/development/libraries/haskell/storable-record/default.nix
+++ b/pkgs/development/libraries/haskell/storable-record/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "storable-record";
-  version = "0.0.2.4";
-  sha256 = "5ed2680dcfc4c3d4fe605d23e797b847fe047b7acd3f4acfd82155c93e72b280";
+  version = "0.0.2.5";
+  sha256 = "078vwwcr47d3dmzkhxr7ggjkq9d5rnxv4z8p049kdnmzfbcmisn3";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [ transformers utilityHt ];
diff --git a/pkgs/development/libraries/haskell/unbound/default.nix b/pkgs/development/libraries/haskell/unbound/default.nix
index 1a186b4a508..b64aff3ae13 100644
--- a/pkgs/development/libraries/haskell/unbound/default.nix
+++ b/pkgs/development/libraries/haskell/unbound/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "unbound";
-  version = "0.4.0.1";
-  sha256 = "0zb029wji85b643iqf4cnkd9d68accrjxnk8422xs82zik2kn6zf";
+  version = "0.4.0.2";
+  sha256 = "0vwbqrjrahg7ifsqgmq18ddmmczjxnsdz5w3kfgb4jpv1glwlxrh";
   buildDepends = [ mtl RepLib transformers ];
   meta = {
     homepage = "http://code.google.com/p/replib/";
diff --git a/pkgs/development/libraries/haskell/wxHaskell/wxc.nix b/pkgs/development/libraries/haskell/wxHaskell/wxc.nix
new file mode 100644
index 00000000000..1d3a331e35e
--- /dev/null
+++ b/pkgs/development/libraries/haskell/wxHaskell/wxc.nix
@@ -0,0 +1,16 @@
+{ cabal, libX11, mesa, wxdirect, wxGTK }:
+
+cabal.mkDerivation (self: {
+  pname = "wxc";
+  version = "0.90.0.2";
+  sha256 = "1vqs9517qacm04d2bxpbpcdgfmlhpblm6af45nmcdikvlfa1v0jp";
+  buildDepends = [ wxdirect ];
+  extraLibraries = [ libX11 mesa wxGTK ];
+  meta = {
+    homepage = "http://haskell.org/haskellwiki/WxHaskell";
+    description = "wxHaskell C++ wrapper";
+    license = "unknown";
+    platforms = self.ghc.meta.platforms;
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
+  };
+})