From 7aabea02f020f72abd8d8f169e1afd799657877c Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 29 Jan 2019 02:30:42 +0100
Subject: [PATCH] hackage-packages.nix: automatic Haskell package set update

This update was generated by hackage2nix v2.13-1-gda47f40 from Hackage revision
https://github.com/commercialhaskell/all-cabal-hashes/commit/c400563a55894c34ae0d7dec415ac8994aa74aa0.
---
 .../haskell-modules/hackage-packages.nix      | 1121 ++++++++++++++---
 1 file changed, 939 insertions(+), 182 deletions(-)

diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index 16a413a03f19..e96440f9c4d9 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -10083,6 +10083,20 @@ self: {
        license = stdenv.lib.licenses.gpl2;
      }) {};
 
+  "HsYAML-aeson" = callPackage
+    ({ mkDerivation, aeson, base, bytestring, HsYAML, mtl, text, vector
+     }:
+     mkDerivation {
+       pname = "HsYAML-aeson";
+       version = "0.1.0.0";
+       sha256 = "1hf1gwa89ghd4aaim6g8dx9wppp6d1y0w1xiddm1r8lpfidca1nw";
+       libraryHaskellDepends = [
+         aeson base bytestring HsYAML mtl text vector
+       ];
+       description = "JSON to YAML Adapter";
+       license = stdenv.lib.licenses.gpl2Plus;
+     }) {};
+
   "Hsed" = callPackage
     ({ mkDerivation, array, base, bytestring, cmdargs, data-accessor
      , data-accessor-template, data-accessor-transformers, directory
@@ -12564,18 +12578,12 @@ self: {
      }) {};
 
   "MonadCompose" = callPackage
-    ({ mkDerivation, base, data-default, ghc-prim, kan-extensions
-     , mmorph, monad-products, mtl, parallel, random, transformers
-     , transformers-compat
-     }:
+    ({ mkDerivation, base, free, mmorph, mtl, transformers }:
      mkDerivation {
        pname = "MonadCompose";
-       version = "0.8.4.2";
-       sha256 = "0y5cigcf6xian619qdnnvs9m5rzqy7n3yhz133ws54im9qzsdhvi";
-       libraryHaskellDepends = [
-         base data-default ghc-prim kan-extensions mmorph monad-products mtl
-         parallel random transformers transformers-compat
-       ];
+       version = "0.9.0.0";
+       sha256 = "1jq8ms16karqqa6qxp4n24f2v4bcc8n8mzfjm6b6q3n8hg7dj8yd";
+       libraryHaskellDepends = [ base free mmorph mtl transformers ];
        description = "Methods for composing monads";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -16530,8 +16538,10 @@ self: {
     ({ mkDerivation, base, bytestring }:
      mkDerivation {
        pname = "SecureHash-SHA3";
-       version = "0.1.0.2";
-       sha256 = "0h0mya8bk7zkq92plihzzqd7svfqdk2dphnivfb0r80iw3678nv9";
+       version = "0.1.1.0";
+       sha256 = "0dva3bzfzyzh8kxljyipd041a2w1zhxjvxmhnw2mlv2jcywnk2hz";
+       revision = "1";
+       editedCabalFile = "034vwq9cfqjj6hj2nf5g8n2p5gsxpdgp6gwgsmi40klracl5ps5s";
        libraryHaskellDepends = [ base bytestring ];
        description = "simple static linked SHA3 using private symbols and the ref impl";
        license = stdenv.lib.licenses.bsd2;
@@ -22007,18 +22017,18 @@ self: {
      }) {};
 
   "aeson-filthy" = callPackage
-    ({ mkDerivation, aeson, base, bytestring, doctest, text
+    ({ mkDerivation, aeson, base, bytestring, doctest, text, time
      , unordered-containers
      }:
      mkDerivation {
        pname = "aeson-filthy";
-       version = "0.1.2";
-       sha256 = "1sph4iq87vl66rbxvhhh5j699yskpb8zs1mvc3nvp60nyg1145b8";
+       version = "0.1.3";
+       sha256 = "121ygm5k9qjizwjj7w5dklxs5sv0zysrnpvwb37ar4bjkcxhs0ap";
        libraryHaskellDepends = [
-         aeson base bytestring text unordered-containers
+         aeson base bytestring text time unordered-containers
        ];
        testHaskellDepends = [
-         aeson base bytestring doctest text unordered-containers
+         aeson base bytestring doctest text time unordered-containers
        ];
        description = "Several newtypes and combinators for dealing with less-than-cleanly JSON input";
        license = stdenv.lib.licenses.bsd3;
@@ -22075,13 +22085,20 @@ self: {
      }) {};
 
   "aeson-gadt-th" = callPackage
-    ({ mkDerivation, aeson, base, dependent-sum, template-haskell }:
+    ({ mkDerivation, aeson, base, dependent-sum, markdown-unlit
+     , template-haskell, transformers
+     }:
      mkDerivation {
        pname = "aeson-gadt-th";
-       version = "0.1.1.0";
-       sha256 = "1s3458ijiigkf1id53w24p1q71flpcd7acnqj4zb03fw6qm60f1v";
+       version = "0.1.2.0";
+       sha256 = "1rlcf37qb16cxrym9f0p1spmwplf521hkvdc4kl5af7q573dahkg";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [
-         aeson base dependent-sum template-haskell
+         aeson base dependent-sum template-haskell transformers
+       ];
+       executableHaskellDepends = [
+         aeson base dependent-sum markdown-unlit
        ];
        description = "Derivation of Aeson instances for GADTs";
        license = stdenv.lib.licenses.bsd3;
@@ -22494,17 +22511,16 @@ self: {
      }) {};
 
   "aeson-value-parser" = callPackage
-    ({ mkDerivation, aeson, base, bytestring, foldl, json-pointer
-     , json-pointer-aeson, mtl, scientific, text, transformers
-     , unordered-containers, vector
+    ({ mkDerivation, aeson, base, bytestring, mtl, scientific, text
+     , transformers, unordered-containers, vector
      }:
      mkDerivation {
        pname = "aeson-value-parser";
-       version = "0.13";
-       sha256 = "0iindqkzlfjdhns7nj8dpmsiq91pm19nd8cr3if1qf0zvjj0nx5q";
+       version = "0.14.2";
+       sha256 = "1nkc86cv82gjk63x4j0hdvb2fgg30j2gv1l4ndq1wbfq94kv350f";
        libraryHaskellDepends = [
-         aeson base bytestring foldl json-pointer json-pointer-aeson mtl
-         scientific text transformers unordered-containers vector
+         aeson base bytestring mtl scientific text transformers
+         unordered-containers vector
        ];
        description = "An API for parsing \"aeson\" JSON tree into Haskell types";
        license = stdenv.lib.licenses.mit;
@@ -27066,6 +27082,20 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "ansi-terminal_0_9" = callPackage
+    ({ mkDerivation, base, colour }:
+     mkDerivation {
+       pname = "ansi-terminal";
+       version = "0.9";
+       sha256 = "00xcq21rp0y8248pwik9rlrfb2m8c27aasla37zdg741yb0c4mfp";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [ base colour ];
+       description = "Simple ANSI terminal support, with Windows compatibility";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "ansi-terminal-game" = callPackage
     ({ mkDerivation, ansi-terminal, array, base, bytestring, cereal
      , clock, hspec, linebreak, split, terminal-size, timers-tick
@@ -27092,6 +27122,8 @@ self: {
        pname = "ansi-wl-pprint";
        version = "0.6.8.2";
        sha256 = "0gnb4mkqryv08vncxnj0bzwcnd749613yw3cxfzw6y3nsldp4c56";
+       revision = "1";
+       editedCabalFile = "00b704rygy4ap540jj3ry7cgiqwwi5zx9nhj7c3905m6n6v3in88";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ ansi-terminal base ];
@@ -40355,6 +40387,17 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "buffon-machines" = callPackage
+    ({ mkDerivation, base, multiset, random, template-haskell }:
+     mkDerivation {
+       pname = "buffon-machines";
+       version = "1.0.0.0";
+       sha256 = "0s8gfbfilvnhkyjs94fb7s0amcar3nvhjb5lx1gzqgbxdgs1grdy";
+       libraryHaskellDepends = [ base multiset random template-haskell ];
+       description = "Perfect simulation of discrete random variables";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "bug" = callPackage
     ({ mkDerivation, base, template-haskell }:
      mkDerivation {
@@ -40795,6 +40838,17 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "bv-embed" = callPackage
+    ({ mkDerivation, base }:
+     mkDerivation {
+       pname = "bv-embed";
+       version = "0.1.0";
+       sha256 = "0afywcb7n2h2vycxg47myaqz49xrlnjpyq753smildjlkl79jx79";
+       libraryHaskellDepends = [ base ];
+       description = "Define embeddings of small bit vectors into larger ones";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "bv-little" = callPackage
     ({ mkDerivation, base, criterion, deepseq, hashable, integer-gmp
      , mono-traversable, primitive, QuickCheck, tasty, tasty-hunit
@@ -41661,6 +41715,18 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "ca-province-codes" = callPackage
+    ({ mkDerivation, aeson, base, hspec, QuickCheck, text }:
+     mkDerivation {
+       pname = "ca-province-codes";
+       version = "1.0.0.0";
+       sha256 = "1lhmmqn83v9bflm4x2nqbxx6pjh393id29syglinaqal4dvl5qq3";
+       libraryHaskellDepends = [ aeson base text ];
+       testHaskellDepends = [ aeson base hspec QuickCheck text ];
+       description = "ISO 3166-2:CA Province Codes and Names";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "cab" = callPackage
     ({ mkDerivation, attoparsec, base, bytestring, Cabal, conduit
      , conduit-extra, containers, directory, filepath, process
@@ -42219,6 +42285,8 @@ self: {
        pname = "cabal-plan";
        version = "0.5.0.0";
        sha256 = "1vfa4lwfjhv4nyl1rwm7i99zdkwriighlhfcz0rgjwzgg56wrihq";
+       revision = "1";
+       editedCabalFile = "0nnh6qq36cpfwzqrv1i1cn93n6n32nbl6ddp0y22jmmxnx9xsrvp";
        configureFlags = [ "-fexe" ];
        isLibrary = true;
        isExecutable = true;
@@ -42231,7 +42299,7 @@ self: {
          optparse-applicative parsec text vector
        ];
        doHaddock = false;
-       description = "Library and utiltity for processing cabal's plan.json file";
+       description = "Library and utility for processing cabal's plan.json file";
        license = "GPL-2.0-or-later AND BSD-3-Clause";
      }) {};
 
@@ -43482,14 +43550,16 @@ self: {
 
   "cantor-pairing" = callPackage
     ({ mkDerivation, arithmoi, base, containers, hspec, hspec-discover
-     , integer-gmp
+     , integer-gmp, integer-logarithms, mtl
      }:
      mkDerivation {
        pname = "cantor-pairing";
-       version = "0.1.0.0";
-       sha256 = "110iq8fldw4rk46lxq1b78mfpbp5dxcjc2vg89996j95xd88xkjp";
-       libraryHaskellDepends = [ arithmoi base containers integer-gmp ];
-       testHaskellDepends = [ base hspec ];
+       version = "0.1.1.0";
+       sha256 = "03vl7qd5962kr0mi4ymgmh667948rzqiq9f1ixcvycyjz8hz0yqw";
+       libraryHaskellDepends = [
+         arithmoi base containers integer-gmp integer-logarithms
+       ];
+       testHaskellDepends = [ base containers hspec mtl ];
        testToolDepends = [ hspec-discover ];
        description = "Convert data to and from a natural number representation";
        license = stdenv.lib.licenses.mit;
@@ -43579,38 +43649,38 @@ self: {
      }) {};
 
   "capnp" = callPackage
-    ({ mkDerivation, array, base, binary, bytes, bytestring, cereal
-     , containers, cpu, data-default, data-default-instances-vector
-     , deepseq, directory, dlist, exceptions, filepath, heredoc, HUnit
-     , mtl, pretty-show, primitive, process, process-extras, QuickCheck
-     , quickcheck-instances, quickcheck-io, reinterpret-cast, resourcet
-     , test-framework, test-framework-hunit, test-framework-quickcheck2
-     , text, transformers, utf8-string, vector, wl-pprint-text
+    ({ mkDerivation, async, base, bytes, bytestring, containers, cpu
+     , data-default, data-default-instances-vector, deepseq, directory
+     , exceptions, filepath, focus, hashable, heredoc, hspec, list-t
+     , mtl, network, network-simple, pretty-show, primitive, process
+     , process-extras, QuickCheck, quickcheck-instances, quickcheck-io
+     , reinterpret-cast, resourcet, safe-exceptions, stm, stm-containers
+     , supervisors, text, transformers, vector, wl-pprint-text
      }:
      mkDerivation {
        pname = "capnp";
-       version = "0.3.0.0";
-       sha256 = "17i7m168bqp57m5lb04sbfh2amc1sicv2jajkl61jb1gsidwdkrz";
-       revision = "1";
-       editedCabalFile = "0faisbw98h1zjsqja57c0xac6hhnhb4sghzh9a3225pp8wxnbjr7";
+       version = "0.4.0.0";
+       sha256 = "1dzabszp3nn13rmvqmdl2gimwmkdpjzd303chbi0jw8248s14bfx";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
-         array base bytes bytestring cpu data-default
-         data-default-instances-vector exceptions mtl primitive
-         reinterpret-cast text transformers vector
+         async base bytes bytestring containers cpu data-default
+         data-default-instances-vector exceptions focus hashable list-t mtl
+         network network-simple pretty-show primitive reinterpret-cast
+         safe-exceptions stm stm-containers supervisors text transformers
+         vector
        ];
        executableHaskellDepends = [
-         array base binary bytes bytestring cereal containers directory
-         dlist exceptions filepath mtl primitive reinterpret-cast text
-         transformers utf8-string vector wl-pprint-text
+         base bytes bytestring containers data-default directory exceptions
+         filepath mtl primitive reinterpret-cast safe-exceptions text
+         transformers vector wl-pprint-text
        ];
        testHaskellDepends = [
-         array base binary bytes bytestring data-default deepseq directory
-         exceptions heredoc HUnit mtl pretty-show primitive process
-         process-extras QuickCheck quickcheck-instances quickcheck-io
-         reinterpret-cast resourcet test-framework test-framework-hunit
-         test-framework-quickcheck2 text transformers vector
+         async base bytes bytestring containers data-default deepseq
+         directory exceptions heredoc hspec mtl network network-simple
+         pretty-show primitive process process-extras QuickCheck
+         quickcheck-instances quickcheck-io reinterpret-cast resourcet
+         safe-exceptions stm supervisors text transformers vector
        ];
        description = "Cap'n Proto for Haskell";
        license = stdenv.lib.licenses.mit;
@@ -45416,8 +45486,8 @@ self: {
        pname = "cgi";
        version = "3001.3.0.3";
        sha256 = "1rml686pvjhpd51vj6g79c6132m8kx6kxikk7g246imps3bl90gb";
-       revision = "2";
-       editedCabalFile = "082i8x8j8ry2nf7m99injh18sr9llbw66ck5ylqlyvh6bhwspa6b";
+       revision = "3";
+       editedCabalFile = "06gyp3mxx9jkkbz9sbn389wjsz33s231vk53pbsm37a1z9ply14a";
        libraryHaskellDepends = [
          base bytestring containers exceptions mtl multipart network
          network-uri parsec time xhtml
@@ -45426,6 +45496,27 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "cgi_3001_4_0_0" = callPackage
+    ({ mkDerivation, base, bytestring, containers, exceptions, mtl
+     , multipart, network-uri, parsec, time, xhtml
+     }:
+     mkDerivation {
+       pname = "cgi";
+       version = "3001.4.0.0";
+       sha256 = "1d0nh5ymkqskkp4yn0gfz4mff8i0cxyw1wws8xxp6k1mg1ywa25k";
+       revision = "1";
+       editedCabalFile = "0q1s49hglw0zjcqsi7ba8nminywxgn6b83xds2lfp0r12q2h00xr";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base bytestring containers exceptions mtl multipart network-uri
+         parsec time xhtml
+       ];
+       description = "A library for writing CGI programs";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "cgi-undecidable" = callPackage
     ({ mkDerivation, base, cgi, mtl }:
      mkDerivation {
@@ -53092,8 +53183,8 @@ self: {
      }:
      mkDerivation {
        pname = "constraints-extras";
-       version = "0.2.3.0";
-       sha256 = "09qa30zgh6w7k5nl1gvr18nhl5cfnnrzzlmafn9hvp8hms6837ic";
+       version = "0.2.3.1";
+       sha256 = "1invhgwvhsab9jj776aaa180xsk1cbnwygxfappasbis42l26ab9";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base constraints template-haskell ];
@@ -53447,12 +53538,18 @@ self: {
      }) {};
 
   "continued-fractions" = callPackage
-    ({ mkDerivation, base }:
+    ({ mkDerivation, base, containers, QuickCheck, test-framework
+     , test-framework-quickcheck2
+     }:
      mkDerivation {
        pname = "continued-fractions";
-       version = "0.9.1.1";
-       sha256 = "0gqp1yazmmmdf04saa306jdsf8r5s98fll9rnm8ff6jzr87nvnnh";
+       version = "0.10.0.2";
+       sha256 = "03s1vrsps2l114b3jg8nmglbv9bwsrjv79j06lyg9pxgvhk4lcpx";
        libraryHaskellDepends = [ base ];
+       testHaskellDepends = [
+         base containers QuickCheck test-framework
+         test-framework-quickcheck2
+       ];
        description = "Continued fractions";
        license = stdenv.lib.licenses.publicDomain;
      }) {};
@@ -57800,8 +57897,8 @@ self: {
      }:
      mkDerivation {
        pname = "darcs";
-       version = "2.14.1";
-       sha256 = "0dfd6bp2wy0aabxx7l93gi3dmq21j970cds424xdy1mgmjcvrpb1";
+       version = "2.14.2";
+       sha256 = "0zm2486gyhiga1amclbg92cd09bvki6vgh0ll75hv5kl72j61lb5";
        configureFlags = [ "-fforce-char8-encoding" "-flibrary" ];
        isLibrary = true;
        isExecutable = true;
@@ -63234,8 +63331,8 @@ self: {
        pname = "diagrams-contrib";
        version = "1.4.3";
        sha256 = "01r081rvxkb9i56iqi28zw4054nm62pf9f1szd9i0avmnxxsiyv5";
-       revision = "1";
-       editedCabalFile = "16ici9kx7cnva1ihhin5nyc1icif17yks3nwcxxzqxjjw556vpig";
+       revision = "2";
+       editedCabalFile = "0xpw4myq4n6k5lxdll1wg76m3gfymwb746x6qd48qfy3z22nrymw";
        libraryHaskellDepends = [
          base circle-packing colour containers cubicbezier data-default
          data-default-class diagrams-core diagrams-lib diagrams-solve
@@ -64740,6 +64837,8 @@ self: {
        pname = "discord-haskell";
        version = "0.7.1";
        sha256 = "0cl40ph5qwpxa05q7jr67syq9dijxyzvmqzgw53wfri4800qxphn";
+       revision = "1";
+       editedCabalFile = "022rnkpy9frsn81d2m9n8r5crsjzjk679mfja5d65s5bzzg3plyj";
        libraryHaskellDepends = [
          aeson async base base64-bytestring bytestring containers
          data-default http-client iso8601-time JuicyPixels MonadRandom req
@@ -76910,14 +77009,12 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
-  "first-class-families_0_4_0_0" = callPackage
+  "first-class-families_0_5_0_0" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
        pname = "first-class-families";
-       version = "0.4.0.0";
-       sha256 = "1hkvk4vhx8zanx7sc8a7nsz4h38nsfhr1rdn1ky1fim328fi4gx6";
-       revision = "1";
-       editedCabalFile = "1nrcbznpzbfxlk29f8q2zsn11h5zf67w84np25z9bc907d0xljiw";
+       version = "0.5.0.0";
+       sha256 = "03skw4axj6zk593zi8fwynzjyiq6s7apjqmjqv6rxpxhj17vqwpj";
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base ];
        description = "First class type families";
@@ -77491,6 +77588,33 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {FLAC = null;};
 
+  "flac_0_2_0" = callPackage
+    ({ mkDerivation, base, bytestring, containers, directory
+     , exceptions, filepath, FLAC, hspec, hspec-discover, mtl, temporary
+     , text, transformers, vector, wave
+     }:
+     mkDerivation {
+       pname = "flac";
+       version = "0.2.0";
+       sha256 = "03zmsnnpkk26ss8ka2l7x9gsfcmiqfyc73v7fna6sk5cwzxsb33c";
+       revision = "1";
+       editedCabalFile = "1phwdnya8bgw24a80vbw0m4pm7r67grnc6si8683jz620snnsm48";
+       enableSeparateDataOutput = true;
+       libraryHaskellDepends = [
+         base bytestring containers directory exceptions filepath mtl text
+         transformers vector wave
+       ];
+       librarySystemDepends = [ FLAC ];
+       testHaskellDepends = [
+         base bytestring directory filepath hspec temporary transformers
+         vector wave
+       ];
+       testToolDepends = [ hspec-discover ];
+       description = "Complete high-level binding to libFLAC";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {FLAC = null;};
+
   "flac-picture" = callPackage
     ({ mkDerivation, base, bytestring, data-default-class, directory
      , flac, hspec, JuicyPixels, temporary
@@ -79033,6 +79157,23 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "forma_1_1_1" = callPackage
+    ({ mkDerivation, aeson, base, containers, hspec, mtl, text
+     , unordered-containers
+     }:
+     mkDerivation {
+       pname = "forma";
+       version = "1.1.1";
+       sha256 = "10q06yjz66h92qm0569l172v0c6mp9m3jfyakyva5v7xdqr8rvxb";
+       libraryHaskellDepends = [
+         aeson base containers mtl text unordered-containers
+       ];
+       testHaskellDepends = [ aeson base containers hspec mtl text ];
+       description = "Parse and validate forms in JSON format";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "formal" = callPackage
     ({ mkDerivation, ansi-terminal, base, bytestring, containers
      , directory, file-embed, HTTP, indents, interpolatedstring-perl6
@@ -79744,8 +79885,8 @@ self: {
     ({ mkDerivation, base, free-algebras }:
      mkDerivation {
        pname = "free-category";
-       version = "0.0.1.0";
-       sha256 = "0cpcn10kbsx1xvvxvvcx5hpa0p9vhkrjf7cmzva2zpmhdj4jp5rg";
+       version = "0.0.2.0";
+       sha256 = "16gs7n3gl5whda376j87qm9jfdx6zhmnyp43fjfaj6s5y2s0z53z";
        libraryHaskellDepends = [ base free-algebras ];
        description = "Free category";
        license = stdenv.lib.licenses.mpl20;
@@ -86526,20 +86667,20 @@ self: {
      }) {};
 
   "git" = callPackage
-    ({ mkDerivation, base, basement, byteable, bytedump, bytestring
-     , containers, cryptonite, hourglass, memory, patience, random
-     , system-fileio, system-filepath, tasty, tasty-quickcheck
-     , unix-compat, utf8-string, vector, zlib, zlib-bindings
+    ({ mkDerivation, base, basement, bytedump, bytestring, containers
+     , cryptonite, hourglass, memory, random, system-fileio
+     , system-filepath, tasty, tasty-quickcheck, unix-compat
+     , utf8-string, vector, zlib, zlib-bindings
      }:
      mkDerivation {
        pname = "git";
-       version = "0.2.2";
-       sha256 = "18sn3rvmrqw8xy7xaqpv82inqj981z79sm6h1aw4jvvzsf6llzwa";
+       version = "0.3.0";
+       sha256 = "0kd35qnxv2vnfaaq13dbf734jq11p05v6sdbxf91pag49817b6bz";
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [
-         base basement byteable bytestring containers cryptonite hourglass
-         memory patience random system-fileio system-filepath unix-compat
-         utf8-string vector zlib zlib-bindings
+         base basement bytestring containers cryptonite hourglass memory
+         random system-fileio system-filepath unix-compat utf8-string vector
+         zlib zlib-bindings
        ];
        testHaskellDepends = [
          base bytedump bytestring hourglass tasty tasty-quickcheck
@@ -91420,6 +91561,23 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "graph-wrapper_0_2_6_0" = callPackage
+    ({ mkDerivation, array, base, containers, deepseq, hspec
+     , QuickCheck
+     }:
+     mkDerivation {
+       pname = "graph-wrapper";
+       version = "0.2.6.0";
+       sha256 = "19jvr7d1kkyh4qdscljbgqnlpv6rr7fsn3h9dm3bji3dgbsdd7mq";
+       libraryHaskellDepends = [ array base containers ];
+       testHaskellDepends = [
+         array base containers deepseq hspec QuickCheck
+       ];
+       description = "A wrapper around the standard Data.Graph with a less awkward interface";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "graphbuilder" = callPackage
     ({ mkDerivation, base, containers, mtl, QuickCheck, test-framework
      , test-framework-quickcheck2
@@ -92806,7 +92964,7 @@ self: {
        description = "Bindings for the Gtk/OS X integration library";
        license = stdenv.lib.licenses.lgpl21;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) {gtk-mac-integration-gtk2 = null;};
+     }) {inherit (pkgs) gtk-mac-integration-gtk2;};
 
   "gtk-serialized-event" = callPackage
     ({ mkDerivation, array, base, containers, glib, gtk, gtk2
@@ -95804,6 +95962,8 @@ self: {
        pname = "hakyll-images";
        version = "0.4.2";
        sha256 = "0la1c25jlqw0y0zfcskkj4mlmkpamr2psqfnsrgz52zvmhy2ha2p";
+       revision = "1";
+       editedCabalFile = "1kmvb0cxvphmx0f1bgjq636yga58n4g2lqrg2xg5xfpwf8r956qf";
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base binary bytestring hakyll JuicyPixels JuicyPixels-extra
@@ -97673,8 +97833,8 @@ self: {
        pname = "hasbolt";
        version = "0.1.3.2";
        sha256 = "14sq3iqbrfkwyswdka2285cdhwx3c6srfhn5qb7yw1nfjx2bdb1i";
-       revision = "2";
-       editedCabalFile = "1i6i3ykglq43aa63s39q31fhmn0r8qjr5v9x98q18xzfbxc30232";
+       revision = "3";
+       editedCabalFile = "10h7pbkrkc9cdxx09zk0s8ygcdva2xy646zq3k8czph3vdaffzqx";
        libraryHaskellDepends = [
          base binary bytestring connection containers data-binary-ieee754
          data-default network text transformers
@@ -97687,20 +97847,25 @@ self: {
      }) {};
 
   "hasbolt-extras" = callPackage
-    ({ mkDerivation, aeson, aeson-casing, base, containers, free
-     , hasbolt, lens, mtl, neat-interpolation, scientific
-     , template-haskell, text, th-lift-instances, unordered-containers
-     , vector
+    ({ mkDerivation, aeson, aeson-casing, base, bytestring, containers
+     , data-default, free, hasbolt, lens, mtl, neat-interpolation
+     , scientific, template-haskell, text, th-lift-instances
+     , unordered-containers, vector
      }:
      mkDerivation {
        pname = "hasbolt-extras";
-       version = "0.0.0.14";
-       sha256 = "1sqlngr8wbvs94j1qmqam0q5shjbil61j7dq520qa87rblljs96i";
+       version = "0.0.0.15";
+       sha256 = "114yzmvj96nhq37947p5kf3zc4hdh4dnbavms0f1ndszmn1q7hd9";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [
          aeson aeson-casing base containers free hasbolt lens mtl
          neat-interpolation scientific template-haskell text
          th-lift-instances unordered-containers vector
        ];
+       executableHaskellDepends = [
+         aeson base bytestring containers data-default hasbolt mtl text
+       ];
        description = "Extras for hasbolt library";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -98347,18 +98512,18 @@ self: {
      }) {};
 
   "haskdogs" = callPackage
-    ({ mkDerivation, base, bytestring, containers, directory, filepath
-     , hasktags, optparse-applicative, process, text
+    ({ mkDerivation, base, containers, directory, filepath, hasktags
+     , optparse-applicative, process-extras, text
      }:
      mkDerivation {
        pname = "haskdogs";
-       version = "0.5.4";
-       sha256 = "1f35np3a99y3aifqgp24c5wdjr5nvvs3jj6g71v39355sjj1hsqq";
+       version = "0.6.0";
+       sha256 = "0xqnsirgbwnp3kbvdmbg8d1b8lm2yk4fvjx71k8274gi7z62l458";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
-         base bytestring containers directory filepath hasktags
-         optparse-applicative process text
+         base containers directory filepath hasktags optparse-applicative
+         process-extras text
        ];
        description = "Generate tags file for Haskell project and its nearest deps";
        license = stdenv.lib.licenses.bsd3;
@@ -102533,10 +102698,8 @@ self: {
      }:
      mkDerivation {
        pname = "haven";
-       version = "0.2.0.0";
-       sha256 = "0cclphiq2jkk1msp5yg2mpkfn98jlqnc0vvwmi3vqcy5ln7641v1";
-       revision = "1";
-       editedCabalFile = "1p4m1iv3649b2wf6wdgbknhpms8rna5sibdi93zxyj0a4b23dh23";
+       version = "0.2.0.1";
+       sha256 = "15q9cgfifz87ns730agv2vzc8rp5lqggiclc91khpckm2qppk6yd";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -107415,29 +107578,20 @@ self: {
      }) {};
 
   "hit" = callPackage
-    ({ mkDerivation, attoparsec, base, byteable, bytedump, bytestring
-     , containers, cryptohash, hourglass, mtl, parsec, patience, random
-     , system-fileio, system-filepath, tasty, tasty-quickcheck
-     , unix-compat, utf8-string, vector, zlib, zlib-bindings
+    ({ mkDerivation, base, bytestring, containers, git, hashable
+     , hashtables, hourglass
      }:
      mkDerivation {
        pname = "hit";
-       version = "0.6.3";
-       sha256 = "0wg44vgd5jzi0r0vg8k5zrvlr7rcrb4nrp862c6y991941qv71nv";
-       revision = "2";
-       editedCabalFile = "1wcc2lywirc6dmhssnbhgv38vf3xz371y99id30bhg1brmiwmii3";
-       isLibrary = true;
+       version = "0.7.0";
+       sha256 = "1d3kqc9yd5hxcrr406cwbxjqnqj0bh4laayx2v1mqqz48x6rmqah";
+       isLibrary = false;
        isExecutable = true;
        enableSeparateDataOutput = true;
-       libraryHaskellDepends = [
-         attoparsec base byteable bytestring containers cryptohash hourglass
-         mtl parsec patience random system-fileio system-filepath
-         unix-compat utf8-string vector zlib zlib-bindings
+       executableHaskellDepends = [
+         base bytestring containers git hashable hashtables hourglass
        ];
-       testHaskellDepends = [
-         base bytedump bytestring hourglass tasty tasty-quickcheck
-       ];
-       description = "Git operations in haskell";
+       description = "Git like program in haskell";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
@@ -108094,8 +108248,8 @@ self: {
      }:
      mkDerivation {
        pname = "hlint";
-       version = "2.1.13";
-       sha256 = "1ac553qf1pc093hrc3kf8yik68619683pazmlm8r2jqqq502fgxc";
+       version = "2.1.14";
+       sha256 = "0arz6x0r4pji37papdrc6brybcd2a2sackvhzmhy89ycgy0k04kk";
        isLibrary = true;
        isExecutable = true;
        enableSeparateDataOutput = true;
@@ -109892,8 +110046,8 @@ self: {
      }:
      mkDerivation {
        pname = "hoogle";
-       version = "5.0.17.4";
-       sha256 = "059dys3vlbxpd4kx1nrjib1ww9rqkk9am3gdsy3d8vl0fxx2p6s9";
+       version = "5.0.17.5";
+       sha256 = "1vpx6v8b0jixn82iqz085w2qpyj5pl2qyhrcd0a4p0vs5qmplf60";
        isLibrary = true;
        isExecutable = true;
        enableSeparateDataOutput = true;
@@ -113607,8 +113761,8 @@ self: {
      }:
      mkDerivation {
        pname = "hsimport";
-       version = "0.8.6";
-       sha256 = "0ylbg5bcylc0gql0qvmih66dj1qj8imn31b6bl70mynwkqh96g1d";
+       version = "0.8.8";
+       sha256 = "0q6348iz4w8zfdrzv98vydw5rdxlhqapdqhxrnhd6dqlcjq3rf1j";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -116688,6 +116842,8 @@ self: {
        pname = "http-client-openssl";
        version = "0.3.0.0";
        sha256 = "0y7d1bp045mj1lnbd74a1v4viv5g5awivdhbycq75hnvqf2n50vl";
+       revision = "2";
+       editedCabalFile = "0p8vgakciq8ar9pfahh1bmriann3h0xn4z3xb328lgbcxxxpwqfd";
        libraryHaskellDepends = [
          base bytestring HsOpenSSL http-client network
        ];
@@ -116866,6 +117022,37 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "http-conduit_2_3_5" = callPackage
+    ({ mkDerivation, aeson, base, blaze-builder, bytestring
+     , case-insensitive, conduit, conduit-extra, connection, cookie
+     , data-default-class, hspec, http-client, http-client-tls
+     , http-types, HUnit, mtl, network, resourcet, streaming-commons
+     , temporary, text, time, transformers, unliftio, unliftio-core
+     , utf8-string, wai, wai-conduit, warp, warp-tls
+     }:
+     mkDerivation {
+       pname = "http-conduit";
+       version = "2.3.5";
+       sha256 = "0hbdsp5x7mwxcjkshkf0hqfgkjcsy1g34m4im5v078izhv3fzad9";
+       revision = "1";
+       editedCabalFile = "03yfl2n04blmmqca18b18jwplmcz7qjzqjgzrrzbd1nr290ivqjz";
+       libraryHaskellDepends = [
+         aeson base bytestring conduit conduit-extra http-client
+         http-client-tls http-types mtl resourcet transformers unliftio-core
+       ];
+       testHaskellDepends = [
+         aeson base blaze-builder bytestring case-insensitive conduit
+         conduit-extra connection cookie data-default-class hspec
+         http-client http-types HUnit network resourcet streaming-commons
+         temporary text time transformers unliftio utf8-string wai
+         wai-conduit warp warp-tls
+       ];
+       doCheck = false;
+       description = "HTTP client package with conduit interface and HTTPS support";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "http-conduit-browser" = callPackage
     ({ mkDerivation, base, base64-bytestring, blaze-builder, bytestring
      , case-insensitive, conduit, containers, cookie, data-default
@@ -117009,6 +117196,8 @@ self: {
        pname = "http-io-streams";
        version = "0.1.0.0";
        sha256 = "0fxz7p5n7gd99xjq9rwm6x74qzpfp4wdmhj1hm08c7hkinizdvgv";
+       revision = "1";
+       editedCabalFile = "10fcy17ny5qvabm98md9j8r7vfklgzxvg89iinna7wm4v6q6j5w5";
        libraryHaskellDepends = [
          attoparsec base base64-bytestring blaze-builder bytestring
          case-insensitive containers directory HsOpenSSL io-streams mtl
@@ -118678,6 +118867,26 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "hw-json-simd" = callPackage
+    ({ mkDerivation, base, bytestring, c2hs, hw-prim, lens
+     , optparse-applicative, vector
+     }:
+     mkDerivation {
+       pname = "hw-json-simd";
+       version = "0.1.0.0";
+       sha256 = "015frhg0v7vxrl1m4bjg2rfa7z0846g9xclirdhb4n5pjzr11rp9";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [ base bytestring hw-prim lens vector ];
+       libraryToolDepends = [ c2hs ];
+       executableHaskellDepends = [
+         base bytestring hw-prim lens optparse-applicative vector
+       ];
+       testHaskellDepends = [ base bytestring hw-prim lens vector ];
+       description = "SIMD-based JSON semi-indexer";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "hw-kafka-avro" = callPackage
     ({ mkDerivation, aeson, avro, base, binary, bytestring, cache
      , containers, errors, hashable, hspec, http-client, http-types
@@ -124091,6 +124300,33 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "io-streams_1_5_1_0" = callPackage
+    ({ mkDerivation, attoparsec, base, bytestring, bytestring-builder
+     , deepseq, directory, filepath, HUnit, mtl, network, primitive
+     , process, QuickCheck, test-framework, test-framework-hunit
+     , test-framework-quickcheck2, text, time, transformers, vector
+     , zlib, zlib-bindings
+     }:
+     mkDerivation {
+       pname = "io-streams";
+       version = "1.5.1.0";
+       sha256 = "1c7byr943x41nxpc3bnz152fvfbmakafq2958wyf9qiyp2pz18la";
+       configureFlags = [ "-fNoInteractiveTests" ];
+       libraryHaskellDepends = [
+         attoparsec base bytestring bytestring-builder network primitive
+         process text time transformers vector zlib-bindings
+       ];
+       testHaskellDepends = [
+         attoparsec base bytestring bytestring-builder deepseq directory
+         filepath HUnit mtl network primitive process QuickCheck
+         test-framework test-framework-hunit test-framework-quickcheck2 text
+         time transformers vector zlib zlib-bindings
+       ];
+       description = "Simple, composable, and easy-to-use stream I/O";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "io-streams-haproxy" = callPackage
     ({ mkDerivation, attoparsec, base, bytestring, HUnit, io-streams
      , network, test-framework, test-framework-hunit, transformers
@@ -124112,6 +124348,26 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "io-streams-haproxy_1_0_1_0" = callPackage
+    ({ mkDerivation, attoparsec, base, bytestring, HUnit, io-streams
+     , network, test-framework, test-framework-hunit, transformers
+     }:
+     mkDerivation {
+       pname = "io-streams-haproxy";
+       version = "1.0.1.0";
+       sha256 = "1dcn5hd4fiwyq7m01r6fi93vfvygca5s6mz87c78m0zyj29clkmp";
+       libraryHaskellDepends = [
+         attoparsec base bytestring io-streams network transformers
+       ];
+       testHaskellDepends = [
+         attoparsec base bytestring HUnit io-streams network test-framework
+         test-framework-hunit transformers
+       ];
+       description = "HAProxy protocol 1.5 support for io-streams";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "io-streams-http" = callPackage
     ({ mkDerivation, base, bytestring, http-client, http-client-tls
      , io-streams, mtl, transformers
@@ -125022,6 +125278,31 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "isobmff" = callPackage
+    ({ mkDerivation, base, binary, bytestring, criterion, data-default
+     , function-builder, hspec, mtl, pretty-types, QuickCheck
+     , singletons, tagged, template-haskell, text, time, type-spec
+     , vector
+     }:
+     mkDerivation {
+       pname = "isobmff";
+       version = "0.13.0.0";
+       sha256 = "032lcpdifrryi4ryz3gwzh9l5927amcpr8xk8jbjwz0mj3z857d5";
+       libraryHaskellDepends = [
+         base bytestring data-default function-builder mtl pretty-types
+         singletons tagged template-haskell text time type-spec vector
+       ];
+       testHaskellDepends = [
+         base binary bytestring hspec mtl pretty-types QuickCheck tagged
+         text type-spec
+       ];
+       benchmarkHaskellDepends = [
+         base binary bytestring criterion tagged type-spec
+       ];
+       description = "A parser and generator for the ISO-14496-12/14 base media file format";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "isobmff-builder" = callPackage
     ({ mkDerivation, base, binary, bytestring, criterion, data-default
      , hspec, mtl, pretty-types, QuickCheck, singletons, tagged
@@ -131182,6 +131463,30 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {mp3lame = null;};
 
+  "lame_0_2_0" = callPackage
+    ({ mkDerivation, base, bytestring, directory, exceptions, filepath
+     , hspec, hspec-discover, htaglib, mp3lame, temporary, text
+     , transformers, wave
+     }:
+     mkDerivation {
+       pname = "lame";
+       version = "0.2.0";
+       sha256 = "1bqq3aanfffdsl3v0am7jdfslcr6y372cq7jx36z7g09zy5mp2sp";
+       enableSeparateDataOutput = true;
+       libraryHaskellDepends = [
+         base bytestring directory exceptions filepath text transformers
+         wave
+       ];
+       librarySystemDepends = [ mp3lame ];
+       testHaskellDepends = [
+         base directory filepath hspec htaglib temporary text
+       ];
+       testToolDepends = [ hspec-discover ];
+       description = "Fairly complete high-level binding to LAME encoder";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {mp3lame = null;};
+
   "lame-tester" = callPackage
     ({ mkDerivation, base-noprelude, bizzlelude, containers, semigroups
      , tasty, tasty-hunit, validation
@@ -131919,26 +132224,29 @@ self: {
   "language-oberon" = callPackage
     ({ mkDerivation, base, containers, directory, either, filepath
      , grammatical-parsers, optparse-applicative, parsers, prettyprinter
-     , rank2classes, repr-tree-syb, tasty, tasty-hunit, text
+     , rank2classes, repr-tree-syb, tasty, tasty-hunit, template-haskell
+     , text, transformers
      }:
      mkDerivation {
        pname = "language-oberon";
-       version = "0.2";
-       sha256 = "052kgd4d1cwdqs8znkx2fagjlb39x6c2lhvic6il2c67ali53nhr";
+       version = "0.2.1";
+       sha256 = "1ia0m9bgrz1jksw349a0pgmkfvy5ykc29n55w7w457c60y37bs02";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
          base containers directory either filepath grammatical-parsers
-         parsers prettyprinter rank2classes text
+         parsers prettyprinter rank2classes template-haskell text
+         transformers
        ];
        executableHaskellDepends = [
          base containers either filepath grammatical-parsers
          optparse-applicative prettyprinter rank2classes repr-tree-syb text
        ];
        testHaskellDepends = [
-         base directory either filepath tasty tasty-hunit
+         base directory either filepath grammatical-parsers prettyprinter
+         tasty tasty-hunit text
        ];
-       description = "Parser and pretty-printer for the Oberon programming language";
+       description = "Parser, pretty-printer, and type checker for the Oberon programming language";
        license = stdenv.lib.licenses.gpl3;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
@@ -134767,6 +135075,53 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "libraft_0_2_0_0" = callPackage
+    ({ mkDerivation, atomic-write, attoparsec, base, base16-bytestring
+     , bytestring, cereal, concurrency, containers, cryptohash-sha256
+     , dejafu, directory, exceptions, file-embed, haskeline
+     , hunit-dejafu, lifted-base, monad-control, mtl, network
+     , network-simple, parsec, postgresql-simple, process, protolude
+     , QuickCheck, quickcheck-state-machine, random, repline, stm, tasty
+     , tasty-dejafu, tasty-discover, tasty-expected-failure, tasty-hunit
+     , tasty-quickcheck, text, time, transformers, transformers-base
+     , tree-diff, word8
+     }:
+     mkDerivation {
+       pname = "libraft";
+       version = "0.2.0.0";
+       sha256 = "0lm2b9n1xlpzsxcvnhc3bkcgzbrwxb1l0ffjjqa55hn42dw8ng1d";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         atomic-write attoparsec base base16-bytestring bytestring cereal
+         concurrency containers cryptohash-sha256 directory exceptions
+         file-embed haskeline lifted-base monad-control mtl network
+         network-simple parsec postgresql-simple protolude random repline
+         text time transformers transformers-base word8
+       ];
+       executableHaskellDepends = [
+         atomic-write attoparsec base base16-bytestring bytestring cereal
+         concurrency containers cryptohash-sha256 directory exceptions
+         file-embed haskeline lifted-base monad-control mtl network
+         network-simple parsec postgresql-simple protolude random repline
+         stm text time transformers transformers-base word8
+       ];
+       testHaskellDepends = [
+         atomic-write attoparsec base base16-bytestring bytestring cereal
+         concurrency containers cryptohash-sha256 dejafu directory
+         exceptions file-embed haskeline hunit-dejafu lifted-base
+         monad-control mtl network network-simple parsec postgresql-simple
+         process protolude QuickCheck quickcheck-state-machine random
+         repline tasty tasty-dejafu tasty-discover tasty-expected-failure
+         tasty-hunit tasty-quickcheck text time transformers
+         transformers-base tree-diff word8
+       ];
+       testToolDepends = [ tasty-discover ];
+       description = "Raft consensus algorithm";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "librandomorg" = callPackage
     ({ mkDerivation, base, bytestring, curl }:
      mkDerivation {
@@ -151838,26 +152193,27 @@ self: {
   "net-mqtt" = callPackage
     ({ mkDerivation, async, attoparsec, base, binary, bytestring
      , conduit, conduit-extra, containers, HUnit, network-conduit-tls
-     , QuickCheck, stm, tasty, tasty-hunit, tasty-quickcheck, text
+     , network-uri, QuickCheck, stm, tasty, tasty-hunit
+     , tasty-quickcheck, text
      }:
      mkDerivation {
        pname = "net-mqtt";
-       version = "0.2.1.0";
-       sha256 = "177w50gcjj7n44y9q4q5xb3gh42ivx7ld7ha3mqg8ik803q523y9";
+       version = "0.2.2.0";
+       sha256 = "1pmjlj90jzyg7ypzaiyw4cl8qv6h5l7923b3zhfwsvi07c2lwi1h";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
          async attoparsec base binary bytestring conduit conduit-extra
-         containers network-conduit-tls stm text
+         containers network-conduit-tls network-uri stm text
        ];
        executableHaskellDepends = [
          async attoparsec base binary bytestring conduit conduit-extra
-         containers network-conduit-tls stm text
+         containers network-conduit-tls network-uri stm text
        ];
        testHaskellDepends = [
          async attoparsec base binary bytestring conduit conduit-extra
-         containers HUnit network-conduit-tls QuickCheck stm tasty
-         tasty-hunit tasty-quickcheck text
+         containers HUnit network-conduit-tls network-uri QuickCheck stm
+         tasty tasty-hunit tasty-quickcheck text
        ];
        description = "An MQTT Protocol Implementation";
        license = stdenv.lib.licenses.bsd3;
@@ -153671,8 +154027,8 @@ self: {
      }:
      mkDerivation {
        pname = "ngx-export";
-       version = "1.6.3";
-       sha256 = "0dqfjiw55cd16grrqdp1ml557rh58dy3lfcjrfmy91kb5v50cqz6";
+       version = "1.6.4";
+       sha256 = "13q2699mamkqfkklk6wgm9jzsb650lrbiqsf8sg66yvhgrxmmk0i";
        libraryHaskellDepends = [
          async base binary bytestring deepseq monad-loops template-haskell
          unix
@@ -153687,8 +154043,8 @@ self: {
      }:
      mkDerivation {
        pname = "ngx-export-tools";
-       version = "0.4.3.0";
-       sha256 = "13vhbwld700f56gd95jm9rrzbzx6sp5mimf8qrjdxqwjj2a3rbmp";
+       version = "0.4.4.0";
+       sha256 = "19x6qzryjdac1alq4wsmy0as6258ga9b3ga3iszqwvqjdpc89a6n";
        libraryHaskellDepends = [
          aeson base binary bytestring ngx-export safe template-haskell
        ];
@@ -155137,6 +155493,17 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "num-non-negative" = callPackage
+    ({ mkDerivation, base, inj }:
+     mkDerivation {
+       pname = "num-non-negative";
+       version = "0.1";
+       sha256 = "0ikhjcjwziv55gnf79fhajhgp5m3441snxg8amc241h5iw4rls8x";
+       libraryHaskellDepends = [ base inj ];
+       description = "Non-negative numbers";
+       license = stdenv.lib.licenses.publicDomain;
+     }) {};
+
   "number" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
@@ -157538,6 +157905,26 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "openssl-streams_1_2_2_0" = callPackage
+    ({ mkDerivation, base, bytestring, HsOpenSSL, HUnit, io-streams
+     , network, test-framework, test-framework-hunit
+     }:
+     mkDerivation {
+       pname = "openssl-streams";
+       version = "1.2.2.0";
+       sha256 = "0rplym6ayydkpr7x9mw3l13p0vzzfzzxw244d7sd3jcvaxpv0rmr";
+       libraryHaskellDepends = [
+         base bytestring HsOpenSSL io-streams network
+       ];
+       testHaskellDepends = [
+         base bytestring HsOpenSSL HUnit io-streams network test-framework
+         test-framework-hunit
+       ];
+       description = "OpenSSL network support for io-streams";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "opentheory" = callPackage
     ({ mkDerivation, base, opentheory-primitive, QuickCheck }:
      mkDerivation {
@@ -163297,6 +163684,31 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "persistent-mysql-haskell_0_5_2" = callPackage
+    ({ mkDerivation, aeson, base, bytestring, conduit, containers
+     , io-streams, monad-logger, mysql-haskell, network, persistent
+     , persistent-template, resource-pool, resourcet, text, time, tls
+     , transformers, unliftio-core
+     }:
+     mkDerivation {
+       pname = "persistent-mysql-haskell";
+       version = "0.5.2";
+       sha256 = "1kc2q9cbgij5b5kz70jcy694v2frgzzb7mvld8dypsz11dlpmhjn";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         aeson base bytestring conduit containers io-streams monad-logger
+         mysql-haskell network persistent resource-pool resourcet text time
+         tls transformers unliftio-core
+       ];
+       executableHaskellDepends = [
+         base monad-logger persistent persistent-template transformers
+       ];
+       description = "A pure haskell backend for the persistent library using MySQL database server";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "persistent-odbc" = callPackage
     ({ mkDerivation, aeson, base, bytestring, conduit, containers
      , convertible, HDBC, HDBC-odbc, monad-control, monad-logger
@@ -163460,6 +163872,24 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "persistent-spatial" = callPackage
+    ({ mkDerivation, aeson, base, hspec, http-api-data
+     , integer-logarithms, lens, persistent, QuickCheck, text
+     }:
+     mkDerivation {
+       pname = "persistent-spatial";
+       version = "0.1.0.0";
+       sha256 = "0x9ialzl7mmq3h4nx79z51czddn7xgs0sngixc38cdlmddvm2g36";
+       libraryHaskellDepends = [
+         aeson base http-api-data integer-logarithms lens persistent text
+       ];
+       testHaskellDepends = [
+         aeson base hspec http-api-data persistent QuickCheck text
+       ];
+       description = "Database agnostic, spatially indexed type for geographic points";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "persistent-sqlite_2_6_4" = callPackage
     ({ mkDerivation, aeson, base, bytestring, conduit, containers
      , hspec, microlens-th, monad-control, monad-logger, old-locale
@@ -163544,6 +163974,30 @@ self: {
        maintainers = with stdenv.lib.maintainers; [ psibi ];
      }) {};
 
+  "persistent-template_2_6_0" = callPackage
+    ({ mkDerivation, aeson, aeson-compat, base, bytestring, containers
+     , ghc-prim, hspec, http-api-data, monad-control, monad-logger
+     , path-pieces, persistent, QuickCheck, tagged, template-haskell
+     , text, transformers, unordered-containers
+     }:
+     mkDerivation {
+       pname = "persistent-template";
+       version = "2.6.0";
+       sha256 = "0wr1z2nfrl6jv1lprxb0d2jw4izqfcbcwvkdrhryzg95gjz8ryjv";
+       libraryHaskellDepends = [
+         aeson aeson-compat base bytestring containers ghc-prim
+         http-api-data monad-control monad-logger path-pieces persistent
+         tagged template-haskell text transformers unordered-containers
+       ];
+       testHaskellDepends = [
+         aeson base bytestring hspec persistent QuickCheck text transformers
+       ];
+       description = "Type-safe, non-relational, multi-backend persistence";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       maintainers = with stdenv.lib.maintainers; [ psibi ];
+     }) {};
+
   "persistent-template-classy" = callPackage
     ({ mkDerivation, base, lens, persistent, persistent-sqlite
      , persistent-template, template-haskell, text
@@ -168212,6 +168666,22 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {inherit (pkgs) postgresql;};
 
+  "postgresql-lo-stream" = callPackage
+    ({ mkDerivation, base, bytestring, io-streams, lifted-base
+     , monad-loops, mtl, postgresql-simple
+     }:
+     mkDerivation {
+       pname = "postgresql-lo-stream";
+       version = "0.1.1.0";
+       sha256 = "196f6lz8i8y0cfnd4lqjky69wpi0mc2jfs7jz5v0j3r15jbs5212";
+       libraryHaskellDepends = [
+         base bytestring io-streams lifted-base monad-loops mtl
+         postgresql-simple
+       ];
+       description = "Utilities for streaming PostgreSQL LargeObjects";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "postgresql-named" = callPackage
     ({ mkDerivation, base, bytestring, extra, generics-sop, hspec, mtl
      , postgresql-libpq, postgresql-simple, utf8-string
@@ -176074,6 +176544,25 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "rank2classes_1_2_1" = callPackage
+    ({ mkDerivation, base, distributive, doctest, tasty, tasty-hunit
+     , template-haskell, transformers
+     }:
+     mkDerivation {
+       pname = "rank2classes";
+       version = "1.2.1";
+       sha256 = "0dbg5hc8vy0nikyw9h99d9z5jpwfzqb3jwg1li5h281fi5cm4nb0";
+       libraryHaskellDepends = [
+         base distributive template-haskell transformers
+       ];
+       testHaskellDepends = [
+         base distributive doctest tasty tasty-hunit
+       ];
+       description = "standard type constructor class hierarchy, only with methods of rank 2 types";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "rapid" = callPackage
     ({ mkDerivation, async, base, containers, foreign-store, stm }:
      mkDerivation {
@@ -178254,27 +178743,35 @@ self: {
      }) {};
 
   "reflex" = callPackage
-    ({ mkDerivation, base, containers, criterion, deepseq
-     , dependent-map, dependent-sum, exception-transformers
-     , haskell-src-exts, haskell-src-meta, MemoTrie, mtl, primitive
-     , ref-tf, semigroups, split, stm, syb, template-haskell, these
-     , transformers, transformers-compat
+    ({ mkDerivation, base, bifunctors, comonad, containers, criterion
+     , data-default, deepseq, dependent-map, dependent-sum, directory
+     , exception-transformers, filemanip, filepath, haskell-src-exts
+     , haskell-src-meta, hlint, lens, loch-th, MemoTrie, monad-control
+     , monoidal-containers, mtl, prim-uniq, primitive, process, random
+     , ref-tf, reflection, semigroupoids, semigroups, split, stm, syb
+     , template-haskell, these, time, transformers, transformers-compat
+     , unbounded-delays
      }:
      mkDerivation {
        pname = "reflex";
-       version = "0.4.0.1";
-       sha256 = "1v4wwy2qc1gb914w5nqjvf7gibdw9yakmhdg260yjxbv1fkg8gyc";
+       version = "0.5";
+       sha256 = "0c9idjkbnw822ky7dn374vq43kivdy0znf2k2w43q7yw7snjh09r";
        libraryHaskellDepends = [
-         base containers dependent-map dependent-sum exception-transformers
-         haskell-src-exts haskell-src-meta mtl primitive ref-tf semigroups
-         syb template-haskell these transformers transformers-compat
+         base bifunctors comonad containers data-default dependent-map
+         dependent-sum exception-transformers haskell-src-exts
+         haskell-src-meta lens MemoTrie monad-control monoidal-containers
+         mtl prim-uniq primitive random ref-tf reflection semigroupoids
+         semigroups stm syb template-haskell these time transformers
+         transformers-compat unbounded-delays
        ];
        testHaskellDepends = [
-         base containers dependent-map MemoTrie mtl ref-tf
+         base bifunctors containers deepseq dependent-map dependent-sum
+         directory filemanip filepath hlint lens monoidal-containers mtl
+         ref-tf semigroups split these transformers
        ];
        benchmarkHaskellDepends = [
-         base containers criterion deepseq dependent-map dependent-sum mtl
-         primitive ref-tf split stm transformers
+         base containers criterion deepseq dependent-map dependent-sum
+         loch-th mtl primitive process ref-tf split stm time transformers
        ];
        description = "Higher-order Functional Reactive Programming";
        license = stdenv.lib.licenses.bsd3;
@@ -179329,7 +179826,7 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
-  "registry_0_1_2_3" = callPackage
+  "registry_0_1_2_6" = callPackage
     ({ mkDerivation, async, base, containers, exceptions, hashable
      , hedgehog, hedgehog-corpus, io-memoize, MonadRandom, mtl
      , protolude, random, resourcet, semigroupoids, semigroups, tasty
@@ -179337,8 +179834,8 @@ self: {
      }:
      mkDerivation {
        pname = "registry";
-       version = "0.1.2.3";
-       sha256 = "17jzvbig0zcmhb1vf2g286px35j3kh544rpsap0094lmj9yac7ni";
+       version = "0.1.2.6";
+       sha256 = "0szzmk7rclzisz0ihs7cz6180wsfv6rkrfvvqk1v6das444y1bw3";
        libraryHaskellDepends = [
          base containers exceptions hashable mtl protolude resourcet
          semigroupoids semigroups text transformers-base
@@ -188661,6 +189158,29 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "servant-client-namedargs" = callPackage
+    ({ mkDerivation, async, base, hspec, http-client, named, QuickCheck
+     , servant, servant-client, servant-client-core, servant-namedargs
+     , servant-server, servant-server-namedargs, text, warp
+     }:
+     mkDerivation {
+       pname = "servant-client-namedargs";
+       version = "0.1.0.0";
+       sha256 = "0smf6ahmzkbsnvgkji5jzj99sy8bgqz0zxx5k1y1ar82pd6m4qnd";
+       revision = "1";
+       editedCabalFile = "0kfhrikja6rvrn3m4c6w7dg28l17f2jx8rwswxiwzvmg2zmwbc1n";
+       libraryHaskellDepends = [
+         base named servant servant-client-core servant-namedargs text
+       ];
+       testHaskellDepends = [
+         async base hspec http-client named QuickCheck servant
+         servant-client servant-namedargs servant-server
+         servant-server-namedargs warp
+       ];
+       description = "Automatically derive API client functions with named and optional parameters";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "servant-conduit" = callPackage
     ({ mkDerivation, base, base-compat, bytestring, conduit
      , http-client, http-media, mtl, resourcet, servant, servant-client
@@ -189346,6 +189866,20 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "servant-namedargs" = callPackage
+    ({ mkDerivation, base, hspec, named, QuickCheck, servant, text }:
+     mkDerivation {
+       pname = "servant-namedargs";
+       version = "0.1.0.1";
+       sha256 = "0ylxcl11wmi3il5bpl7qc32qh2s210xfp37vfhhvnlxzgdzj84vh";
+       revision = "1";
+       editedCabalFile = "0nr11syaq0l04qdwh5ac0gnpfcgi9vakfjgv5i6p6kraag8za5k7";
+       libraryHaskellDepends = [ base named servant text ];
+       testHaskellDepends = [ base hspec named QuickCheck servant ];
+       description = "Combinators for servant providing named parameters";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "servant-nix" = callPackage
     ({ mkDerivation, base, bytestring, hnix, http-client, http-media
      , servant, servant-client, servant-server, text, wai, warp
@@ -189720,6 +190254,24 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "servant-server-namedargs" = callPackage
+    ({ mkDerivation, base, http-api-data, http-types, named, servant
+     , servant-namedargs, servant-server, string-conversions, text, wai
+     }:
+     mkDerivation {
+       pname = "servant-server-namedargs";
+       version = "0.1.0.0";
+       sha256 = "0ncrrl91b8bcih4qf7gwl7m2qqmx6glwgvwcd4rvi1kdjrry8w0y";
+       revision = "1";
+       editedCabalFile = "1yf69y0w8miwcgdq9f88c2vabmqbn85rqsr8pqhijz24byyxnnl7";
+       libraryHaskellDepends = [
+         base http-api-data http-types named servant servant-namedargs
+         servant-server string-conversions text wai
+       ];
+       description = "Automatically derive API server functions with named and optional parameters";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "servant-smsc-ru" = callPackage
     ({ mkDerivation, aeson, base, bytestring, http-client
      , http-client-tls, HUnit, mtl, QuickCheck, quickcheck-text
@@ -201808,15 +202360,15 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
-  "stratosphere_0_30_0" = callPackage
+  "stratosphere_0_30_1" = callPackage
     ({ mkDerivation, aeson, aeson-pretty, base, bytestring, containers
      , hashable, hspec, hspec-discover, lens, template-haskell, text
      , unordered-containers
      }:
      mkDerivation {
        pname = "stratosphere";
-       version = "0.30.0";
-       sha256 = "15cv5w93w6z1w5ry69iv0lab6qcdmwqvi0wyym4rigfs8ag3rrra";
+       version = "0.30.1";
+       sha256 = "1j2k4z5chi41fjf1shhci8yf6x5fyj1z5wa077n3n3m7hrlf3r76";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -211635,6 +212187,33 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "these_0_7_6" = callPackage
+    ({ mkDerivation, aeson, base, base-compat, bifunctors, binary
+     , containers, data-default-class, deepseq, hashable, keys, lens
+     , mtl, QuickCheck, quickcheck-instances, semigroupoids, tasty
+     , tasty-quickcheck, transformers, transformers-compat
+     , unordered-containers, vector, vector-instances
+     }:
+     mkDerivation {
+       pname = "these";
+       version = "0.7.6";
+       sha256 = "0in77b1g73m224dmpfc9khgcs0ajgsknp0yri853c9p6k0yvhr4l";
+       libraryHaskellDepends = [
+         aeson base base-compat bifunctors binary containers
+         data-default-class deepseq hashable keys lens mtl QuickCheck
+         semigroupoids transformers transformers-compat unordered-containers
+         vector vector-instances
+       ];
+       testHaskellDepends = [
+         aeson base base-compat bifunctors binary containers hashable lens
+         QuickCheck quickcheck-instances tasty tasty-quickcheck transformers
+         unordered-containers vector
+       ];
+       description = "An either-or-both data type & a generalized 'zip with padding' typeclass";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "these-skinny" = callPackage
     ({ mkDerivation, base, deepseq }:
      mkDerivation {
@@ -214126,6 +214705,140 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "tonalude" = callPackage
+    ({ mkDerivation, base, bytestring, doctest, Glob, rio, unliftio }:
+     mkDerivation {
+       pname = "tonalude";
+       version = "0.1.1.0";
+       sha256 = "060hc1dydlq1zd1fn5scz7xhbflqm4fa86rz6275drymi5gwx82s";
+       libraryHaskellDepends = [ base bytestring rio unliftio ];
+       testHaskellDepends = [ base bytestring doctest Glob rio unliftio ];
+       description = "A standard library for Tonatona framework";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
+  "tonaparser" = callPackage
+    ({ mkDerivation, base, doctest, envy, Glob, rio, say, tonatona }:
+     mkDerivation {
+       pname = "tonaparser";
+       version = "0.1.0.0";
+       sha256 = "0v9qfc13lyjclk7pqsld1lzzbdhimz7gziix7w2x6v2rr2nia8j0";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [ base envy rio say ];
+       testHaskellDepends = [ base doctest envy Glob rio say tonatona ];
+       description = "Scalable way to pass runtime configurations for tonatona";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
+  "tonatona" = callPackage
+    ({ mkDerivation, base, doctest, Glob, rio, tonaparser }:
+     mkDerivation {
+       pname = "tonatona";
+       version = "0.1.0.1";
+       sha256 = "0vc2q0j26ig2qhrc8dfy0knsp0gj8p7yda4xaps5v51dsqpj9yfv";
+       libraryHaskellDepends = [ base rio tonaparser ];
+       testHaskellDepends = [ base doctest Glob rio tonaparser ];
+       description = "meta application framework";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
+  "tonatona-google-server-api" = callPackage
+    ({ mkDerivation, base, doctest, Glob, google-server-api
+     , monad-logger, persistent, persistent-sqlite, resource-pool
+     , servant-client, tonalude, tonaparser, tonatona
+     }:
+     mkDerivation {
+       pname = "tonatona-google-server-api";
+       version = "0.1.0.0";
+       sha256 = "0mlzw51s4q3q7sf2hbx26g8chmicsv7nchqrq06x6f7ms58aiy27";
+       libraryHaskellDepends = [
+         base google-server-api monad-logger persistent persistent-sqlite
+         resource-pool servant-client tonalude tonaparser tonatona
+       ];
+       testHaskellDepends = [
+         base doctest Glob google-server-api monad-logger persistent
+         persistent-sqlite resource-pool servant-client tonalude tonaparser
+         tonatona
+       ];
+       description = "tonatona plugin for google-server-api";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
+  "tonatona-logger" = callPackage
+    ({ mkDerivation, base, doctest, Glob, rio, tonaparser, tonatona }:
+     mkDerivation {
+       pname = "tonatona-logger";
+       version = "0.2.0.0";
+       sha256 = "14pirmflhyfmw6y7j1af7ryh8iq30prx7xsdjwmliacszhsqvvfa";
+       libraryHaskellDepends = [ base rio tonaparser tonatona ];
+       testHaskellDepends = [ base doctest Glob rio tonaparser tonatona ];
+       description = "tonatona plugin for logging";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
+  "tonatona-persistent-postgresql" = callPackage
+    ({ mkDerivation, base, doctest, Glob, monad-logger, persistent
+     , persistent-postgresql, resource-pool, rio, tonaparser, tonatona
+     }:
+     mkDerivation {
+       pname = "tonatona-persistent-postgresql";
+       version = "0.1.0.1";
+       sha256 = "1fxf3h024bl02aldcwc9mhjish9l2y57ir9shra6liddk6065g5n";
+       libraryHaskellDepends = [
+         base monad-logger persistent persistent-postgresql resource-pool
+         rio tonaparser tonatona
+       ];
+       testHaskellDepends = [
+         base doctest Glob monad-logger persistent persistent-postgresql
+         resource-pool rio tonaparser tonatona
+       ];
+       description = "tonatona plugin for accessing PostgreSQL database";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
+  "tonatona-persistent-sqlite" = callPackage
+    ({ mkDerivation, base, doctest, Glob, monad-logger, persistent
+     , persistent-sqlite, resource-pool, rio, tonaparser, tonatona
+     }:
+     mkDerivation {
+       pname = "tonatona-persistent-sqlite";
+       version = "0.1.0.1";
+       sha256 = "0a0jgi01pdirr7ay2ah3cvf3nv2pnmvxag34zif04vc6sbs8pryb";
+       libraryHaskellDepends = [
+         base monad-logger persistent persistent-sqlite resource-pool rio
+         tonaparser tonatona
+       ];
+       testHaskellDepends = [
+         base doctest Glob monad-logger persistent persistent-sqlite
+         resource-pool rio tonaparser tonatona
+       ];
+       description = "tonatona plugin for accessing Sqlite database";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
+  "tonatona-servant" = callPackage
+    ({ mkDerivation, base, doctest, exceptions, Glob, http-types
+     , monad-logger, rio, servant, servant-server, tonaparser, tonatona
+     , tonatona-logger, wai, wai-extra, warp
+     }:
+     mkDerivation {
+       pname = "tonatona-servant";
+       version = "0.1.0.1";
+       sha256 = "1202fxvjkmvj9sgy576y0ghpcqdca1bhagsxrrz3hcdkyvd2lr9s";
+       libraryHaskellDepends = [
+         base exceptions http-types monad-logger rio servant servant-server
+         tonaparser tonatona tonatona-logger wai wai-extra warp
+       ];
+       testHaskellDepends = [
+         base doctest exceptions Glob http-types monad-logger rio servant
+         servant-server tonaparser tonatona tonatona-logger wai wai-extra
+         warp
+       ];
+       description = "tonatona plugin for servant";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "too-many-cells" = callPackage
     ({ mkDerivation, aeson, base, birch-beer, bytestring, cassava
      , colour, containers, deepseq, diagrams, diagrams-cairo
@@ -214169,31 +214882,32 @@ self: {
      }) {};
 
   "toodles" = callPackage
-    ({ mkDerivation, aeson, base, blaze-html, cmdargs, directory, hspec
-     , hspec-expectations, megaparsec, MissingH, regex-posix, servant
-     , servant-blaze, servant-server, strict, text, wai, warp, yaml
+    ({ mkDerivation, aeson, base, blaze-html, cmdargs, directory, extra
+     , hspec, hspec-expectations, megaparsec, MissingH, regex-posix
+     , servant, servant-blaze, servant-server, strict, text, wai, warp
+     , yaml
      }:
      mkDerivation {
        pname = "toodles";
-       version = "1.0.2";
-       sha256 = "066nc1xgy9g7w82f0s1lagxjpf5hw9zxpnbcf5lbjdj58ssrkdr5";
+       version = "1.0.3";
+       sha256 = "1nzrfdbwz5ykiim76jr3v1666acrhh76k4q4gwix9bixcm8al2zf";
        isLibrary = true;
        isExecutable = true;
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [
-         aeson base blaze-html cmdargs directory hspec hspec-expectations
-         megaparsec MissingH regex-posix servant servant-blaze
-         servant-server strict text wai warp yaml
+         aeson base blaze-html cmdargs directory extra hspec
+         hspec-expectations megaparsec MissingH regex-posix servant
+         servant-blaze servant-server strict text wai warp yaml
        ];
        executableHaskellDepends = [
-         aeson base blaze-html cmdargs directory hspec hspec-expectations
-         megaparsec MissingH regex-posix servant servant-blaze
-         servant-server strict text wai warp yaml
+         aeson base blaze-html cmdargs directory extra hspec
+         hspec-expectations megaparsec MissingH regex-posix servant
+         servant-blaze servant-server strict text wai warp yaml
        ];
        testHaskellDepends = [
-         aeson base blaze-html cmdargs directory hspec hspec-expectations
-         megaparsec MissingH regex-posix servant servant-blaze
-         servant-server strict text wai warp yaml
+         aeson base blaze-html cmdargs directory extra hspec
+         hspec-expectations megaparsec MissingH regex-posix servant
+         servant-blaze servant-server strict text wai warp yaml
        ];
        description = "Manage the TODO entries in your code";
        license = stdenv.lib.licenses.mit;
@@ -214676,8 +215390,8 @@ self: {
      }:
      mkDerivation {
        pname = "trackit";
-       version = "0.5";
-       sha256 = "1vzq0jfa9dxaqpkk0wipd3jmppdkr0jypb2463b63qzb0jc6f05n";
+       version = "0.6";
+       sha256 = "0944m0s1r2f53m9cmfw7jzv4xxgrfppy0cnh0a98j129n6xn39sq";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -215402,6 +216116,8 @@ self: {
        pname = "tree-diff";
        version = "0.0.2";
        sha256 = "0zlviaikyk50l577q7h06w5z058v1ngjlhwzfn965xkp978hnsgq";
+       revision = "1";
+       editedCabalFile = "1rl12a2ydg744s289lna4zb0sj0b16abmrngp6qd1kfkih2ygml0";
        libraryHaskellDepends = [
          aeson ansi-terminal ansi-wl-pprint base base-compat bytestring
          containers generics-sop hashable MemoTrie parsec parsers pretty
@@ -215674,6 +216390,8 @@ self: {
        pname = "trifecta";
        version = "2";
        sha256 = "0hznd8i65s81xy13i2qc7cvipw3lfb2yhkv53apbdsh6sbljz5sk";
+       revision = "1";
+       editedCabalFile = "1qqkiwy0yvnj4yszsw9jrv83qf5hw87jdqdb34401dskaf81gwrm";
        setupHaskellDepends = [ base Cabal cabal-doctest ];
        libraryHaskellDepends = [
          ansi-terminal ansi-wl-pprint array base blaze-builder blaze-html
@@ -218275,8 +218993,8 @@ self: {
      }:
      mkDerivation {
        pname = "typograffiti";
-       version = "0.1.0.2";
-       sha256 = "1i7my9vqkabwxsj6hp9alvlpb483vs07f07662i707kpqf5pryrz";
+       version = "0.1.0.3";
+       sha256 = "16491jhiw8yvs1491plf5c98rarxk0j2dfy76ggayxypzqdn2rmr";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -226692,6 +227410,27 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "wave_0_2_0" = callPackage
+    ({ mkDerivation, base, bytestring, cereal, containers, hspec
+     , hspec-discover, QuickCheck, temporary, transformers
+     }:
+     mkDerivation {
+       pname = "wave";
+       version = "0.2.0";
+       sha256 = "149kgwngq3qxc7gxpkqb16j669j0wpv2f3gnvfwp58yg6m4259ki";
+       enableSeparateDataOutput = true;
+       libraryHaskellDepends = [
+         base bytestring cereal containers transformers
+       ];
+       testHaskellDepends = [
+         base bytestring containers hspec QuickCheck temporary
+       ];
+       testToolDepends = [ hspec-discover ];
+       description = "Work with WAVE and RF64 files";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "wavefront" = callPackage
     ({ mkDerivation, attoparsec, base, dlist, filepath, mtl, text
      , transformers, vector
@@ -227665,13 +228404,13 @@ self: {
     ({ mkDerivation, base, blaze-html, data-default, lucid, text }:
      mkDerivation {
        pname = "webpage";
-       version = "0.0.5";
-       sha256 = "1b8s7nnzyadla3wl6p58dwhinscajp5p0ajkrfz5hzqxjgzr4gi1";
+       version = "0.0.5.1";
+       sha256 = "1nbnpqbknfgw9pyj0phgc9g5srwdzzga3vy58yin25xvkzj2grfr";
        libraryHaskellDepends = [
          base blaze-html data-default lucid text
        ];
        description = "Organized and simple web page scaffold for blaze and lucid";
-       license = stdenv.lib.licenses.mit;
+       license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
@@ -232008,6 +232747,24 @@ self: {
        license = "LGPL";
      }) {};
 
+  "xorshift-plus" = callPackage
+    ({ mkDerivation, base, doctest, gauge, ghc-prim, hspec
+     , hspec-discover, QuickCheck, random, xorshift, Xorshift128Plus
+     }:
+     mkDerivation {
+       pname = "xorshift-plus";
+       version = "0.1.0.0";
+       sha256 = "1m0wilg47jv9zsklghcs1h9bf4vykn8r4bwl0ncr7cqrlfa8d94l";
+       libraryHaskellDepends = [ base ghc-prim ];
+       testHaskellDepends = [ base doctest hspec QuickCheck ];
+       testToolDepends = [ hspec-discover ];
+       benchmarkHaskellDepends = [
+         base gauge random xorshift Xorshift128Plus
+       ];
+       description = "Simple implementation of xorshift+ PRNG";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "xosd" = callPackage
     ({ mkDerivation, base, xosd }:
      mkDerivation {