summary refs log tree commit diff
path: root/pkgs/development/libraries
diff options
context:
space:
mode:
Diffstat (limited to 'pkgs/development/libraries')
-rw-r--r--pkgs/development/libraries/gnutls/default.nix10
-rw-r--r--pkgs/development/libraries/haskell/ConfigFile/default.nix5
-rw-r--r--pkgs/development/libraries/haskell/NanoProlog/default.nix19
-rw-r--r--pkgs/development/libraries/haskell/WebBits/2.1.nix18
-rw-r--r--pkgs/development/libraries/haskell/blaze-builder-enumerator/default.nix4
-rw-r--r--pkgs/development/libraries/haskell/bytestring-nums/default.nix4
-rw-r--r--pkgs/development/libraries/haskell/cabal-file-th/default.nix13
-rw-r--r--pkgs/development/libraries/haskell/clientsession/default.nix4
-rw-r--r--pkgs/development/libraries/haskell/cprng-aes/default.nix8
-rw-r--r--pkgs/development/libraries/haskell/crypto-api/default.nix4
-rw-r--r--pkgs/development/libraries/haskell/cryptohash/default.nix4
-rw-r--r--pkgs/development/libraries/haskell/enumerator/default.nix4
-rw-r--r--pkgs/development/libraries/haskell/gloss/default.nix8
-rw-r--r--pkgs/development/libraries/haskell/haskeline/default.nix4
-rw-r--r--pkgs/development/libraries/haskell/hledger-web/default.nix18
-rw-r--r--pkgs/development/libraries/haskell/hmatrix/default.nix1
-rw-r--r--pkgs/development/libraries/haskell/hp2any-core/default.nix8
-rw-r--r--pkgs/development/libraries/haskell/nixos-types/default.nix4
-rw-r--r--pkgs/development/libraries/haskell/skein/default.nix4
-rw-r--r--pkgs/development/libraries/haskell/vty/4.6.0.4.nix18
-rw-r--r--pkgs/development/libraries/haskell/vty/default.nix (renamed from pkgs/development/libraries/haskell/vty/4.7.0.4.nix)0
-rw-r--r--pkgs/development/libraries/haskell/yap/default.nix4
-rw-r--r--pkgs/development/libraries/haskell/yesod-auth/default.nix4
-rw-r--r--pkgs/development/libraries/haskell/yesod-core/default.nix24
-rw-r--r--pkgs/development/libraries/haskell/yesod-form/default.nix4
-rw-r--r--pkgs/development/libraries/haskell/yesod-static/default.nix11
-rw-r--r--pkgs/development/libraries/haskell/yesod/default.nix4
-rw-r--r--pkgs/development/libraries/opendkim/default.nix4
-rw-r--r--pkgs/development/libraries/yajl/default.nix8
29 files changed, 131 insertions, 94 deletions
diff --git a/pkgs/development/libraries/gnutls/default.nix b/pkgs/development/libraries/gnutls/default.nix
index 39532c075d1a..888a119bb360 100644
--- a/pkgs/development/libraries/gnutls/default.nix
+++ b/pkgs/development/libraries/gnutls/default.nix
@@ -1,15 +1,15 @@
 { fetchurl, stdenv, xz, zlib, lzo, libtasn1, nettle
-, guileBindings, guile }:
+, guileBindings, guile, perl }:
 
 assert guileBindings -> guile != null;
 
 stdenv.mkDerivation rec {
 
-  name = "gnutls-3.0.2";
+  name = "gnutls-3.0.4";
 
   src = fetchurl {
     url = "mirror://gnu/gnutls/${name}.tar.xz";
-    sha256 = "0jy0j77inv6yr7s9mnhs5kvjjmhj0ifg35145s1qn3hd9ma36nii";
+    sha256 = "16mhr52c07xlkv5m5bxgr51ppjz0gqjw6rgv52ql4iyi569ffrx3";
   };
 
   configurePhase = ''
@@ -22,9 +22,11 @@ stdenv.mkDerivation rec {
         else ""}
   '';
 
-  buildInputs = [ xz zlib lzo ]
+  buildInputs = [ zlib lzo ]
     ++ stdenv.lib.optional guileBindings guile;
 
+  buildNativeInputs = [ xz perl ];
+
   propagatedBuildInputs = [ nettle libtasn1 ];
 
   doCheck = true;
diff --git a/pkgs/development/libraries/haskell/ConfigFile/default.nix b/pkgs/development/libraries/haskell/ConfigFile/default.nix
index 378d1e2cd376..d7a5a674bb6a 100644
--- a/pkgs/development/libraries/haskell/ConfigFile/default.nix
+++ b/pkgs/development/libraries/haskell/ConfigFile/default.nix
@@ -2,11 +2,12 @@
 
 cabal.mkDerivation (self: {
   pname = "ConfigFile";
-  version = "1.0.6";
-  sha256 = "339722184b86d53d8b361933e572b6e1478824c7eba3fb66b67d0eb5245cd038";
+  version = "1.1.0";
+  sha256 = "0m5p56if711qi69lxw78746sb0jr5gqbmip5hdbb7lk4z5drgvhc";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [ MissingH mtl parsec ];
+  noHaddock = true;
   meta = {
     homepage = "http://software.complete.org/configfile";
     description = "Configuration file reading & writing";
diff --git a/pkgs/development/libraries/haskell/NanoProlog/default.nix b/pkgs/development/libraries/haskell/NanoProlog/default.nix
new file mode 100644
index 000000000000..85f5a1d9e6ea
--- /dev/null
+++ b/pkgs/development/libraries/haskell/NanoProlog/default.nix
@@ -0,0 +1,19 @@
+{ cabal, ListLike, uuParsinglib }:
+
+cabal.mkDerivation (self: {
+  pname = "NanoProlog";
+  version = "0.2.3.3";
+  sha256 = "0008xpahqbs2djchlw1bslhqqhbc0n7ql7pqm4g7lh8xd3ampxba";
+  isLibrary = true;
+  isExecutable = true;
+  buildDepends = [ ListLike uuParsinglib ];
+  meta = {
+    description = "Very small interpreter for a Prolog-like language";
+    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/WebBits/2.1.nix b/pkgs/development/libraries/haskell/WebBits/2.1.nix
new file mode 100644
index 000000000000..915ff0b1d60e
--- /dev/null
+++ b/pkgs/development/libraries/haskell/WebBits/2.1.nix
@@ -0,0 +1,18 @@
+{ cabal, mtl, parsec, syb }:
+
+cabal.mkDerivation (self: {
+  pname = "WebBits";
+  version = "2.1";
+  sha256 = "18m19fck9zb6jh8bfd47nja1q6ab1jmd0q5r3k8m5674i6273hyn";
+  buildDepends = [ mtl parsec syb ];
+  meta = {
+    homepage = "http://www.cs.brown.edu/research/plt/";
+    description = "JavaScript analysis tools";
+    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-enumerator/default.nix b/pkgs/development/libraries/haskell/blaze-builder-enumerator/default.nix
index 84d667de29af..ccc8d36d6fdd 100644
--- a/pkgs/development/libraries/haskell/blaze-builder-enumerator/default.nix
+++ b/pkgs/development/libraries/haskell/blaze-builder-enumerator/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "blaze-builder-enumerator";
-  version = "0.2.0.2";
-  sha256 = "0as4mjh695jpxp9qfhpsxyr1448l0pk94sh5kk8sgxv5hfiy41k9";
+  version = "0.2.0.3";
+  sha256 = "00a9rly27sh49gi5askg7z3ji8ig9llxk4qcznsag01d1z0kb97n";
   buildDepends = [ blazeBuilder enumerator transformers ];
   meta = {
     homepage = "https://github.com/meiersi/blaze-builder-enumerator";
diff --git a/pkgs/development/libraries/haskell/bytestring-nums/default.nix b/pkgs/development/libraries/haskell/bytestring-nums/default.nix
index 4a480b079317..20228b9eed14 100644
--- a/pkgs/development/libraries/haskell/bytestring-nums/default.nix
+++ b/pkgs/development/libraries/haskell/bytestring-nums/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "bytestring-nums";
-  version = "0.3.3";
-  sha256 = "09gdbyj5qw98j57cs9phzsbmvdm7y6j07wg908i34jklwm24nxfd";
+  version = "0.3.5";
+  sha256 = "12knbyrvr1wa7za8bwypvq3cp81k18qi032dl98s2ylhcz1r6rdk";
   isLibrary = true;
   isExecutable = true;
   meta = {
diff --git a/pkgs/development/libraries/haskell/cabal-file-th/default.nix b/pkgs/development/libraries/haskell/cabal-file-th/default.nix
new file mode 100644
index 000000000000..427e4ba2cc60
--- /dev/null
+++ b/pkgs/development/libraries/haskell/cabal-file-th/default.nix
@@ -0,0 +1,13 @@
+{ cabal }:
+
+cabal.mkDerivation (self: {
+  pname = "cabal-file-th";
+  version = "0.2.1";
+  sha256 = "0nczwicgf6kx3lk5m7wqf1wj6ghn8jfx112dzh7jh4f4xs66nsd1";
+  meta = {
+    homepage = "http://github.com/nkpart/cabal-file-th";
+    description = "Template Haskell expressions for reading fields from a project's cabal file";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+  };
+})
diff --git a/pkgs/development/libraries/haskell/clientsession/default.nix b/pkgs/development/libraries/haskell/clientsession/default.nix
index c5096ae9a771..a2ebb5c2d9ba 100644
--- a/pkgs/development/libraries/haskell/clientsession/default.nix
+++ b/pkgs/development/libraries/haskell/clientsession/default.nix
@@ -3,8 +3,8 @@
 
 cabal.mkDerivation (self: {
   pname = "clientsession";
-  version = "0.7.3.1";
-  sha256 = "0q16brla4m5g7dmgln3awx964ms7pi1s2r21idmc0mk4rnw2rpi7";
+  version = "0.7.3.2";
+  sha256 = "1ml1f5sarfck39qrv4zjcbk1vwgazn32gnjm78fm047ixczi9340";
   buildDepends = [
     base64Bytestring cereal cryptoApi cryptocipher skein
   ];
diff --git a/pkgs/development/libraries/haskell/cprng-aes/default.nix b/pkgs/development/libraries/haskell/cprng-aes/default.nix
index 1c156f47a3fa..80a04e965498 100644
--- a/pkgs/development/libraries/haskell/cprng-aes/default.nix
+++ b/pkgs/development/libraries/haskell/cprng-aes/default.nix
@@ -1,10 +1,10 @@
-{ cabal, cereal, cryptoApi, cryptocipher, random }:
+{ cabal, cereal, cryptoApi, cryptocipher, entropy, random }:
 
 cabal.mkDerivation (self: {
   pname = "cprng-aes";
-  version = "0.2.1";
-  sha256 = "0q6qkvha7cckz3zjnzfsrx298arzbdavy1f73hygrd8f7n74442j";
-  buildDepends = [ cereal cryptoApi cryptocipher random ];
+  version = "0.2.2";
+  sha256 = "0jfa9fb670bqlnkplmscz878hvdbpap47xfxvshgs102iq7rjasf";
+  buildDepends = [ cereal cryptoApi cryptocipher entropy random ];
   meta = {
     homepage = "http://github.com/vincenthz/hs-cprng-aes";
     description = "Crypto Pseudo Random Number Generator using AES in counter mode";
diff --git a/pkgs/development/libraries/haskell/crypto-api/default.nix b/pkgs/development/libraries/haskell/crypto-api/default.nix
index e651d03b736f..66204112c166 100644
--- a/pkgs/development/libraries/haskell/crypto-api/default.nix
+++ b/pkgs/development/libraries/haskell/crypto-api/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "crypto-api";
-  version = "0.6.4";
-  sha256 = "1v3nnfw13r514a723lsx8d1awlad6fmv27bgp76f1ssv1garraf3";
+  version = "0.8";
+  sha256 = "1fwkafb9v2348vr1a4xnlmkgs4kh85az4f3wnrl9cbqwxf3cc328";
   buildDepends = [ cereal entropy largeword tagged ];
   meta = {
     homepage = "http://trac.haskell.org/crypto-api/wiki";
diff --git a/pkgs/development/libraries/haskell/cryptohash/default.nix b/pkgs/development/libraries/haskell/cryptohash/default.nix
index 132a46be09e7..4336be8318d9 100644
--- a/pkgs/development/libraries/haskell/cryptohash/default.nix
+++ b/pkgs/development/libraries/haskell/cryptohash/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "cryptohash";
-  version = "0.7.3";
-  sha256 = "1wjmf7ll9jady6p79066b5ib70ywvbgnbc71s76pibkg5hsvclgj";
+  version = "0.7.4";
+  sha256 = "1nplmwihq40jmng4r3wiyfb0i33a8wx2gmlbqajc62wny98l7sab";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [ cereal cryptoApi tagged ];
diff --git a/pkgs/development/libraries/haskell/enumerator/default.nix b/pkgs/development/libraries/haskell/enumerator/default.nix
index 1037c570bdbb..d42470637d47 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.14";
-  sha256 = "06bvrr76y12r3i1xi1s98fc1v6mcmn8nzhbp80wgyi743ksqcr1d";
+  version = "0.4.15";
+  sha256 = "06yzf2xaadmdhgidzyp7qywd8d401f4n1qlfyx0q72nafgnlvr6v";
   buildDepends = [ text transformers ];
   meta = {
     homepage = "https://john-millikin.com/software/enumerator/";
diff --git a/pkgs/development/libraries/haskell/gloss/default.nix b/pkgs/development/libraries/haskell/gloss/default.nix
index 509624321f8a..6bc322bce0ee 100644
--- a/pkgs/development/libraries/haskell/gloss/default.nix
+++ b/pkgs/development/libraries/haskell/gloss/default.nix
@@ -1,10 +1,10 @@
-{ cabal, GLUT, OpenGL }:
+{ cabal, bmp, GLUT, OpenGL }:
 
 cabal.mkDerivation (self: {
   pname = "gloss";
-  version = "1.3.4.1";
-  sha256 = "0cyk75b495vq59pnfqy6ny5kb0i0zq2hwfb1q69vj0cfyiqiwjsb";
-  buildDepends = [ GLUT OpenGL ];
+  version = "1.4.0.1";
+  sha256 = "0za7imyzfgk3ndh9db55wi7zbxrmpvshws4vywrr35b77b3nabr1";
+  buildDepends = [ bmp GLUT OpenGL ];
   meta = {
     homepage = "http://gloss.ouroborus.net";
     description = "Painless 2D vector graphics, animations and simulations";
diff --git a/pkgs/development/libraries/haskell/haskeline/default.nix b/pkgs/development/libraries/haskell/haskeline/default.nix
index 63fdc751d8d1..2b15fa562bfc 100644
--- a/pkgs/development/libraries/haskell/haskeline/default.nix
+++ b/pkgs/development/libraries/haskell/haskeline/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "haskeline";
-  version = "0.6.4.4";
-  sha256 = "03cnhidnpnz7fh34c7x0rpl15zi6hkh9khganrdhwa59srxzbxqb";
+  version = "0.6.4.5";
+  sha256 = "1blhbh53p6di3q3gldzmg3i8f4w3ahipai3di49i4rdcnjry0j5b";
   buildDepends = [ extensibleExceptions mtl terminfo utf8String ];
   meta = {
     homepage = "http://trac.haskell.org/haskeline";
diff --git a/pkgs/development/libraries/haskell/hledger-web/default.nix b/pkgs/development/libraries/haskell/hledger-web/default.nix
index a046e86e075e..426e477fc0f2 100644
--- a/pkgs/development/libraries/haskell/hledger-web/default.nix
+++ b/pkgs/development/libraries/haskell/hledger-web/default.nix
@@ -1,19 +1,19 @@
-{ cabal, aesonNative, blazeHtml, clientsession, cmdargs, dataObject
-, dataObjectYaml, failure, fileEmbed, hamlet, hledger, hledgerLib
-, HUnit, ioStorage, parsec, regexpr, safe, shakespeareCss
-, shakespeareJs, shakespeareText, text, time, transformers, wai
-, waiExtra, warp, yesod, yesodCore, yesodForm, yesodJson
-, yesodStatic
+{ cabal, aesonNative, blazeHtml, cabalFileTh, clientsession
+, cmdargs, dataObject, dataObjectYaml, failure, fileEmbed, hamlet
+, hledger, hledgerLib, HUnit, ioStorage, parsec, regexpr, safe
+, shakespeareCss, shakespeareJs, shakespeareText, text, time
+, transformers, wai, waiExtra, warp, yesod, yesodCore, yesodForm
+, yesodJson, yesodStatic
 }:
 
 cabal.mkDerivation (self: {
   pname = "hledger-web";
-  version = "0.16.3";
-  sha256 = "0jciah0k6i4aa21hgpl1nqfyjkmm5kg5zmzmxwynvwckncy17ihg";
+  version = "0.16.4";
+  sha256 = "1p776fzgan9y7g03g92gsvnassc3k28l6l3gr1vd9v3fcnckg2wj";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [
-    aesonNative blazeHtml clientsession cmdargs dataObject
+    aesonNative blazeHtml cabalFileTh clientsession cmdargs dataObject
     dataObjectYaml failure fileEmbed hamlet hledger hledgerLib HUnit
     ioStorage parsec regexpr safe shakespeareCss shakespeareJs
     shakespeareText text time transformers wai waiExtra warp yesod
diff --git a/pkgs/development/libraries/haskell/hmatrix/default.nix b/pkgs/development/libraries/haskell/hmatrix/default.nix
index 43c66c3d8944..5f45d99c75c3 100644
--- a/pkgs/development/libraries/haskell/hmatrix/default.nix
+++ b/pkgs/development/libraries/haskell/hmatrix/default.nix
@@ -10,6 +10,7 @@ cabal.mkDerivation (self: {
     binary HUnit QuickCheck random storableComplex vector
   ];
   extraLibraries = [ blas gsl liblapack ];
+  configureFlags = "-fvector";
   meta = {
     homepage = "http://perception.inf.um.es/hmatrix";
     description = "Linear algebra and numerical computation";
diff --git a/pkgs/development/libraries/haskell/hp2any-core/default.nix b/pkgs/development/libraries/haskell/hp2any-core/default.nix
index 8bc4620ac26f..f1634f632a3e 100644
--- a/pkgs/development/libraries/haskell/hp2any-core/default.nix
+++ b/pkgs/development/libraries/haskell/hp2any-core/default.nix
@@ -1,10 +1,10 @@
-{ cabal, bytestringTrie, network, time }:
+{ cabal, attoparsec, network, time }:
 
 cabal.mkDerivation (self: {
   pname = "hp2any-core";
-  version = "0.10.1";
-  sha256 = "1qblsvlj4x22ml3k5mlr28r5xk9rmi7lpipd369dbvdzm0rflf03";
-  buildDepends = [ bytestringTrie network time ];
+  version = "0.11.1";
+  sha256 = "146bigmch7dawyyakj0w55p0jdpnxkj8q5izjsswqqk0pdxia546";
+  buildDepends = [ attoparsec network time ];
   meta = {
     homepage = "http://www.haskell.org/haskellwiki/Hp2any";
     description = "Heap profiling helper library";
diff --git a/pkgs/development/libraries/haskell/nixos-types/default.nix b/pkgs/development/libraries/haskell/nixos-types/default.nix
index b63f8a9fbdc1..9a1103a2bb80 100644
--- a/pkgs/development/libraries/haskell/nixos-types/default.nix
+++ b/pkgs/development/libraries/haskell/nixos-types/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "nixos-types";
-  version = "1.1";
-  sha256 = "0vnlhq2pjnslq1h9h3lyaxw604s3zdhs7k8hfr35m178rdm3a5az";
+  version = "1.2";
+  sha256 = "140qk6wqq87qfk471cnhrg135fnqv0vfmfxh8kj14ar2kxvzrr8w";
   buildDepends = [ regexPosix ];
   meta = {
     homepage = "http://github.com/haskell4nix/nixos-types";
diff --git a/pkgs/development/libraries/haskell/skein/default.nix b/pkgs/development/libraries/haskell/skein/default.nix
index 4795c5f2f04b..e197ab349e35 100644
--- a/pkgs/development/libraries/haskell/skein/default.nix
+++ b/pkgs/development/libraries/haskell/skein/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "skein";
-  version = "0.1.0.1";
-  sha256 = "1i05ajmnsm0ac9cqnf1lmdaa6sxkirxv5r2h8phpapzvzwislpr8";
+  version = "0.1.0.2";
+  sha256 = "1ay7ri011vwvl74b9calbnav90d0r08gzqgdk8nvw1qx4slk1ibs";
   buildDepends = [ cereal cryptoApi tagged ];
   meta = {
     description = "Skein, a family of cryptographic hash functions. Includes Skein-MAC as well.";
diff --git a/pkgs/development/libraries/haskell/vty/4.6.0.4.nix b/pkgs/development/libraries/haskell/vty/4.6.0.4.nix
deleted file mode 100644
index 55c731184462..000000000000
--- a/pkgs/development/libraries/haskell/vty/4.6.0.4.nix
+++ /dev/null
@@ -1,18 +0,0 @@
-{ cabal, deepseq, mtl, parallel, parsec, terminfo, utf8String }:
-
-cabal.mkDerivation (self: {
-  pname = "vty";
-  version = "4.6.0.4";
-  sha256 = "0kabssw3v7nglvsr687ppmdnnmii1q2g5zg8rxwi2hcmvnjx7567";
-  buildDepends = [ deepseq mtl parallel parsec terminfo utf8String ];
-  meta = {
-    homepage = "http://trac.haskell.org/vty/";
-    description = "A simple terminal access 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/vty/4.7.0.4.nix b/pkgs/development/libraries/haskell/vty/default.nix
index 8ef4c51d03d1..8ef4c51d03d1 100644
--- a/pkgs/development/libraries/haskell/vty/4.7.0.4.nix
+++ b/pkgs/development/libraries/haskell/vty/default.nix
diff --git a/pkgs/development/libraries/haskell/yap/default.nix b/pkgs/development/libraries/haskell/yap/default.nix
index 858466ab1a49..27938a2fad09 100644
--- a/pkgs/development/libraries/haskell/yap/default.nix
+++ b/pkgs/development/libraries/haskell/yap/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "yap";
-  version = "0.0";
-  sha256 = "0cjsmf9p220fb9yf2i81xspa3rpnlln3hfb9yc5x6xbcc6py0nw5";
+  version = "0.1";
+  sha256 = "14x1z5pmb499qq5sy0iksxv0mli8556s1jh9jm7rdg671h1cy1hl";
   meta = {
     description = "yet another prelude - a simplistic refactoring with algebraic classes";
     license = self.stdenv.lib.licenses.bsd3;
diff --git a/pkgs/development/libraries/haskell/yesod-auth/default.nix b/pkgs/development/libraries/haskell/yesod-auth/default.nix
index 56d5c43887b6..fb74e1dfba24 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.2";
-  sha256 = "18i1ijxrhmmxy45ymc89f7m2zazd7lca4jv4q08d7mr1hdgsx8cn";
+  version = "0.7.4";
+  sha256 = "088hhyy7fwga7hwqqwxxn12iqnz6jadq1bc9p8hdv1jy6ib769dl";
   buildDepends = [
     aesonNative 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 5321294e55ab..9319eb9a39cd 100644
--- a/pkgs/development/libraries/haskell/yesod-core/default.nix
+++ b/pkgs/development/libraries/haskell/yesod-core/default.nix
@@ -1,19 +1,21 @@
-{ cabal, blazeBuilder, blazeHtml, caseInsensitive, cereal
-, clientsession, cookie, enumerator, failure, hamlet, httpTypes
-, monadControl, parsec, pathPieces, random, shakespeare
-, shakespeareCss, shakespeareJs, strictConcurrency, text, time
-, transformers, wai, waiExtra
+{ cabal, aesonNative, blazeBuilder, blazeHtml, caseInsensitive
+, cereal, clientsession, cookie, dataObject, dataObjectYaml
+, enumerator, failure, hamlet, httpTypes, monadControl, parsec
+, pathPieces, random, shakespeare, shakespeareCss, shakespeareJs
+, strictConcurrency, text, time, transformers, vector, wai
+, waiExtra
 }:
 
 cabal.mkDerivation (self: {
   pname = "yesod-core";
-  version = "0.9.2";
-  sha256 = "1h9w5fgdr4w4ikp5axzxmsvc14ikbsjmlwd2lmlrh1cjcx8xzjwf";
+  version = "0.9.3.2";
+  sha256 = "1h45vgxcn4sraax5rsccksx5yz57k32d7vzpp02prz2s2x5bv3xl";
   buildDepends = [
-    blazeBuilder blazeHtml caseInsensitive cereal clientsession cookie
-    enumerator failure hamlet httpTypes monadControl parsec pathPieces
-    random shakespeare shakespeareCss shakespeareJs strictConcurrency
-    text time transformers wai waiExtra
+    aesonNative blazeBuilder blazeHtml caseInsensitive cereal
+    clientsession cookie dataObject dataObjectYaml enumerator failure
+    hamlet httpTypes monadControl parsec pathPieces random shakespeare
+    shakespeareCss shakespeareJs strictConcurrency text time
+    transformers vector wai waiExtra
   ];
   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 fab623a29268..133d45c6c190 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.2.1";
-  sha256 = "1gzd8vs9nabv7vf41b5xxwy49yak9jd3mpxkg4yx7pndm4321hp9";
+  version = "0.3.3";
+  sha256 = "1lym9h7xr26i36n62cvbdyzjxna1p0alyhx9qhi5zhg0xz4nd3xq";
   buildDepends = [
     blazeBuilder blazeHtml dataDefault emailValidate hamlet network
     persistent shakespeareCss shakespeareJs text time transformers wai
diff --git a/pkgs/development/libraries/haskell/yesod-static/default.nix b/pkgs/development/libraries/haskell/yesod-static/default.nix
index 8fbc8baff49d..0f700667f34a 100644
--- a/pkgs/development/libraries/haskell/yesod-static/default.nix
+++ b/pkgs/development/libraries/haskell/yesod-static/default.nix
@@ -1,13 +1,14 @@
-{ cabal, base64Bytestring, cereal, fileEmbed, httpTypes, pureMD5
-, text, transformers, unixCompat, wai, waiAppStatic, yesodCore
+{ cabal, base64Bytestring, cereal, enumerator, fileEmbed, httpTypes
+, pureMD5, text, transformers, unixCompat, wai, waiAppStatic
+, yesodCore
 }:
 
 cabal.mkDerivation (self: {
   pname = "yesod-static";
-  version = "0.3.0.1";
-  sha256 = "1dvg60kawmvczwxvkxzx5k19y36i23fi0faw71ck58mlkjdczby5";
+  version = "0.3.1.2";
+  sha256 = "0r72xspxq7122k9vird4yqqzrn6p4xgzvxid7ig62zdxjlw1p36j";
   buildDepends = [
-    base64Bytestring cereal fileEmbed httpTypes pureMD5 text
+    base64Bytestring cereal enumerator fileEmbed httpTypes pureMD5 text
     transformers unixCompat wai waiAppStatic yesodCore
   ];
   meta = {
diff --git a/pkgs/development/libraries/haskell/yesod/default.nix b/pkgs/development/libraries/haskell/yesod/default.nix
index e4947dc94f21..84a5c25b91f4 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.2.2";
-  sha256 = "09l7cdsrxlr1nb03h3nisih9sm824gnp3nkblvgh8b1pfi54wdkl";
+  version = "0.9.3";
+  sha256 = "1w5fml250i63qhlxkn1bidc3sminmxf98zsdzvdi42sfjx8fdkkx";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [
diff --git a/pkgs/development/libraries/opendkim/default.nix b/pkgs/development/libraries/opendkim/default.nix
index e77a241af729..62a343d8efc7 100644
--- a/pkgs/development/libraries/opendkim/default.nix
+++ b/pkgs/development/libraries/opendkim/default.nix
@@ -1,10 +1,10 @@
 {stdenv, fetchurl, openssl, libmilter}:
 
 stdenv.mkDerivation rec {
-  name = "opendkim-1.2.2";
+  name = "opendkim-2.4.2";
   src = fetchurl {
     url = "mirror://sourceforge/opendkim/files/${name}.tar.gz";
-    sha256 = "01kvhm10kv17mm4zfz0zd24wzr98fxqwyzm56m2l1v262ng3l4nw";
+    sha256 = "0gwgcrnl5c60sxb9z38ari2gl7vd626r3z3dcq8a6aw28pw9w2lk";
   };
 
   configureFlags="--with-openssl=${openssl} --with-milter=${libmilter}";
diff --git a/pkgs/development/libraries/yajl/default.nix b/pkgs/development/libraries/yajl/default.nix
index 6ba81a4766b4..221344b91251 100644
--- a/pkgs/development/libraries/yajl/default.nix
+++ b/pkgs/development/libraries/yajl/default.nix
@@ -19,10 +19,8 @@ stdenv.mkDerivation {
       C, and a small validating JSON generator.
     '';
     homepage = http://lloyd.github.com/yajl/;
-    license = stdenv.lib.license.isc;
-    platforms = with stdenv.lib.platforms; [ linux darwin ];
-    maintainers = with stdenv.lib.maintainers; [
-      z77z
-    ];
+    license = stdenv.lib.licenses.isc;
+    platforms = with stdenv.lib.platforms; linux ++ darwin;
+    maintainers = with stdenv.lib.maintainers; [ z77z ];
   };
 }