hackage-packages.nix: update Haskell package set

This update was generated by hackage2nix v20150922-17-gacb24c5 using the following inputs:

  - Nixpkgs: https://github.com/NixOS/nixpkgs/commit/d16b4a3e789f1abb769c6816b9a78466dcc81f8e
  - Hackage: https://github.com/commercialhaskell/all-cabal-hashes/commit/bf464d875465fd575aad1adf660ff83d35ba0a7b
  - LTS Haskell: https://github.com/fpco/lts-haskell/commit/0d493eae3616d7da684f1b6bf35709bc4408a5c0
  - Stackage Nightly: https://github.com/fpco/stackage-nightly/commit/a19cf709b396706a63c627959a6ff52a6c14e8d7

1 files changed, 596 insertions, 199 deletions

diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index d13b8d5ba5c9..c9c4b5b2575c 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -6065,7 +6065,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) freeglut; inherit (pkgs) mesa;};
 
-  "GLURaw" = callPackage
+  "GLURaw_1_5_0_1" = callPackage
     ({ mkDerivation, base, freeglut, mesa, OpenGLRaw, transformers }:
      mkDerivation {
        pname = "GLURaw";
@@ -6076,6 +6076,20 @@ self: {
        homepage = "http://www.haskell.org/haskellwiki/Opengl";
        description = "A raw binding for the OpenGL graphics system";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {inherit (pkgs) freeglut; inherit (pkgs) mesa;};
+
+  "GLURaw" = callPackage
+    ({ mkDerivation, base, freeglut, mesa, OpenGLRaw, transformers }:
+     mkDerivation {
+       pname = "GLURaw";
+       version = "1.5.0.2";
+       sha256 = "dd24af039bef7f44dc580692b57a7a16a36a44b7261c8d3008aba60b696a4c3f";
+       libraryHaskellDepends = [ base OpenGLRaw transformers ];
+       librarySystemDepends = [ freeglut mesa ];
+       homepage = "http://www.haskell.org/haskellwiki/Opengl";
+       description = "A raw binding for the OpenGL graphics system";
+       license = stdenv.lib.licenses.bsd3;
      }) {inherit (pkgs) freeglut; inherit (pkgs) mesa;};
 
   "GLUT_2_5_1_1" = callPackage
@@ -11343,6 +11357,17 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "Lambdaya" = callPackage
+    ({ mkDerivation, base, mtl, unix }:
+     mkDerivation {
+       pname = "Lambdaya";
+       version = "0.1.0.0";
+       sha256 = "99107e7588c63f173c085c6310ab122cee45ce55f16f6ded2eed7b279f0c7301";
+       libraryHaskellDepends = [ base mtl unix ];
+       description = "Library for RedPitaya";
+       license = stdenv.lib.licenses.gpl3;
+     }) {};
+
   "LargeCardinalHierarchy" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
@@ -12359,6 +12384,8 @@ self: {
        pname = "MonadRandom";
        version = "0.3.0.1";
        sha256 = "40e6a19cecf9c72a5281e813c982e037104c287eef3e4b49a03b4fdd6736722d";
+       revision = "1";
+       editedCabalFile = "aef6c8f98c9f4c1fc09753192ec83a6c259087dd098ca2e6cacd3219872f071c";
        libraryHaskellDepends = [ base mtl random transformers ];
        description = "Random-number generation monad";
        license = "unknown";
@@ -12373,6 +12400,8 @@ self: {
        pname = "MonadRandom";
        version = "0.3.0.2";
        sha256 = "71afdea34f7836678d989cef3373f76a62cca5f47440aa0185c85fff5694eaa1";
+       revision = "1";
+       editedCabalFile = "1b96fa21489194e7d5634e42f1f4efef26c5e0f9c0cea47c0ea0ca86dc4fd2e6";
        libraryHaskellDepends = [
          base mtl random transformers transformers-compat
        ];
@@ -12389,6 +12418,8 @@ self: {
        pname = "MonadRandom";
        version = "0.4";
        sha256 = "d32f3f7a8390125f43a67b78741c6655452dfc4388009ab4ca5a265ab5b86f93";
+       revision = "1";
+       editedCabalFile = "d913e82863e6b10963cc9f48a74e70739336e17debbcccef66f7e5068cdf7f1d";
        libraryHaskellDepends = [
          base mtl random transformers transformers-compat
        ];
@@ -13684,6 +13715,24 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {inherit (pkgs) mesa;};
 
+  "OpenGLRaw_2_6_0_0" = callPackage
+    ({ mkDerivation, base, bytestring, containers, half, mesa, text
+     , transformers
+     }:
+     mkDerivation {
+       pname = "OpenGLRaw";
+       version = "2.6.0.0";
+       sha256 = "e962c18eb40d6e1ef7c2c3a877b0be14c35dbf533612d33074d5011bd266cc0d";
+       libraryHaskellDepends = [
+         base bytestring containers half text transformers
+       ];
+       librarySystemDepends = [ mesa ];
+       homepage = "http://www.haskell.org/haskellwiki/Opengl";
+       description = "A raw binding for the OpenGL graphics system";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {inherit (pkgs) mesa;};
+
   "OpenGLRaw21" = callPackage
     ({ mkDerivation, OpenGLRaw }:
      mkDerivation {
@@ -14999,7 +15048,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "RSA" = callPackage
+  "RSA_2_1_0_3" = callPackage
     ({ mkDerivation, base, binary, bytestring, crypto-api
      , crypto-pubkey-types, DRBG, pureMD5, QuickCheck, SHA, tagged
      , test-framework, test-framework-quickcheck2
@@ -15017,9 +15066,10 @@ self: {
        ];
        description = "Implementation of RSA, using the padding schemes of PKCS#1 v2.1.";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "RSA_2_2_0" = callPackage
+  "RSA" = callPackage
     ({ mkDerivation, base, binary, bytestring, crypto-api
      , crypto-pubkey-types, DRBG, pureMD5, QuickCheck, SHA, tagged
      , test-framework, test-framework-quickcheck2
@@ -15037,7 +15087,6 @@ self: {
        ];
        description = "Implementation of RSA, using the padding schemes of PKCS#1 v2.1.";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "Raincat" = callPackage
@@ -19596,8 +19645,8 @@ self: {
        pname = "accelerate-cuda";
        version = "0.15.0.0";
        sha256 = "bec5de97e2a621d8eab3da2598143e34c4145fb10adad6d4164ed4ce237316fd";
-       revision = "2";
-       editedCabalFile = "5ed199c4c1d360ed3eaee24df7016462ed1fb1313ff47d6828be546eec8708fc";
+       revision = "3";
+       editedCabalFile = "14c5a52cc4989793c20d22d81dec4aa91e4c64be122fde0453b0bd6cd790af82";
        libraryHaskellDepends = [
          accelerate array base binary bytestring cryptohash cuda directory
          fclabels filepath hashable hashtables language-c-quote
@@ -19737,14 +19786,11 @@ self: {
      }:
      mkDerivation {
        pname = "accelerate-io";
-       version = "0.15.0.0";
-       sha256 = "66a48e417e353f6daad24e7ca385370764d6a0a1979066c1e890fba77b95e802";
-       revision = "1";
-       editedCabalFile = "5c3f8f7ebc03117652646329743ea251d281f72d81454e55538c27e87e8c0ecc";
+       version = "0.15.1.0";
+       sha256 = "d531fc6c950a6fcf0bdd72c65438c27fbffe2f3043444128979490d53fc7677c";
        libraryHaskellDepends = [
          accelerate array base bmp bytestring repa vector
        ];
-       jailbreak = true;
        homepage = "https://github.com/AccelerateHS/accelerate-io";
        description = "Read and write Accelerate arrays in various formats";
        license = stdenv.lib.licenses.bsd3;
@@ -40302,8 +40348,8 @@ self: {
      }:
      mkDerivation {
        pname = "cef";
-       version = "0.1.2";
-       sha256 = "9191a449057e8889c3626f8e625b85a27af059cc43c74d6202dad30a7b91b838";
+       version = "0.1.3";
+       sha256 = "9918fb0b19e23aefe90ed914e30498011f1fa6ea0c8ffdc9e8f8a90337ac41d4";
        libraryHaskellDepends = [ base bytestring text time ];
        testHaskellDepends = [ base directory doctest filepath ];
        homepage = "http://github.com/picussecurity/haskell-cef.git";
@@ -43206,8 +43252,8 @@ self: {
      }:
      mkDerivation {
        pname = "clckwrks";
-       version = "0.23.10";
-       sha256 = "7e85091501c7a91a51c17920b415e764f20b730f1bf59ad0e0cc5be9b777cbe7";
+       version = "0.23.11";
+       sha256 = "65868751cc51e409a000edc5fb26e25f3c151f8a792ca80006ae87813cc9ea6e";
        libraryHaskellDepends = [
          acid-state aeson aeson-qq attoparsec base blaze-html bytestring
          cereal containers directory filepath happstack-authenticate
@@ -43231,14 +43277,13 @@ self: {
      }:
      mkDerivation {
        pname = "clckwrks-cli";
-       version = "0.2.14";
-       sha256 = "2336de23aed5c6cb2dafdafbd42581c43db3313835a91ad70a664a2d7ecf9bb7";
+       version = "0.2.15";
+       sha256 = "8a7fad8590c6c1297b7076a7e4cc03689f37cd9371171748f351967cbb91b7f2";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
          acid-state base clckwrks haskeline mtl network parsec
        ];
-       jailbreak = true;
        homepage = "http://www.clckwrks.com/";
        description = "a command-line interface for adminstrating some aspects of clckwrks";
        license = stdenv.lib.licenses.bsd3;
@@ -43370,13 +43415,12 @@ self: {
      }:
      mkDerivation {
        pname = "clckwrks-theme-bootstrap";
-       version = "0.4.0";
-       sha256 = "9f4e43b58b2a8ec3d9a8d33663c3cad8121981e72d69cada7c76467b329d4d23";
+       version = "0.4.1";
+       sha256 = "59399a42c5d928e9aa332e0901d023e00f6add27c03b95cddf405e392885f852";
        libraryHaskellDepends = [
          base clckwrks happstack-authenticate hsp hsx-jmacro hsx2hs jmacro
          mtl text web-plugins
        ];
-       jailbreak = true;
        homepage = "http://www.clckwrks.com/";
        description = "simple bootstrap based template for clckwrks";
        license = stdenv.lib.licenses.bsd3;
@@ -43388,8 +43432,8 @@ self: {
      }:
      mkDerivation {
        pname = "clckwrks-theme-clckwrks";
-       version = "0.5.1";
-       sha256 = "93540dc0dafbf1e9bc6863c215391905201bc4653133fd01c0f0c6a9bacd6858";
+       version = "0.5.2";
+       sha256 = "53182128e49924132191d6d607e7088f92367a10ab31d38b5e4a1d8a2471ed1c";
        libraryHaskellDepends = [
          base clckwrks containers happstack-authenticate hsp hsx2hs mtl text
          web-plugins
@@ -57751,6 +57795,7 @@ self: {
          QuickCheck rematch stm test-framework test-framework-hunit
          test-framework-quickcheck2 time transformers unordered-containers
        ];
+       doCheck = false;
        homepage = "http://github.com/haskell-distributed/distributed-process-execution";
        description = "Execution Framework for The Cloud Haskell Application Platform";
        license = stdenv.lib.licenses.bsd3;
@@ -58128,6 +58173,7 @@ self: {
          QuickCheck rematch stm test-framework test-framework-hunit
          test-framework-quickcheck2 time transformers unordered-containers
        ];
+       doCheck = false;
        homepage = "http://github.com/haskell-distributed/distributed-process-task";
        description = "Task Framework for The Cloud Haskell Application Platform";
        license = stdenv.lib.licenses.bsd3;
@@ -58448,7 +58494,7 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "dns" = callPackage
+  "dns_2_0_0" = callPackage
     ({ mkDerivation, attoparsec, base, binary, blaze-builder
      , bytestring, conduit, conduit-extra, containers, doctest, hspec
      , iproute, mtl, network, random, resourcet, word8
@@ -58470,6 +58516,31 @@ self: {
        testTarget = "spec";
        description = "DNS library in Haskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "dns" = callPackage
+    ({ mkDerivation, attoparsec, base, binary, blaze-builder
+     , bytestring, conduit, conduit-extra, containers, doctest, hspec
+     , iproute, mtl, network, random, resourcet, word8
+     }:
+     mkDerivation {
+       pname = "dns";
+       version = "2.0.1";
+       sha256 = "3d11e14bbfd07b46bba9c676dd970731be190d6dc9c5e95089c4da60565e47d2";
+       libraryHaskellDepends = [
+         attoparsec base binary blaze-builder bytestring conduit
+         conduit-extra containers iproute mtl network random resourcet
+       ];
+       testHaskellDepends = [
+         attoparsec base binary blaze-builder bytestring conduit
+         conduit-extra containers doctest hspec iproute mtl network random
+         resourcet word8
+       ];
+       doCheck = false;
+       testTarget = "spec";
+       description = "DNS library in Haskell";
+       license = stdenv.lib.licenses.bsd3;
      }) {};
 
   "dnscache" = callPackage
@@ -67208,6 +67279,19 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "first-and-last" = callPackage
+    ({ mkDerivation, base, Cabal }:
+     mkDerivation {
+       pname = "first-and-last";
+       version = "0.1.0.0";
+       sha256 = "d3d54fb686d09717501eed65a1ae21fdd5434ad73f958ff57d7ae849b1519653";
+       libraryHaskellDepends = [ base ];
+       testHaskellDepends = [ base Cabal ];
+       homepage = "https://github.com/markandrus/first-and-last";
+       description = "First and Last generalized to return up to n values";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "first-class-patterns" = callPackage
     ({ mkDerivation, base, transformers }:
      mkDerivation {
@@ -71939,8 +72023,8 @@ self: {
      }:
      mkDerivation {
        pname = "getopt-generics";
-       version = "0.11.0.1";
-       sha256 = "b3f49f80af9e7eba12260f772c8b2b85cea4be80c7f33fc363c28f5f9d7f9eca";
+       version = "0.11.0.2";
+       sha256 = "d1d989bbf86df719c57cb01db59a554f3b07c475644dd3cecc48bfc29d885010";
        libraryHaskellDepends = [
          base base-compat base-orphans generics-sop tagged
        ];
@@ -71949,7 +72033,7 @@ self: {
          QuickCheck safe silently tagged
        ];
        doCheck = false;
-       homepage = "https://github.com/zalora/getopt-generics#readme";
+       homepage = "https://github.com/soenkehahn/getopt-generics#readme";
        description = "Create command line interfaces with ease";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -76689,25 +76773,12 @@ self: {
     ({ mkDerivation, base, containers, deepseq, pointed }:
      mkDerivation {
        pname = "grouped-list";
-       version = "0.1.0.0";
-       sha256 = "e8d4003fa846ee6a928209bd78c526691d40b7eaaec76fdc636d38967f05c9fb";
-       libraryHaskellDepends = [ base containers deepseq pointed ];
-       homepage = "https://github.com/Daniel-Diaz/grouped-list/blob/master/README.md";
-       description = "Grouped lists. Equal consecutive elements are grouped.";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "grouped-list_0_1_1_0" = callPackage
-    ({ mkDerivation, base, containers, deepseq, pointed }:
-     mkDerivation {
-       pname = "grouped-list";
-       version = "0.1.1.0";
-       sha256 = "ee4d9d19edb36c8f3bcf5b85e3ef461d73018424197a0ae1cc1161edd8ebc765";
+       version = "0.1.2.0";
+       sha256 = "77aa60756373ca42065568fb5c57c8cb9b5f85e89ed3d35192b8df4c48ae390f";
        libraryHaskellDepends = [ base containers deepseq pointed ];
        homepage = "https://github.com/Daniel-Diaz/grouped-list/blob/master/README.md";
        description = "Grouped lists. Equal consecutive elements are grouped.";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "groupoid" = callPackage
@@ -80726,24 +80797,25 @@ self: {
   "happstack-authenticate" = callPackage
     ({ mkDerivation, acid-state, aeson, authenticate, base
      , base64-bytestring, boomerang, bytestring, containers
-     , data-default, filepath, happstack-hsp, happstack-jmacro
-     , happstack-server, hsp, hsx-jmacro, hsx2hs, http-conduit
-     , http-types, ixset-typed, jmacro, jwt, lens, mime-mail, mtl
-     , pwstore-purehaskell, random, safecopy, shakespeare, text, time
-     , unordered-containers, userid, web-routes, web-routes-boomerang
-     , web-routes-happstack, web-routes-hsp, web-routes-th
+     , data-default, email-validate, filepath, happstack-hsp
+     , happstack-jmacro, happstack-server, hsp, hsx-jmacro, hsx2hs
+     , http-conduit, http-types, ixset-typed, jmacro, jwt, lens
+     , mime-mail, mtl, pwstore-purehaskell, random, safecopy
+     , shakespeare, text, time, unordered-containers, userid, web-routes
+     , web-routes-boomerang, web-routes-happstack, web-routes-hsp
+     , web-routes-th
      }:
      mkDerivation {
        pname = "happstack-authenticate";
-       version = "2.2.0";
-       sha256 = "7093ae69b6be698102f87df7851eafbdeb830f55467083aea06bd8b11adf5078";
+       version = "2.3.0";
+       sha256 = "d459a80c7c54a05e31a803f200233bb491350099e04f2fb27567735fe0dfe9c2";
        libraryHaskellDepends = [
          acid-state aeson authenticate base base64-bytestring boomerang
-         bytestring containers data-default filepath happstack-hsp
-         happstack-jmacro happstack-server hsp hsx-jmacro hsx2hs
-         http-conduit http-types ixset-typed jmacro jwt lens mime-mail mtl
-         pwstore-purehaskell random safecopy shakespeare text time
-         unordered-containers userid web-routes web-routes-boomerang
+         bytestring containers data-default email-validate filepath
+         happstack-hsp happstack-jmacro happstack-server hsp hsx-jmacro
+         hsx2hs http-conduit http-types ixset-typed jmacro jwt lens
+         mime-mail mtl pwstore-purehaskell random safecopy shakespeare text
+         time unordered-containers userid web-routes web-routes-boomerang
          web-routes-happstack web-routes-hsp web-routes-th
        ];
        homepage = "http://www.happstack.com/";
@@ -81176,7 +81248,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "happstack-server" = callPackage
+  "happstack-server_7_4_4" = callPackage
     ({ mkDerivation, base, base64-bytestring, blaze-html, bytestring
      , containers, directory, exceptions, extensible-exceptions
      , filepath, hslogger, html, HUnit, monad-control, mtl, network
@@ -81203,6 +81275,36 @@ self: {
        homepage = "http://happstack.com";
        description = "Web related tools and services";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "happstack-server" = callPackage
+    ({ mkDerivation, base, base64-bytestring, blaze-html, bytestring
+     , containers, directory, exceptions, extensible-exceptions
+     , filepath, hslogger, html, HUnit, monad-control, mtl, network
+     , network-uri, old-locale, parsec, process, sendfile, syb
+     , system-filepath, template-haskell, text, threads, time
+     , time-compat, transformers, transformers-base, transformers-compat
+     , unix, utf8-string, xhtml, zlib
+     }:
+     mkDerivation {
+       pname = "happstack-server";
+       version = "7.4.5";
+       sha256 = "704a11b50604e57bd960633a73baa77fe23993f41b35202a0e26f4af2f91dc96";
+       libraryHaskellDepends = [
+         base base64-bytestring blaze-html bytestring containers directory
+         exceptions extensible-exceptions filepath hslogger html
+         monad-control mtl network network-uri old-locale parsec process
+         sendfile syb system-filepath template-haskell text threads time
+         time-compat transformers transformers-base transformers-compat unix
+         utf8-string xhtml zlib
+       ];
+       testHaskellDepends = [
+         base bytestring containers HUnit parsec zlib
+       ];
+       homepage = "http://happstack.com";
+       description = "Web related tools and services";
+       license = stdenv.lib.licenses.bsd3;
      }) {};
 
   "happstack-server-tls" = callPackage
@@ -84234,8 +84336,8 @@ self: {
     ({ mkDerivation, base }:
      mkDerivation {
        pname = "haskore-vintage";
-       version = "0.2";
-       sha256 = "d618cd63ca221c980b61fde864e8a024bfefba0318984d92a270c3b1fbd1f8b6";
+       version = "0.3";
+       sha256 = "0bd49a041c73292d195897a1e8a73713669b09b1a73f3e29251f72223da708ab";
        libraryHaskellDepends = [ base ];
        homepage = "http://haskell.org/haskore/";
        description = "The February 2000 version of Haskore";
@@ -85147,8 +85249,8 @@ self: {
      }:
      mkDerivation {
        pname = "hastily";
-       version = "0.1.0.4";
-       sha256 = "0cb4cb729d1c6a382a81c2667c0bd42ec6be3aaa90604e8de2067f5ec8a351fb";
+       version = "0.1.0.6";
+       sha256 = "d001119682dc0389bbac946793401209c7286a01d9b157fab638ac8fda78a72e";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -96076,8 +96178,8 @@ self: {
     ({ mkDerivation, base, checkers, hspec }:
      mkDerivation {
        pname = "hspec-checkers";
-       version = "0.1.0";
-       sha256 = "cd4ceeed2d9b46f42d440914814162657264e541ad25232ae609b274e5fb7810";
+       version = "0.1.0.1";
+       sha256 = "9703ad134d1711b17301d760cebc36814c48a0e4e5712590514c93e6ec278dab";
        libraryHaskellDepends = [ base checkers hspec ];
        testHaskellDepends = [ base checkers hspec ];
        description = "Allows to use checkers properties from hspec";
@@ -97191,6 +97293,7 @@ self: {
        libraryHaskellDepends = [
          base exceptions hsqml-datamodel type-list vinyl
        ];
+       jailbreak = true;
        homepage = "https://github.com/marcinmrotek/hsqml-datamodel-vinyl";
        description = "HsQML DataModel instances for Vinyl Rec";
        license = stdenv.lib.licenses.bsd3;
@@ -98130,23 +98233,6 @@ self: {
      }:
      mkDerivation {
        pname = "http-api-data";
-       version = "0.2";
-       sha256 = "25b9127e356d15b7edea37068629f87523854a12f0ce4ac65a03ae391a4a6659";
-       libraryHaskellDepends = [ base bytestring text time ];
-       testHaskellDepends = [
-         base doctest Glob hspec HUnit QuickCheck text time
-       ];
-       homepage = "http://github.com/fizruk/http-api-data";
-       description = "Converting to/from HTTP API data like URL pieces, headers and query parameters";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "http-api-data_0_2_1" = callPackage
-    ({ mkDerivation, base, bytestring, doctest, Glob, hspec, HUnit
-     , QuickCheck, text, time
-     }:
-     mkDerivation {
-       pname = "http-api-data";
        version = "0.2.1";
        sha256 = "856138d79945770cdb4b522f58893a1c45014d39238cfc5b2eceeac089c56f71";
        libraryHaskellDepends = [ base bytestring text time ];
@@ -98156,7 +98242,6 @@ self: {
        homepage = "http://github.com/fizruk/http-api-data";
        description = "Converting to/from HTTP API data like URL pieces, headers and query parameters";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "http-attoparsec" = callPackage
@@ -108779,8 +108864,8 @@ self: {
        pname = "keter";
        version = "1.3.7";
        sha256 = "a0710bf072a8829f5e696a6cf760554b26006d520f311ae29a53bf46e96f98c3";
-       revision = "2";
-       editedCabalFile = "cefc8c00964e630396ca46f09d13a77fc4870db48e5526796817ca6d35aa3e49";
+       revision = "3";
+       editedCabalFile = "97b84a04bdbef02b95c502f4a4e27791dc3a6e10f40a4797cf267311be1c6875";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -108822,8 +108907,8 @@ self: {
        pname = "keter";
        version = "1.3.7.1";
        sha256 = "003ce327d5b8ce407df901b46a99a37109b2ce14d6f51e50212130ba5ed9843e";
-       revision = "2";
-       editedCabalFile = "a1c0a6f6e7ffa9cd6c5a1c2780fdb5ce14a95d3c5fe9fe96cfeccc3726e91e98";
+       revision = "3";
+       editedCabalFile = "a534637676d741ad4b3a5c0ba745df72206f16008e52ed037cc7de8cb4db2556";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -111272,15 +111357,15 @@ self: {
      }) {};
 
   "language-lua2" = callPackage
-    ({ mkDerivation, base, containers, Earley, lexer-applicative
-     , microlens, optparse-applicative, QuickCheck, regex-applicative
-     , semigroups, srcloc, tasty, tasty-hunit, tasty-quickcheck
-     , transformers, unordered-containers, wl-pprint
+    ({ mkDerivation, base, containers, deepseq, Earley
+     , lexer-applicative, microlens, optparse-applicative, QuickCheck
+     , regex-applicative, semigroups, srcloc, tasty, tasty-hunit
+     , tasty-quickcheck, transformers, unordered-containers, wl-pprint
      }:
      mkDerivation {
        pname = "language-lua2";
-       version = "0.1.0.3";
-       sha256 = "f375d752b3100a5cf2afa3238ba6a3fac5311af3e937e3f988c569de319aa009";
+       version = "0.1.0.4";
+       sha256 = "3d5e92e4ec4b096cb44432fc7e2ee2620470c4912c3fd85e30b07a7b834c422b";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -111292,9 +111377,10 @@ self: {
          base Earley lexer-applicative optparse-applicative srcloc wl-pprint
        ];
        testHaskellDepends = [
-         base lexer-applicative QuickCheck semigroups srcloc tasty
+         base deepseq lexer-applicative QuickCheck semigroups srcloc tasty
          tasty-hunit tasty-quickcheck unordered-containers
        ];
+       doCheck = false;
        homepage = "http://github.com/mitchellwrosen/language-lua2";
        description = "Lua parser and pretty printer";
        license = stdenv.lib.licenses.bsd3;
@@ -118496,29 +118582,6 @@ self: {
      , bytestring, containers, email-validate, http-client
      , http-client-tls, http-types, lens, mtl, old-locale, QuickCheck
      , raw-strings-qq, tasty, tasty-hunit, tasty-quickcheck, text, time
-     }:
-     mkDerivation {
-       pname = "mandrill";
-       version = "0.4.1.0";
-       sha256 = "677f358e4ff991a41baff9e105a96d90849778dfa1ed12b316866e2df4cdb7e6";
-       libraryHaskellDepends = [
-         aeson base base64-bytestring blaze-html bytestring containers
-         email-validate http-client http-client-tls http-types lens mtl
-         old-locale QuickCheck text time
-       ];
-       testHaskellDepends = [
-         aeson base bytestring QuickCheck raw-strings-qq tasty tasty-hunit
-         tasty-quickcheck text
-       ];
-       description = "Library for interfacing with the Mandrill JSON API";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "mandrill_0_5_0_0" = callPackage
-    ({ mkDerivation, aeson, base, base64-bytestring, blaze-html
-     , bytestring, containers, email-validate, http-client
-     , http-client-tls, http-types, lens, mtl, old-locale, QuickCheck
-     , raw-strings-qq, tasty, tasty-hunit, tasty-quickcheck, text, time
      , unordered-containers
      }:
      mkDerivation {
@@ -118536,7 +118599,6 @@ self: {
        ];
        description = "Library for interfacing with the Mandrill JSON API";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "mandulia" = callPackage
@@ -122653,7 +122715,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "monad-parallel" = callPackage
+  "monad-parallel_0_7_1_4" = callPackage
     ({ mkDerivation, base, parallel, transformers, transformers-compat
      }:
      mkDerivation {
@@ -122666,6 +122728,22 @@ self: {
        homepage = "http://trac.haskell.org/SCC/wiki/monad-parallel";
        description = "Parallel execution of monadic computations";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "monad-parallel" = callPackage
+    ({ mkDerivation, base, parallel, transformers, transformers-compat
+     }:
+     mkDerivation {
+       pname = "monad-parallel";
+       version = "0.7.2";
+       sha256 = "fa410be89895b177dd092a30a324e12a026d59bc999070e0c1d4da91d747bee3";
+       libraryHaskellDepends = [
+         base parallel transformers transformers-compat
+       ];
+       homepage = "http://trac.haskell.org/SCC/wiki/monad-parallel";
+       description = "Parallel execution of monadic computations";
+       license = stdenv.lib.licenses.bsd3;
      }) {};
 
   "monad-parallel-progressbar" = callPackage
@@ -123520,7 +123598,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "mono-traversable" = callPackage
+  "mono-traversable_0_9_3" = callPackage
     ({ mkDerivation, base, bytestring, comonad, containers, dlist
      , dlist-instances, foldl, hashable, hspec, HUnit, QuickCheck
      , semigroupoids, semigroups, split, text, transformers
@@ -123542,6 +123620,31 @@ self: {
        homepage = "https://github.com/snoyberg/mono-traversable";
        description = "Type classes for mapping, folding, and traversing monomorphic containers";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "mono-traversable" = callPackage
+    ({ mkDerivation, base, bytestring, comonad, containers, dlist
+     , dlist-instances, foldl, hashable, hspec, HUnit, QuickCheck
+     , semigroupoids, semigroups, split, text, transformers
+     , unordered-containers, vector, vector-algorithms, vector-instances
+     }:
+     mkDerivation {
+       pname = "mono-traversable";
+       version = "0.10.0";
+       sha256 = "5f71c909ed5b5b399fdceeb565b3eb3c19fbcdd771ca9a87595f863c35429fab";
+       libraryHaskellDepends = [
+         base bytestring comonad containers dlist dlist-instances hashable
+         semigroupoids semigroups split text transformers
+         unordered-containers vector vector-algorithms vector-instances
+       ];
+       testHaskellDepends = [
+         base bytestring containers foldl hspec HUnit QuickCheck semigroups
+         text transformers unordered-containers vector
+       ];
+       homepage = "https://github.com/snoyberg/mono-traversable";
+       description = "Type classes for mapping, folding, and traversing monomorphic containers";
+       license = stdenv.lib.licenses.mit;
      }) {};
 
   "monoid-extras_0_3_3_5" = callPackage
@@ -126500,8 +126603,8 @@ self: {
      }:
      mkDerivation {
        pname = "ncurses";
-       version = "0.2.11";
-       sha256 = "f3dbd238d44c4bf44ccb5364540300bc9a16b539822535f3cd5d9e1189105922";
+       version = "0.2.12";
+       sha256 = "fbafe7fcb6e829fa1c3a3827c9adc871e7784cd76448d0c75d99b92f81dc1165";
        libraryHaskellDepends = [ base containers text transformers ];
        librarySystemDepends = [ ncurses ];
        libraryToolDepends = [ c2hs ];
@@ -129913,8 +130016,8 @@ self: {
     ({ mkDerivation, base, containers }:
      mkDerivation {
        pname = "observable-sharing";
-       version = "0.2.3";
-       sha256 = "36438ff9a35a7d7ff0f73d5bc798e544584d1aa0efc07e7f0fb7a5513ed20432";
+       version = "0.2.4";
+       sha256 = "400efecddcfdd992717caccc3a7b00590e7635bf92305d7d93f81d47327811d3";
        libraryHaskellDepends = [ base containers ];
        homepage = "https://github.com/atzeus/observable-sharing";
        description = "Simple observable sharing";
@@ -131878,8 +131981,8 @@ self: {
      }:
      mkDerivation {
        pname = "ot";
-       version = "0.2.0.0";
-       sha256 = "a3e917487a3aab56966fc3d676a3b8cf079acbd05b0ea0c887d6b90a18a6c46d";
+       version = "0.2.1.0";
+       sha256 = "56f1c888103c699b1025c1f23a7e3423a5b7cf93041af24d8fbd1eb9f08caa04";
        libraryHaskellDepends = [
          aeson attoparsec base binary either ghc mtl QuickCheck text
        ];
@@ -131887,7 +131990,6 @@ self: {
          aeson base binary HUnit QuickCheck test-framework
          test-framework-hunit test-framework-quickcheck2 text
        ];
-       jailbreak = true;
        homepage = "https://github.com/operational-transformation/ot.hs";
        description = "Real-time collaborative editing with Operational Transformation";
        license = stdenv.lib.licenses.mit;
@@ -132037,8 +132139,8 @@ self: {
      }:
      mkDerivation {
        pname = "packer";
-       version = "0.1.8";
-       sha256 = "713d29b95f41aff8ed21dc59551c5caf3ac165c07d43d4e403cb1b161429f8e4";
+       version = "0.1.9";
+       sha256 = "d2926f876da4ef8e4590bbc501caf83b0703018971ad5413e9d6647667d681e4";
        libraryHaskellDepends = [ base bytestring ghc-prim transformers ];
        testHaskellDepends = [
          base bytestring tasty tasty-hunit tasty-quickcheck
@@ -132665,6 +132767,37 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "pandoc-citeproc_0_8" = callPackage
+    ({ mkDerivation, aeson, aeson-pretty, attoparsec, base, bytestring
+     , containers, data-default, directory, filepath, hs-bibutils, mtl
+     , old-locale, pandoc, pandoc-types, parsec, process, rfc5051
+     , setenv, split, syb, tagsoup, temporary, text, time, vector
+     , xml-conduit, yaml
+     }:
+     mkDerivation {
+       pname = "pandoc-citeproc";
+       version = "0.8";
+       sha256 = "834ba89edc9d92dd2e9bf0f001a5ce3d5713b8a7b580232b6a088b5f7f6ddc5e";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         aeson base bytestring containers data-default directory filepath
+         hs-bibutils mtl old-locale pandoc pandoc-types parsec rfc5051
+         setenv split syb tagsoup text time vector xml-conduit yaml
+       ];
+       executableHaskellDepends = [
+         aeson aeson-pretty attoparsec base bytestring containers directory
+         filepath pandoc pandoc-types process syb temporary text vector yaml
+       ];
+       testHaskellDepends = [
+         aeson base bytestring directory filepath pandoc pandoc-types
+         process temporary text yaml
+       ];
+       description = "Supports using pandoc with citeproc";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "pandoc-citeproc-preamble" = callPackage
     ({ mkDerivation, base, directory, filepath, pandoc-types, process
      }:
@@ -135520,7 +135653,6 @@ self: {
          monad-control monad-logger mysql mysql-simple persistent resourcet
          text transformers
        ];
-       doHaddock = false;
        homepage = "http://www.yesodweb.com/book/persistent";
        description = "Backend for the persistent library using MySQL database server";
        license = stdenv.lib.licenses.mit;
@@ -136856,17 +136988,21 @@ self: {
      }) {};
 
   "picologic" = callPackage
-    ({ mkDerivation, base, containers, mtl, parsec, picosat, pretty }:
+    ({ mkDerivation, base, containers, mtl, parsec, picosat, pretty
+     , QuickCheck
+     }:
      mkDerivation {
        pname = "picologic";
-       version = "0.1.1";
-       sha256 = "40b8f3a30f200f956d967c4bfa8063cbaf9a9e1963c246cffcc79e8e5da29193";
+       version = "0.1.2";
+       sha256 = "449f6ead23c54d1751d66437a06950a5b2a478348c53e6b927ec9a2bb9e9e40f";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
          base containers mtl parsec picosat pretty
        ];
-       jailbreak = true;
+       testHaskellDepends = [
+         base containers mtl picosat pretty QuickCheck
+       ];
        homepage = "https://github.com/sdiehl/picologic";
        description = "Utilities for symbolic predicate logic expressions";
        license = stdenv.lib.licenses.mit;
@@ -146349,8 +146485,8 @@ self: {
      }:
      mkDerivation {
        pname = "reflex-transformers";
-       version = "0.1";
-       sha256 = "b7871b9e833eadfa04832cf978bfbb762c3f02cab68a8876eeb8b45af2fd219e";
+       version = "0.2";
+       sha256 = "81ab5c2fd634285c6c3044310ec37082e2d2350a8857f29c3c615198593b8430";
        libraryHaskellDepends = [
          base containers lens mtl reflex semigroups stateWriter transformers
        ];
@@ -149159,21 +149295,6 @@ self: {
      }:
      mkDerivation {
        pname = "rest-happstack";
-       version = "0.3";
-       sha256 = "494b9ae9e126e03e45d0fd61cbd77c4160ad3493448fcfbfcb1e2d0d8e9bc766";
-       libraryHaskellDepends = [
-         base containers happstack-server mtl rest-core rest-gen utf8-string
-       ];
-       description = "Rest driver for Happstack";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "rest-happstack_0_3_1" = callPackage
-    ({ mkDerivation, base, containers, happstack-server, mtl, rest-core
-     , rest-gen, utf8-string
-     }:
-     mkDerivation {
-       pname = "rest-happstack";
        version = "0.3.1";
        sha256 = "a2c2e1b1e1bfdc7870100eee642e488268e21117b08aad254342d14a53ce13d9";
        libraryHaskellDepends = [
@@ -149181,7 +149302,6 @@ self: {
        ];
        description = "Rest driver for Happstack";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "rest-snap_0_1_17_14" = callPackage
@@ -154739,7 +154859,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "servant" = callPackage
+  "servant_0_4_4_4" = callPackage
     ({ mkDerivation, aeson, attoparsec, base, bytestring
      , bytestring-conversion, case-insensitive, directory, doctest
      , filemanip, filepath, hspec, http-media, http-types, network-uri
@@ -154763,6 +154883,33 @@ self: {
        homepage = "http://haskell-servant.github.io/";
        description = "A family of combinators for defining webservices APIs";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "servant" = callPackage
+    ({ mkDerivation, aeson, attoparsec, base, bytestring
+     , bytestring-conversion, case-insensitive, directory, doctest
+     , filemanip, filepath, hspec, http-media, http-types, network-uri
+     , parsec, QuickCheck, quickcheck-instances, string-conversions
+     , text, url
+     }:
+     mkDerivation {
+       pname = "servant";
+       version = "0.4.4.5";
+       sha256 = "b82abafe5bd1357c64c36c344ab38dc8fa8ad8f40126b86323da9bfc4047f544";
+       libraryHaskellDepends = [
+         aeson attoparsec base bytestring bytestring-conversion
+         case-insensitive http-media http-types network-uri
+         string-conversions text
+       ];
+       testHaskellDepends = [
+         aeson attoparsec base bytestring directory doctest filemanip
+         filepath hspec parsec QuickCheck quickcheck-instances
+         string-conversions text url
+       ];
+       homepage = "http://haskell-servant.github.io/";
+       description = "A family of combinators for defining webservices APIs";
+       license = stdenv.lib.licenses.bsd3;
      }) {};
 
   "servant-JuicyPixels_0_1_0_0" = callPackage
@@ -154812,8 +154959,8 @@ self: {
     ({ mkDerivation, base, blaze-html, http-media, servant }:
      mkDerivation {
        pname = "servant-blaze";
-       version = "0.4.4.4";
-       sha256 = "58e3d5922b9031559aebc7ae99e52712d6a208cb2c0164da5baffb4cd55cafa1";
+       version = "0.4.4.5";
+       sha256 = "b2ac467c4cc6e3e439436616f9132818e1023ea048e918d87f133342705bc991";
        libraryHaskellDepends = [ base blaze-html http-media servant ];
        homepage = "http://haskell-servant.github.io/";
        description = "Blaze-html support for servant";
@@ -154900,7 +155047,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "servant-client" = callPackage
+  "servant-client_0_4_4_4" = callPackage
     ({ mkDerivation, aeson, attoparsec, base, bytestring, deepseq
      , either, exceptions, hspec, http-client, http-client-tls
      , http-media, http-types, HUnit, network, network-uri, QuickCheck
@@ -154924,6 +155071,33 @@ self: {
        homepage = "http://haskell-servant.github.io/";
        description = "automatical derivation of querying functions for servant webservices";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "servant-client" = callPackage
+    ({ mkDerivation, aeson, attoparsec, base, bytestring, deepseq
+     , either, exceptions, hspec, http-client, http-client-tls
+     , http-media, http-types, HUnit, network, network-uri, QuickCheck
+     , safe, servant, servant-server, string-conversions, text
+     , transformers, wai, warp
+     }:
+     mkDerivation {
+       pname = "servant-client";
+       version = "0.4.4.5";
+       sha256 = "7ca47d0bb95268222fe19d34b31acf501ea89d7a9a4ce77a3ebc0cd18386b953";
+       libraryHaskellDepends = [
+         aeson attoparsec base bytestring either exceptions http-client
+         http-client-tls http-media http-types network-uri safe servant
+         string-conversions text transformers
+       ];
+       testHaskellDepends = [
+         aeson base bytestring deepseq either hspec http-client http-media
+         http-types HUnit network QuickCheck servant servant-server text wai
+         warp
+       ];
+       homepage = "http://haskell-servant.github.io/";
+       description = "automatical derivation of querying functions for servant webservices";
+       license = stdenv.lib.licenses.bsd3;
      }) {};
 
   "servant-docs_0_3_1" = callPackage
@@ -155007,7 +155181,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "servant-docs" = callPackage
+  "servant-docs_0_4_4_4" = callPackage
     ({ mkDerivation, aeson, base, bytestring, bytestring-conversion
      , case-insensitive, hashable, hspec, http-media, http-types, lens
      , servant, string-conversions, text, unordered-containers
@@ -155033,6 +155207,35 @@ self: {
        homepage = "http://haskell-servant.github.io/";
        description = "generate API docs for your servant webservice";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "servant-docs" = callPackage
+    ({ mkDerivation, aeson, base, bytestring, bytestring-conversion
+     , case-insensitive, hashable, hspec, http-media, http-types, lens
+     , servant, string-conversions, text, unordered-containers
+     }:
+     mkDerivation {
+       pname = "servant-docs";
+       version = "0.4.4.5";
+       sha256 = "55f4c036cc96aebac19eeea43af412f696002a8e3497a95ff4aa25429c7c474e";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base bytestring bytestring-conversion case-insensitive hashable
+         http-media http-types lens servant string-conversions text
+         unordered-containers
+       ];
+       executableHaskellDepends = [
+         aeson base bytestring-conversion lens servant string-conversions
+         text
+       ];
+       testHaskellDepends = [
+         aeson base hspec lens servant string-conversions
+       ];
+       homepage = "http://haskell-servant.github.io/";
+       description = "generate API docs for your servant webservice";
+       license = stdenv.lib.licenses.bsd3;
      }) {};
 
   "servant-ede" = callPackage
@@ -155067,8 +155270,8 @@ self: {
      }:
      mkDerivation {
        pname = "servant-examples";
-       version = "0.4.4.4";
-       sha256 = "e180ff93d58ebb467097b337e00f77b42e9780880627ab52a2b8d69363fc7de4";
+       version = "0.4.4.5";
+       sha256 = "51a0f8953c3eeed16c6745286d858338f657d000af9ad2f6a7a7531688426425";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -155153,7 +155356,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "servant-jquery" = callPackage
+  "servant-jquery_0_4_4_4" = callPackage
     ({ mkDerivation, aeson, base, charset, filepath, hspec
      , hspec-expectations, language-ecmascript, lens, servant
      , servant-server, stm, text, transformers, warp
@@ -155174,14 +155377,38 @@ self: {
        homepage = "http://haskell-servant.github.io/";
        description = "Automatically derive (jquery) javascript functions to query servant webservices";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "servant-jquery" = callPackage
+    ({ mkDerivation, aeson, base, charset, filepath, hspec
+     , hspec-expectations, language-ecmascript, lens, servant
+     , servant-server, stm, text, transformers, warp
+     }:
+     mkDerivation {
+       pname = "servant-jquery";
+       version = "0.4.4.5";
+       sha256 = "33059d2a707bfad6fcd3f92cdaac69da9767dce1f2e11f7c4c9b2ad9df1d1b3c";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [ base charset lens servant text ];
+       executableHaskellDepends = [
+         aeson base filepath servant servant-server stm transformers warp
+       ];
+       testHaskellDepends = [
+         base hspec hspec-expectations language-ecmascript lens servant
+       ];
+       homepage = "http://haskell-servant.github.io/";
+       description = "Automatically derive (jquery) javascript functions to query servant webservices";
+       license = stdenv.lib.licenses.bsd3;
      }) {};
 
   "servant-lucid" = callPackage
     ({ mkDerivation, base, http-media, lucid, servant }:
      mkDerivation {
        pname = "servant-lucid";
-       version = "0.4.4.4";
-       sha256 = "c42702b20da1f8daea4c2a633e777214e524a2afac96c0b559209351f1f1cd0d";
+       version = "0.4.4.5";
+       sha256 = "85c922b88dbf4c7c0e8447e326938ab1f3f8dd60400f1b23a0d63109e6159913";
        libraryHaskellDepends = [ base http-media lucid servant ];
        homepage = "http://haskell-servant.github.io/";
        description = "Servant support for lucid";
@@ -155194,8 +155421,8 @@ self: {
      }:
      mkDerivation {
        pname = "servant-mock";
-       version = "0.4.4.4";
-       sha256 = "1df192ac10aea342cffd5da509f9c5eca40b659fa3c7b77aad87ec0bbb82f35c";
+       version = "0.4.4.5";
+       sha256 = "3b1cb43127ceb10979fa056c847e588d030293ee8842e13d1c18458b886d7ed6";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -155426,7 +155653,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "servant-server" = callPackage
+  "servant-server_0_4_4_4" = callPackage
     ({ mkDerivation, aeson, attoparsec, base, bytestring
      , bytestring-conversion, directory, doctest, either, exceptions
      , filemanip, filepath, hspec, hspec-wai, http-types, mmorph, mtl
@@ -155455,6 +155682,38 @@ self: {
        homepage = "http://haskell-servant.github.io/";
        description = "A family of combinators for defining webservices APIs and serving them";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "servant-server" = callPackage
+    ({ mkDerivation, aeson, attoparsec, base, bytestring
+     , bytestring-conversion, directory, doctest, either, exceptions
+     , filemanip, filepath, hspec, hspec-wai, http-types, mmorph, mtl
+     , network, network-uri, parsec, QuickCheck, safe, servant, split
+     , string-conversions, system-filepath, temporary, text
+     , transformers, wai, wai-app-static, wai-extra, warp
+     }:
+     mkDerivation {
+       pname = "servant-server";
+       version = "0.4.4.5";
+       sha256 = "30d9668ff406911356a0ebcba7591924c5bb5c55a228e5682e394a66ee593a58";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         aeson attoparsec base bytestring either filepath http-types mmorph
+         mtl network-uri safe servant split string-conversions
+         system-filepath text transformers wai wai-app-static warp
+       ];
+       executableHaskellDepends = [ aeson base servant text wai warp ];
+       testHaskellDepends = [
+         aeson base bytestring bytestring-conversion directory doctest
+         either exceptions filemanip filepath hspec hspec-wai http-types mtl
+         network parsec QuickCheck servant string-conversions temporary text
+         transformers wai wai-extra warp
+       ];
+       homepage = "http://haskell-servant.github.io/";
+       description = "A family of combinators for defining webservices APIs and serving them";
+       license = stdenv.lib.licenses.bsd3;
      }) {};
 
   "serversession" = callPackage
@@ -173065,8 +173324,8 @@ self: {
      }:
      mkDerivation {
        pname = "threads-supervisor";
-       version = "1.0.3.0";
-       sha256 = "b64e2b63d65808de4a64a1157ebacb831efc549fdbd38a97012f48ecb3a437c6";
+       version = "1.0.4.0";
+       sha256 = "6d48e9007275c6ff3ce01c35f89a106110878e65c67c654f3432c3c3d6b9e02f";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -173802,6 +174061,18 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "timeless" = callPackage
+    ({ mkDerivation, base, time, transformers }:
+     mkDerivation {
+       pname = "timeless";
+       version = "0.8.0.2";
+       sha256 = "bb32b4ed361bbb17d2d86d19958513a0231d9789c615a52975cedb7efba99ad7";
+       libraryHaskellDepends = [ base time transformers ];
+       homepage = "https://github.com/carldong/timeless";
+       description = "An Arrow based Functional Reactive Programming library";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "timeout" = callPackage
     ({ mkDerivation, base, exceptions, mtl, QuickCheck, tasty
      , tasty-quickcheck, time
@@ -175745,8 +176016,8 @@ self: {
     ({ mkDerivation, base, containers, template-haskell, time }:
      mkDerivation {
        pname = "true-name";
-       version = "0.0.0.1";
-       sha256 = "f5b57148ebab8d1f72001d795d44720aa3ee2d4c7f12e63f48fc38884004e7e2";
+       version = "0.0.0.2";
+       sha256 = "55e3785f6072bd0b5ed030ae3894bb92c5684681217833ddc4f112b0d32f9c3e";
        libraryHaskellDepends = [ base template-haskell ];
        testHaskellDepends = [ base containers template-haskell time ];
        homepage = "https://github.com/liyang/true-name";
@@ -176677,6 +176948,7 @@ self: {
          template-haskell text time transformers transformers-base
          twitter-types twitter-types-lens
        ];
+       doCheck = false;
        homepage = "https://github.com/himura/twitter-conduit";
        description = "Twitter API package with conduit interface and Streaming API support";
        license = stdenv.lib.licenses.bsd3;
@@ -176786,6 +177058,7 @@ self: {
          test-framework-hunit test-framework-quickcheck2
          test-framework-th-prime text time unordered-containers
        ];
+       doCheck = false;
        homepage = "https://github.com/himura/twitter-types";
        description = "Twitter JSON parser and types";
        license = stdenv.lib.licenses.bsd3;
@@ -177194,7 +177467,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "type-list" = callPackage
+  "type-list_0_2_0_0" = callPackage
     ({ mkDerivation, base, singletons }:
      mkDerivation {
        pname = "type-list";
@@ -177203,6 +177476,18 @@ self: {
        libraryHaskellDepends = [ base singletons ];
        description = "Operations on type-level lists and tuples";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "type-list" = callPackage
+    ({ mkDerivation, base, singletons }:
+     mkDerivation {
+       pname = "type-list";
+       version = "0.3.0.2";
+       sha256 = "80e7f52a5fb88880be9a166fbe664bda7e9f94d64d70c877471c833567722aee";
+       libraryHaskellDepends = [ base singletons ];
+       description = "Operations on type-level lists and tuples";
+       license = stdenv.lib.licenses.bsd3;
      }) {};
 
   "type-natural" = callPackage
@@ -177753,10 +178038,8 @@ self: {
      }:
      mkDerivation {
        pname = "uhc-light";
-       version = "1.1.9.0";
-       sha256 = "72d6c7c3a8b94b315c6346684e9ba2e97215ebf6e49d97bbc3852e4b0a000b37";
-       revision = "1";
-       editedCabalFile = "8847b4a41a2f6c9be09cf7b4835f53219522da9ef0ca26b918159fec747bd938";
+       version = "1.1.9.1";
+       sha256 = "9192b3ce50cf5f796799490b8f22b6ee20a3310e7e2216e09dc9706765e0cc61";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -177776,16 +178059,16 @@ self: {
 
   "uhc-util" = callPackage
     ({ mkDerivation, array, base, binary, bytestring, containers
-     , directory, fclabels, fgl, hashable, ListLike, mtl, process, syb
-     , time, time-compat, uulib
+     , directory, fclabels, fgl, hashable, mtl, process, syb, time
+     , time-compat, uulib
      }:
      mkDerivation {
        pname = "uhc-util";
-       version = "0.1.6.0";
-       sha256 = "128641dd69d7adb85095988132914ac5d14140ef063e28cee5102997d1acb6d9";
+       version = "0.1.6.2";
+       sha256 = "f559daf2f339b4d3ab2194895c19a10a304c68970b10c1e6571b52734f4bd19a";
        libraryHaskellDepends = [
          array base binary bytestring containers directory fclabels fgl
-         hashable ListLike mtl process syb time time-compat uulib
+         hashable mtl process syb time time-compat uulib
        ];
        homepage = "https://github.com/UU-ComputerScience/uhc-util";
        description = "UHC utilities";
@@ -178845,7 +179128,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "unix-time" = callPackage
+  "unix-time_0_3_5" = callPackage
     ({ mkDerivation, base, binary, bytestring, doctest, hspec
      , old-locale, old-time, QuickCheck, time
      }:
@@ -178860,6 +179143,24 @@ self: {
        doCheck = false;
        description = "Unix time parser/formatter and utilities";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "unix-time" = callPackage
+    ({ mkDerivation, base, binary, bytestring, doctest, hspec
+     , old-locale, old-time, QuickCheck, time
+     }:
+     mkDerivation {
+       pname = "unix-time";
+       version = "0.3.6";
+       sha256 = "5d15ebd0ee74e13638a7c04a7fc5f05a29ccd3228c8798df226939a778f7db37";
+       libraryHaskellDepends = [ base binary bytestring old-time ];
+       testHaskellDepends = [
+         base bytestring doctest hspec old-locale old-time QuickCheck time
+       ];
+       doCheck = false;
+       description = "Unix time parser/formatter and utilities";
+       license = stdenv.lib.licenses.bsd3;
      }) {};
 
   "unlambda" = callPackage
@@ -181626,12 +181927,27 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "vector-th-unbox" = callPackage
+  "vector-th-unbox_0_2_1_2" = callPackage
     ({ mkDerivation, base, data-default, template-haskell, vector }:
      mkDerivation {
        pname = "vector-th-unbox";
        version = "0.2.1.2";
        sha256 = "0df696462d424bab569cc7a8ba1b1d0057bc5a71c510567fe5bcd1a940ae4d05";
+       revision = "1";
+       editedCabalFile = "bddeef74d6aab09ec3f1b5c9781f96b4a92f6f1234836cbaff78a493e73ca1fa";
+       libraryHaskellDepends = [ base template-haskell vector ];
+       testHaskellDepends = [ base data-default vector ];
+       description = "Deriver for Data.Vector.Unboxed using Template Haskell";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "vector-th-unbox" = callPackage
+    ({ mkDerivation, base, data-default, template-haskell, vector }:
+     mkDerivation {
+       pname = "vector-th-unbox";
+       version = "0.2.1.3";
+       sha256 = "33db750d3d867f23d0406a7165952b030831ed610b06ef777cfae8439b382689";
        libraryHaskellDepends = [ base template-haskell vector ];
        testHaskellDepends = [ base data-default vector ];
        description = "Deriver for Data.Vector.Unboxed using Template Haskell";
@@ -182280,8 +182596,8 @@ self: {
      }:
      mkDerivation {
        pname = "waddle";
-       version = "0.1.0.5";
-       sha256 = "9b2101391babec27362f11bea8775d2b778766cbc24184cb82e7e3154086986c";
+       version = "0.1.0.6";
+       sha256 = "48782ba072e71678cb7d01043f8c10981ea7e7e5a123f0d8fb7a482f75c4ca15";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -182292,7 +182608,6 @@ self: {
          base binary bytestring case-insensitive containers directory
          JuicyPixels
        ];
-       jailbreak = true;
        homepage = "https://github.com/mgrabmueller/waddle";
        description = "DOOM WAD file utilities";
        license = stdenv.lib.licenses.bsd3;
@@ -185222,8 +185537,8 @@ self: {
      }:
      mkDerivation {
        pname = "warp";
-       version = "3.1.4";
-       sha256 = "6e7e96dd49f0d0635e3453dbe3a074db3ab8ce69ce48b9da7701f211198029b9";
+       version = "3.1.6";
+       sha256 = "34ce9ad59002bee92224b25bc64bec7d86576b41900cde305af419f304ad4093";
        libraryHaskellDepends = [
          array auto-update base blaze-builder bytestring bytestring-builder
          case-insensitive containers ghc-prim hashable http-date http-types
@@ -185663,15 +185978,16 @@ self: {
 
   "wavefront" = callPackage
     ({ mkDerivation, attoparsec, base, dlist, filepath, mtl, text
-     , transformers
+     , transformers, vector
      }:
      mkDerivation {
        pname = "wavefront";
-       version = "0.2";
-       sha256 = "5f9130cb8fa4ecb1b4f6313aa24c8e7c595c15cce72fa9a2e0f009dd6cb9503c";
+       version = "0.3";
+       sha256 = "65443f1ca1ceb6418e3740c085bd8f6f85c6ca2033deeafd7c7e4f418043e3a2";
        libraryHaskellDepends = [
-         attoparsec base dlist filepath mtl text transformers
+         attoparsec base dlist filepath mtl text transformers vector
        ];
+       jailbreak = true;
        homepage = "https://github.com/phaazon/wavefront";
        description = "Wavefront OBJ loader";
        license = stdenv.lib.licenses.bsd3;
@@ -186268,26 +186584,26 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "webdriver_0_7" = callPackage
+  "webdriver_0_8" = callPackage
     ({ mkDerivation, aeson, attoparsec, base, base64-bytestring
-     , bytestring, cond, data-default, directory, directory-tree
+     , bytestring, cond, data-default-class, directory, directory-tree
      , exceptions, filepath, http-client, http-types, lifted-base
-     , monad-control, mtl, network, network-uri, parallel, scientific
-     , temporary, text, time, transformers, transformers-base
-     , unordered-containers, vector, zip-archive
+     , monad-control, network, network-uri, scientific, temporary, text
+     , time, transformers, transformers-base, unordered-containers
+     , vector, zip-archive
      }:
      mkDerivation {
        pname = "webdriver";
-       version = "0.7";
-       sha256 = "3e26d74d378318d58fd8080d2e18394e953821801ee6ce8394e6321c7bdb6b6f";
+       version = "0.8";
+       sha256 = "357b6d21d9c3e322a7d85868e40464505d30fce3d3e3fd318c1742247cc431aa";
        libraryHaskellDepends = [
          aeson attoparsec base base64-bytestring bytestring cond
-         data-default directory directory-tree exceptions filepath
-         http-client http-types lifted-base monad-control mtl network
+         data-default-class directory directory-tree exceptions filepath
+         http-client http-types lifted-base monad-control network
          network-uri scientific temporary text time transformers
          transformers-base unordered-containers vector zip-archive
        ];
-       testHaskellDepends = [ base parallel text ];
+       testHaskellDepends = [ base text ];
        homepage = "https://github.com/kallisti-dev/hs-webdriver";
        description = "a Haskell client for the Selenium WebDriver protocol";
        license = stdenv.lib.licenses.bsd3;
@@ -186686,7 +187002,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "websockets" = callPackage
+  "websockets_0_9_6_0" = callPackage
     ({ mkDerivation, attoparsec, base, base64-bytestring, binary
      , blaze-builder, bytestring, case-insensitive, containers, entropy
      , HUnit, network, QuickCheck, random, SHA, test-framework
@@ -186716,6 +187032,39 @@ self: {
        homepage = "http://jaspervdj.be/websockets";
        description = "A sensible and clean way to write WebSocket-capable servers in Haskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "websockets" = callPackage
+    ({ mkDerivation, attoparsec, base, base64-bytestring, binary
+     , blaze-builder, bytestring, case-insensitive, containers, entropy
+     , HUnit, network, QuickCheck, random, SHA, test-framework
+     , test-framework-hunit, test-framework-quickcheck2, text
+     }:
+     mkDerivation {
+       pname = "websockets";
+       version = "0.9.6.1";
+       sha256 = "3c75cb59585710862c57277c8be718903ba727452d5f662288abb8b59eb57cd4";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         attoparsec base base64-bytestring binary blaze-builder bytestring
+         case-insensitive containers entropy network random SHA text
+       ];
+       executableHaskellDepends = [
+         attoparsec base base64-bytestring binary blaze-builder bytestring
+         case-insensitive containers entropy network random SHA text
+       ];
+       testHaskellDepends = [
+         attoparsec base base64-bytestring binary blaze-builder bytestring
+         case-insensitive containers entropy HUnit network QuickCheck random
+         SHA test-framework test-framework-hunit test-framework-quickcheck2
+         text
+       ];
+       doCheck = false;
+       homepage = "http://jaspervdj.be/websockets";
+       description = "A sensible and clean way to write WebSocket-capable servers in Haskell";
+       license = stdenv.lib.licenses.bsd3;
      }) {};
 
   "websockets-snap" = callPackage
@@ -187120,6 +187469,24 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "witherable_0_1_3_1" = callPackage
+    ({ mkDerivation, base, base-orphans, containers, hashable
+     , transformers, unordered-containers, vector
+     }:
+     mkDerivation {
+       pname = "witherable";
+       version = "0.1.3.1";
+       sha256 = "4b11917e2d562ce725394d994600ef59c7d1928dccbffe44a5bdf6de62af2fd0";
+       libraryHaskellDepends = [
+         base base-orphans containers hashable transformers
+         unordered-containers vector
+       ];
+       homepage = "https://github.com/fumieval/witherable";
+       description = "Generalization of filter and catMaybes";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "witness" = callPackage
     ({ mkDerivation, base, categories, constraints, transformers }:
      mkDerivation {
@@ -191989,7 +192356,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "yesod-auth" = callPackage
+  "yesod-auth_1_4_7" = callPackage
     ({ mkDerivation, aeson, authenticate, base, base16-bytestring
      , base64-bytestring, binary, blaze-builder, blaze-html
      , blaze-markup, byteable, bytestring, conduit, conduit-extra
@@ -192016,6 +192383,36 @@ self: {
        homepage = "http://www.yesodweb.com/";
        description = "Authentication for Yesod";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "yesod-auth" = callPackage
+    ({ mkDerivation, aeson, authenticate, base, base16-bytestring
+     , base64-bytestring, binary, blaze-builder, blaze-html
+     , blaze-markup, byteable, bytestring, conduit, conduit-extra
+     , containers, cryptohash, data-default, email-validate, file-embed
+     , http-client, http-conduit, http-types, lifted-base, mime-mail
+     , network-uri, nonce, persistent, persistent-template, random
+     , resourcet, safe, shakespeare, template-haskell, text, time
+     , transformers, unordered-containers, wai, yesod-core, yesod-form
+     , yesod-persistent
+     }:
+     mkDerivation {
+       pname = "yesod-auth";
+       version = "1.4.8";
+       sha256 = "65a16bb6fb9601be88ec9af99577800041b455eaa5d0b2f645c618c306587cb2";
+       libraryHaskellDepends = [
+         aeson authenticate base base16-bytestring base64-bytestring binary
+         blaze-builder blaze-html blaze-markup byteable bytestring conduit
+         conduit-extra containers cryptohash data-default email-validate
+         file-embed http-client http-conduit http-types lifted-base
+         mime-mail network-uri nonce persistent persistent-template random
+         resourcet safe shakespeare template-haskell text time transformers
+         unordered-containers wai yesod-core yesod-form yesod-persistent
+       ];
+       homepage = "http://www.yesodweb.com/";
+       description = "Authentication for Yesod";
+       license = stdenv.lib.licenses.mit;
      }) {};
 
   "yesod-auth-account" = callPackage