hackage-packages.nix: automatic Haskell package set update

This update was generated by hackage2nix v2.1 from Hackage revision
https://github.com/commercialhaskell/all-cabal-hashes/commit/d654ea25e98c918aeb46cdb7b7d2372bec114101.

1 files changed, 4817 insertions, 1498 deletions

diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index d31dc82822cb9..a2e477baa15ea 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -255,6 +255,8 @@ self: {
        pname = "ADPfusion";
        version = "0.5.2.0";
        sha256 = "264284d9a7bb0978caec240c98d8cabbe89772248bd8e7514f53b277f902a61d";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [
          base bits containers DPutils mmorph mtl OrderedBits primitive
          PrimitiveArray QuickCheck strict template-haskell th-orphans
@@ -455,6 +457,8 @@ self: {
        pname = "ALUT";
        version = "2.4.0.2";
        sha256 = "b8364da380f5f1d85d13e427851a153be2809e1838d16393e37566f34b384b87";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [ base OpenAL StateVar transformers ];
        librarySystemDepends = [ freealut ];
        homepage = "https://github.com/haskell-openal/ALUT";
@@ -754,8 +758,9 @@ self: {
      }) {};
 
   "AlanDeniseEricLauren" = callPackage
-    ({ mkDerivation, base, containers, hspec, hspec-core, MonadRandom
-     , mtl, QuickCheck, random, random-shuffle, transformers, vector
+    ({ mkDerivation, base, containers, criterion, hspec, hspec-core
+     , MonadRandom, mtl, QuickCheck, random, random-shuffle
+     , transformers, vector
      }:
      mkDerivation {
        pname = "AlanDeniseEricLauren";
@@ -768,6 +773,7 @@ self: {
          base containers hspec hspec-core MonadRandom QuickCheck random
          transformers
        ];
+       benchmarkHaskellDepends = [ base containers criterion ];
        homepage = "http://github.com/enolan/AlanDeniseEricLauren";
        description = "Find the minimal subset/submap satisfying some property";
        license = stdenv.lib.licenses.bsd3;
@@ -916,8 +922,7 @@ self: {
        pname = "AppleScript";
        version = "0.2.0.1";
        sha256 = "796b0a7deaa5a6ae0f30f98f9451afa5033aea96b41df52b1d4bd7b27d8fbcca";
-       isLibrary = false;
-       isExecutable = false;
+       doHaddock = false;
        homepage = "https://github.com/reinerp/haskell-AppleScript";
        description = "Call AppleScript from Haskell, and then call back into Haskell";
        license = stdenv.lib.licenses.bsd3;
@@ -1246,6 +1251,8 @@ self: {
        pname = "BenchmarkHistory";
        version = "0.0.0.2";
        sha256 = "a3ab4de30a90e70c3b8bfe28d956322312c5e14b42f94da1051c71ff0853fa3d";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [
          base bytestring cassava deepseq directory statistics time vector
        ];
@@ -1344,8 +1351,8 @@ self: {
      }:
      mkDerivation {
        pname = "BioHMM";
-       version = "1.0.4";
-       sha256 = "b3c36291729328b42ba73ee777c4ef1490eccee982b64ee3dbf5103c25d5c2f3";
+       version = "1.0.5";
+       sha256 = "f32d7c8e0433c38e77c3c06c08fd30bfc6eccaa8a4ccc074638de016ab13793f";
        libraryHaskellDepends = [
          base colour diagrams-cairo diagrams-lib directory either-unwrap
          filepath parsec ParsecTools StockholmAlignment SVGFonts text vector
@@ -2938,6 +2945,8 @@ self: {
        pname = "ConfigFile";
        version = "1.1.4";
        sha256 = "ae087b359ff2945a62b671449227e0a811d143ee651179f4e7e9c66548e0f514";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [ base containers MissingH mtl parsec ];
        homepage = "http://software.complete.org/configfile";
        description = "Configuration file reading & writing";
@@ -3248,10 +3257,11 @@ self: {
     ({ mkDerivation, array, async, attoparsec, attoparsec-conduit, base
      , binary, blaze-builder, blaze-textual, bytestring, conduit
      , containers, data-default, directory, doctest, fast-logger
-     , filepath, hashable, hspec, lens, lifted-base, monad-control
-     , monad-logger, mtl, network, network-conduit, optparse-applicative
-     , stm, system-fileio, system-filepath, template-haskell, text, time
-     , transformers, transformers-base, unordered-containers
+     , filepath, hashable, hspec, lens, lifted-base
+     , mersenne-random-pure64, monad-control, monad-logger, mtl, network
+     , network-conduit, optparse-applicative, stm, system-fileio
+     , system-filepath, template-haskell, text, time, transformers
+     , transformers-base, unordered-containers
      }:
      mkDerivation {
        pname = "CurryDB";
@@ -3273,6 +3283,9 @@ self: {
        testHaskellDepends = [
          base conduit directory doctest filepath hspec lifted-base mtl stm
        ];
+       benchmarkHaskellDepends = [
+         base bytestring mersenne-random-pure64 mtl
+       ];
        description = "CurryDB: In-memory Key/Value Database";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -3435,8 +3448,9 @@ self: {
      }) {};
 
   "DPutils" = callPackage
-    ({ mkDerivation, base, containers, kan-extensions, parallel, pipes
-     , QuickCheck, tasty, tasty-quickcheck, tasty-th, vector
+    ({ mkDerivation, base, containers, criterion, kan-extensions
+     , parallel, pipes, QuickCheck, tasty, tasty-quickcheck, tasty-th
+     , vector
      }:
      mkDerivation {
        pname = "DPutils";
@@ -3449,6 +3463,7 @@ self: {
          base containers kan-extensions parallel pipes QuickCheck tasty
          tasty-quickcheck tasty-th vector
        ];
+       benchmarkHaskellDepends = [ base criterion vector ];
        homepage = "https://github.com/choener/DPutils";
        description = "utilities for DP";
        license = stdenv.lib.licenses.bsd3;
@@ -3485,8 +3500,8 @@ self: {
      }:
      mkDerivation {
        pname = "DSA";
-       version = "1.0.1";
-       sha256 = "cd5fb8bc019734caca4d1351bdc360c8947fc180646be43ee4888c25b9530101";
+       version = "1.0.2";
+       sha256 = "9c4f9de5fe61be4c25e4696b3ddbf1b38d7f064c4600d24e6021d342194deb1d";
        libraryHaskellDepends = [
          base binary bytestring crypto-api crypto-pubkey-types ghc-prim
          integer-gmp SHA tagged
@@ -3647,7 +3662,7 @@ self: {
      }) {};
 
   "DataIndex" = callPackage
-    ({ mkDerivation, base, tasty, tasty-hspec }:
+    ({ mkDerivation, base, criterion, tasty, tasty-hspec }:
      mkDerivation {
        pname = "DataIndex";
        version = "0.1.1";
@@ -3657,6 +3672,7 @@ self: {
        libraryHaskellDepends = [ base ];
        executableHaskellDepends = [ base ];
        testHaskellDepends = [ base tasty tasty-hspec ];
+       benchmarkHaskellDepends = [ base criterion ];
        homepage = "https://github.com/yuhangwang/DataIndex#readme";
        description = "A package for adding index column to data files";
        license = stdenv.lib.licenses.mit;
@@ -4342,31 +4358,41 @@ self: {
      }) {};
 
   "Earley" = callPackage
-    ({ mkDerivation, base, ListLike, tasty, tasty-hunit
-     , tasty-quickcheck
+    ({ mkDerivation, base, criterion, deepseq, ListLike, parsec, tasty
+     , tasty-hunit, tasty-quickcheck
      }:
      mkDerivation {
        pname = "Earley";
        version = "0.11.0.1";
        sha256 = "c207a40926bb0b9de05641a0fc03c22849a2c7e0bc007d2ffef37f33793985b3";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [ base ListLike ];
        testHaskellDepends = [ base tasty tasty-hunit tasty-quickcheck ];
+       benchmarkHaskellDepends = [
+         base criterion deepseq ListLike parsec
+       ];
        description = "Parsing all context-free grammars using Earley's algorithm";
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
   "Earley_0_12_0_0" = callPackage
-    ({ mkDerivation, base, ListLike, QuickCheck, tasty, tasty-hunit
-     , tasty-quickcheck
+    ({ mkDerivation, base, criterion, deepseq, ListLike, parsec
+     , QuickCheck, tasty, tasty-hunit, tasty-quickcheck
      }:
      mkDerivation {
        pname = "Earley";
        version = "0.12.0.0";
        sha256 = "98657d247c04f7f37dc3b7e03a9bf6c0ea20e945ddac0aa0406ba7c464723337";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [ base ListLike ];
        testHaskellDepends = [
          base QuickCheck tasty tasty-hunit tasty-quickcheck
        ];
+       benchmarkHaskellDepends = [
+         base criterion deepseq ListLike parsec
+       ];
        description = "Parsing all context-free grammars using Earley's algorithm";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -4613,6 +4639,8 @@ self: {
        pname = "EsounD";
        version = "0.2";
        sha256 = "59b6f6676e5cd005e296ee8e8f0669522d981f94fb96874deb223133d09842b4";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [
          base base-unicode-symbols bindings-EsounD monad-control network
          regions safer-file-handles storablevector transformers unix
@@ -4948,8 +4976,8 @@ self: {
     ({ mkDerivation, base, STMonadTrans, vector }:
      mkDerivation {
        pname = "FastPush";
-       version = "0.1.0.2";
-       sha256 = "301cf0552dc14adc8865038b7d7f5aac7dc791f4039c790c28262603b129c674";
+       version = "0.1.0.3";
+       sha256 = "61f383fa02c0c2e34e3905be1ededc0db65012e4a7d55bec747e756bacc7aa7b";
        libraryHaskellDepends = [ base STMonadTrans vector ];
        homepage = "https://github.com/wyager/FastPush/";
        description = "A monad and monad transformer for pushing things onto a stack very fast";
@@ -5316,8 +5344,8 @@ self: {
      }) {};
 
   "ForestStructures" = callPackage
-    ({ mkDerivation, base, containers, fgl, QuickCheck, test-framework
-     , test-framework-quickcheck2, test-framework-th
+    ({ mkDerivation, base, containers, criterion, fgl, QuickCheck
+     , test-framework, test-framework-quickcheck2, test-framework-th
      , unordered-containers, vector, vector-th-unbox
      }:
      mkDerivation {
@@ -5331,6 +5359,7 @@ self: {
          base QuickCheck test-framework test-framework-quickcheck2
          test-framework-th
        ];
+       benchmarkHaskellDepends = [ base criterion ];
        homepage = "https://github.com/choener/ForestStructures";
        description = "Tree- and forest structures";
        license = stdenv.lib.licenses.bsd3;
@@ -5376,8 +5405,8 @@ self: {
      }) {};
 
   "Foster" = callPackage
-    ({ mkDerivation, array, base, cmdtheline, containers, random
-     , strict
+    ({ mkDerivation, array, base, cmdtheline, containers, criterion
+     , random, strict
      }:
      mkDerivation {
        pname = "Foster";
@@ -5388,6 +5417,9 @@ self: {
        executableHaskellDepends = [
          array base cmdtheline containers random strict
        ];
+       benchmarkHaskellDepends = [
+         array base cmdtheline containers criterion random strict
+       ];
        description = "Utilities to generate and solve puzzles";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -5443,15 +5475,17 @@ self: {
      }) {};
 
   "Frames" = callPackage
-    ({ mkDerivation, base, directory, ghc-prim, hspec, htoml, pipes
-     , pretty, primitive, readable, regex-applicative, template-haskell
-     , temporary, text, transformers, unordered-containers, vector
-     , vinyl
+    ({ mkDerivation, base, criterion, directory, ghc-prim, hspec, htoml
+     , pipes, pretty, primitive, readable, regex-applicative
+     , template-haskell, temporary, text, transformers
+     , unordered-containers, vector, vinyl
      }:
      mkDerivation {
        pname = "Frames";
        version = "0.1.9";
        sha256 = "18eaea64c8f3ff7156ca1dcc372bae3e8ff7538cffce4c415710eae770eb6b25";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [
          base ghc-prim pipes primitive readable template-haskell text
          transformers vector vinyl
@@ -5460,6 +5494,7 @@ self: {
          base directory hspec htoml pretty regex-applicative
          template-haskell temporary text unordered-containers
        ];
+       benchmarkHaskellDepends = [ base criterion pipes transformers ];
        description = "Data frames For working with tabular data files";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -5485,6 +5520,8 @@ self: {
        pname = "FreeTypeGL";
        version = "0.0.4";
        sha256 = "4e85f39777c29cc145b760289906b3a9f8e518296af258004223d87bbbdc5183";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [ base freetype2 OpenGL ];
        description = "Loadable texture fonts for OpenGL";
        license = stdenv.lib.licenses.bsd3;
@@ -5717,6 +5754,8 @@ self: {
        pname = "GLUT";
        version = "2.7.0.11";
        sha256 = "da270ef3027f48fd62115e6f1e90a44334e3da5524e4619dbab6d186f5511b5d";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [
          array base containers OpenGL StateVar transformers
        ];
@@ -6349,6 +6388,8 @@ self: {
        pname = "GrammarProducts";
        version = "0.1.1.2";
        sha256 = "9023283298ad178efaf9ba965e7a0005ff41a8a01d2e0f581ed3c29e414f15a2";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [
          ADPfusion ansi-wl-pprint base bytestring containers data-default
          FormalGrammars lens newtype parsers PrimitiveArray semigroups
@@ -6795,6 +6836,8 @@ self: {
        sha256 = "7a3ee21c41e716111c4a3742a66eb448683719a9384afbf7021c5942ac73d2ad";
        revision = "1";
        editedCabalFile = "da1cef4f99bc200ef3c4c866519859dfee81457aff6a8fa7418c17f210a1e7fd";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [
          base bytestring containers convertible mtl old-time text time
          utf8-string
@@ -6830,6 +6873,8 @@ self: {
        pname = "HDBC-odbc";
        version = "2.5.0.1";
        sha256 = "96000a9573e873d231ca09f974c4ff0c4d7ec86d7ec6ceaaeb0cc02fc5e6de99";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [
          base bytestring concurrent-extra HDBC mtl time utf8-string
        ];
@@ -6847,11 +6892,14 @@ self: {
        pname = "HDBC-postgresql";
        version = "2.3.2.4";
        sha256 = "71988482df2efc773e8272a041f46c61bb4357aa3856edbc69d3fb9d09c168fd";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [
          base bytestring convertible HDBC mtl old-time parsec time
          utf8-string
        ];
        librarySystemDepends = [ postgresql ];
+       executableSystemDepends = [ postgresql ];
        homepage = "http://github.com/hdbc/hdbc-postgresql";
        description = "PostgreSQL driver for HDBC";
        license = stdenv.lib.licenses.bsd3;
@@ -6889,8 +6937,11 @@ self: {
        pname = "HDBC-sqlite3";
        version = "2.3.3.1";
        sha256 = "a783d9ab707ebfc68e3e46bd1bbb5d3d5493f50a7ccf31223d9848cff986ebea";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [ base bytestring HDBC mtl utf8-string ];
        librarySystemDepends = [ sqlite ];
+       executableSystemDepends = [ sqlite ];
        homepage = "https://github.com/hdbc/hdbc-sqlite3";
        description = "Sqlite v3 driver for HDBC";
        license = stdenv.lib.licenses.bsd3;
@@ -6943,6 +6994,8 @@ self: {
        pname = "HFuse";
        version = "0.2.4.5";
        sha256 = "e28e0689dfe5f7bc312b842adb02e172b56c3f53a1819ebda7ab39eace6c24a1";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [ base bytestring unix ];
        librarySystemDepends = [ fuse ];
        preConfigure = ''
@@ -7318,10 +7371,11 @@ self: {
      }) {};
 
   "HGraphStorage" = callPackage
-    ({ mkDerivation, base, binary, bytestring, containers, data-default
-     , directory, filepath, HUnit, lifted-base, monad-control
-     , monad-logger, QuickCheck, resourcet, tasty, tasty-hunit
-     , tasty-quickcheck, text, transformers, transformers-base
+    ({ mkDerivation, base, binary, bytestring, Cabal, containers
+     , criterion, data-default, directory, filepath, HUnit, lifted-base
+     , monad-control, monad-logger, QuickCheck, resourcet, tar, tasty
+     , tasty-hunit, tasty-quickcheck, text, text-binary, transformers
+     , transformers-base, zlib
      }:
      mkDerivation {
        pname = "HGraphStorage";
@@ -7337,6 +7391,11 @@ self: {
          lifted-base monad-control monad-logger QuickCheck resourcet tasty
          tasty-hunit tasty-quickcheck text transformers transformers-base
        ];
+       benchmarkHaskellDepends = [
+         base binary bytestring Cabal containers criterion data-default
+         directory filepath monad-logger resourcet tar text text-binary
+         transformers zlib
+       ];
        homepage = "https://github.com/JPMoresmau/HGraphStorage";
        description = "Graph database stored on disk";
        license = stdenv.lib.licenses.bsd3;
@@ -7959,6 +8018,8 @@ self: {
        pname = "HSH";
        version = "2.1.2";
        sha256 = "788a7f25336e7fe9c7d38b68bb4cc0030712fc47e0cdf282267dea1e46b0da9f";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [
          base bytestring directory filepath hslogger MissingH mtl process
          regex-base regex-compat regex-posix unix
@@ -8562,6 +8623,8 @@ self: {
        pname = "HandsomeSoup";
        version = "0.4.2";
        sha256 = "0ae2dad3fbde1efee9e45b84b2aeb5b526cc7b3ea2cbc5715494f7bde3ceeefb";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [
          base containers HTTP hxt hxt-http mtl network network-uri parsec
          transformers
@@ -9109,6 +9172,8 @@ self: {
        pname = "Hoed";
        version = "0.3.6";
        sha256 = "8508f5077a0a45662af4dddd44bf1ce55fb4cd007b0246ce193ff6d439c351db";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [
          array base bytestring cereal containers directory filepath FPretty
          libgraph mtl process RBTree regex-posix template-haskell
@@ -9252,13 +9317,14 @@ self: {
      }) {};
 
   "HostAndPort" = callPackage
-    ({ mkDerivation, base, doctest, hspec, parsec }:
+    ({ mkDerivation, base, criterion, doctest, hspec, parsec }:
      mkDerivation {
        pname = "HostAndPort";
        version = "0.2.0";
        sha256 = "15a625f5e0f1a510fa1a307127abae2ae2589d9525ff60ed33be39230f335be6";
        libraryHaskellDepends = [ base parsec ];
        testHaskellDepends = [ base doctest hspec ];
+       benchmarkHaskellDepends = [ base criterion ];
        homepage = "https://github.com/bacher09/hostandport";
        description = "Parser for host and port pairs like localhost:22";
        license = stdenv.lib.licenses.mit;
@@ -9385,8 +9451,8 @@ self: {
      }:
      mkDerivation {
        pname = "HsOpenSSL";
-       version = "0.11.4";
-       sha256 = "6326b9b1fb07e05a72f8435cc3ae777d696251e43e93b25ec2ff513f7f2bed07";
+       version = "0.11.4.1";
+       sha256 = "03445cb1ed881f3a8825e375d87af92a5521549ab86042a5bd4d6052b4e7bfbd";
        libraryHaskellDepends = [
          base bytestring integer-gmp network time
        ];
@@ -9553,7 +9619,7 @@ self: {
      }) {};
 
   "Hungarian-Munkres" = callPackage
-    ({ mkDerivation, array, base, Munkres, random, tasty
+    ({ mkDerivation, array, base, criterion, Munkres, random, tasty
      , tasty-quickcheck
      }:
      mkDerivation {
@@ -9564,6 +9630,7 @@ self: {
        testHaskellDepends = [
          array base Munkres random tasty tasty-quickcheck
        ];
+       benchmarkHaskellDepends = [ array base criterion Munkres random ];
        description = "A Linear Sum Assignment Problem (LSAP) solver";
        license = stdenv.lib.licenses.gpl3;
      }) {};
@@ -9789,13 +9856,19 @@ self: {
      }) {};
 
   "IntervalMap" = callPackage
-    ({ mkDerivation, base, Cabal, containers, deepseq, QuickCheck }:
+    ({ mkDerivation, base, Cabal, containers, criterion, deepseq
+     , fingertree, QuickCheck, random, SegmentTree, weigh
+     }:
      mkDerivation {
        pname = "IntervalMap";
        version = "0.5.2.0";
        sha256 = "031a491ae40c333a3227d147aae9ace42f2f4b535fcbbb991c6b4f35a1531684";
        libraryHaskellDepends = [ base containers deepseq ];
        testHaskellDepends = [ base Cabal containers deepseq QuickCheck ];
+       benchmarkHaskellDepends = [
+         base containers criterion deepseq fingertree random SegmentTree
+         weigh
+       ];
        homepage = "http://www.chr-breitkopf.de/comp/IntervalMap";
        description = "Containers for intervals, with efficient search";
        license = stdenv.lib.licenses.bsd3;
@@ -9905,6 +9978,8 @@ self: {
        sha256 = "477eecd8af2f070ff648f576ee81ee04efa45cc77b606f7fc09b6f2c156df299";
        revision = "1";
        editedCabalFile = "47b2855a9c5769eadfdbb4eaddca6c66e6de21432d555162f2cc4dcde6e0861a";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [
          attoparsec base bytestring bytestring-nums bytestring-trie
          containers utf8-string
@@ -9983,8 +10058,8 @@ self: {
     ({ mkDerivation, base }:
      mkDerivation {
        pname = "Jdh";
-       version = "0.1.0.0";
-       sha256 = "df460a97cde668b6d170ddcbfe547e146de56524108a4e811c6ca7bb26b4e864";
+       version = "0.1.0.1";
+       sha256 = "8005db8ccfcdd6bab84fcfb8bfc2b357161d5999e6a0ff121bfdd4ab06ece77d";
        libraryHaskellDepends = [ base ];
        homepage = "https://github.com/brunoczim/Json-Data-for-Haskell";
        description = "A Json implementation for Haskell, with JavaScript Values and Encoding/Decoding";
@@ -10070,13 +10145,14 @@ self: {
      }) {};
 
   "JuicyPixels-extra" = callPackage
-    ({ mkDerivation, base, hspec, JuicyPixels }:
+    ({ mkDerivation, base, criterion, hspec, JuicyPixels }:
      mkDerivation {
        pname = "JuicyPixels-extra";
        version = "0.1.1";
        sha256 = "d37b257e7780e18a4e8335523b2f8962efb845da3b1dd84435a684b24a82b9fd";
        libraryHaskellDepends = [ base JuicyPixels ];
        testHaskellDepends = [ base hspec JuicyPixels ];
+       benchmarkHaskellDepends = [ base criterion JuicyPixels ];
        homepage = "https://github.com/mrkkrp/JuicyPixels-extra";
        description = "Efficiently scale, crop, flip images with JuicyPixels";
        license = stdenv.lib.licenses.bsd3;
@@ -10416,6 +10492,8 @@ self: {
        pname = "LDAP";
        version = "0.6.11";
        sha256 = "01cb48801eb3033fbd8be6d755863e7fea7d9083afc76aff07b9c42f8e1890b3";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [ base ];
        librarySystemDepends = [ lber openldap ];
        testHaskellDepends = [ base HUnit ];
@@ -10929,9 +11007,9 @@ self: {
 
   "LogicGrowsOnTrees" = callPackage
     ({ mkDerivation, AbortT-mtl, AbortT-transformers, base, bytestring
-     , cereal, cmdtheline, composition, containers, data-ivar, derive
-     , directory, hslogger, hslogger-template, HUnit, lens
-     , MonadCatchIO-transformers, monoid-statistics, mtl, multiset
+     , cereal, cmdtheline, composition, containers, criterion, data-ivar
+     , deepseq, derive, directory, hslogger, hslogger-template, HUnit
+     , lens, MonadCatchIO-transformers, monoid-statistics, mtl, multiset
      , old-locale, operational, prefix-units, pretty, PSQueue
      , QuickCheck, quickcheck-instances, random, sequential-index
      , smallcheck, split, stm, test-framework, test-framework-hunit
@@ -10942,6 +11020,8 @@ self: {
        pname = "LogicGrowsOnTrees";
        version = "1.1.0.2";
        sha256 = "f3f6e7ee3022a60d279eff5d27fd6d3a7ca25972f18077594f90a15ed9cf16fb";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [
          AbortT-mtl AbortT-transformers base bytestring cereal cmdtheline
          composition containers data-ivar derive directory hslogger
@@ -10956,6 +11036,7 @@ self: {
          test-framework test-framework-hunit test-framework-quickcheck2
          test-framework-smallcheck time transformers uuid void
        ];
+       benchmarkHaskellDepends = [ base cereal criterion deepseq ];
        description = "a parallel implementation of logic programming using distributed tree exploration";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -10970,12 +11051,15 @@ self: {
        pname = "LogicGrowsOnTrees-MPI";
        version = "1.0.0.1.1";
        sha256 = "22f5bcb22e731984e40a76ae1d48b0e59329ac5d3bd633efef7cb8140de8146b";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [
          base bytestring cereal cmdtheline containers data-ivar derive
          hslogger hslogger-template LogicGrowsOnTrees
          MonadCatchIO-transformers stm transformers
        ];
        librarySystemDepends = [ openmpi ];
+       executableSystemDepends = [ openmpi ];
        description = "an adapter for LogicGrowsOnTrees that uses MPI";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -10991,6 +11075,8 @@ self: {
        pname = "LogicGrowsOnTrees-network";
        version = "1.0.0.4";
        sha256 = "7a01eb40f87b5810bfccfb23d49e4a04f7bb630f201425caaa0eeb0a82d9b973";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [
          base cereal cmdtheline composition containers hslogger
          hslogger-template lens LogicGrowsOnTrees MonadCatchIO-transformers
@@ -11007,7 +11093,7 @@ self: {
 
   "LogicGrowsOnTrees-processes" = callPackage
     ({ mkDerivation, base, bytestring, cereal, cmdtheline, containers
-     , filepath, FindBin, hslogger, hslogger-template, HUnit
+     , criterion, filepath, FindBin, hslogger, hslogger-template, HUnit
      , LogicGrowsOnTrees, MonadCatchIO-transformers, process, random
      , test-framework, test-framework-hunit, transformers
      }:
@@ -11015,6 +11101,8 @@ self: {
        pname = "LogicGrowsOnTrees-processes";
        version = "1.0.0.2";
        sha256 = "766b912ffe650e0ab7cd23a54b51fa440b9e411b63be1d520936bb815af93334";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [
          base bytestring cereal cmdtheline containers filepath FindBin
          hslogger hslogger-template LogicGrowsOnTrees
@@ -11024,6 +11112,7 @@ self: {
          base cereal hslogger hslogger-template HUnit LogicGrowsOnTrees
          random test-framework test-framework-hunit transformers
        ];
+       benchmarkHaskellDepends = [ base criterion LogicGrowsOnTrees ];
        description = "an adapter for LogicGrowsOnTrees that uses multiple processes for parallelism";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -11376,6 +11465,8 @@ self: {
        pname = "MemoTrie";
        version = "0.6.7";
        sha256 = "cdab03dc1394e982dd3144ac433b7548d51a55a1c44ddb864e5ac14057c41672";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [ base newtype-generics ];
        homepage = "https://github.com/conal/MemoTrie";
        description = "Trie-based memo functions";
@@ -11970,7 +12061,7 @@ self: {
      }) {};
 
   "MyPrimes" = callPackage
-    ({ mkDerivation, base, containers }:
+    ({ mkDerivation, base, containers, time }:
      mkDerivation {
        pname = "MyPrimes";
        version = "0.1.0.0";
@@ -11979,6 +12070,7 @@ self: {
        isExecutable = true;
        libraryHaskellDepends = [ base containers ];
        executableHaskellDepends = [ base containers ];
+       benchmarkHaskellDepends = [ base time ];
        homepage = "http://afonso.xyz";
        description = "Generate all primes";
        license = stdenv.lib.licenses.mit;
@@ -12103,8 +12195,9 @@ self: {
 
   "NaturalLanguageAlphabets" = callPackage
     ({ mkDerivation, aeson, array, attoparsec, base, bimaps, binary
-     , bytestring, cereal, cereal-text, deepseq, file-embed, hashable
-     , intern, LinguisticsTypes, QuickCheck, stringable, system-filepath
+     , bytestring, cereal, cereal-text, containers, criterion, deepseq
+     , file-embed, hashable, hashtables, intern, LinguisticsTypes
+     , mwc-random, QuickCheck, random, stringable, system-filepath
      , test-framework, test-framework-quickcheck2, test-framework-th
      , text, text-binary, unordered-containers, vector, vector-th-unbox
      }:
@@ -12123,6 +12216,10 @@ self: {
          test-framework test-framework-quickcheck2 test-framework-th text
          unordered-containers
        ];
+       benchmarkHaskellDepends = [
+         base containers criterion deepseq hashtables LinguisticsTypes
+         mwc-random random unordered-containers vector
+       ];
        homepage = "https://github.com/choener/NaturalLanguageAlphabets";
        description = "Simple scoring schemes for word alignments";
        license = stdenv.lib.licenses.bsd3;
@@ -12135,6 +12232,8 @@ self: {
        pname = "NaturalSort";
        version = "0.2.1";
        sha256 = "49fd310566c86d85714a1839f1bc845891771dbc023a0befee16f073bbac50f6";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [ base bytestring strict ];
        homepage = "http://github.com/joachifm/natsort";
        description = "Natural sorting for strings";
@@ -12800,6 +12899,8 @@ self: {
        pname = "OpenAL";
        version = "1.7.0.4";
        sha256 = "3989f6c4fe437843551004dd011c4308bf63d787ae4fbb8ce71d44b1b0b1f118";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [
          base ObjectName OpenGL StateVar transformers
        ];
@@ -13021,19 +13122,20 @@ self: {
      }) {};
 
   "OrderedBits" = callPackage
-    ({ mkDerivation, base, bits, primitive, QuickCheck, tasty
-     , tasty-quickcheck, tasty-th, vector, vector-algorithms
+    ({ mkDerivation, base, bits, criterion, primitive, QuickCheck
+     , tasty, tasty-quickcheck, tasty-th, vector, vector-algorithms
      }:
      mkDerivation {
        pname = "OrderedBits";
-       version = "0.0.1.1";
-       sha256 = "084e073c7b310b36fdfb0ad6c5793ef1478890b8a136160ab555e65b54e81284";
+       version = "0.0.1.2";
+       sha256 = "14855fdeda5822ea54c588085f98984062d5a7febc8cbb6e8b8f62de28375df5";
        libraryHaskellDepends = [
          base bits primitive vector vector-algorithms
        ];
        testHaskellDepends = [
          base QuickCheck tasty tasty-quickcheck tasty-th vector
        ];
+       benchmarkHaskellDepends = [ base criterion vector ];
        homepage = "https://github.com/choener/OrderedBits";
        description = "Efficient ordered (by popcount) enumeration of bits";
        license = stdenv.lib.licenses.bsd3;
@@ -13116,6 +13218,8 @@ self: {
        pname = "PDBtools";
        version = "0.0.3";
        sha256 = "d80810bd44765b86c0ebf247f32ddded301eddb587fe12a0bdc378ee6b8fb0c4";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [ base bytestring containers ];
        homepage = "http://www.github.com/rotskoff";
        description = "A library for analysis of 3-D protein coordinates";
@@ -13534,6 +13638,8 @@ self: {
        pname = "Plot-ho-matic";
        version = "0.11.0.0";
        sha256 = "bb9d6d7e5c39e48ebf380653f4f9c65391bb746ea68d44650707d02b3f6521a9";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [
          base bytestring cairo cereal Chart Chart-cairo containers
          data-default-class generic-accessors glib gtk3 lens text time
@@ -14041,6 +14147,8 @@ self: {
        pname = "QuickPlot";
        version = "0.1.0.1";
        sha256 = "02864cb2f1abcea25b5956421cfdd596c3b4d3ceafcd54d3aad26f443ba53fb5";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [
          aeson attoparsec base bytestring haskell-src-meta parsec scientific
          snap snap-core template-haskell text vector websockets
@@ -14356,17 +14464,17 @@ self: {
 
   "Raincat" = callPackage
     ({ mkDerivation, base, containers, extensible-exceptions, GLUT, mtl
-     , OpenGL, random, SDL, SDL-image, SDL-mixer, time
+     , OpenGL, random, sdl2, sdl2-image, sdl2-mixer, time
      }:
      mkDerivation {
        pname = "Raincat";
-       version = "1.1.1.3";
-       sha256 = "28abdf5df4d4654aee515f0629bab153163af5fd603cbfc9ae291d03918154a9";
+       version = "1.2";
+       sha256 = "93ce80efedffc63e49bcd3e5745521fa810e438cd2f601de54bca9d9e59eddff";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
-         base containers extensible-exceptions GLUT mtl OpenGL random SDL
-         SDL-image SDL-mixer time
+         base containers extensible-exceptions GLUT mtl OpenGL random sdl2
+         sdl2-image sdl2-mixer time
        ];
        homepage = "http://raincat.bysusanlin.com/";
        description = "A puzzle game written in Haskell with a cat in lead role";
@@ -14374,8 +14482,9 @@ self: {
      }) {};
 
   "Random123" = callPackage
-    ({ mkDerivation, array, base, data-dword, HUnit, QuickCheck, random
-     , test-framework, test-framework-hunit, test-framework-quickcheck2
+    ({ mkDerivation, array, base, criterion, data-dword, HUnit
+     , QuickCheck, random, test-framework, test-framework-hunit
+     , test-framework-quickcheck2
      }:
      mkDerivation {
        pname = "Random123";
@@ -14386,6 +14495,7 @@ self: {
          base HUnit QuickCheck random test-framework test-framework-hunit
          test-framework-quickcheck2
        ];
+       benchmarkHaskellDepends = [ base criterion random ];
        homepage = "http://github.com/Manticore/haskell-random123";
        description = "Haskell port of Random123 library";
        license = stdenv.lib.licenses.mit;
@@ -14952,6 +15062,8 @@ self: {
        pname = "SHA";
        version = "1.6.4.2";
        sha256 = "c470176f63cbe49fd0502a1b32ef22bc01b1af42385583b8be94547750958a8c";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [ array base binary bytestring ];
        testHaskellDepends = [
          array base binary bytestring QuickCheck test-framework
@@ -15264,6 +15376,8 @@ self: {
        pname = "SegmentTree";
        version = "0.3";
        sha256 = "6188c1b1276d7fa0391098a563df73dd522d20b57dc5321fe3418a9e3ca84fc1";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [ base ];
        description = "Data structure for querying the set (or count) of intervals covering given point";
        license = stdenv.lib.licenses.bsd3;
@@ -15558,6 +15672,18 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "SimpleTableGenerator" = callPackage
+    ({ mkDerivation, base, Cabal, split }:
+     mkDerivation {
+       pname = "SimpleTableGenerator";
+       version = "0.2.0.0";
+       sha256 = "1b58efcfa9689b1d1c82c5e3016b15d3eaa6d104303feabb31064dff16fe71ad";
+       libraryHaskellDepends = [ base split ];
+       testHaskellDepends = [ base Cabal ];
+       description = "Simple table generator";
+       license = stdenv.lib.licenses.gpl3;
+     }) {};
+
   "SizeCompare" = callPackage
     ({ mkDerivation, base, containers }:
      mkDerivation {
@@ -16219,8 +16345,9 @@ self: {
 
   "SuffixStructures" = callPackage
     ({ mkDerivation, aeson, base, binary, bytestring, cereal, cmdargs
-     , containers, data-default-class, ListLike, primitive, vector
-     , vector-algorithms, vector-binary-instances
+     , containers, criterion, data-default-class, deepseq, ListLike
+     , mwc-random, primitive, vector, vector-algorithms
+     , vector-binary-instances
      }:
      mkDerivation {
        pname = "SuffixStructures";
@@ -16235,6 +16362,9 @@ self: {
        executableHaskellDepends = [
          aeson base binary bytestring cereal cmdargs containers vector
        ];
+       benchmarkHaskellDepends = [
+         base bytestring cmdargs criterion deepseq mwc-random vector
+       ];
        homepage = "http://www.bioinf.uni-leipzig.de/~choener/";
        description = "Suffix array construction";
        license = stdenv.lib.licenses.bsd3;
@@ -16481,6 +16611,8 @@ self: {
        pname = "Takusen";
        version = "0.8.7";
        sha256 = "9e9fe740a9030e27ee84343a7e308853b0e5d50371a841d9a3979a9f8d99ac57";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [ base mtl old-time time ];
        description = "Database library with left-fold interface, for PostgreSQL, Oracle, SQLite, ODBC";
        license = stdenv.lib.licenses.bsd3;
@@ -17769,6 +17901,8 @@ self: {
        pname = "Win32-notify";
        version = "0.3.0.1";
        sha256 = "c49159d8154f9ff7d30207901125ceadc2aa94baa3b2996ff0884e9f0158eb7f";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [ base containers directory Win32 ];
        description = "A binding to part of the Win32 library for file notification";
        license = stdenv.lib.licenses.bsd3;
@@ -17781,6 +17915,8 @@ self: {
        pname = "Win32-security";
        version = "0.1.1";
        sha256 = "9eca6c3efea64d83ee3aaf2ec0706695087e98e47c77163ac497f70ad4f90436";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [ base text Win32 Win32-errors ];
        homepage = "https://github.com/anton-dessiatov/Win32-security";
        description = "Haskell bindings to a security-related functions of the Windows API";
@@ -18261,7 +18397,7 @@ self: {
        pname = "Yablog";
        version = "0.2.0";
        sha256 = "737b4a1ab300cc2d5b8689640b51092b5a54d8ad4cb4bb451699b2367caa4761";
-       isLibrary = false;
+       isLibrary = true;
        isExecutable = true;
        executableHaskellDepends = [
          base blaze-builder blaze-html bytestring case-insensitive
@@ -18327,6 +18463,8 @@ self: {
        pname = "Yampa-core";
        version = "0.2.0";
        sha256 = "b78b1367c404e50021a7f17748d894e0c74a8b22dc8e48c7fbceea8fa4adaf1a";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [ base deepseq random vector-space ];
        homepage = "https://github.com/ony/Yampa-core";
        description = "Library for programming hybrid systems";
@@ -18560,6 +18698,8 @@ self: {
        pname = "abcBridge";
        version = "0.15";
        sha256 = "45fef882d6e9c3f7ad48621fc835417df5c161c6743ebc4e4d3cabe9445b113c";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [
          aig base base-compat containers directory vector
        ];
@@ -18827,6 +18967,8 @@ self: {
        pname = "accelerate-cufft";
        version = "0.0.0.1";
        sha256 = "d78fd117e67ad141910f1a95ec5c82beb351bfe9a144c8cdb36fe94950055c8d";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [
          accelerate accelerate-cuda accelerate-fourier accelerate-utility
          base cuda cufft
@@ -18909,9 +19051,9 @@ self: {
      }) {};
 
   "accelerate-fourier" = callPackage
-    ({ mkDerivation, accelerate, accelerate-arithmetic
-     , accelerate-utility, base, containers, QuickCheck, transformers
-     , utility-ht
+    ({ mkDerivation, accelerate, accelerate-arithmetic, accelerate-cuda
+     , accelerate-utility, base, containers, criterion, QuickCheck
+     , transformers, utility-ht
      }:
      mkDerivation {
        pname = "accelerate-fourier";
@@ -18925,6 +19067,10 @@ self: {
          accelerate accelerate-arithmetic accelerate-utility base QuickCheck
          utility-ht
        ];
+       benchmarkHaskellDepends = [
+         accelerate accelerate-arithmetic accelerate-cuda accelerate-utility
+         base criterion utility-ht
+       ];
        homepage = "http://hub.darcs.net/thielema/accelerate-fourier/";
        description = "Fast Fourier transform and convolution using the Accelerate framework";
        license = stdenv.lib.licenses.bsd3;
@@ -19074,8 +19220,9 @@ self: {
 
   "acid-state" = callPackage
     ({ mkDerivation, array, base, bytestring, cereal, containers
-     , directory, extensible-exceptions, filepath, mtl, network
-     , safecopy, stm, template-haskell, unix
+     , criterion, directory, extensible-exceptions, filepath, mtl
+     , network, random, safecopy, stm, system-fileio, system-filepath
+     , template-haskell, unix
      }:
      mkDerivation {
        pname = "acid-state";
@@ -19086,6 +19233,9 @@ self: {
          extensible-exceptions filepath mtl network safecopy stm
          template-haskell unix
        ];
+       benchmarkHaskellDepends = [
+         base criterion directory mtl random system-fileio system-filepath
+       ];
        homepage = "http://acid-state.seize.it/";
        description = "Add ACID guarantees to any serializable Haskell data structure";
        license = stdenv.lib.licenses.publicDomain;
@@ -19093,8 +19243,9 @@ self: {
 
   "acid-state-dist" = callPackage
     ({ mkDerivation, acid-state, base, bytestring, cereal
-     , concurrent-extra, containers, directory, filepath, mtl, random
-     , safe, safecopy, semigroups, stm, transformers, zeromq4-haskell
+     , concurrent-extra, containers, criterion, directory, filepath, mtl
+     , random, safe, safecopy, semigroups, stm, transformers
+     , zeromq4-haskell
      }:
      mkDerivation {
        pname = "acid-state-dist";
@@ -19108,6 +19259,9 @@ self: {
        testHaskellDepends = [
          acid-state base directory mtl random safecopy
        ];
+       benchmarkHaskellDepends = [
+         acid-state base criterion directory mtl safecopy
+       ];
        description = "A replication backend for acid-state";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -19348,6 +19502,18 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "acme-kitchen-sink" = callPackage
+    ({ mkDerivation, base }:
+     mkDerivation {
+       pname = "acme-kitchen-sink";
+       version = "0.1.0.0";
+       sha256 = "252007a08308670edeef46742da25169025f44b52da8c1ce55fe0fd37c3ea82c";
+       libraryHaskellDepends = [ base ];
+       homepage = "https://github.com/marcosdumay/acme-kitchen-sink";
+       description = "A place for dumping that does-not-feel-right code while you improve it";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "acme-left-pad" = callPackage
     ({ mkDerivation, base, text }:
      mkDerivation {
@@ -19618,13 +19784,14 @@ self: {
      }) {};
 
   "acme-year" = callPackage
-    ({ mkDerivation, base, time }:
+    ({ mkDerivation, base, criterion, time }:
      mkDerivation {
        pname = "acme-year";
        version = "2016";
        sha256 = "b43d1f33434930d8f6f2971eef34bd12c305f3976d7115688b87b00c85f170ff";
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base time ];
+       benchmarkHaskellDepends = [ base criterion ];
        homepage = "http://github.com/joeyadams/hs-acme-year";
        description = "Get the current year";
        license = stdenv.lib.licenses.publicDomain;
@@ -19738,9 +19905,9 @@ self: {
      }) {};
 
   "ad" = callPackage
-    ({ mkDerivation, array, base, comonad, containers, data-reify
-     , directory, doctest, erf, filepath, free, nats, reflection
-     , transformers
+    ({ mkDerivation, array, base, comonad, containers, criterion
+     , data-reify, directory, doctest, erf, filepath, free, nats
+     , reflection, transformers
      }:
      mkDerivation {
        pname = "ad";
@@ -19751,6 +19918,7 @@ self: {
          transformers
        ];
        testHaskellDepends = [ base directory doctest filepath ];
+       benchmarkHaskellDepends = [ base criterion erf ];
        homepage = "http://github.com/ekmett/ad";
        description = "Automatic Differentiation";
        license = stdenv.lib.licenses.bsd3;
@@ -19937,6 +20105,8 @@ self: {
        pname = "adp-multi";
        version = "0.2.3";
        sha256 = "4728f3d87728adead1d6ebb33e032dd05673cc43573dc00d52a9522154f7b5d2";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [ array base containers htrace ];
        testHaskellDepends = [
          array base containers htrace HUnit mtl QuickCheck random-shuffle
@@ -19956,6 +20126,8 @@ self: {
        pname = "adp-multi-monadiccp";
        version = "0.2.1";
        sha256 = "dae838558f728af3cf1e58aaccfcc66fe66a0d3d33332eb365d710e71facf48f";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [ adp-multi base containers monadiccp ];
        testHaskellDepends = [
          adp-multi base containers monadiccp mtl QuickCheck test-framework
@@ -20240,6 +20412,21 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "aeson-flat" = callPackage
+    ({ mkDerivation, aeson, base, text, unordered-containers, vector }:
+     mkDerivation {
+       pname = "aeson-flat";
+       version = "0.1.0.0";
+       sha256 = "1db507abdb802732ffa3444cb227411ad68b430692578fc79e7c19b7165a6214";
+       libraryHaskellDepends = [
+         aeson base text unordered-containers vector
+       ];
+       testHaskellDepends = [ base ];
+       homepage = "https://github.com/seanhess/aeson-flat#readme";
+       description = "Tools for creating flat JSON serializations";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "aeson-flatten" = callPackage
     ({ mkDerivation, aeson, base, bytestring, hspec, text
      , unordered-containers
@@ -20451,8 +20638,9 @@ self: {
      }) {};
 
   "aeson-quick" = callPackage
-    ({ mkDerivation, aeson, attoparsec, base, bytestring, deepseq
-     , microlens, tasty, tasty-hunit, text, unordered-containers, vector
+    ({ mkDerivation, aeson, attoparsec, base, bytestring, criterion
+     , deepseq, microlens, tasty, tasty-hunit, text
+     , unordered-containers, vector
      }:
      mkDerivation {
        pname = "aeson-quick";
@@ -20464,6 +20652,7 @@ self: {
        testHaskellDepends = [
          aeson attoparsec base bytestring microlens tasty tasty-hunit text
        ];
+       benchmarkHaskellDepends = [ aeson base bytestring criterion text ];
        homepage = "https://github.com/libscott/aeson-quick";
        description = "Quick JSON extractions with Aeson";
        license = stdenv.lib.licenses.bsd3;
@@ -20628,16 +20817,17 @@ self: {
      }) {};
 
   "affection" = callPackage
-    ({ mkDerivation, babl, base, clock, containers, gegl, glib, linear
+    ({ mkDerivation, babl, base, clock, containers, gegl, glib
      , monad-loops, mtl, sdl2, text
      }:
      mkDerivation {
        pname = "affection";
-       version = "0.0.0.2";
-       sha256 = "e8e0ba4af134cabf1af0b63e1d010e9d868f881074baf8096551dfdf5c68bf29";
+       version = "0.0.0.4";
+       sha256 = "31d82e66df577e34b0b96a70111d61918db70db93b3b0a66ce4e27c661688a58";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [
-         babl base clock containers gegl glib linear monad-loops mtl sdl2
-         text
+         babl base clock containers gegl glib monad-loops mtl sdl2 text
        ];
        homepage = "https://github.com/nek0/affection#readme";
        description = "A simple Game Engine using SDL";
@@ -20785,6 +20975,8 @@ self: {
        pname = "agentx";
        version = "0.2.0.0";
        sha256 = "e61dc3994aaf70cf8823064d56e839ee1af18ae6be30e294214f759064ccb65e";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [
          base binary bitwise bytestring containers data-default Diff
          fclabels mtl network pipes pipes-concurrency pipes-network safe
@@ -21372,6 +21564,8 @@ self: {
        pname = "algebraic-prelude";
        version = "0.1.0.1";
        sha256 = "8bb052b29571d4c07c03d14eb17f9d302f18e619bbe743509b9ec6e4fde2192d";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [
          algebra base basic-prelude lens semigroups
        ];
@@ -21381,9 +21575,9 @@ self: {
      }) {};
 
   "algo-s" = callPackage
-    ({ mkDerivation, base, bytestring, errors, foldl, hspec, mwc-random
-     , optparse-applicative, primitive, QuickCheck, smallcheck
-     , unordered-containers
+    ({ mkDerivation, base, bytestring, criterion, errors, foldl, hspec
+     , mwc-random, optparse-applicative, primitive, QuickCheck
+     , smallcheck, unordered-containers
      }:
      mkDerivation {
        pname = "algo-s";
@@ -21400,6 +21594,7 @@ self: {
        testHaskellDepends = [
          base errors foldl hspec mwc-random QuickCheck smallcheck
        ];
+       benchmarkHaskellDepends = [ base criterion ];
        description = "An implementation of Knuth's algorithm S";
        license = stdenv.lib.licenses.asl20;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -21667,6 +21862,8 @@ self: {
        pname = "alsa-pcm";
        version = "0.6.0.4";
        sha256 = "9aae1379903b8445073f8a2b6ccf86b904b4045247747516530a165a3f76ca2a";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [
          alsa-core array base extensible-exceptions sample-frame
          storable-record
@@ -21700,6 +21897,8 @@ self: {
        pname = "alsa-seq";
        version = "0.6.0.7";
        sha256 = "06cda1e24993aaf0c3592b51a613cf1e187eea603dd77ad3a129a8a7b1e0b778";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [
          alsa-core array base bytestring data-accessor enumset
          extensible-exceptions poll transformers utility-ht
@@ -23197,7 +23396,7 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "amazonka-s3-streaming_0_2_0_0" = callPackage
+  "amazonka-s3-streaming_0_2_0_1" = callPackage
     ({ mkDerivation, amazonka, amazonka-core, amazonka-s3, base
      , bytestring, conduit, conduit-extra, deepseq, dlist, exceptions
      , http-client, lens, lifted-async, mmap, mmorph, mtl, resourcet
@@ -23205,8 +23404,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-s3-streaming";
-       version = "0.2.0.0";
-       sha256 = "d4a583eead4b7d050c9a6e762d77050cf07c5da541a04e25424850fa0e66dbd7";
+       version = "0.2.0.1";
+       sha256 = "714c62e6b903dfc968f72c3966ffbce14dd1f885f4c95a34a7bd1a49e84c6966";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -23578,6 +23777,7 @@ self: {
          safe scientific statistics text vector vector-algorithms
        ];
        testHaskellDepends = [ base doctest tasty tasty-hunit vector ];
+       benchmarkHaskellDepends = [ base statistics ];
        homepage = "https://github.com/jsermeno/amby#readme";
        description = "Statistical data visualization";
        license = stdenv.lib.licenses.bsd3;
@@ -23894,9 +24094,9 @@ self: {
      }) {};
 
   "angle" = callPackage
-    ({ mkDerivation, base, containers, directory, filepath, haskeline
-     , mtl, process, QuickCheck, split, tasty, tasty-quickcheck
-     , transformers, transformers-compat
+    ({ mkDerivation, base, containers, criterion, directory, filepath
+     , haskeline, mtl, process, QuickCheck, split, tasty
+     , tasty-quickcheck, transformers, transformers-compat
      }:
      mkDerivation {
        pname = "angle";
@@ -23916,6 +24116,7 @@ self: {
          base containers mtl QuickCheck tasty tasty-quickcheck transformers
          transformers-compat
        ];
+       benchmarkHaskellDepends = [ base criterion ];
        description = "A small, general-purpose programming language";
        license = stdenv.lib.licenses.gpl3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -24054,6 +24255,8 @@ self: {
        pname = "ansi-terminal";
        version = "0.6.2.3";
        sha256 = "4dc02cb53e9ca7c8800bbdfc0337b961e5a945382cd09a6a40c6170126e0ee42";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [ base unix ];
        homepage = "https://github.com/feuerbach/ansi-terminal";
        description = "Simple ANSI terminal support, with Windows compatibility";
@@ -24066,6 +24269,8 @@ self: {
        pname = "ansi-wl-pprint";
        version = "0.6.7.3";
        sha256 = "3789ecaa89721eabef58ddc5711f7fd1ff67e262da1659f3b20d38a9e1f5b708";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [ ansi-terminal base ];
        homepage = "http://github.com/ekmett/ansi-wl-pprint";
        description = "The Wadler/Leijen Pretty Printer for colored ANSI terminal output";
@@ -24262,6 +24467,8 @@ self: {
        pname = "anydbm";
        version = "1.0.7";
        sha256 = "d33410fc5fad79bd5a5bcc24248f6e5a7a3133ede5111c31a8c58068b219b3e7";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [ base containers MissingH mtl ];
        homepage = "http://software.complete.org/anydbm";
        description = "Interface for DBM-like database systems";
@@ -24303,9 +24510,9 @@ self: {
      }) {};
 
   "apache-md5" = callPackage
-    ({ mkDerivation, base, bytestring, HUnit, MonadRandom, openssl
-     , process, random, test-framework, test-framework-hunit
-     , transformers
+    ({ mkDerivation, base, bytestring, criterion, deepseq, HUnit
+     , MonadRandom, openssl, process, random, test-framework
+     , test-framework-hunit, transformers
      }:
      mkDerivation {
        pname = "apache-md5";
@@ -24320,6 +24527,10 @@ self: {
          test-framework-hunit transformers
        ];
        testSystemDepends = [ openssl ];
+       benchmarkHaskellDepends = [
+         base bytestring criterion deepseq MonadRandom
+       ];
+       benchmarkSystemDepends = [ openssl ];
        homepage = "https://github.com/trskop/apache-md5";
        description = "Apache specific MD5 digest algorighm";
        license = stdenv.lib.licenses.bsd3;
@@ -24799,12 +25010,15 @@ self: {
      }) {};
 
   "app-lens" = callPackage
-    ({ mkDerivation, base, containers, lens, mtl }:
+    ({ mkDerivation, base, containers, criterion, deepseq, lens, mtl }:
      mkDerivation {
        pname = "app-lens";
        version = "0.1.0.3";
        sha256 = "ecb966a61eee1465d2e89d98ee2dfbdd52c7bc37707e817809ff520c91f9d744";
        libraryHaskellDepends = [ base containers lens mtl ];
+       benchmarkHaskellDepends = [
+         base containers criterion deepseq lens mtl
+       ];
        homepage = "https://bitbucket.org/kztk/app-lens";
        description = "applicative (functional) bidirectional programming beyond composition chains";
        license = stdenv.lib.licenses.bsd3;
@@ -25261,9 +25475,9 @@ self: {
      }) {};
 
   "arena" = callPackage
-    ({ mkDerivation, base, bytes, bytestring, containers, digest
-     , directory, filepath, mtl, persistent-vector, safe, semigroups
-     , unix
+    ({ mkDerivation, base, bytes, bytestring, containers, criterion
+     , digest, directory, filepath, mtl, persistent-vector, safe
+     , semigroups, unix
      }:
      mkDerivation {
        pname = "arena";
@@ -25278,6 +25492,9 @@ self: {
        testHaskellDepends = [
          base bytes containers directory mtl semigroups
        ];
+       benchmarkHaskellDepends = [
+         base criterion directory mtl semigroups
+       ];
        description = "A journaled data store";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -25508,9 +25725,9 @@ self: {
      }) {};
 
   "arithmoi" = callPackage
-    ({ mkDerivation, array, base, containers, ghc-prim, integer-gmp
-     , mtl, QuickCheck, random, smallcheck, tasty, tasty-hunit
-     , tasty-quickcheck, tasty-smallcheck, transformers
+    ({ mkDerivation, array, base, containers, criterion, ghc-prim
+     , integer-gmp, mtl, QuickCheck, random, smallcheck, tasty
+     , tasty-hunit, tasty-quickcheck, tasty-smallcheck, transformers
      , transformers-compat
      }:
      mkDerivation {
@@ -25525,6 +25742,7 @@ self: {
          base containers QuickCheck smallcheck tasty tasty-hunit
          tasty-quickcheck tasty-smallcheck transformers transformers-compat
        ];
+       benchmarkHaskellDepends = [ base containers criterion random ];
        homepage = "https://github.com/cartazio/arithmoi";
        description = "Efficient basic number-theoretic functions. Primes, powers, integer logarithms.";
        license = stdenv.lib.licenses.mit;
@@ -25635,7 +25853,7 @@ self: {
      }) {};
 
   "array-primops" = callPackage
-    ({ mkDerivation, base, ghc-prim, QuickCheck, tasty
+    ({ mkDerivation, base, criterion, ghc-prim, QuickCheck, tasty
      , tasty-quickcheck
      }:
      mkDerivation {
@@ -25646,6 +25864,7 @@ self: {
        testHaskellDepends = [
          base ghc-prim QuickCheck tasty tasty-quickcheck
        ];
+       benchmarkHaskellDepends = [ base criterion ghc-prim ];
        description = "Extra foreign primops for primitive arrays";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -25846,6 +26065,8 @@ self: {
        pname = "ascii-progress";
        version = "0.3.3.0";
        sha256 = "7e3fa6b80c09a83c9ba8a0644ef304ca92d65b76383b8dd023ff9f89ebec913e";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [
          async base concurrent-output data-default time
        ];
@@ -25976,6 +26197,8 @@ self: {
        sha256 = "83999c03cbc993f7e0dea010942a4dc39ae986c498c57eadc1e5ee1b4e23aca1";
        revision = "1";
        editedCabalFile = "1543bc1ee13d3f4b9ee6f9445edede596d5fe7f8a4551333b54634aad5b112a3";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [ base bytestring cereal mtl text ];
        homepage = "https://github.com/vincenthz/hs-asn1/tree/master/data";
        description = "ASN1 data reader and writer in RAW, BER and DER forms";
@@ -26243,8 +26466,8 @@ self: {
      }:
      mkDerivation {
        pname = "async-extras";
-       version = "0.1.3.1";
-       sha256 = "c134da7e8955354670916cde8c5199b2bf08e455605d19a355a781d925b4d28e";
+       version = "0.1.3.2";
+       sha256 = "ac26da945147b74c5f1a29c7765e08d081d15dea5e609e5dc086a7b09efa32c7";
        libraryHaskellDepends = [
          async base lifted-async lifted-base monad-control SafeSemaphore stm
          transformers-base
@@ -26256,12 +26479,12 @@ self: {
      }) {};
 
   "async-io-either" = callPackage
-    ({ mkDerivation, async, base, transformers }:
+    ({ mkDerivation, async, base, retry, transformers }:
      mkDerivation {
        pname = "async-io-either";
-       version = "0.1.0.2";
-       sha256 = "71d7ed0974ac8aaaeba0a53268f13ad7277a24b224762b33837d0aab93d76601";
-       libraryHaskellDepends = [ async base transformers ];
+       version = "0.1.0.4";
+       sha256 = "f0326b543a51cf06e3bd8375d2ce18d6a60f7dd413bac1e740dc90083cbc7a6a";
+       libraryHaskellDepends = [ async base retry transformers ];
        homepage = "https://github.com/mankyKitty/async-io-either#readme";
        description = "Could be useful";
        license = stdenv.lib.licenses.bsd3;
@@ -26733,9 +26956,11 @@ self: {
      }) {};
 
   "attoparsec" = callPackage
-    ({ mkDerivation, array, base, bytestring, containers, deepseq
-     , QuickCheck, quickcheck-unicode, scientific, tasty
-     , tasty-quickcheck, text, transformers, vector
+    ({ mkDerivation, array, base, bytestring, case-insensitive
+     , containers, criterion, deepseq, directory, filepath, ghc-prim
+     , http-types, parsec, QuickCheck, quickcheck-unicode, scientific
+     , tasty, tasty-quickcheck, text, transformers, unordered-containers
+     , vector
      }:
      mkDerivation {
        pname = "attoparsec";
@@ -26749,6 +26974,11 @@ self: {
          array base bytestring deepseq QuickCheck quickcheck-unicode
          scientific tasty tasty-quickcheck text transformers vector
        ];
+       benchmarkHaskellDepends = [
+         array base bytestring case-insensitive containers criterion deepseq
+         directory filepath ghc-prim http-types parsec scientific text
+         transformers unordered-containers vector
+       ];
        homepage = "https://github.com/bos/attoparsec";
        description = "Fast combinator parsing for bytestrings and text";
        license = stdenv.lib.licenses.bsd3;
@@ -26967,6 +27197,8 @@ self: {
        pname = "audacity";
        version = "0.0";
        sha256 = "1f578e6cf8bfc5524a9e49ff306a736ab1c5db2a8a4ab4a3e4f47cb34a2fd7ed";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [ base deepseq utility-ht ];
        homepage = "http://code.haskell.org/~thielema/audacity";
        description = "Interchange with the Audacity sound signal editor";
@@ -27369,8 +27601,8 @@ self: {
 
   "avers" = callPackage
     ({ mkDerivation, aeson, attoparsec, base, base16-bytestring
-     , bytestring, clock, containers, cryptohash, cryptonite, filepath
-     , hspec, inflections, memory, MonadRandom, mtl, network
+     , bytestring, clock, containers, criterion, cryptohash, cryptonite
+     , filepath, hspec, inflections, memory, MonadRandom, mtl, network
      , network-uri, resource-pool, rethinkdb-client-driver, safe, scrypt
      , stm, template-haskell, text, time, unordered-containers, vector
      }:
@@ -27378,8 +27610,8 @@ self: {
        pname = "avers";
        version = "0.0.17.1";
        sha256 = "1b45d8aa036b3c2ec7ea180327ff3cdce28dc1e1ef319c062be79f0ffa7626f5";
-       revision = "6";
-       editedCabalFile = "4fdb981cfedcc58b8b64a823d826fafd32c7b0fce7e01bd816db1474994d6018";
+       revision = "7";
+       editedCabalFile = "fb4e416f91c130daa956139b2d2cac7c92735879c699802e7f2acb0115eb671f";
        libraryHaskellDepends = [
          aeson attoparsec base bytestring clock containers cryptonite
          filepath inflections memory MonadRandom mtl network network-uri
@@ -27392,6 +27624,10 @@ self: {
          rethinkdb-client-driver scrypt stm text time unordered-containers
          vector
        ];
+       benchmarkHaskellDepends = [
+         aeson base criterion mtl network-uri resource-pool
+         rethinkdb-client-driver text
+       ];
        description = "empty";
        license = stdenv.lib.licenses.gpl3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -27605,6 +27841,8 @@ self: {
        pname = "aws";
        version = "0.16";
        sha256 = "84b5c60227f3c9eddc0abf0881aee22443fc4a211b8a95f18be628eaa492209c";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [
          aeson attoparsec base base16-bytestring base64-bytestring
          blaze-builder byteable bytestring case-insensitive cereal conduit
@@ -27742,6 +27980,8 @@ self: {
        pname = "aws-elastic-transcoder";
        version = "0.2.0.2";
        sha256 = "896b7cdb17313b8a5e848de797ab61a3d1ab3779b6bf2d571cda50e5317ebe09";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [
          aeson aws aws-sign4 base bytestring conduit containers http-conduit
          http-types QuickCheck regex-compat safe text time transformers
@@ -28104,12 +28344,17 @@ self: {
      }) {control-invariants = null;};
 
   "azubi" = callPackage
-    ({ mkDerivation, base, filepath, options }:
+    ({ mkDerivation, base, Diff, directory, filepath, hspec, options
+     , process, unix
+     }:
      mkDerivation {
        pname = "azubi";
-       version = "0.1.0.1";
-       sha256 = "b75133db17e6dfe66593dca1e2809e096a8473463950826c31c8ac9a1497468e";
-       libraryHaskellDepends = [ base filepath options ];
+       version = "0.2.0.0";
+       sha256 = "c3ac3b5ff5960c7ba0349bae282be1b0e4f361268b85aa80d57f399bac5a455c";
+       libraryHaskellDepends = [
+         base Diff directory filepath options process unix
+       ];
+       testHaskellDepends = [ base filepath hspec ];
        homepage = "http://palovandalo.com/azubi";
        description = "A simple DevOps tool which will never \"reach\" enterprice level";
        license = stdenv.lib.licenses.gpl3;
@@ -28204,9 +28449,9 @@ self: {
      }) {};
 
   "b-tree" = callPackage
-    ({ mkDerivation, base, binary, bytestring, containers, directory
-     , errors, filepath, lens, mmap, mtl, pipes, pipes-interleave
-     , QuickCheck, transformers, vector
+    ({ mkDerivation, base, binary, bytestring, containers, criterion
+     , directory, errors, filepath, lens, mmap, mtl, pipes
+     , pipes-interleave, QuickCheck, transformers, vector
      }:
      mkDerivation {
        pname = "b-tree";
@@ -28217,6 +28462,7 @@ self: {
          mmap mtl pipes pipes-interleave transformers vector
        ];
        testHaskellDepends = [ base binary containers pipes QuickCheck ];
+       benchmarkHaskellDepends = [ base criterion pipes ];
        homepage = "http://github.com/bgamari/b-tree";
        description = "Immutable disk-based B* trees";
        license = stdenv.lib.licenses.bsd3;
@@ -28677,6 +28923,8 @@ self: {
        pname = "barrier";
        version = "0.1.1";
        sha256 = "6395da01eea1984c7bcc85c624b1b5dfbe0b6b764adeed7b04c9fa4d8de91ed9";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [
          base blaze-svg bytestring template-haskell text
          unordered-containers
@@ -28815,8 +29063,8 @@ self: {
      }) {};
 
   "base32-bytestring" = callPackage
-    ({ mkDerivation, base, bits-extras, bytestring, cpu, hspec
-     , QuickCheck
+    ({ mkDerivation, base, bits-extras, bytestring, cpu, criterion
+     , hspec, QuickCheck
      }:
      mkDerivation {
        pname = "base32-bytestring";
@@ -28824,6 +29072,7 @@ self: {
        sha256 = "74bee674a45705347954f4e7e6eda01c123751fa51ac846b7ff97e39b81b187c";
        libraryHaskellDepends = [ base bits-extras bytestring cpu ];
        testHaskellDepends = [ base bytestring hspec QuickCheck ];
+       benchmarkHaskellDepends = [ base bytestring criterion ];
        homepage = "https://github.com/pxqr/base32-bytestring";
        description = "Fast base32 and base32hex codec for ByteStrings";
        license = stdenv.lib.licenses.bsd3;
@@ -28843,7 +29092,7 @@ self: {
      }) {};
 
   "base58-bytestring" = callPackage
-    ({ mkDerivation, base, bytestring, quickcheck-assertions
+    ({ mkDerivation, base, bytestring, criterion, quickcheck-assertions
      , quickcheck-instances, tasty, tasty-quickcheck
      }:
      mkDerivation {
@@ -28855,6 +29104,7 @@ self: {
          base bytestring quickcheck-assertions quickcheck-instances tasty
          tasty-quickcheck
        ];
+       benchmarkHaskellDepends = [ base bytestring criterion ];
        homepage = "https://bitbucket.org/s9gf4ult/base58-bytestring";
        description = "Implementation of BASE58 transcoding for ByteStrings";
        license = stdenv.lib.licenses.publicDomain;
@@ -29284,9 +29534,9 @@ self: {
      }) {};
 
   "beamable" = callPackage
-    ({ mkDerivation, base, blaze-builder, bytestring, ghc-prim
-     , integer-gmp, murmur-hash, QuickCheck, test-framework
-     , test-framework-quickcheck2
+    ({ mkDerivation, base, blaze-builder, bytestring, criterion
+     , deepseq, ghc-prim, integer-gmp, murmur-hash, QuickCheck
+     , test-framework, test-framework-quickcheck2
      }:
      mkDerivation {
        pname = "beamable";
@@ -29299,6 +29549,10 @@ self: {
          base blaze-builder bytestring ghc-prim integer-gmp murmur-hash
          QuickCheck test-framework test-framework-quickcheck2
        ];
+       benchmarkHaskellDepends = [
+         base blaze-builder bytestring criterion deepseq ghc-prim
+         integer-gmp murmur-hash
+       ];
        description = "Generic serializer/deserializer with compact representation";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -29433,8 +29687,9 @@ self: {
      }) {};
 
   "bencoding" = callPackage
-    ({ mkDerivation, attoparsec, base, bytestring, containers, deepseq
-     , ghc-prim, hspec, mtl, pretty, QuickCheck, text
+    ({ mkDerivation, AttoBencode, attoparsec, base, bencode, bytestring
+     , containers, criterion, deepseq, ghc-prim, hspec, mtl, pretty
+     , QuickCheck, text
      }:
      mkDerivation {
        pname = "bencoding";
@@ -29446,6 +29701,10 @@ self: {
        testHaskellDepends = [
          attoparsec base bytestring containers ghc-prim hspec QuickCheck
        ];
+       benchmarkHaskellDepends = [
+         AttoBencode attoparsec base bencode bytestring criterion deepseq
+         ghc-prim
+       ];
        homepage = "https://github.com/cobit/bencoding";
        description = "A library for encoding and decoding of BEncode data";
        license = stdenv.lib.licenses.bsd3;
@@ -29550,6 +29809,8 @@ self: {
        pname = "bet";
        version = "0.1.2.3";
        sha256 = "a818d927e09c0386842658f70682089c16bc241961834af07fdbb0155015c13f";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [
          aeson base bifunctors binary bytestring containers exceptions
          HsOpenSSL http-client http-client-openssl lens mtl semigroupoids
@@ -29613,6 +29874,8 @@ self: {
        pname = "bff";
        version = "0.3.1.2";
        sha256 = "5d44be6c1890b08ed18b8ebac8cf2565747f2c20f143edb7c0d0c311e73dbec4";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [
          base bimap category-extras containers derive haskell98 mtl
          template-haskell unix
@@ -29694,6 +29957,8 @@ self: {
        pname = "bibtex";
        version = "0.1.0.6";
        sha256 = "090a3b9589388bdf9d2bf60d8d1898aa0313a2874b551ba86cbbd049f3ee5f04";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [ base latex parsec utility-ht ];
        homepage = "http://www.haskell.org/haskellwiki/BibTeX";
        description = "Parse, format and processing BibTeX files";
@@ -29934,8 +30199,8 @@ self: {
 
   "bimaps" = callPackage
     ({ mkDerivation, aeson, base, binary, cereal, cereal-vector
-     , containers, deepseq, hashable, primitive, QuickCheck
-     , storable-tuple, tasty, tasty-quickcheck, tasty-th
+     , containers, criterion, deepseq, hashable, mwc-random, primitive
+     , QuickCheck, storable-tuple, tasty, tasty-quickcheck, tasty-th
      , unordered-containers, vector, vector-binary-instances
      , vector-th-unbox
      }:
@@ -29951,15 +30216,19 @@ self: {
        testHaskellDepends = [
          base QuickCheck tasty tasty-quickcheck tasty-th
        ];
+       benchmarkHaskellDepends = [
+         base containers criterion deepseq mwc-random unordered-containers
+         vector
+       ];
        homepage = "https://github.com/choener/bimaps";
        description = "bijections with multiple implementations";
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
   "binary_0_7_6_1" = callPackage
-    ({ mkDerivation, array, base, bytestring, Cabal, containers
-     , directory, filepath, HUnit, QuickCheck, random, test-framework
-     , test-framework-quickcheck2
+    ({ mkDerivation, array, attoparsec, base, bytestring, Cabal, cereal
+     , containers, criterion, deepseq, directory, filepath, HUnit, mtl
+     , QuickCheck, random, test-framework, test-framework-quickcheck2
      }:
      mkDerivation {
        pname = "binary";
@@ -29970,6 +30239,10 @@ self: {
          array base bytestring Cabal containers directory filepath HUnit
          QuickCheck random test-framework test-framework-quickcheck2
        ];
+       benchmarkHaskellDepends = [
+         array attoparsec base bytestring cereal containers criterion
+         deepseq mtl
+       ];
        homepage = "https://github.com/kolmodin/binary";
        description = "Binary serialisation for Haskell values using lazy ByteStrings";
        license = stdenv.lib.licenses.bsd3;
@@ -29977,9 +30250,10 @@ self: {
      }) {};
 
   "binary_0_8_4_1" = callPackage
-    ({ mkDerivation, array, base, bytestring, Cabal, containers
-     , directory, filepath, HUnit, QuickCheck, random, test-framework
-     , test-framework-quickcheck2
+    ({ mkDerivation, array, attoparsec, base, bytestring, Cabal, cereal
+     , containers, criterion, deepseq, directory, filepath, HUnit, mtl
+     , QuickCheck, random, tar, test-framework
+     , test-framework-quickcheck2, unordered-containers, zlib
      }:
      mkDerivation {
        pname = "binary";
@@ -29992,6 +30266,10 @@ self: {
          array base bytestring Cabal containers directory filepath HUnit
          QuickCheck random test-framework test-framework-quickcheck2
        ];
+       benchmarkHaskellDepends = [
+         array attoparsec base bytestring Cabal cereal containers criterion
+         deepseq directory filepath mtl tar unordered-containers zlib
+       ];
        homepage = "https://github.com/kolmodin/binary";
        description = "Binary serialisation for Haskell values using lazy ByteStrings";
        license = stdenv.lib.licenses.bsd3;
@@ -30150,8 +30428,8 @@ self: {
      }) {};
 
   "binary-list" = callPackage
-    ({ mkDerivation, base, binary, bytestring, deepseq, phantom-state
-     , transformers
+    ({ mkDerivation, base, binary, bytestring, criterion, deepseq
+     , phantom-state, transformers
      }:
      mkDerivation {
        pname = "binary-list";
@@ -30160,6 +30438,7 @@ self: {
        libraryHaskellDepends = [
          base binary bytestring deepseq phantom-state transformers
        ];
+       benchmarkHaskellDepends = [ base criterion ];
        description = "Lists of length a power of two";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -30220,14 +30499,17 @@ self: {
 
   "binary-parsers" = callPackage
     ({ mkDerivation, attoparsec, base, binary, bytestring
-     , bytestring-lexing, deepseq, directory, filepath, QuickCheck
-     , quickcheck-instances, quickcheck-unicode, scientific, tasty
-     , tasty-hunit, tasty-quickcheck, text, unordered-containers, vector
+     , bytestring-lexing, case-insensitive, criterion, deepseq
+     , directory, filepath, http-types, QuickCheck, quickcheck-instances
+     , quickcheck-unicode, scanner, scientific, tasty, tasty-hunit
+     , tasty-quickcheck, text, unordered-containers, vector
      }:
      mkDerivation {
        pname = "binary-parsers";
        version = "0.2.3.0";
        sha256 = "bc6195493b950efcbeb9ef54dfe47a6badf894dff934cf02a4b170331c1b217a";
+       revision = "1";
+       editedCabalFile = "25e07c108ea6f11588d74be3c3d7f3010859706961a9c3077546d4903d0a4f25";
        libraryHaskellDepends = [
          base binary bytestring bytestring-lexing scientific
        ];
@@ -30237,6 +30519,11 @@ self: {
          quickcheck-unicode scientific tasty tasty-hunit tasty-quickcheck
          text unordered-containers vector
        ];
+       benchmarkHaskellDepends = [
+         attoparsec base binary bytestring case-insensitive criterion
+         deepseq directory filepath http-types scanner scientific text
+         unordered-containers vector
+       ];
        homepage = "https://github.com/winterland1989/binary-parsers";
        description = "Extends binary with parsec/attoparsec style parsing combinators";
        license = stdenv.lib.licenses.bsd3;
@@ -30261,6 +30548,8 @@ self: {
        pname = "binary-protocol-zmq";
        version = "0.2";
        sha256 = "beaad38fb11794b368e69f3b84d46809440a1afae26110401c79c9c0a6b94a92";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [
          base binary bytestring mtl zeromq-haskell
        ];
@@ -30365,10 +30654,10 @@ self: {
 
   "binary-tagged" = callPackage
     ({ mkDerivation, aeson, array, base, base16-bytestring, bifunctors
-     , binary, binary-orphans, bytestring, containers, generics-sop
-     , hashable, nats, quickcheck-instances, scientific, semigroups, SHA
-     , tagged, tasty, tasty-quickcheck, text, time, unordered-containers
-     , vector
+     , binary, binary-orphans, bytestring, containers, criterion
+     , deepseq, generics-sop, hashable, nats, quickcheck-instances
+     , scientific, semigroups, SHA, tagged, tasty, tasty-quickcheck
+     , text, time, unordered-containers, vector
      }:
      mkDerivation {
        pname = "binary-tagged";
@@ -30387,14 +30676,19 @@ self: {
          quickcheck-instances scientific semigroups SHA tagged tasty
          tasty-quickcheck text time unordered-containers vector
        ];
+       benchmarkHaskellDepends = [
+         aeson array base base16-bytestring binary binary-orphans bytestring
+         containers criterion deepseq generics-sop hashable nats scientific
+         semigroups SHA tagged text time unordered-containers vector
+       ];
        homepage = "https://github.com/phadej/binary-tagged#readme";
        description = "Tagged binary serialisation";
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
   "binary-typed" = callPackage
-    ({ mkDerivation, base, binary, bytestring, murmur-hash, tasty
-     , tasty-hunit, tasty-quickcheck
+    ({ mkDerivation, base, binary, bytestring, criterion, deepseq
+     , murmur-hash, tasty, tasty-hunit, tasty-quickcheck
      }:
      mkDerivation {
        pname = "binary-typed";
@@ -30404,6 +30698,9 @@ self: {
        testHaskellDepends = [
          base binary bytestring tasty tasty-hunit tasty-quickcheck
        ];
+       benchmarkHaskellDepends = [
+         base binary bytestring criterion deepseq
+       ];
        homepage = "https://github.com/quchen/binary-typed";
        description = "Type-safe binary serialization";
        license = stdenv.lib.licenses.bsd2;
@@ -31418,7 +31715,7 @@ self: {
   "bioinformatics-toolkit" = callPackage
     ({ mkDerivation, aeson, aeson-pretty, base, bytestring
      , bytestring-lexing, case-insensitive, clustering, conduit
-     , conduit-combinators, containers, data-default-class
+     , conduit-combinators, containers, criterion, data-default-class
      , double-conversion, hexpat, HsHTSLib, http-conduit, IntervalMap
      , math-functions, matrices, mtl, parallel, primitive, random, split
      , statistics, tasty, tasty-golden, tasty-hunit, text, transformers
@@ -31441,6 +31738,10 @@ self: {
          matrices mtl random tasty tasty-golden tasty-hunit
          unordered-containers vector
        ];
+       benchmarkHaskellDepends = [
+         base bytestring clustering conduit criterion data-default-class mtl
+         random
+       ];
        description = "A collection of bioinformatics tools";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -31678,10 +31979,10 @@ self: {
 
   "bitcoin-payment-channel" = callPackage
     ({ mkDerivation, aeson, base, base16-bytestring, base64-bytestring
-     , bytestring, cereal, deepseq, errors, haskoin-core, hexstring
-     , hspec, monad-time, mtl, QuickCheck, random, rbpcp-api, scientific
-     , semigroups, string-conversions, tagged, test-framework
-     , test-framework-quickcheck2, text, tf-random, time
+     , bytestring, cereal, criterion, deepseq, errors, haskoin-core
+     , hexstring, hspec, monad-time, mtl, QuickCheck, random, rbpcp-api
+     , scientific, semigroups, string-conversions, tagged
+     , test-framework, test-framework-quickcheck2, text, tf-random, time
      }:
      mkDerivation {
        pname = "bitcoin-payment-channel";
@@ -31699,6 +32000,11 @@ self: {
          string-conversions tagged test-framework test-framework-quickcheck2
          text tf-random time
        ];
+       benchmarkHaskellDepends = [
+         aeson base base16-bytestring bytestring cereal criterion deepseq
+         errors haskoin-core hexstring hspec monad-time QuickCheck rbpcp-api
+         scientific semigroups string-conversions tagged text time
+       ];
        homepage = "https://github.com/runeksvendsen/bitcoin-payment-channel";
        description = "Instant, two-party Bitcoin payments";
        license = "unknown";
@@ -31865,45 +32171,60 @@ self: {
        pname = "bits-atomic";
        version = "0.1.3";
        sha256 = "e0ac3456cf0338e1d5ed33f4c3c6b932d652add2ac827c6a1b6636c6e754cb8d";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [ base ];
        description = "Atomic bit operations on memory locations for low-level synchronization";
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
   "bits-bytestring" = callPackage
-    ({ mkDerivation, base, bits, bytestring, hspec, QuickCheck }:
+    ({ mkDerivation, base, bits, bytestring, criterion, hspec
+     , QuickCheck
+     }:
      mkDerivation {
        pname = "bits-bytestring";
        version = "0.1.0.1";
        sha256 = "d9e90f0b05589d9fcb4a807242a3b92e25786c118d168cbb7ccdbaf8076b6152";
        libraryHaskellDepends = [ base bits bytestring ];
        testHaskellDepends = [ base bits bytestring hspec QuickCheck ];
+       benchmarkHaskellDepends = [ base bytestring criterion ];
        homepage = "https://github.com/oldmanmike/bits-bytestring";
        description = "Bits instance for bytestrings";
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
   "bits-bytestring-lazy" = callPackage
-    ({ mkDerivation, base, bits, bytestring, hspec, QuickCheck }:
+    ({ mkDerivation, base, bits, bits-bytestring, bytestring, criterion
+     , hspec, QuickCheck
+     }:
      mkDerivation {
        pname = "bits-bytestring-lazy";
        version = "0.1.0.1";
        sha256 = "f222dd064307db289e6aacbffdbede82c8b459d80cb85d328a82fe8ef125eaf5";
        libraryHaskellDepends = [ base bits bytestring ];
        testHaskellDepends = [ base bits bytestring hspec QuickCheck ];
+       benchmarkHaskellDepends = [
+         base bits-bytestring bytestring criterion
+       ];
        homepage = "https://github.com/semaj/bits-bytestring-lazy";
        description = "Bits instance for lazy bytestrings";
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
   "bits-conduit" = callPackage
-    ({ mkDerivation, base, bytestring, conduit, hspec, HUnit, mtl }:
+    ({ mkDerivation, base, bytestring, conduit, criterion, hspec, HUnit
+     , mtl, random
+     }:
      mkDerivation {
        pname = "bits-conduit";
        version = "0.2.0.0";
        sha256 = "32b7f730be27810519f1ea32bdb82e25c187373dd407cdf0cbb629be6fa00f22";
        libraryHaskellDepends = [ base bytestring conduit mtl ];
        testHaskellDepends = [ base bytestring conduit hspec HUnit mtl ];
+       benchmarkHaskellDepends = [
+         base bytestring conduit criterion random
+       ];
        description = "Bitstream support for Conduit";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -31915,6 +32236,8 @@ self: {
        pname = "bits-extras";
        version = "0.1.3";
        sha256 = "27a5dcf562e5f4c011421263859e09f65d4c382cd123abd73807f456f56cc96b";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [ base ];
        librarySystemDepends = [ gcc_s ];
        description = "Efficient high-level bit operations not found in Data.Bits";
@@ -31922,8 +32245,9 @@ self: {
      }) {gcc_s = null;};
 
   "bitset" = callPackage
-    ({ mkDerivation, base, deepseq, ghc-prim, gmp, integer-gmp
-     , QuickCheck, tasty, tasty-quickcheck
+    ({ mkDerivation, base, containers, criterion, deepseq, ghc-prim
+     , gmp, integer-gmp, QuickCheck, random, random-shuffle, tasty
+     , tasty-quickcheck
      }:
      mkDerivation {
        pname = "bitset";
@@ -31932,6 +32256,11 @@ self: {
        libraryHaskellDepends = [ base deepseq ghc-prim integer-gmp ];
        librarySystemDepends = [ gmp ];
        testHaskellDepends = [ base QuickCheck tasty tasty-quickcheck ];
+       benchmarkHaskellDepends = [
+         base containers criterion deepseq ghc-prim integer-gmp random
+         random-shuffle
+       ];
+       benchmarkSystemDepends = [ gmp ];
        description = "A space-efficient set data structure";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -32041,13 +32370,14 @@ self: {
      }) {};
 
   "bitwise" = callPackage
-    ({ mkDerivation, array, base, bytestring, QuickCheck }:
+    ({ mkDerivation, array, base, bytestring, criterion, QuickCheck }:
      mkDerivation {
        pname = "bitwise";
        version = "0.1.1.1";
        sha256 = "cde04615108c8e1e4b9f3a6fd7115b6fe40068385489fc5fc3d41e3700d69486";
        libraryHaskellDepends = [ array base bytestring ];
        testHaskellDepends = [ base QuickCheck ];
+       benchmarkHaskellDepends = [ array base bytestring criterion ];
        homepage = "http://code.mathr.co.uk/bitwise";
        description = "fast multi-dimensional unboxed bit packed Bool arrays";
        license = stdenv.lib.licenses.bsd3;
@@ -32077,6 +32407,18 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "bizzlelude" = callPackage
+    ({ mkDerivation, base, containers, directory, text }:
+     mkDerivation {
+       pname = "bizzlelude";
+       version = "1.0.1";
+       sha256 = "0b1fa2c6e0ab2fa3830bbd41a18d93e34f8f035b1c7439fa1424e38a5f44a399";
+       libraryHaskellDepends = [ base containers directory text ];
+       homepage = "http://github.com/TheBizzle";
+       description = "A lousy Prelude replacement by a lousy dude";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "bk-tree" = callPackage
     ({ mkDerivation, base, containers }:
      mkDerivation {
@@ -32163,9 +32505,9 @@ self: {
      }) {};
 
   "blacktip" = callPackage
-    ({ mkDerivation, base, bitwise, bytestring, deepseq
-     , deepseq-generics, hspec, locators, network-info, safe, split
-     , system-fileio, system-filepath, time
+    ({ mkDerivation, async, base, bitwise, bytestring, criterion
+     , deepseq, deepseq-generics, hspec, locators, network-info, safe
+     , split, system-fileio, system-filepath, time
      }:
      mkDerivation {
        pname = "blacktip";
@@ -32176,6 +32518,9 @@ self: {
          network-info safe split system-fileio system-filepath time
        ];
        testHaskellDepends = [ base hspec ];
+       benchmarkHaskellDepends = [
+         async base criterion network-info time
+       ];
        homepage = "https://github.com/bitemyapp/blacktip";
        description = "Decentralized, k-ordered unique ID generator";
        license = stdenv.lib.licenses.asl20;
@@ -32183,8 +32528,8 @@ self: {
      }) {};
 
   "blake2" = callPackage
-    ({ mkDerivation, base, base16-bytestring, bytestring, hlint
-     , QuickCheck, tasty, tasty-quickcheck
+    ({ mkDerivation, base, base16-bytestring, bytestring, criterion
+     , hlint, QuickCheck, tasty, tasty-quickcheck
      }:
      mkDerivation {
        pname = "blake2";
@@ -32195,6 +32540,7 @@ self: {
          base base16-bytestring bytestring hlint QuickCheck tasty
          tasty-quickcheck
        ];
+       benchmarkHaskellDepends = [ base bytestring criterion ];
        homepage = "https://github.com/centromere/blake2";
        description = "A library providing BLAKE2";
        license = stdenv.lib.licenses.publicDomain;
@@ -32401,8 +32747,8 @@ self: {
      }:
      mkDerivation {
        pname = "blaze-colonnade";
-       version = "0.1";
-       sha256 = "cee73ec0777ecc268958699ead67b527b2b99cfbad38532b4687628bf70138e8";
+       version = "1.1.0";
+       sha256 = "194fd18e3d911dbe4b4f229df37b90e739fbb3c389a9c85cf9333f5a7159b37b";
        libraryHaskellDepends = [
          base blaze-html blaze-markup colonnade text
        ];
@@ -32918,9 +33264,9 @@ self: {
      }) {};
 
   "bloomfilter-redis" = callPackage
-    ({ mkDerivation, arithmoi, base, binary, bytestring, hashable
-     , hedis, QuickCheck, tasty, tasty-hunit, tasty-quickcheck
-     , tasty-rerun
+    ({ mkDerivation, arithmoi, base, binary, bytestring, criterion
+     , hashable, hedis, QuickCheck, random, tasty, tasty-hunit
+     , tasty-quickcheck, tasty-rerun
      }:
      mkDerivation {
        pname = "bloomfilter-redis";
@@ -32933,6 +33279,7 @@ self: {
          base bytestring hashable hedis QuickCheck tasty tasty-hunit
          tasty-quickcheck tasty-rerun
        ];
+       benchmarkHaskellDepends = [ base criterion random ];
        description = "Distributed bloom filters on Redis (using the Hedis client)";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -33209,9 +33556,9 @@ self: {
 
   "bond-haskell" = callPackage
     ({ mkDerivation, aeson, array, base, binary, bond-haskell-compiler
-     , bytestring, containers, deepseq, either, extra, filepath
-     , hashable, mtl, scientific, tasty, tasty-golden, tasty-hunit
-     , tasty-quickcheck, text, unordered-containers, vector
+     , bytestring, containers, criterion, deepseq, either, extra
+     , filepath, hashable, mtl, scientific, tasty, tasty-golden
+     , tasty-hunit, tasty-quickcheck, text, unordered-containers, vector
      }:
      mkDerivation {
        pname = "bond-haskell";
@@ -33227,6 +33574,9 @@ self: {
          tasty-golden tasty-hunit tasty-quickcheck unordered-containers
          vector
        ];
+       benchmarkHaskellDepends = [
+         base bytestring criterion filepath vector
+       ];
        homepage = "http://github.com/rblaze/bond-haskell#readme";
        description = "Runtime support for BOND serialization";
        license = stdenv.lib.licenses.bsd3;
@@ -33257,8 +33607,8 @@ self: {
      }) {};
 
   "bookkeeper" = callPackage
-    ({ mkDerivation, base, data-default-class, doctest, Glob, hspec
-     , markdown-unlit, QuickCheck, type-level-sets, yaml
+    ({ mkDerivation, base, criterion, data-default-class, doctest, Glob
+     , hspec, markdown-unlit, QuickCheck, type-level-sets, yaml
      }:
      mkDerivation {
        pname = "bookkeeper";
@@ -33276,6 +33626,9 @@ self: {
          base data-default-class doctest Glob hspec QuickCheck
          type-level-sets yaml
        ];
+       benchmarkHaskellDepends = [
+         base criterion data-default-class type-level-sets
+       ];
        homepage = "http://github.com/turingjump/bookkeeper#readme";
        description = "Anonymous records and overloaded labels";
        license = stdenv.lib.licenses.bsd3;
@@ -33299,8 +33652,8 @@ self: {
     ({ mkDerivation, base, dlist, doctest, Glob, mtl, text, time }:
      mkDerivation {
        pname = "bookkeeping";
-       version = "0.1.0.1";
-       sha256 = "3fcfd3c8754c14b4882c35bb9762d928ada95fc099bac3ab5bb4821aeb879a58";
+       version = "0.2.1.1";
+       sha256 = "d920c7865a11a35af8147e79e2c48028831d5f6c0227cdf2ee65ec32b0e17fb5";
        libraryHaskellDepends = [ base dlist mtl text time ];
        testHaskellDepends = [ base doctest Glob ];
        homepage = "https://github.com/arowM/haskell-bookkeeping#readme";
@@ -33308,6 +33661,19 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "bookkeeping-jp" = callPackage
+    ({ mkDerivation, base, bookkeeping, doctest, Glob }:
+     mkDerivation {
+       pname = "bookkeeping-jp";
+       version = "0.1.0.1";
+       sha256 = "10cb27933f689d38c0bc6e24ae6b1a06cdd9f69aef83dc6aa779c9872410cde5";
+       libraryHaskellDepends = [ base bookkeeping ];
+       testHaskellDepends = [ base doctest Glob ];
+       homepage = "https://github.com/arowM/haskell-bookkeeping-jp#readme";
+       description = "Helper functions for Japanese bookkeeping";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "bool-extras" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
@@ -33822,8 +34188,8 @@ self: {
      }:
      mkDerivation {
        pname = "breve";
-       version = "0.4.3.1";
-       sha256 = "2c1a7d1cb1653a4bf66d5cb53e064b498d8165aa67d7380580a0b69d0f5f2581";
+       version = "0.4.4.0";
+       sha256 = "1701c1550b07051e9c6f1c89713a2d3c6d5feb348e04e5bd957952543b8f72de";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -33860,8 +34226,10 @@ self: {
      }:
      mkDerivation {
        pname = "brick";
-       version = "0.17";
-       sha256 = "891cb3323b1de2ed27849399cf8ab1ed1467560813a6182edb53b3726e4b3b68";
+       version = "0.17.1";
+       sha256 = "8c7ae11cbe393d3498e8e4a2e2b6eb1ee8b0582b3724fe6e844104e479c48511";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [
          base containers contravariant deepseq dlist microlens microlens-mtl
          microlens-th stm template-haskell text text-zipper transformers
@@ -34020,8 +34388,8 @@ self: {
      }) {};
 
   "bspack" = callPackage
-    ({ mkDerivation, base, bytestring, ghc-prim, mtl, tasty
-     , tasty-hunit, tasty-quickcheck
+    ({ mkDerivation, base, blaze-builder, bytestring, criterion
+     , ghc-prim, mtl, sandi, tasty, tasty-hunit, tasty-quickcheck
      }:
      mkDerivation {
        pname = "bspack";
@@ -34031,6 +34399,9 @@ self: {
        testHaskellDepends = [
          base bytestring mtl tasty tasty-hunit tasty-quickcheck
        ];
+       benchmarkHaskellDepends = [
+         base blaze-builder bytestring criterion sandi
+       ];
        homepage = "https://github.com/NicolasDP/hs-bspack";
        description = "A simple and fast bytestring packer";
        license = stdenv.lib.licenses.bsd3;
@@ -34077,6 +34448,8 @@ self: {
        pname = "btrfs";
        version = "0.1.2.3";
        sha256 = "7efc0b5c65623dcf60910baf896aec7da7ac2df4231f03a3072c78fb5b2fb88d";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [ base bytestring time unix ];
        homepage = "https://github.com/redneb/hs-btrfs";
        description = "Bindings to the btrfs API";
@@ -34125,8 +34498,8 @@ self: {
 
   "buffer-builder" = callPackage
     ({ mkDerivation, aeson, attoparsec, base, bytestring, criterion
-     , deepseq, HTF, mtl, quickcheck-instances, text
-     , unordered-containers, vector
+     , deepseq, HTF, http-types, json-builder, mtl, quickcheck-instances
+     , text, unordered-containers, vector
      }:
      mkDerivation {
        pname = "buffer-builder";
@@ -34139,6 +34512,10 @@ self: {
          aeson attoparsec base bytestring criterion deepseq HTF
          quickcheck-instances text vector
        ];
+       benchmarkHaskellDepends = [
+         aeson base bytestring criterion deepseq http-types json-builder
+         text vector
+       ];
        homepage = "https://github.com/chadaustin/buffer-builder";
        description = "Library for efficiently building up buffers, one piece at a time";
        license = stdenv.lib.licenses.bsd3;
@@ -34147,9 +34524,9 @@ self: {
 
   "buffer-builder-aeson" = callPackage
     ({ mkDerivation, aeson, attoparsec, base, buffer-builder
-     , bytestring, hashable, HUnit, integer-gmp, QuickCheck, scientific
-     , tasty, tasty-hunit, tasty-quickcheck, tasty-th, text
-     , unordered-containers, vector
+     , bytestring, criterion, deepseq, hashable, HUnit, integer-gmp
+     , QuickCheck, scientific, tasty, tasty-hunit, tasty-quickcheck
+     , tasty-th, text, unordered-containers, vector
      }:
      mkDerivation {
        pname = "buffer-builder-aeson";
@@ -34166,6 +34543,9 @@ self: {
          QuickCheck scientific tasty tasty-hunit tasty-quickcheck tasty-th
          text unordered-containers vector
        ];
+       benchmarkHaskellDepends = [
+         aeson base buffer-builder bytestring criterion deepseq text vector
+       ];
        description = "Serialize Aeson values with Data.BufferBuilder";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -34211,6 +34591,8 @@ self: {
        pname = "bugzilla";
        version = "0.2.1.1";
        sha256 = "ad30a9b8cbe7e9b994d6898ff68007e0c5a5a45b873e9a52dd51cf68d5945ea5";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [
          aeson base blaze-builder bytestring connection containers
          data-default http-conduit http-types iso8601-time resourcet text
@@ -34342,13 +34724,14 @@ self: {
      }) {};
 
   "burst-detection" = callPackage
-    ({ mkDerivation, base, deepseq }:
+    ({ mkDerivation, base, criterion, deepseq }:
      mkDerivation {
        pname = "burst-detection";
        version = "1.0";
        sha256 = "953742286dddadd2bd54e13a72916044e1c1a7acada5a5e5d12759c29ac4f9dd";
        libraryHaskellDepends = [ base deepseq ];
        testHaskellDepends = [ base ];
+       benchmarkHaskellDepends = [ base criterion ];
        homepage = "http://parsci.com/";
        description = "Burst detection algorithms";
        license = stdenv.lib.licenses.gpl2;
@@ -34479,6 +34862,8 @@ self: {
        pname = "bv";
        version = "0.4.1";
        sha256 = "dd092150f1792e76e168365d69798d3a27b911ce9de8b21a47c5fed42acf45bb";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [ base ghc-prim integer-gmp ];
        homepage = "https://github.com/iagoabal/haskell-bv";
        description = "Bit-vector arithmetic library";
@@ -34493,6 +34878,8 @@ self: {
        pname = "byline";
        version = "0.2.3.0";
        sha256 = "964668e4e3eec9807e64c739a4a215c8e07800661c6d34ad2bd258e08872845c";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [
          ansi-terminal base colour containers exceptions haskeline mtl
          terminfo-hs text transformers
@@ -34533,6 +34920,8 @@ self: {
        pname = "bytedump";
        version = "1.0";
        sha256 = "ae17b5040f0423eec792505f14d1d3e53f5ff81ddf83524f1c5dc7a16c0dc0dd";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [ base bytestring ];
        homepage = "http://github.com/vincenthz/hs-bytedump";
        description = "Flexible byte dump helpers for human readers";
@@ -34603,13 +34992,18 @@ self: {
      }) {};
 
   "bytestring-arbitrary" = callPackage
-    ({ mkDerivation, base, bytestring, cryptohash, QuickCheck }:
+    ({ mkDerivation, base, bytestring, criterion, cryptohash
+     , QuickCheck
+     }:
      mkDerivation {
        pname = "bytestring-arbitrary";
        version = "0.1.1";
        sha256 = "bbe78d37e9788ecf6fc4d64633047579b66e71ffcab70cbc8be100a722056efd";
        libraryHaskellDepends = [ base bytestring cryptohash QuickCheck ];
        testHaskellDepends = [ base bytestring cryptohash QuickCheck ];
+       benchmarkHaskellDepends = [
+         base bytestring criterion cryptohash QuickCheck
+       ];
        homepage = "https://github.com/tsuraan/bytestring-arbitrary";
        description = "Arbitrary instances for ByteStrings";
        license = stdenv.lib.licenses.bsd3;
@@ -34644,7 +35038,8 @@ self: {
 
   "bytestring-conversion" = callPackage
     ({ mkDerivation, attoparsec, base, bytestring, case-insensitive
-     , double-conversion, QuickCheck, tasty, tasty-quickcheck, text
+     , criterion, double-conversion, QuickCheck, tasty, tasty-quickcheck
+     , text, transformers
      }:
      mkDerivation {
        pname = "bytestring-conversion";
@@ -34658,6 +35053,9 @@ self: {
        testHaskellDepends = [
          base bytestring QuickCheck tasty tasty-quickcheck
        ];
+       benchmarkHaskellDepends = [
+         base bytestring criterion text transformers
+       ];
        homepage = "https://github.com/twittner/bytestring-conversion/";
        description = "Type-classes to convert values to and from ByteString";
        license = stdenv.lib.licenses.mpl20;
@@ -34754,6 +35152,8 @@ self: {
        pname = "bytestring-nums";
        version = "0.3.6";
        sha256 = "bdca97600d91f00bb3c0f654784e3fbd2d62fcf4671820578105487cdf39e7cd";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [ base bytestring containers ];
        homepage = "http://github.com/solidsnack/bytestring-nums";
        description = "Parse numeric literals from ByteStrings";
@@ -34792,7 +35192,8 @@ self: {
      }) {};
 
   "bytestring-read" = callPackage
-    ({ mkDerivation, base, bytestring, doctest, tasty, tasty-quickcheck
+    ({ mkDerivation, attoparsec, base, bytestring, bytestring-lexing
+     , criterion, doctest, scientific, tasty, tasty-quickcheck, text
      , types-compat
      }:
      mkDerivation {
@@ -34805,6 +35206,10 @@ self: {
        testHaskellDepends = [
          base bytestring doctest tasty tasty-quickcheck
        ];
+       benchmarkHaskellDepends = [
+         attoparsec base bytestring bytestring-lexing criterion scientific
+         text
+       ];
        homepage = "https://github.com/philopon/bytestring-read";
        description = "fast ByteString to number converting library";
        license = stdenv.lib.licenses.mit;
@@ -34874,7 +35279,7 @@ self: {
      }) {};
 
   "bytestring-tree-builder" = callPackage
-    ({ mkDerivation, base, base-prelude, bytestring
+    ({ mkDerivation, base, base-prelude, bytestring, criterion, deepseq
      , quickcheck-instances, semigroups, tasty, tasty-hunit
      , tasty-quickcheck, tasty-smallcheck, text
      }:
@@ -34889,6 +35294,9 @@ self: {
          base-prelude bytestring quickcheck-instances tasty tasty-hunit
          tasty-quickcheck tasty-smallcheck
        ];
+       benchmarkHaskellDepends = [
+         base-prelude bytestring criterion deepseq
+       ];
        homepage = "https://github.com/nikita-volkov/bytestring-tree-builder";
        description = "A very efficient ByteString builder implementation based on the binary tree";
        license = stdenv.lib.licenses.mit;
@@ -34908,7 +35316,7 @@ self: {
 
   "bytestring-typenats" = callPackage
     ({ mkDerivation, base, binary, blake2, bytestring, cereal
-     , cryptohash, deepseq, entropy, QuickCheck
+     , criterion, cryptohash, deepseq, entropy, QuickCheck
      }:
      mkDerivation {
        pname = "bytestring-typenats";
@@ -34919,6 +35327,7 @@ self: {
          QuickCheck
        ];
        testHaskellDepends = [ base bytestring cryptohash QuickCheck ];
+       benchmarkHaskellDepends = [ base bytestring criterion QuickCheck ];
        homepage = "https://github.com/tsuraan/bytestring-typenats";
        description = "Bytestrings with typenat lengths";
        license = stdenv.lib.licenses.bsd3;
@@ -34990,6 +35399,7 @@ self: {
          base bytestring conduit conduit-extra hspec QuickCheck random
          resourcet
        ];
+       benchmarkHaskellDepends = [ base conduit conduit-extra resourcet ];
        homepage = "https://github.com/snoyberg/bzlib-conduit";
        description = "Streaming compression/decompression via conduits";
        license = stdenv.lib.licenses.bsd3;
@@ -35622,8 +36032,8 @@ self: {
      }:
      mkDerivation {
        pname = "cabal-macosx";
-       version = "0.2.3.5";
-       sha256 = "6f5604cd4d1e7e67736c408babda35fdf1b1ff7348254d1f308ccea953615633";
+       version = "0.2.4.0";
+       sha256 = "41fb5231327860676eb4496fedba4da7df00f7cff969589a86e4b687177788fa";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -35993,15 +36403,15 @@ self: {
 
   "cabal2nix" = callPackage
     ({ mkDerivation, aeson, ansi-wl-pprint, base, bytestring, Cabal
-     , containers, deepseq, directory, distribution-nixpkgs, filepath
-     , hackage-db, language-nix, lens, monad-par, monad-par-extras, mtl
-     , optparse-applicative, pretty, process, SHA, split, text, time
-     , transformers, utf8-string, yaml
+     , containers, deepseq, directory, distribution-nixpkgs, doctest
+     , filepath, hackage-db, language-nix, lens, monad-par
+     , monad-par-extras, mtl, optparse-applicative, pretty, process, SHA
+     , split, text, time, transformers, utf8-string, yaml
      }:
      mkDerivation {
        pname = "cabal2nix";
-       version = "2.0.4";
-       sha256 = "b20b597df92787ba878073cd7cc855b3c0186f1781ac65056f261c420a1c7fe3";
+       version = "2.1";
+       sha256 = "6874df33b6a208d7715f673ceded9e09a7e8188a0a94651b14e208b928256f6e";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -36016,6 +36426,12 @@ self: {
          lens monad-par monad-par-extras mtl optparse-applicative pretty
          process SHA split text time transformers utf8-string yaml
        ];
+       testHaskellDepends = [
+         aeson ansi-wl-pprint base bytestring Cabal containers deepseq
+         directory distribution-nixpkgs doctest filepath hackage-db
+         language-nix lens optparse-applicative pretty process SHA split
+         text transformers yaml
+       ];
        homepage = "https://github.com/nixos/cabal2nix#readme";
        description = "Convert Cabal files into Nix build instructions";
        license = stdenv.lib.licenses.bsd3;
@@ -36223,13 +36639,16 @@ self: {
 
   "cacophony" = callPackage
     ({ mkDerivation, aeson, async, base, base16-bytestring, bytestring
-     , cryptonite, directory, exceptions, free, hlint, lens, memory
-     , monad-coroutine, mtl, safe-exceptions, text, transformers
+     , criterion, cryptonite, deepseq, directory, exceptions, free
+     , hlint, lens, memory, monad-coroutine, mtl, safe-exceptions, text
+     , transformers
      }:
      mkDerivation {
        pname = "cacophony";
        version = "0.9.1";
        sha256 = "cb60834c8b0571f2b2b54b6f9847960c71ffe5350c60791c439de6ba54c67c02";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [
          base bytestring cryptonite exceptions free lens memory
          monad-coroutine mtl safe-exceptions transformers
@@ -36238,6 +36657,10 @@ self: {
          aeson async base base16-bytestring bytestring directory free hlint
          lens memory mtl text
        ];
+       benchmarkHaskellDepends = [
+         async base base16-bytestring bytestring criterion deepseq lens
+         memory
+       ];
        homepage = "https://github.com/centromere/cacophony";
        description = "A library implementing the Noise protocol";
        license = stdenv.lib.licenses.publicDomain;
@@ -36535,6 +36958,8 @@ self: {
        pname = "call";
        version = "0.1.4.2";
        sha256 = "2fe8f1ade21ea24c67ab2447189f756b75a60cbb4d2221a0058bc62050c00461";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [
          base bindings-portaudio boundingboxes colors containers
          control-bool deepseq directory filepath free freetype2 GLFW-b
@@ -36671,17 +37096,19 @@ self: {
      }) {};
 
   "canteven-http" = callPackage
-    ({ mkDerivation, base, bytestring, canteven-log, exceptions
-     , http-types, monad-logger, text, time, transformers, uuid, wai
+    ({ mkDerivation, base, bytestring, canteven-log, directory
+     , exceptions, filepath, http-types, mime-types, monad-logger
+     , template-haskell, text, time, transformers, unix, uuid, wai
      , wai-extra
      }:
      mkDerivation {
        pname = "canteven-http";
-       version = "0.1.2.0";
-       sha256 = "194fbbb36eaa70c4ed2dbf8cdc9e5831761bbefba2cccd473f1068bf33ac0977";
+       version = "0.1.3.0";
+       sha256 = "d427d5bc77861c2a648a604443f2a5ca882b911487ac313dbb5db6b0271870d4";
        libraryHaskellDepends = [
-         base bytestring canteven-log exceptions http-types monad-logger
-         text time transformers uuid wai wai-extra
+         base bytestring canteven-log directory exceptions filepath
+         http-types mime-types monad-logger template-haskell text time
+         transformers unix uuid wai wai-extra
        ];
        homepage = "https://github.com/SumAll/canteven-http";
        description = "Utilities for HTTP programming";
@@ -36872,6 +37299,8 @@ self: {
        pname = "caramia";
        version = "0.7.2.2";
        sha256 = "fa3129d63816e1ccb47a57808ece432a2b6ab652eeba15ac6a76d6799af277b3";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [
          base bytestring containers exceptions gl lens linear mtl semigroups
          text transformers vector
@@ -36937,6 +37366,7 @@ self: {
          array base binary bytestring ix-shapable QuickCheck syb
        ];
        testHaskellDepends = [ array base ix-shapable QuickCheck ];
+       benchmarkHaskellDepends = [ array base ];
        description = "A C-compatible array library";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -37149,8 +37579,8 @@ self: {
      }) {};
 
   "case-insensitive" = callPackage
-    ({ mkDerivation, base, bytestring, deepseq, hashable, HUnit
-     , test-framework, test-framework-hunit, text
+    ({ mkDerivation, base, bytestring, criterion, deepseq, hashable
+     , HUnit, test-framework, test-framework-hunit, text
      }:
      mkDerivation {
        pname = "case-insensitive";
@@ -37160,13 +37590,16 @@ self: {
        testHaskellDepends = [
          base bytestring HUnit test-framework test-framework-hunit text
        ];
+       benchmarkHaskellDepends = [ base bytestring criterion deepseq ];
        homepage = "https://github.com/basvandijk/case-insensitive";
        description = "Case insensitive string comparison";
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
   "case-insensitive-match" = callPackage
-    ({ mkDerivation, base, bytestring, mtl, QuickCheck, text }:
+    ({ mkDerivation, base, bytestring, case-insensitive, criterion, mtl
+     , QuickCheck, random-strings, tagsoup, text
+     }:
      mkDerivation {
        pname = "case-insensitive-match";
        version = "0.1.1.0";
@@ -37176,6 +37609,10 @@ self: {
        libraryHaskellDepends = [ base bytestring text ];
        executableHaskellDepends = [ base bytestring ];
        testHaskellDepends = [ base bytestring mtl QuickCheck text ];
+       benchmarkHaskellDepends = [
+         base bytestring case-insensitive criterion random-strings tagsoup
+         text
+       ];
        homepage = "https://github.com/mikehat/case-insensitive-match";
        description = "A simplified, faster way to do case-insensitive matching";
        license = stdenv.lib.licenses.bsd3;
@@ -37195,8 +37632,9 @@ self: {
      }) {};
 
   "cases" = callPackage
-    ({ mkDerivation, attoparsec, base, base-prelude, HTF, HUnit
-     , loch-th, placeholders, QuickCheck, text
+    ({ mkDerivation, attoparsec, base, base-prelude, criterion, HTF
+     , HUnit, loch-th, mwc-random, placeholders, QuickCheck, rerebase
+     , text
      }:
      mkDerivation {
        pname = "cases";
@@ -37206,6 +37644,7 @@ self: {
        testHaskellDepends = [
          base HTF HUnit loch-th placeholders QuickCheck text
        ];
+       benchmarkHaskellDepends = [ criterion mwc-random rerebase ];
        homepage = "https://github.com/nikita-volkov/cases";
        description = "A converter for spinal, snake and camel cases";
        license = stdenv.lib.licenses.mit;
@@ -37462,14 +37901,16 @@ self: {
 
   "cassava" = callPackage
     ({ mkDerivation, array, attoparsec, base, blaze-builder, bytestring
-     , containers, deepseq, hashable, HUnit, QuickCheck, test-framework
-     , test-framework-hunit, test-framework-quickcheck2, text
-     , unordered-containers, vector
+     , containers, criterion, deepseq, hashable, HUnit, lazy-csv
+     , QuickCheck, test-framework, test-framework-hunit
+     , test-framework-quickcheck2, text, unordered-containers, vector
      }:
      mkDerivation {
        pname = "cassava";
        version = "0.4.5.1";
        sha256 = "7c622ae9dc647508662a1cda3fe3f6d7032786e4e3d15f8488de9e9330cf9d9f";
+       revision = "1";
+       editedCabalFile = "c04d2ca56a5c725b3044ccf06c6fd09ff47265e3a1e125ae364363bfed2a0314";
        libraryHaskellDepends = [
          array attoparsec base blaze-builder bytestring containers deepseq
          hashable text unordered-containers vector
@@ -37479,6 +37920,10 @@ self: {
          test-framework-hunit test-framework-quickcheck2 text
          unordered-containers vector
        ];
+       benchmarkHaskellDepends = [
+         array attoparsec base blaze-builder bytestring containers criterion
+         deepseq hashable lazy-csv text unordered-containers vector
+       ];
        homepage = "https://github.com/hvr/cassava";
        description = "A CSV parsing and encoding library";
        license = stdenv.lib.licenses.bsd3;
@@ -37486,7 +37931,8 @@ self: {
 
   "cassava-conduit" = callPackage
     ({ mkDerivation, array, base, bifunctors, bytestring, cassava
-     , conduit, conduit-extra, containers, mtl, QuickCheck, text
+     , conduit, conduit-extra, containers, criterion, mtl, QuickCheck
+     , text
      }:
      mkDerivation {
        pname = "cassava-conduit";
@@ -37499,6 +37945,7 @@ self: {
        testHaskellDepends = [
          base bytestring cassava conduit conduit-extra QuickCheck text
        ];
+       benchmarkHaskellDepends = [ base criterion ];
        homepage = "https://github.com/domdere/cassava-conduit";
        description = "Conduit interface for cassava package";
        license = stdenv.lib.licenses.bsd3;
@@ -37534,6 +37981,8 @@ self: {
        pname = "cassava-streams";
        version = "0.3.0.0";
        sha256 = "81a4548c78474d025c525728a57616a657e5d59c377625c54ebb3f1818f5c49b";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [
          base bytestring cassava io-streams vector
        ];
@@ -37803,6 +38252,8 @@ self: {
        pname = "cci";
        version = "0.3.1";
        sha256 = "87390d636e6877bfb982ce60b3accef9d73153ea03632cec967526eb8eb96a5f";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [ base bytestring ];
        librarySystemDepends = [ cci ];
        testHaskellDepends = [
@@ -38023,8 +38474,9 @@ self: {
      }) {};
 
   "cereal-io-streams" = callPackage
-    ({ mkDerivation, base, bytestring, cereal, derive, HUnit
-     , io-streams, mtl, QuickCheck, tasty, tasty-hunit, tasty-quickcheck
+    ({ mkDerivation, base, bytestring, cereal, cereal-conduit, conduit
+     , conduit-extra, criterion, derive, HUnit, io-streams, mtl
+     , QuickCheck, tasty, tasty-hunit, tasty-quickcheck
      }:
      mkDerivation {
        pname = "cereal-io-streams";
@@ -38035,6 +38487,10 @@ self: {
          base bytestring cereal derive HUnit io-streams mtl QuickCheck tasty
          tasty-hunit tasty-quickcheck
        ];
+       benchmarkHaskellDepends = [
+         base bytestring cereal cereal-conduit conduit conduit-extra
+         criterion io-streams
+       ];
        description = "io-streams support for the cereal binary serialization library";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -38065,8 +38521,9 @@ self: {
      }) {};
 
   "cereal-streams" = callPackage
-    ({ mkDerivation, base, bytestring, cereal, derive, HUnit
-     , io-streams, mtl, QuickCheck, tasty, tasty-hunit, tasty-quickcheck
+    ({ mkDerivation, base, bytestring, cereal, cereal-conduit, conduit
+     , conduit-extra, criterion, derive, HUnit, io-streams, mtl
+     , QuickCheck, tasty, tasty-hunit, tasty-quickcheck, transformers
      }:
      mkDerivation {
        pname = "cereal-streams";
@@ -38077,6 +38534,10 @@ self: {
          base bytestring cereal derive HUnit io-streams mtl QuickCheck tasty
          tasty-hunit tasty-quickcheck
        ];
+       benchmarkHaskellDepends = [
+         base bytestring cereal cereal-conduit conduit conduit-extra
+         criterion io-streams transformers
+       ];
        description = "Use cereal to encode/decode io-streams";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -38117,6 +38578,8 @@ self: {
        sha256 = "e6257b4b0e884db8a817d265d9a7f9a6c76af8190504f32dadbbf64b0fcee5a1";
        revision = "1";
        editedCabalFile = "6b4b703a1c34a9fa3e0223f3ff2796183c7b9b7351da1ad34478225637e837ba";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [
          asn1-data base bytestring containers crypto-pubkey-types cryptohash
          directory filepath mtl pem process time
@@ -38701,6 +39164,8 @@ self: {
        pname = "check-email";
        version = "1.0";
        sha256 = "dfbba577c18ca1180d8d4b38cd0a54a6f0ca5a886e502cb83c8ab07675463cb7";
+       revision = "1";
+       editedCabalFile = "39f8616eeee765838400cd6754f864e9e65e8a89123327161227b6a424c20d75";
        libraryHaskellDepends = [ base bytestring email-validate ];
        librarySystemDepends = [ resolv ];
        description = "Confirm whether an email is valid and probably existant";
@@ -39194,8 +39659,9 @@ self: {
      }) {};
 
   "cipher-aes" = callPackage
-    ({ mkDerivation, base, byteable, bytestring, crypto-cipher-tests
-     , crypto-cipher-types, QuickCheck, securemem, test-framework
+    ({ mkDerivation, base, byteable, bytestring, criterion
+     , crypto-cipher-benchmarks, crypto-cipher-tests
+     , crypto-cipher-types, mtl, QuickCheck, securemem, test-framework
      , test-framework-quickcheck2
      }:
      mkDerivation {
@@ -39209,28 +39675,40 @@ self: {
          base byteable bytestring crypto-cipher-tests crypto-cipher-types
          QuickCheck test-framework test-framework-quickcheck2
        ];
+       benchmarkHaskellDepends = [
+         base bytestring criterion crypto-cipher-benchmarks
+         crypto-cipher-types mtl
+       ];
        homepage = "https://github.com/vincenthz/hs-cipher-aes";
        description = "Fast AES cipher implementation with advanced mode of operations";
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
   "cipher-aes128" = callPackage
-    ({ mkDerivation, base, bytestring, cereal, crypto-api, tagged }:
+    ({ mkDerivation, base, bytestring, cereal, criterion, crypto-api
+     , entropy, tagged
+     }:
      mkDerivation {
        pname = "cipher-aes128";
        version = "0.7.0.3";
        sha256 = "6f27bea8bcd1987072fc75b6b423ae9c691574324b6a328ec1e2866f84412e3a";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [
          base bytestring cereal crypto-api tagged
        ];
+       benchmarkHaskellDepends = [
+         base bytestring cereal criterion crypto-api entropy tagged
+       ];
        homepage = "https://github.com/TomMD/cipher-aes128";
        description = "AES and common modes using AES-NI when available";
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
   "cipher-blowfish" = callPackage
-    ({ mkDerivation, base, byteable, bytestring, crypto-cipher-tests
-     , crypto-cipher-types, QuickCheck, securemem, test-framework
+    ({ mkDerivation, base, byteable, bytestring, criterion
+     , crypto-cipher-benchmarks, crypto-cipher-tests
+     , crypto-cipher-types, mtl, QuickCheck, securemem, test-framework
      , test-framework-quickcheck2, vector
      }:
      mkDerivation {
@@ -39244,14 +39722,19 @@ self: {
          base byteable bytestring crypto-cipher-tests crypto-cipher-types
          QuickCheck test-framework test-framework-quickcheck2
        ];
+       benchmarkHaskellDepends = [
+         base bytestring criterion crypto-cipher-benchmarks
+         crypto-cipher-types mtl
+       ];
        homepage = "http://github.com/vincenthz/hs-crypto-cipher";
        description = "Blowfish cipher";
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
   "cipher-camellia" = callPackage
-    ({ mkDerivation, base, byteable, bytestring, crypto-cipher-tests
-     , crypto-cipher-types, QuickCheck, securemem, test-framework
+    ({ mkDerivation, base, byteable, bytestring, criterion
+     , crypto-cipher-benchmarks, crypto-cipher-tests
+     , crypto-cipher-types, mtl, QuickCheck, securemem, test-framework
      , test-framework-quickcheck2, vector
      }:
      mkDerivation {
@@ -39265,14 +39748,19 @@ self: {
          base byteable bytestring crypto-cipher-tests crypto-cipher-types
          QuickCheck test-framework test-framework-quickcheck2
        ];
+       benchmarkHaskellDepends = [
+         base bytestring criterion crypto-cipher-benchmarks
+         crypto-cipher-types mtl
+       ];
        homepage = "http://github.com/vincenthz/hs-crypto-cipher";
        description = "Camellia block cipher primitives";
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
   "cipher-des" = callPackage
-    ({ mkDerivation, base, byteable, bytestring, crypto-cipher-tests
-     , crypto-cipher-types, QuickCheck, securemem, test-framework
+    ({ mkDerivation, base, byteable, bytestring, criterion
+     , crypto-cipher-benchmarks, crypto-cipher-tests
+     , crypto-cipher-types, mtl, QuickCheck, securemem, test-framework
      , test-framework-quickcheck2
      }:
      mkDerivation {
@@ -39286,14 +39774,19 @@ self: {
          base byteable bytestring crypto-cipher-tests crypto-cipher-types
          QuickCheck test-framework test-framework-quickcheck2
        ];
+       benchmarkHaskellDepends = [
+         base bytestring criterion crypto-cipher-benchmarks
+         crypto-cipher-types mtl
+       ];
        homepage = "http://github.com/vincenthz/hs-crypto-cipher";
        description = "DES and 3DES primitives";
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
   "cipher-rc4" = callPackage
-    ({ mkDerivation, base, byteable, bytestring, crypto-cipher-tests
-     , crypto-cipher-types, QuickCheck, test-framework
+    ({ mkDerivation, base, byteable, bytestring, criterion
+     , crypto-cipher-benchmarks, crypto-cipher-tests
+     , crypto-cipher-types, deepseq, mtl, QuickCheck, test-framework
      , test-framework-quickcheck2
      }:
      mkDerivation {
@@ -39307,6 +39800,10 @@ self: {
          base bytestring crypto-cipher-tests crypto-cipher-types QuickCheck
          test-framework test-framework-quickcheck2
        ];
+       benchmarkHaskellDepends = [
+         base bytestring criterion crypto-cipher-benchmarks
+         crypto-cipher-types deepseq mtl
+       ];
        homepage = "http://github.com/vincenthz/hs-cipher-rc4";
        description = "Fast RC4 cipher implementation";
        license = stdenv.lib.licenses.bsd3;
@@ -39608,6 +40105,8 @@ self: {
        pname = "clang-pure";
        version = "0.2.0.2";
        sha256 = "fad48f3ba3fad6a99d73923a6034a3d2a6610812404b39c05e6dc3dd20e0604c";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [
          base bytestring containers contravariant inline-c microlens
          microlens-contra singletons stm template-haskell vector
@@ -39740,10 +40239,11 @@ self: {
      }) {};
 
   "clash-prelude" = callPackage
-    ({ mkDerivation, array, base, constraints, data-binary-ieee754
-     , data-default, deepseq, doctest, ghc-prim, ghc-typelits-extra
-     , ghc-typelits-knownnat, ghc-typelits-natnormalise, integer-gmp
-     , lens, QuickCheck, reflection, singletons, template-haskell
+    ({ mkDerivation, array, base, constraints, criterion
+     , data-binary-ieee754, data-default, deepseq, doctest, ghc-prim
+     , ghc-typelits-extra, ghc-typelits-knownnat
+     , ghc-typelits-natnormalise, integer-gmp, lens, QuickCheck
+     , reflection, singletons, template-haskell
      }:
      mkDerivation {
        pname = "clash-prelude";
@@ -39756,6 +40256,9 @@ self: {
          singletons template-haskell
        ];
        testHaskellDepends = [ base doctest ];
+       benchmarkHaskellDepends = [
+         base criterion deepseq template-haskell
+       ];
        homepage = "http://www.clash-lang.org/";
        description = "CAES Language for Synchronous Hardware - Prelude library";
        license = stdenv.lib.licenses.bsd2;
@@ -39841,14 +40344,15 @@ self: {
 
   "classy-influxdb-simple" = callPackage
     ({ mkDerivation, aeson, async-io-either, base, bytestring, lens
-     , mtl, text, wreq
+     , mtl, scientific, text, time, vector, wreq
      }:
      mkDerivation {
        pname = "classy-influxdb-simple";
-       version = "0.1.0.1";
-       sha256 = "37655507a92d3bc9c019a5d25b746db95f948b57f5d58126bac4abba38d37383";
+       version = "0.2.1.0";
+       sha256 = "75b4a50512fd4d9cc785620b1bd01c683cc6cb8940157b8e871fa89ec7c95961";
        libraryHaskellDepends = [
-         aeson async-io-either base bytestring lens mtl text wreq
+         aeson async-io-either base bytestring lens mtl scientific text time
+         vector wreq
        ];
        homepage = "https://github.com/mankyKitty/classy-influxdb-simple#readme";
        description = "Super simple InfluxDB package in Classy-MTL style";
@@ -40356,7 +40860,7 @@ self: {
 
   "clif" = callPackage
     ({ mkDerivation, base, containers, QuickCheck, tasty
-     , tasty-quickcheck, tasty-th
+     , tasty-quickcheck, tasty-th, time
      }:
      mkDerivation {
        pname = "clif";
@@ -40366,6 +40870,7 @@ self: {
        testHaskellDepends = [
          base containers QuickCheck tasty tasty-quickcheck tasty-th
        ];
+       benchmarkHaskellDepends = [ base time ];
        description = "A Clifford algebra number type for Haskell";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -40396,6 +40901,9 @@ self: {
        testHaskellDepends = [
          base hspec nats numeric-prelude QuickCheck
        ];
+       benchmarkHaskellDepends = [
+         base criterion numeric-prelude stream-fusion
+       ];
        homepage = "http://github.com/spacekitteh/haskell-clifford";
        description = "A Clifford algebra library";
        license = stdenv.lib.licenses.bsd3;
@@ -40718,9 +41226,10 @@ self: {
      }) {};
 
   "clustering" = callPackage
-    ({ mkDerivation, base, binary, containers, hierarchical-clustering
-     , matrices, mwc-random, parallel, primitive, Rlang-QQ, split, tasty
-     , tasty-hunit, tasty-quickcheck, unordered-containers, vector
+    ({ mkDerivation, base, binary, containers, criterion
+     , hierarchical-clustering, matrices, mwc-random, parallel
+     , primitive, Rlang-QQ, split, tasty, tasty-hunit, tasty-quickcheck
+     , unordered-containers, vector
      }:
      mkDerivation {
        pname = "clustering";
@@ -40734,6 +41243,9 @@ self: {
          base binary hierarchical-clustering matrices mwc-random Rlang-QQ
          split tasty tasty-hunit tasty-quickcheck vector
        ];
+       benchmarkHaskellDepends = [
+         base criterion hierarchical-clustering matrices mwc-random vector
+       ];
        description = "High performance clustering algorithms";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -40793,13 +41305,18 @@ self: {
      }) {};
 
   "cmark" = callPackage
-    ({ mkDerivation, base, bytestring, HUnit, text }:
+    ({ mkDerivation, base, blaze-html, bytestring, cheapskate
+     , criterion, discount, HUnit, markdown, sundown, text
+     }:
      mkDerivation {
        pname = "cmark";
        version = "0.5.5";
        sha256 = "03bd6fc962bb92127f64a9c597a904492a16fb3f34587775a741d22311fe53e2";
        libraryHaskellDepends = [ base bytestring text ];
        testHaskellDepends = [ base HUnit text ];
+       benchmarkHaskellDepends = [
+         base blaze-html cheapskate criterion discount markdown sundown text
+       ];
        homepage = "https://github.com/jgm/cmark-hs";
        description = "Fast, accurate CommonMark (Markdown) parser and renderer";
        license = stdenv.lib.licenses.bsd3;
@@ -40910,6 +41427,8 @@ self: {
        pname = "cmdargs";
        version = "0.10.14";
        sha256 = "38b60053c11394a1876d2744950eece66ca9e4364298c1383f247894044bce58";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [
          base filepath process template-haskell transformers
        ];
@@ -40944,6 +41463,8 @@ self: {
        pname = "cmdlib";
        version = "0.3.6";
        sha256 = "5643d219c371f903c3f877b5955de4ca99a723bc96165f4f629d3e3dbc3fb357";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [ base mtl split syb transformers ];
        description = "a library for command line parsing & online help";
        license = stdenv.lib.licenses.bsd3;
@@ -41080,8 +41601,8 @@ self: {
     ({ mkDerivation, base }:
      mkDerivation {
        pname = "code-page";
-       version = "0.1.1";
-       sha256 = "16b8b802bca21b71dd782560978b7ac88866c129df83b760e9059a7da04d70f7";
+       version = "0.1.2";
+       sha256 = "aef2b0b043767ef28496aa6b8c744db8185492c0d1e94e567a62eb4fdcaa3b09";
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base ];
        homepage = "https://github.com/RyanGlScott/code-page";
@@ -41539,15 +42060,15 @@ self: {
      }) {};
 
   "colonnade" = callPackage
-    ({ mkDerivation, base, bytestring, contravariant, doctest, text
-     , vector
+    ({ mkDerivation, base, bytestring, contravariant, doctest
+     , profunctors, text, vector
      }:
      mkDerivation {
        pname = "colonnade";
-       version = "1.0.0";
-       sha256 = "47280e7dc733a66d0e507492e2b5499115027911d6ab859e29c602308f7bdf08";
+       version = "1.1.0";
+       sha256 = "e86e90e2eb8e983a0916b8651b248ad9d11202add0cab034f609d5e80923eafc";
        libraryHaskellDepends = [
-         base bytestring contravariant text vector
+         base bytestring contravariant profunctors text vector
        ];
        testHaskellDepends = [ base doctest ];
        homepage = "https://github.com/andrewthad/colonnade#readme";
@@ -41689,8 +42210,7 @@ self: {
        pname = "com";
        version = "1.2.3.1";
        sha256 = "f5085572cd0b0c8f8fdf115fad5c842657e803c70b2ce1c230ee452f87a9dff8";
-       isLibrary = false;
-       isExecutable = false;
+       doHaddock = false;
        description = "Haskell COM support library";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -42033,6 +42553,21 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "compact" = callPackage
+    ({ mkDerivation, base, binary, bytestring, directory, ghc-compact
+     }:
+     mkDerivation {
+       pname = "compact";
+       version = "0.1.0.1";
+       sha256 = "ee8533e16b94bbbf3519ccad26f3e569d60d33a5a9d2e3636e0764aff7b2d653";
+       libraryHaskellDepends = [ base binary bytestring ghc-compact ];
+       testHaskellDepends = [ base directory ];
+       homepage = "https://github.com/ezyang/compact";
+       description = "Non-GC'd, contiguous storage for immutable data structures";
+       license = stdenv.lib.licenses.bsd3;
+       broken = true;
+     }) {ghc-compact = null;};
+
   "compact-map" = callPackage
     ({ mkDerivation, array, base, binary, bytestring, containers }:
      mkDerivation {
@@ -42061,8 +42596,7 @@ self: {
        ];
        description = "Socket functions for compact normal form";
        license = stdenv.lib.licenses.bsd3;
-       broken = true;
-     }) {compact = null;};
+     }) {};
 
   "compact-string" = callPackage
     ({ mkDerivation, base, bytestring }:
@@ -42116,10 +42650,10 @@ self: {
      }) {};
 
   "compdata" = callPackage
-    ({ mkDerivation, base, containers, deepseq, derive, HUnit, mtl
-     , QuickCheck, template-haskell, test-framework
+    ({ mkDerivation, base, containers, criterion, deepseq, derive
+     , HUnit, mtl, QuickCheck, random, template-haskell, test-framework
      , test-framework-hunit, test-framework-quickcheck2, th-expand-syns
-     , transformers, tree-view
+     , transformers, tree-view, uniplate
      }:
      mkDerivation {
        pname = "compdata";
@@ -42134,12 +42668,17 @@ self: {
          template-haskell test-framework test-framework-hunit
          test-framework-quickcheck2 th-expand-syns transformers
        ];
+       benchmarkHaskellDepends = [
+         base containers criterion deepseq derive mtl QuickCheck random
+         template-haskell th-expand-syns transformers uniplate
+       ];
        description = "Compositional Data Types";
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
   "compdata-automata" = callPackage
-    ({ mkDerivation, base, compdata, containers, projection }:
+    ({ mkDerivation, base, compdata, containers, criterion, projection
+     }:
      mkDerivation {
        pname = "compdata-automata";
        version = "0.9";
@@ -42147,6 +42686,9 @@ self: {
        revision = "1";
        editedCabalFile = "f8bda15b8d1d1e56f64c37f39ac8ba1c7bf860c291adad3698041eee68146130";
        libraryHaskellDepends = [ base compdata containers projection ];
+       benchmarkHaskellDepends = [
+         base compdata containers criterion projection
+       ];
        description = "Tree automata on Compositional Data Types";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -42364,12 +42906,13 @@ self: {
      }) {};
 
   "compound-types" = callPackage
-    ({ mkDerivation, base }:
+    ({ mkDerivation, base, base-prelude }:
      mkDerivation {
        pname = "compound-types";
        version = "0.1.3.1";
        sha256 = "81c67beb0379502875e2fbec9c346db7221f598197534064a4b4bd3d4ae930f2";
        libraryHaskellDepends = [ base ];
+       benchmarkHaskellDepends = [ base-prelude ];
        homepage = "https://github.com/nikita-volkov/compound-types";
        description = "Sum and Product types and such";
        license = stdenv.lib.licenses.mit;
@@ -42446,19 +42989,22 @@ self: {
 
   "computational-algebra" = callPackage
     ({ mkDerivation, algebra, algebraic-prelude, arithmoi, base
-     , constraints, containers, control-monad-loop, convertible, deepseq
-     , dlist, entropy, equational-reasoning, ghc-typelits-knownnat
-     , hashable, heaps, hmatrix, hspec, HUnit, hybrid-vectors, lens
-     , matrix, monad-loops, MonadRandom, mono-traversable, monomorphic
-     , mtl, parallel, primes, process, QuickCheck, quickcheck-instances
-     , reflection, semigroups, singletons, sized, smallcheck, tagged
-     , template-haskell, test-framework, test-framework-hunit, text
+     , constraints, containers, control-monad-loop, convertible
+     , criterion, deepseq, dlist, entropy, equational-reasoning
+     , ghc-typelits-knownnat, hashable, heaps, hmatrix, hspec, HUnit
+     , hybrid-vectors, lens, matrix, monad-loops, MonadRandom
+     , mono-traversable, monomorphic, mtl, parallel, primes, process
+     , QuickCheck, quickcheck-instances, random, reflection, semigroups
+     , singletons, sized, smallcheck, tagged, template-haskell
+     , test-framework, test-framework-hunit, text, transformers
      , type-natural, unamb, unordered-containers, vector
      }:
      mkDerivation {
        pname = "computational-algebra";
        version = "0.5.0.0";
        sha256 = "fce631557cfcef120382e91744279f5e7a61c0afaae95cf2159195f7e57fda49";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [
          algebra algebraic-prelude arithmoi base constraints containers
          control-monad-loop convertible deepseq dlist entropy
@@ -42475,6 +43021,13 @@ self: {
          singletons sized smallcheck tagged test-framework
          test-framework-hunit text type-natural vector
        ];
+       benchmarkHaskellDepends = [
+         algebra base constraints containers criterion deepseq
+         equational-reasoning hspec HUnit lens matrix MonadRandom
+         monomorphic parallel process QuickCheck quickcheck-instances random
+         reflection singletons sized smallcheck tagged test-framework
+         test-framework-hunit transformers type-natural vector
+       ];
        homepage = "https://github.com/konn/computational-algebra";
        description = "Well-kinded computational algebra library, currently supporting Groebner basis";
        license = stdenv.lib.licenses.bsd3;
@@ -42541,6 +43094,8 @@ self: {
        pname = "concraft";
        version = "0.9.4";
        sha256 = "030f63c8c08dba11ac85b08746a145df45276930de8fc937ecf6260b1cac079f";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [
          aeson array base binary bytestring cmdargs comonad containers
          crf-chain1-constrained crf-chain2-tiers data-lens lazy-io
@@ -42672,6 +43227,24 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "concurrency_1_1_0_0" = callPackage
+    ({ mkDerivation, array, atomic-primops, base, exceptions
+     , monad-control, mtl, stm, transformers
+     }:
+     mkDerivation {
+       pname = "concurrency";
+       version = "1.1.0.0";
+       sha256 = "bc6e4d9db178937bf5223b8534bb56bf508242259ee489709af203ad39914605";
+       libraryHaskellDepends = [
+         array atomic-primops base exceptions monad-control mtl stm
+         transformers
+       ];
+       homepage = "https://github.com/barrucadu/dejafu";
+       description = "Typeclasses, functions, and data types for concurrency and STM";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "concurrent-barrier" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
@@ -42741,6 +43314,7 @@ self: {
        testHaskellDepends = [
          base machines tasty tasty-hunit time transformers
        ];
+       benchmarkHaskellDepends = [ base machines time ];
        description = "Concurrent networked stream transducers";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -42801,6 +43375,8 @@ self: {
        pname = "concurrent-state";
        version = "0.6.0.0";
        sha256 = "e6071814c277106cb13b458a7161dd42269e9a7c2419b17992a1908a7fb3342d";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [ base exceptions mtl stm transformers ];
        homepage = "https://github.com/joelteon/concurrent-state";
        description = "MTL-like library using TVars";
@@ -42949,9 +43525,10 @@ self: {
      }) {};
 
   "conduit" = callPackage
-    ({ mkDerivation, base, containers, exceptions, hspec, lifted-base
-     , mmorph, monad-control, mtl, QuickCheck, resourcet, safe, split
-     , transformers, transformers-base
+    ({ mkDerivation, base, containers, criterion, deepseq, exceptions
+     , hspec, kan-extensions, lifted-base, mmorph, monad-control, mtl
+     , mwc-random, QuickCheck, resourcet, safe, split, transformers
+     , transformers-base, vector
      }:
      mkDerivation {
        pname = "conduit";
@@ -42965,6 +43542,10 @@ self: {
          base containers exceptions hspec mtl QuickCheck resourcet safe
          split transformers
        ];
+       benchmarkHaskellDepends = [
+         base containers criterion deepseq hspec kan-extensions mwc-random
+         transformers vector
+       ];
        homepage = "http://github.com/snoyberg/conduit";
        description = "Streaming data processing library";
        license = stdenv.lib.licenses.mit;
@@ -43096,9 +43677,9 @@ self: {
 
   "conduit-extra" = callPackage
     ({ mkDerivation, async, attoparsec, base, blaze-builder, bytestring
-     , bytestring-builder, conduit, directory, exceptions, filepath
-     , hspec, monad-control, network, primitive, process, QuickCheck
-     , resourcet, stm, streaming-commons, text, transformers
+     , bytestring-builder, conduit, criterion, directory, exceptions
+     , filepath, hspec, monad-control, network, primitive, process
+     , QuickCheck, resourcet, stm, streaming-commons, text, transformers
      , transformers-base
      }:
      mkDerivation {
@@ -43115,6 +43696,10 @@ self: {
          conduit directory exceptions hspec process QuickCheck resourcet stm
          streaming-commons text transformers transformers-base
        ];
+       benchmarkHaskellDepends = [
+         base blaze-builder bytestring bytestring-builder conduit criterion
+         transformers
+       ];
        homepage = "http://github.com/snoyberg/conduit";
        description = "Batteries included conduit: adapters for common libraries";
        license = stdenv.lib.licenses.mit;
@@ -43157,8 +43742,8 @@ self: {
      }) {};
 
   "conduit-iconv" = callPackage
-    ({ mkDerivation, base, bytestring, conduit, mtl, QuickCheck
-     , test-framework, test-framework-quickcheck2, text
+    ({ mkDerivation, base, bytestring, conduit, criterion, mtl
+     , QuickCheck, test-framework, test-framework-quickcheck2, text
      }:
      mkDerivation {
        pname = "conduit-iconv";
@@ -43169,6 +43754,9 @@ self: {
          base bytestring conduit mtl QuickCheck test-framework
          test-framework-quickcheck2 text
        ];
+       benchmarkHaskellDepends = [
+         base bytestring conduit criterion mtl text
+       ];
        homepage = "https://github.com/sdroege/conduit-iconv";
        description = "Conduit for character encoding conversion";
        license = stdenv.lib.licenses.bsd3;
@@ -43325,6 +43913,8 @@ self: {
        pname = "config-ini";
        version = "0.1.2.0";
        sha256 = "d3a2b77545fba315db644ce177248e59f918cf4b6e17123c04d66e8bb3c7ee15";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [
          base megaparsec text transformers unordered-containers
        ];
@@ -43413,6 +44003,8 @@ self: {
        pname = "configifier";
        version = "0.1.1";
        sha256 = "52cbd5b32d438766e655104e583baa5379e618bc2526382c970bde313db72e11";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [
          base bytestring case-insensitive containers directory either
          functor-infix mtl safe string-conversions template-haskell
@@ -43736,6 +44328,23 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "constrained-monads" = callPackage
+    ({ mkDerivation, base, containers, doctest, QuickCheck
+     , transformers
+     }:
+     mkDerivation {
+       pname = "constrained-monads";
+       version = "0.1.0.0";
+       sha256 = "1822fb5f5bec60b9c7efc11b776718bcdc66399a8c34687fe6173975ec010184";
+       libraryHaskellDepends = [ base containers transformers ];
+       testHaskellDepends = [
+         base containers doctest QuickCheck transformers
+       ];
+       homepage = "https://github.com/oisdk/constrained-monads#readme";
+       description = "Typeclasses and instances for monads with constraints";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "constrained-normal" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
@@ -43910,9 +44519,9 @@ self: {
      }) {};
 
   "containers_0_5_10_1" = callPackage
-    ({ mkDerivation, array, base, ChasingBottoms, deepseq, ghc-prim
-     , HUnit, QuickCheck, test-framework, test-framework-hunit
-     , test-framework-quickcheck2, transformers
+    ({ mkDerivation, array, base, ChasingBottoms, criterion, deepseq
+     , ghc-prim, HUnit, QuickCheck, random, test-framework
+     , test-framework-hunit, test-framework-quickcheck2, transformers
      }:
      mkDerivation {
        pname = "containers";
@@ -43924,6 +44533,9 @@ self: {
          test-framework test-framework-hunit test-framework-quickcheck2
          transformers
        ];
+       benchmarkHaskellDepends = [
+         base criterion deepseq ghc-prim random transformers
+       ];
        description = "Assorted concrete container types";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -44040,19 +44652,22 @@ self: {
      }) {};
 
   "continuum" = callPackage
-    ({ mkDerivation, base, bytestring, cereal, containers, mtl
-     , nanomsg-haskell, time
+    ({ mkDerivation, base, bytestring, cereal, containers, hyperleveldb
+     , mtl, nanomsg-haskell, time
      }:
      mkDerivation {
        pname = "continuum";
        version = "0.1.0.7";
        sha256 = "a6bbd7bee80d5216e4678fc9bdf85f4136b079ed8d2e2cf8585c76420bb0386e";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [
          base bytestring cereal containers mtl nanomsg-haskell time
        ];
+       executableSystemDepends = [ hyperleveldb ];
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
+     }) {hyperleveldb = null;};
 
   "continuum-client" = callPackage
     ({ mkDerivation, base, bytestring, cereal, containers, mtl
@@ -44453,6 +45068,8 @@ self: {
        pname = "convertible";
        version = "1.1.1.0";
        sha256 = "e9f9a70904b9995314c2aeb41580d654a2c76293feb955fb6bd63256c355286c";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [
          base bytestring containers mtl old-locale old-time text time
        ];
@@ -44487,6 +45104,8 @@ self: {
        pname = "convertible-text";
        version = "0.4.0.2";
        sha256 = "df8dc391ff4d82e3d18b049e3c4db50198aa1345c101d088683a075d5ba217f3";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [
          attempt base bytestring containers old-time template-haskell text
          time
@@ -45003,6 +45622,8 @@ self: {
        pname = "country-codes";
        version = "0.1.3";
        sha256 = "062843cebfcb4df513e4688456311f07a2eb693935a053ce2eade2c8d586d1b5";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [ aeson base shakespeare text ];
        testHaskellDepends = [ aeson base HTF HUnit ];
        homepage = "https://github.com/prowdsponsor/country-codes";
@@ -45147,9 +45768,31 @@ self: {
        license = "LGPL";
      }) {};
 
+  "cpphs_1_20_4" = callPackage
+    ({ mkDerivation, base, directory, filepath, old-locale, old-time
+     , polyparse
+     }:
+     mkDerivation {
+       pname = "cpphs";
+       version = "1.20.4";
+       sha256 = "d159437cea89854c3f413f7157f40ea2d82272fce83efe6ce17e2065883da47e";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base directory filepath old-locale old-time polyparse
+       ];
+       executableHaskellDepends = [
+         base directory filepath old-locale old-time polyparse
+       ];
+       homepage = "http://projects.haskell.org/cpphs/";
+       description = "A liberalised re-implementation of cpp, the C pre-processor";
+       license = "LGPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "cprng-aes" = callPackage
-    ({ mkDerivation, base, byteable, bytestring, cipher-aes
-     , crypto-random
+    ({ mkDerivation, base, byteable, bytestring, cipher-aes, criterion
+     , crypto-random, mtl
      }:
      mkDerivation {
        pname = "cprng-aes";
@@ -45158,6 +45801,9 @@ self: {
        libraryHaskellDepends = [
          base byteable bytestring cipher-aes crypto-random
        ];
+       benchmarkHaskellDepends = [
+         base bytestring criterion crypto-random mtl
+       ];
        homepage = "http://github.com/vincenthz/hs-cprng-aes";
        description = "Crypto Pseudo Random Number Generator using AES in counter mode";
        license = stdenv.lib.licenses.bsd3;
@@ -45202,6 +45848,8 @@ self: {
        pname = "cpu";
        version = "0.1.2";
        sha256 = "5627feb4974a3ff8499c42cc958927e88761a2e004c4000d34e9cd6a15ad2974";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [ base ];
        homepage = "http://github.com/vincenthz/hs-cpu";
        description = "Cpu information and properties helpers";
@@ -45214,6 +45862,8 @@ self: {
        pname = "cpuid";
        version = "0.2.3";
        sha256 = "f8198ab4408219fe001c0a50908af38a766e2a0b3afb8260307838e5517add88";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [ base data-accessor enumset ];
        homepage = "http://code.haskell.org/cpuid/";
        description = "Binding for the cpuid machine instruction on x86 compatible processors";
@@ -45555,6 +46205,8 @@ self: {
        pname = "craftwerk";
        version = "0.1";
        sha256 = "a39d24c7e05469883f35d642c393c04a8bca6d03d1bd41905fd5a981ddb00200";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [ base colour mtl vector-space ];
        homepage = "http://mahrz.github.com/craftwerk.html";
        description = "2D graphics library with integrated TikZ output";
@@ -45583,6 +46235,8 @@ self: {
        pname = "craftwerk-gtk";
        version = "0.1";
        sha256 = "ced95080b5b735d57a13b9082ebdadf5015926f4f49a3b181a3e974ba01f66a1";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [
          base cairo containers craftwerk craftwerk-cairo gtk mtl
        ];
@@ -45645,7 +46299,7 @@ self: {
 
   "crc" = callPackage
     ({ mkDerivation, base, bytestring, conduit, conduit-extra
-     , resourcet, tasty, tasty-golden, vector
+     , criterion, resourcet, tasty, tasty-golden, vector
      }:
      mkDerivation {
        pname = "crc";
@@ -45655,6 +46309,7 @@ self: {
        testHaskellDepends = [
          base bytestring conduit conduit-extra resourcet tasty tasty-golden
        ];
+       benchmarkHaskellDepends = [ base bytestring criterion ];
        homepage = "http://github.com/MichaelXavier/crc";
        description = "Implements various Cyclic Redundancy Checks (CRC)";
        license = stdenv.lib.licenses.mit;
@@ -45858,9 +46513,10 @@ self: {
      }) {};
 
   "critbit" = callPackage
-    ({ mkDerivation, array, base, bytestring, containers, deepseq
+    ({ mkDerivation, array, base, bytestring, bytestring-trie
+     , containers, criterion, deepseq, hashable, mtl, mwc-random
      , QuickCheck, test-framework, test-framework-quickcheck2, text
-     , transformers, vector
+     , transformers, unordered-containers, vector
      }:
      mkDerivation {
        pname = "critbit";
@@ -45873,6 +46529,11 @@ self: {
          base bytestring containers QuickCheck test-framework
          test-framework-quickcheck2 text transformers vector
        ];
+       benchmarkHaskellDepends = [
+         base bytestring bytestring-trie containers criterion deepseq
+         hashable mtl mwc-random text transformers unordered-containers
+         vector
+       ];
        homepage = "https://github.com/bos/critbit";
        description = "Crit-bit maps and sets";
        license = stdenv.lib.licenses.bsd3;
@@ -46017,9 +46678,9 @@ self: {
      }) {};
 
   "cron" = callPackage
-    ({ mkDerivation, attoparsec, base, data-default-class, generics-sop
-     , mtl, mtl-compat, old-locale, quickcheck-instances, semigroups
-     , tasty, tasty-hunit, tasty-quickcheck, text, time
+    ({ mkDerivation, attoparsec, base, criterion, data-default-class
+     , generics-sop, mtl, mtl-compat, old-locale, quickcheck-instances
+     , semigroups, tasty, tasty-hunit, tasty-quickcheck, text, time
      , transformers-compat
      }:
      mkDerivation {
@@ -46034,6 +46695,7 @@ self: {
          attoparsec base generics-sop quickcheck-instances semigroups tasty
          tasty-hunit tasty-quickcheck text time transformers-compat
        ];
+       benchmarkHaskellDepends = [ attoparsec base criterion text time ];
        homepage = "http://github.com/michaelxavier/cron";
        description = "Cron datatypes and Attoparsec parser";
        license = stdenv.lib.licenses.mit;
@@ -46267,9 +46929,9 @@ self: {
      }) {};
 
   "crypto-numbers" = callPackage
-    ({ mkDerivation, base, byteable, bytestring, crypto-random
-     , ghc-prim, integer-gmp, tasty, tasty-hunit, tasty-quickcheck
-     , vector
+    ({ mkDerivation, base, byteable, bytestring, criterion
+     , crypto-random, ghc-prim, integer-gmp, mtl, tasty, tasty-hunit
+     , tasty-quickcheck, vector
      }:
      mkDerivation {
        pname = "crypto-numbers";
@@ -46284,15 +46946,16 @@ self: {
          base byteable bytestring crypto-random tasty tasty-hunit
          tasty-quickcheck vector
        ];
+       benchmarkHaskellDepends = [ base bytestring criterion mtl ];
        homepage = "https://github.com/vincenthz/hs-crypto-numbers";
        description = "Cryptographic numbers: functions and algorithms";
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
   "crypto-pubkey" = callPackage
-    ({ mkDerivation, base, byteable, bytestring, crypto-numbers
-     , crypto-pubkey-types, crypto-random, cryptohash, tasty
-     , tasty-hunit, tasty-kat, tasty-quickcheck
+    ({ mkDerivation, base, byteable, bytestring, criterion
+     , crypto-numbers, crypto-pubkey-types, crypto-random, cryptohash
+     , deepseq, mtl, tasty, tasty-hunit, tasty-kat, tasty-quickcheck
      }:
      mkDerivation {
        pname = "crypto-pubkey";
@@ -46307,6 +46970,10 @@ self: {
          crypto-random cryptohash tasty tasty-hunit tasty-kat
          tasty-quickcheck
        ];
+       benchmarkHaskellDepends = [
+         base bytestring criterion crypto-pubkey-types crypto-random
+         cryptohash deepseq mtl
+       ];
        homepage = "https://github.com/vincenthz/hs-crypto-pubkey";
        description = "Public Key cryptography";
        license = stdenv.lib.licenses.bsd3;
@@ -46458,8 +47125,9 @@ self: {
      }) {};
 
   "cryptohash" = callPackage
-    ({ mkDerivation, base, byteable, bytestring, cryptonite, ghc-prim
-     , HUnit, memory, QuickCheck, tasty, tasty-hunit, tasty-quickcheck
+    ({ mkDerivation, base, byteable, bytestring, criterion, cryptonite
+     , ghc-prim, HUnit, memory, QuickCheck, tasty, tasty-hunit
+     , tasty-quickcheck
      }:
      mkDerivation {
        pname = "cryptohash";
@@ -46472,6 +47140,7 @@ self: {
          base byteable bytestring HUnit QuickCheck tasty tasty-hunit
          tasty-quickcheck
        ];
+       benchmarkHaskellDepends = [ base byteable bytestring criterion ];
        homepage = "http://github.com/vincenthz/hs-cryptohash";
        description = "collection of crypto hashes, fast, pure and practical";
        license = stdenv.lib.licenses.bsd3;
@@ -46511,8 +47180,8 @@ self: {
      }) {};
 
   "cryptohash-md5" = callPackage
-    ({ mkDerivation, base, base16-bytestring, bytestring, pureMD5
-     , tasty, tasty-hunit, tasty-quickcheck
+    ({ mkDerivation, base, base16-bytestring, bytestring, criterion
+     , pureMD5, tasty, tasty-hunit, tasty-quickcheck
      }:
      mkDerivation {
        pname = "cryptohash-md5";
@@ -46523,14 +47192,15 @@ self: {
          base base16-bytestring bytestring pureMD5 tasty tasty-hunit
          tasty-quickcheck
        ];
+       benchmarkHaskellDepends = [ base bytestring criterion ];
        homepage = "https://github.com/hvr/cryptohash-md5";
        description = "Fast, pure and practical MD5 implementation";
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
   "cryptohash-sha1" = callPackage
-    ({ mkDerivation, base, base16-bytestring, bytestring, SHA, tasty
-     , tasty-hunit, tasty-quickcheck
+    ({ mkDerivation, base, base16-bytestring, bytestring, criterion
+     , SHA, tasty, tasty-hunit, tasty-quickcheck
      }:
      mkDerivation {
        pname = "cryptohash-sha1";
@@ -46541,14 +47211,15 @@ self: {
          base base16-bytestring bytestring SHA tasty tasty-hunit
          tasty-quickcheck
        ];
+       benchmarkHaskellDepends = [ base bytestring criterion ];
        homepage = "https://github.com/hvr/cryptohash-sha1";
        description = "Fast, pure and practical SHA-1 implementation";
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
   "cryptohash-sha256" = callPackage
-    ({ mkDerivation, base, base16-bytestring, bytestring, SHA, tasty
-     , tasty-hunit, tasty-quickcheck
+    ({ mkDerivation, base, base16-bytestring, bytestring, criterion
+     , SHA, tasty, tasty-hunit, tasty-quickcheck
      }:
      mkDerivation {
        pname = "cryptohash-sha256";
@@ -46559,14 +47230,15 @@ self: {
          base base16-bytestring bytestring SHA tasty tasty-hunit
          tasty-quickcheck
        ];
+       benchmarkHaskellDepends = [ base bytestring criterion ];
        homepage = "https://github.com/hvr/cryptohash-sha256";
        description = "Fast, pure and practical SHA-256 implementation";
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
   "cryptohash-sha512" = callPackage
-    ({ mkDerivation, base, base16-bytestring, bytestring, SHA, tasty
-     , tasty-hunit, tasty-quickcheck
+    ({ mkDerivation, base, base16-bytestring, bytestring, criterion
+     , SHA, tasty, tasty-hunit, tasty-quickcheck
      }:
      mkDerivation {
        pname = "cryptohash-sha512";
@@ -46577,6 +47249,7 @@ self: {
          base base16-bytestring bytestring SHA tasty tasty-hunit
          tasty-quickcheck
        ];
+       benchmarkHaskellDepends = [ base bytestring criterion ];
        homepage = "https://github.com/hvr/cryptohash-sha512";
        description = "Fast, pure and practical SHA-512 implementation";
        license = stdenv.lib.licenses.bsd3;
@@ -46584,11 +47257,12 @@ self: {
 
   "cryptol" = callPackage
     ({ mkDerivation, alex, ansi-terminal, array, async, base
-     , base-compat, bytestring, containers, deepseq, directory, filepath
-     , gitrev, GraphSCC, happy, haskeline, heredoc, monad-control
-     , monadLib, old-time, presburger, pretty, process, QuickCheck
-     , random, sbv, simple-smt, smtLib, syb, template-haskell, text
-     , tf-random, transformers, transformers-base, utf8-string
+     , base-compat, bytestring, containers, criterion, deepseq
+     , directory, filepath, gitrev, GraphSCC, happy, haskeline, heredoc
+     , monad-control, monadLib, old-time, presburger, pretty, process
+     , QuickCheck, random, sbv, simple-smt, smtLib, syb
+     , template-haskell, text, tf-random, transformers
+     , transformers-base, utf8-string
      }:
      mkDerivation {
        pname = "cryptol";
@@ -46611,6 +47285,7 @@ self: {
          filepath haskeline monad-control monadLib process random sbv
          tf-random transformers
        ];
+       benchmarkHaskellDepends = [ base criterion deepseq text ];
        homepage = "http://www.cryptol.net/";
        description = "Cryptol: The Language of Cryptography";
        license = stdenv.lib.licenses.bsd3;
@@ -46637,6 +47312,26 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "cryptonite_0_22" = callPackage
+    ({ mkDerivation, base, bytestring, deepseq, ghc-prim, integer-gmp
+     , memory, tasty, tasty-hunit, tasty-kat, tasty-quickcheck
+     }:
+     mkDerivation {
+       pname = "cryptonite";
+       version = "0.22";
+       sha256 = "4be312a42a12ccd2ca60272ef485664f242c7ed89fa1909ba36a54c5fb6ff5f0";
+       libraryHaskellDepends = [
+         base bytestring deepseq ghc-prim integer-gmp memory
+       ];
+       testHaskellDepends = [
+         base bytestring memory tasty tasty-hunit tasty-kat tasty-quickcheck
+       ];
+       homepage = "https://github.com/haskell-crypto/cryptonite";
+       description = "Cryptography Primitives sink";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "cryptonite-conduit" = callPackage
     ({ mkDerivation, base, bytestring, conduit, conduit-combinators
      , conduit-extra, cryptonite, memory, resourcet, tasty, tasty-hunit
@@ -46933,6 +47628,8 @@ self: {
        pname = "csv-conduit";
        version = "0.6.7";
        sha256 = "501e6b0b7c6f0e80ba381b5f18af5ec343eb5e1afb4f5fc4e5e318ce51eeb33d";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [
          array attoparsec base blaze-builder bytestring conduit
          conduit-extra containers data-default ghc-prim mmorph monad-control
@@ -47058,8 +47755,10 @@ self: {
      }) {};
 
   "ctrie" = callPackage
-    ({ mkDerivation, atomic-primops, base, containers, hashable
-     , primitive, QuickCheck, test-framework, test-framework-quickcheck2
+    ({ mkDerivation, async, atomic-primops, base, containers, criterion
+     , deepseq, hashable, primitive, QuickCheck, random, random-shuffle
+     , stm, test-framework, test-framework-quickcheck2, transformers
+     , unordered-containers
      }:
      mkDerivation {
        pname = "ctrie";
@@ -47070,6 +47769,10 @@ self: {
          base containers hashable QuickCheck test-framework
          test-framework-quickcheck2
        ];
+       benchmarkHaskellDepends = [
+         async base containers criterion deepseq hashable random
+         random-shuffle stm transformers unordered-containers
+       ];
        homepage = "https://github.com/mcschroeder/ctrie";
        description = "Non-blocking concurrent map";
        license = stdenv.lib.licenses.mit;
@@ -47082,6 +47785,8 @@ self: {
        pname = "cube";
        version = "0.2.0";
        sha256 = "d71f6392f0323ab12da36c43e8780a39c3d547e217d63d19205f056839a30c6a";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [ base bytestring cereal containers STL ];
        testHaskellDepends = [
          base bytestring cereal containers hspec STL
@@ -47377,6 +48082,7 @@ self: {
        sha256 = "1cdb55745936dbca5224dbb36a7006b85164a3bcc3e6af0c2670c0c0f8bb9adb";
        libraryHaskellDepends = [ base mtl ];
        testHaskellDepends = [ base tasty tasty-hunit ];
+       benchmarkHaskellDepends = [ base ];
        homepage = "https://github.com/mgattozzi/curryrs#readme";
        description = "Easy to use FFI Bridge for using Rust in Haskell";
        license = "unknown";
@@ -47998,7 +48704,7 @@ self: {
      }) {};
 
   "darkplaces-demo" = callPackage
-    ({ mkDerivation, base, binary, bytestring, containers
+    ({ mkDerivation, base, binary, bytestring, containers, criterion
      , darkplaces-text, data-binary-ieee754, directory, mtl
      , optparse-applicative, regex-tdfa, transformers
      }:
@@ -48017,6 +48723,9 @@ self: {
        executableHaskellDepends = [
          base bytestring darkplaces-text directory mtl optparse-applicative
        ];
+       benchmarkHaskellDepends = [
+         base binary bytestring criterion transformers
+       ];
        homepage = "https://github.com/bacher09/darkplaces-demo";
        description = "Utility and parser for DarkPlaces demo files";
        license = stdenv.lib.licenses.gpl2;
@@ -48868,12 +49577,13 @@ self: {
      }) {};
 
   "data-has" = callPackage
-    ({ mkDerivation, base }:
+    ({ mkDerivation, base, criterion, transformers }:
      mkDerivation {
        pname = "data-has";
        version = "0.2.1.0";
        sha256 = "c13dd9875174926b41911a826bbf6d616ceabc56d27017a76a39d097e170f890";
        libraryHaskellDepends = [ base ];
+       benchmarkHaskellDepends = [ base criterion transformers ];
        homepage = "https://github.com/winterland1989/data-has";
        description = "Simple extensible product";
        license = stdenv.lib.licenses.bsd3;
@@ -49104,7 +49814,7 @@ self: {
      }) {};
 
   "data-msgpack" = callPackage
-    ({ mkDerivation, base, binary, bytestring, containers
+    ({ mkDerivation, base, binary, bytestring, containers, criterion
      , data-binary-ieee754, deepseq, groom, hashable, hspec, QuickCheck
      , text, unordered-containers, vector, void
      }:
@@ -49123,6 +49833,9 @@ self: {
          base bytestring containers hashable hspec QuickCheck text
          unordered-containers vector void
        ];
+       benchmarkHaskellDepends = [
+         base bytestring criterion deepseq QuickCheck
+       ];
        homepage = "http://msgpack.org/";
        description = "A Haskell implementation of MessagePack";
        license = stdenv.lib.licenses.bsd3;
@@ -49193,6 +49906,8 @@ self: {
        pname = "data-object-yaml";
        version = "0.3.4.2";
        sha256 = "5785ea86b5c2da50edc5dc595d9deadae0a5868f294a6b9664f1aceb38c949a1";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [
          base bytestring conduit containers convertible-text data-object
          failure text transformers yaml
@@ -49301,6 +50016,8 @@ self: {
        sha256 = "61350a1e96cb1276c2b6b8b13fa1bade5d4e63c702509a3f5e90bbc19ad9b202";
        revision = "1";
        editedCabalFile = "f7f3a5b2f482a67eb77f4ba32e15f91bcfa4c220cdda9dde22cd9d9ff18ab447";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [ base containers ];
        homepage = "http://ku-fpg.github.io/software/data-reify/";
        description = "Reify a recursive data structure into an explicit graph";
@@ -49428,9 +50145,10 @@ self: {
      }) {};
 
   "data-store" = callPackage
-    ({ mkDerivation, base, cereal, containers, deepseq, lens
-     , QuickCheck, safecopy, test-framework, test-framework-quickcheck2
-     , transformers, vector
+    ({ mkDerivation, base, bytestring, cereal, containers, criterion
+     , deepseq, ixset, lens, mtl, QuickCheck, random, safecopy, tables
+     , tagged, test-framework, test-framework-quickcheck2, transformers
+     , unordered-containers, vector
      }:
      mkDerivation {
        pname = "data-store";
@@ -49443,6 +50161,11 @@ self: {
          base cereal containers deepseq lens QuickCheck safecopy
          test-framework test-framework-quickcheck2 transformers vector
        ];
+       benchmarkHaskellDepends = [
+         base bytestring cereal containers criterion deepseq ixset lens mtl
+         random safecopy tables tagged transformers unordered-containers
+         vector
+       ];
        homepage = "https://github.com/Palmik/data-store";
        description = "Type safe, in-memory dictionary with multidimensional keys";
        license = stdenv.lib.licenses.bsd3;
@@ -49669,6 +50392,8 @@ self: {
        pname = "dataenc";
        version = "0.14.0.7";
        sha256 = "f9d370a1ac1b9cd3c66abd13ad351270d020a21fcd774f49dae6cfa9f8a98ff3";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [ array base containers ];
        homepage = "http://www.haskell.org/haskellwiki/Library/Data_encoding";
        description = "Data encoding library";
@@ -50084,9 +50809,9 @@ self: {
 
   "dbus" = callPackage
     ({ mkDerivation, base, bytestring, cereal, chell, chell-quickcheck
-     , containers, directory, filepath, libxml-sax, network, parsec
-     , process, QuickCheck, random, text, transformers, unix, vector
-     , xml-types
+     , containers, criterion, deepseq, directory, filepath, libxml-sax
+     , network, parsec, process, QuickCheck, random, text, transformers
+     , unix, vector, xml-types
      }:
      mkDerivation {
        pname = "dbus";
@@ -50101,6 +50826,7 @@ self: {
          filepath libxml-sax network parsec process QuickCheck random text
          transformers unix vector xml-types
        ];
+       benchmarkHaskellDepends = [ base criterion deepseq ];
        doCheck = false;
        homepage = "https://john-millikin.com/software/haskell-dbus/";
        description = "A client library for the D-Bus IPC system";
@@ -50197,8 +50923,9 @@ self: {
      }) {};
 
   "dclabel" = callPackage
-    ({ mkDerivation, base, bytestring, cereal, containers, QuickCheck
-     , quickcheck-instances, test-framework, test-framework-quickcheck2
+    ({ mkDerivation, base, bytestring, cereal, containers, criterion
+     , QuickCheck, quickcheck-instances, test-framework
+     , test-framework-quickcheck2
      }:
      mkDerivation {
        pname = "dclabel";
@@ -50209,6 +50936,10 @@ self: {
          base bytestring cereal containers QuickCheck quickcheck-instances
          test-framework test-framework-quickcheck2
        ];
+       benchmarkHaskellDepends = [
+         base bytestring cereal containers criterion QuickCheck
+         quickcheck-instances
+       ];
        description = "This packge is deprecated. See the the \"LIO.DCLabel\" in the \"lio\" package.";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -51107,6 +51838,25 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "dejafu_0_5_1_1" = callPackage
+    ({ mkDerivation, base, concurrency, containers, deepseq, exceptions
+     , monad-loops, mtl, random, ref-fd, semigroups, transformers
+     , transformers-base
+     }:
+     mkDerivation {
+       pname = "dejafu";
+       version = "0.5.1.1";
+       sha256 = "c8ba221dd45a107488e5b499fc59f66587a66eb366c4e3dafb76b84b9d38488a";
+       libraryHaskellDepends = [
+         base concurrency containers deepseq exceptions monad-loops mtl
+         random ref-fd semigroups transformers transformers-base
+       ];
+       homepage = "https://github.com/barrucadu/dejafu";
+       description = "Systematic testing for Haskell concurrency";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "deka" = callPackage
     ({ mkDerivation, base, bytestring, mpdec, parsec, transformers }:
      mkDerivation {
@@ -51485,8 +52235,8 @@ self: {
      }:
      mkDerivation {
        pname = "derive";
-       version = "2.5.26";
-       sha256 = "b6ef2e5e7fa79d3b76053c97bf88cd2ab77fe15065bf321a135a29d18b4e4a6d";
+       version = "2.6.1";
+       sha256 = "8544ac13c09059acd2914da86506206879e3feb375361fc5e312548c4d9b6d72";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -52208,7 +52958,7 @@ self: {
 
   "diagrams-lib" = callPackage
     ({ mkDerivation, active, adjunctions, array, base, cereal, colour
-     , containers, data-default-class, deepseq, diagrams-core
+     , containers, criterion, data-default-class, deepseq, diagrams-core
      , diagrams-solve, directory, distributive, dual-tree, exceptions
      , filepath, fingertree, fsnotify, hashable, intervals, JuicyPixels
      , lens, linear, monoid-extras, mtl, numeric-extras
@@ -52234,6 +52984,7 @@ self: {
          base deepseq diagrams-solve lens numeric-extras tasty tasty-hunit
          tasty-quickcheck
        ];
+       benchmarkHaskellDepends = [ base criterion diagrams-core ];
        homepage = "http://projects.haskell.org/diagrams";
        description = "Embedded domain-specific language for declarative graphics";
        license = stdenv.lib.licenses.bsd3;
@@ -52451,6 +53202,8 @@ self: {
        pname = "diagrams-wx";
        version = "0.1.1.0";
        sha256 = "472855bcd4f7df78002a35099ba9b0eb21e5473c30e6eff74ecc9dcafa35b9ba";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [
          base cairo diagrams-cairo diagrams-lib wx wxcore
        ];
@@ -52475,6 +53228,7 @@ self: {
        homepage = "https://gitlab.com/lamefun/dialog";
        description = "Simple dialog-based user interfaces";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "dib" = callPackage
@@ -53023,7 +53777,8 @@ self: {
      }) {};
 
   "dimensional" = callPackage
-    ({ mkDerivation, base, deepseq, exact-pi, HUnit, numtype-dk, vector
+    ({ mkDerivation, base, criterion, deepseq, exact-pi, HUnit
+     , numtype-dk, vector
      }:
      mkDerivation {
        pname = "dimensional";
@@ -53033,6 +53788,7 @@ self: {
          base deepseq exact-pi numtype-dk vector
        ];
        testHaskellDepends = [ base HUnit ];
+       benchmarkHaskellDepends = [ base criterion deepseq ];
        homepage = "https://github.com/bjornbm/dimensional/";
        description = "Statically checked physical dimensions, using Type Families and Data Kinds";
        license = stdenv.lib.licenses.bsd3;
@@ -53390,8 +54146,8 @@ self: {
      }:
      mkDerivation {
        pname = "dirstream";
-       version = "1.0.1";
-       sha256 = "76136a076311a19e4e3242ef15bd21e39b8eade315d03b92f9b8750daffdbe59";
+       version = "1.0.2";
+       sha256 = "ff5e186dffbb2308a81312c17147609bc9d0352c829a3f138119810f4b70fa75";
        libraryHaskellDepends = [
          base directory pipes pipes-safe system-fileio system-filepath unix
        ];
@@ -53436,6 +54192,30 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "discord-hs" = callPackage
+    ({ mkDerivation, aeson, base, bytestring, case-insensitive
+     , containers, data-default, hakyll, hashable, hslogger, lens
+     , mmorph, mtl, pipes, split, stm, stm-conduit, text, time
+     , transformers, unordered-containers, url, vector, websockets, wreq
+     , wuss
+     }:
+     mkDerivation {
+       pname = "discord-hs";
+       version = "0.1.3";
+       sha256 = "4cdcbc983ef10838e96344ad9b63e772296d9e734b4dc87768f657b7aaa106fc";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         aeson base bytestring case-insensitive containers data-default
+         hashable hslogger lens mmorph mtl pipes stm stm-conduit text time
+         transformers unordered-containers url vector websockets wreq wuss
+       ];
+       executableHaskellDepends = [ base hakyll split ];
+       homepage = "https://github.com/jano017/Discord.hs";
+       description = "An API wrapper for Discord in Haskell";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "discordian-calendar" = callPackage
     ({ mkDerivation, base, time }:
      mkDerivation {
@@ -53480,9 +54260,10 @@ self: {
      }) {};
 
   "discrimination" = callPackage
-    ({ mkDerivation, array, base, containers, contravariant, deepseq
-     , ghc-prim, hashable, primitive, profunctors, promises, semigroups
-     , transformers, transformers-compat, vector, void
+    ({ mkDerivation, array, base, containers, contravariant, criterion
+     , deepseq, ghc-prim, hashable, primitive, profunctors, promises
+     , semigroups, transformers, transformers-compat
+     , unordered-containers, vector, void
      }:
      mkDerivation {
        pname = "discrimination";
@@ -53495,6 +54276,10 @@ self: {
          primitive profunctors promises semigroups transformers
          transformers-compat vector void
        ];
+       benchmarkHaskellDepends = [
+         base containers criterion deepseq ghc-prim primitive
+         unordered-containers
+       ];
        homepage = "http://github.com/ekmett/discrimination/";
        description = "Fast generic linear-time sorting, joins and container construction";
        license = stdenv.lib.licenses.bsd3;
@@ -53544,6 +54329,30 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "display-haskell-do" = callPackage
+    ({ mkDerivation, aeson, base, text }:
+     mkDerivation {
+       pname = "display-haskell-do";
+       version = "0.1.0.0";
+       sha256 = "78c4fd335953e51394476a6643dac326645877c91f076f12079ebb595fd55948";
+       libraryHaskellDepends = [ aeson base text ];
+       homepage = "https://github.com/KitFreddura/HaskellDO-Display";
+       description = "A display API for HaskellDO";
+       license = stdenv.lib.licenses.asl20;
+     }) {};
+
+  "disposable" = callPackage
+    ({ mkDerivation, base, dlist }:
+     mkDerivation {
+       pname = "disposable";
+       version = "0.1.0.0";
+       sha256 = "fc7d7dc460566c9f3ac965c355792806278a19a0fa35e89ab3a5df465fb34e43";
+       libraryHaskellDepends = [ base dlist ];
+       homepage = "https://github.com/louispan/disposable#readme";
+       description = "Allows storing different resource-releasing actions together";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "dist-upload" = callPackage
     ({ mkDerivation, base, Cabal, directory, filepath, process }:
      mkDerivation {
@@ -53605,8 +54414,8 @@ self: {
   "distributed-process" = callPackage
     ({ mkDerivation, base, binary, bytestring, containers
      , data-accessor, deepseq, distributed-static, exceptions, hashable
-     , mtl, network-transport, random, rank1dynamic, stm, syb
-     , template-haskell, time, transformers
+     , mtl, network-transport, network-transport-tcp, random
+     , rank1dynamic, stm, syb, template-haskell, time, transformers
      }:
      mkDerivation {
        pname = "distributed-process";
@@ -53619,6 +54428,9 @@ self: {
          distributed-static exceptions hashable mtl network-transport random
          rank1dynamic stm syb template-haskell time transformers
        ];
+       benchmarkHaskellDepends = [
+         base binary bytestring network-transport-tcp
+       ];
        homepage = "http://haskell-distributed.github.com/";
        description = "Cloud Haskell: Erlang-style concurrency in Haskell";
        license = stdenv.lib.licenses.bsd3;
@@ -53664,6 +54476,8 @@ self: {
        pname = "distributed-process-azure";
        version = "0.1.0";
        sha256 = "4f64d22e0ff0dc94e6ecfd99cc7133ab5c5df4dbbe3415bd2c99fdaee98f8035";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [
          azure-service-api base binary bytestring certificate
          distributed-process distributed-static executable-path filepath
@@ -53773,12 +54587,11 @@ self: {
      }:
      mkDerivation {
        pname = "distributed-process-extras";
-       version = "0.3.0";
-       sha256 = "bffa1640ec7f59bf415e18fb68e6085bf1cf96d4fc4c51c260ef554385e3cb36";
+       version = "0.3.1";
+       sha256 = "feeb3891a60c8f1833aec4e3a7eeae34a54f0baf83f6ebfb5610bb14b4f66bdc";
        libraryHaskellDepends = [
-         base binary containers data-accessor deepseq distributed-process
-         exceptions fingertree hashable mtl stm time transformers
-         unordered-containers
+         base binary containers deepseq distributed-process exceptions
+         fingertree hashable mtl stm time transformers unordered-containers
        ];
        testHaskellDepends = [
          ansi-terminal base binary bytestring containers data-accessor
@@ -53847,6 +54660,8 @@ self: {
        pname = "distributed-process-p2p";
        version = "0.1.3.2";
        sha256 = "613c65aa986085e61cf65b55bf174cc2f31a79e5b666daf1ef402bcad940a28e";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [
          base binary bytestring containers distributed-process mtl network
          network-transport network-transport-tcp
@@ -53869,6 +54684,8 @@ self: {
        pname = "distributed-process-platform";
        version = "0.1.0";
        sha256 = "752980d006aaa5319b91da7b5bd5124322552fff9e9cb7de816aff89b7f5ae2f";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [
          base binary containers data-accessor deepseq distributed-process
          fingertree hashable mtl stm time transformers unordered-containers
@@ -53931,6 +54748,8 @@ self: {
        sha256 = "7b98498f2d6ce185ae0a855ff35e97a9ad1bd1ec7872b2d75aa0bb1f1fb24316";
        revision = "1";
        editedCabalFile = "4ccf03a12611141e322511b6370e2f757e215f17e68fc3f68485ec5b48fa8f70";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [
          base binary bytestring containers data-accessor distributed-process
          network network-multicast network-transport network-transport-tcp
@@ -54068,6 +54887,8 @@ self: {
        pname = "distributed-process-zookeeper";
        version = "0.2.2.0";
        sha256 = "df15044fe0f74e4034be2f58d589e2ffa1e46c36e8024c07d6db56fe39697928";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [
          base binary bytestring containers deepseq distributed-process hzk
          mtl network network-transport network-transport-tcp transformers
@@ -54490,13 +55311,14 @@ self: {
      }) {dns_sd = null;};
 
   "do-list" = callPackage
-    ({ mkDerivation, base, hspec }:
+    ({ mkDerivation, base, criterion, hspec, mtl, text }:
      mkDerivation {
        pname = "do-list";
        version = "1.0.1";
        sha256 = "b377193461b0ad7a81f9e66bcf10f8838b6f1e39f4a5de3b2e2f45c749c5b694";
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base hspec ];
+       benchmarkHaskellDepends = [ base criterion mtl text ];
        homepage = "https://github.com/tserduke/do-list#readme";
        description = "Do notation for free";
        license = stdenv.lib.licenses.bsd3;
@@ -55051,6 +55873,8 @@ self: {
        pname = "dotgen";
        version = "0.4.2";
        sha256 = "cf0de20a435d74aeb9a32b8bcb3ebfa1b6659ac3f26edefe2df9e1aaf1481891";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [ base containers ];
        homepage = "https://github.com/ku-fpg/dotgen";
        description = "A simple interface for building .dot graph files.";
@@ -55457,6 +56281,8 @@ self: {
        pname = "drawille";
        version = "0.1.2.0";
        sha256 = "b8188ee87a06c168974c9655188450eb86c331c556decb31cf084efa846237df";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [ base containers ];
        testHaskellDepends = [ base containers hspec QuickCheck ];
        homepage = "https://github.com/yamadapc/haskell-drawille#readme";
@@ -55791,6 +56617,8 @@ self: {
        pname = "dtrace";
        version = "0.1";
        sha256 = "393b9e0f3ed92d2b817ae162ad5478116d001ec8e05ddf3c65a0334029a45f63";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [ base ];
        description = "Haskell interface to the DTrace system tracing utility";
        license = stdenv.lib.licenses.bsd3;
@@ -56284,6 +57112,8 @@ self: {
        pname = "dynobud";
        version = "1.9.1.0";
        sha256 = "3995a1186ca493ae30fc38b72fbfa49b8f4b5858e266a9b6b24135267deedde5";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [
          aeson base binary casadi-bindings casadi-bindings-core cereal
          containers data-default-class directory distributive
@@ -56605,6 +57435,8 @@ self: {
        pname = "echo";
        version = "0.1.3";
        sha256 = "704f07310f8272d170f8ab7fb2a2c13f15d8501ef8310801e36964c8eff485ef";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [ base process ];
        homepage = "https://github.com/RyanGlScott/echo";
        description = "A cross-platform, cross-console way to handle echoing terminal input";
@@ -56651,8 +57483,8 @@ self: {
      }) {canlib = null;};
 
   "ed25519" = callPackage
-    ({ mkDerivation, base, bytestring, directory, doctest, filepath
-     , ghc-prim, hlint, QuickCheck
+    ({ mkDerivation, base, bytestring, criterion, deepseq, directory
+     , doctest, filepath, ghc-prim, hlint, QuickCheck
      }:
      mkDerivation {
        pname = "ed25519";
@@ -56664,6 +57496,7 @@ self: {
        testHaskellDepends = [
          base bytestring directory doctest filepath hlint QuickCheck
        ];
+       benchmarkHaskellDepends = [ base bytestring criterion deepseq ];
        homepage = "http://thoughtpolice.github.com/hs-ed25519";
        description = "Ed25519 cryptographic signatures";
        license = stdenv.lib.licenses.mit;
@@ -56802,8 +57635,9 @@ self: {
      }) {};
 
   "edit-distance" = callPackage
-    ({ mkDerivation, array, base, containers, QuickCheck, random
-     , test-framework, test-framework-quickcheck2
+    ({ mkDerivation, array, base, containers, criterion, deepseq
+     , process, QuickCheck, random, test-framework
+     , test-framework-quickcheck2, time, unix
      }:
      mkDerivation {
        pname = "edit-distance";
@@ -56816,6 +57650,9 @@ self: {
          array base containers QuickCheck random test-framework
          test-framework-quickcheck2
        ];
+       benchmarkHaskellDepends = [
+         array base containers criterion deepseq process random time unix
+       ];
        homepage = "http://github.com/phadej/edit-distance";
        description = "Levenshtein and restricted Damerau-Levenshtein edit distances";
        license = stdenv.lib.licenses.bsd3;
@@ -56930,8 +57767,8 @@ self: {
      }) {};
 
   "effect-handlers" = callPackage
-    ({ mkDerivation, base, free, hspec, hspec-discover, HUnit
-     , kan-extensions, mtl, QuickCheck
+    ({ mkDerivation, base, criterion, free, hspec, hspec-discover
+     , HUnit, kan-extensions, mtl, QuickCheck
      }:
      mkDerivation {
        pname = "effect-handlers";
@@ -56941,6 +57778,7 @@ self: {
        testHaskellDepends = [
          base hspec hspec-discover HUnit QuickCheck
        ];
+       benchmarkHaskellDepends = [ base criterion ];
        homepage = "https://github.com/edofic/effect-handlers";
        description = "A library for writing extensible algebraic effects and handlers. Similar to extensible-effects but with deep handlers.";
        license = stdenv.lib.licenses.mit;
@@ -57040,10 +57878,11 @@ self: {
      }) {};
 
   "egison" = callPackage
-    ({ mkDerivation, array, base, containers, directory, filepath, ghc
-     , ghc-paths, Glob, haskeline, HUnit, monad-parallel, mtl, parsec
-     , process, random, regex-tdfa, test-framework, test-framework-hunit
-     , text, transformers, unordered-containers, vector
+    ({ mkDerivation, array, base, containers, criterion, deepseq
+     , directory, filepath, ghc, ghc-paths, Glob, haskeline, HUnit
+     , monad-parallel, mtl, parsec, process, random, regex-tdfa
+     , test-framework, test-framework-hunit, text, transformers
+     , unordered-containers, vector
      }:
      mkDerivation {
        pname = "egison";
@@ -57065,6 +57904,9 @@ self: {
          base Glob HUnit mtl test-framework test-framework-hunit
          transformers
        ];
+       benchmarkHaskellDepends = [
+         base criterion deepseq mtl transformers
+       ];
        homepage = "http://www.egison.org";
        description = "Programming language with non-linear pattern-matching against non-free data";
        license = stdenv.lib.licenses.mit;
@@ -57136,6 +57978,8 @@ self: {
        sha256 = "3d84485f15b876982c857a57e6e0fec85417c85eddd6b6f4344b3db30f8b934d";
        revision = "3";
        editedCabalFile = "e27ea9e604b3868e61e330abcd605d550371ef7f2c27e12e60b1caad99458222";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [
          base bytestring haskell-src-meta parsec template-haskell text
          transformers
@@ -57315,6 +58159,7 @@ self: {
        libraryHaskellDepends = [
          base containers ghc-prim text unordered-containers
        ];
+       benchmarkHaskellDepends = [ base ];
        homepage = "https://github.com/tibbe/ekg-core";
        description = "Tracking of system metrics";
        license = stdenv.lib.licenses.bsd3;
@@ -57396,6 +58241,8 @@ self: {
        pname = "ekg-push";
        version = "0.0.3";
        sha256 = "be683041cb6935aa194a9d241b5f11c2038b7056884fbc0a10ec1f148706b7fb";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [
          base bytestring ekg-core text time unordered-containers
        ];
@@ -57443,6 +58290,24 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "ekg-wai" = callPackage
+    ({ mkDerivation, aeson, base, bytestring, ekg-core, ekg-json
+     , filepath, http-types, network, text, time, transformers
+     , unordered-containers, wai, wai-app-static, warp
+     }:
+     mkDerivation {
+       pname = "ekg-wai";
+       version = "0.1.0.0";
+       sha256 = "48a7e64ac613caf2eea1db79a20785d66552ea0f6943941468b0b6e44dfa7798";
+       libraryHaskellDepends = [
+         aeson base bytestring ekg-core ekg-json filepath http-types network
+         text time transformers unordered-containers wai wai-app-static warp
+       ];
+       homepage = "https://github.com/tvh/ekg-wai";
+       description = "Remote monitoring of processes";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "electrum-mnemonic" = callPackage
     ({ mkDerivation, base, tasty, tasty-quickcheck }:
      mkDerivation {
@@ -57512,10 +58377,10 @@ self: {
     ({ mkDerivation, base, binary, bytestring }:
      mkDerivation {
        pname = "elf";
-       version = "0.27";
-       sha256 = "5ade563fb19d75af6bf02effe6f9fa8fc207102c259b8d9fe394096f4798d4a7";
+       version = "0.28";
+       sha256 = "9e27129a3b10386e719e8caeed1cdff6a2a1f3a3c9a81ee493dfb6d11e9ff157";
        libraryHaskellDepends = [ base binary bytestring ];
-       homepage = "http://github.com/erikcharlebois/elf";
+       homepage = "https://github.com/wangbj/elf";
        description = "Parser for ELF object format";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -58165,6 +59030,8 @@ self: {
        pname = "enchant";
        version = "0.1.0.0";
        sha256 = "553536cc63fa18dfa07441e03166f10ae71d19c6dbfd04a996a91c318be36dfc";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [ base ];
        libraryPkgconfigDepends = [ enchant ];
        libraryToolDepends = [ c2hs ];
@@ -58487,9 +59354,9 @@ self: {
      }) {};
 
   "enummapmap" = callPackage
-    ({ mkDerivation, base, cereal, containers, contravariant
+    ({ mkDerivation, base, cereal, containers, contravariant, criterion
      , data-default, deepseq, ghc-prim, hspec, hspec-expectations, HUnit
-     , lens, QuickCheck, safecopy, semigroups
+     , lens, mtl, QuickCheck, safecopy, semigroups
      }:
      mkDerivation {
        pname = "enummapmap";
@@ -58503,6 +59370,9 @@ self: {
          base cereal containers deepseq hspec hspec-expectations HUnit lens
          QuickCheck safecopy semigroups
        ];
+       benchmarkHaskellDepends = [
+         base containers criterion deepseq mtl
+       ];
        description = "Map of maps using Enum types as keys";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -58611,8 +59481,8 @@ self: {
      }:
      mkDerivation {
        pname = "envy";
-       version = "1.3.0.1";
-       sha256 = "ac630e03e9f4c8c99c39e622b9638c3bdc3b71300ef92597d60acac7ace8e85c";
+       version = "1.3.0.2";
+       sha256 = "4ca0af8de7d089cf9f1e16e46a6a1300e901907f4edb3a8d393e5af11868899b";
        libraryHaskellDepends = [
          base bytestring containers mtl text time transformers
        ];
@@ -59145,6 +60015,8 @@ self: {
        sha256 = "b83980c6f537ab812ac8605a9fe8c3bb9764bb5ae098e20ef882fd5aa824f7b6";
        revision = "1";
        editedCabalFile = "146f86cb3df790cd26c0ec2f7061027257c7932a64ff8a6725eee5356a887776";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [
          array base containers ersatz toysolver transformers
        ];
@@ -59474,8 +60346,8 @@ self: {
      }) {};
 
   "euler" = callPackage
-    ({ mkDerivation, base, directory, happy, hlint, hspec, process
-     , regex-posix, xml
+    ({ mkDerivation, base, criterion, directory, happy, hlint, hspec
+     , process, regex-posix, xml
      }:
      mkDerivation {
        pname = "euler";
@@ -59486,15 +60358,17 @@ self: {
          base directory hlint hspec process regex-posix xml
        ];
        testToolDepends = [ happy ];
+       benchmarkHaskellDepends = [ base criterion ];
        homepage = "https://github.com/decomputed/euler";
        description = "Mathematics utilities for Haskell";
        license = stdenv.lib.licenses.mit;
      }) {};
 
   "euphoria" = callPackage
-    ({ mkDerivation, base, containers, deepseq, elerea, enummapset-th
-     , hashable, HUnit, test-framework, test-framework-hunit
-     , test-framework-th, transformers, unordered-containers
+    ({ mkDerivation, base, containers, criterion, deepseq, elerea
+     , enummapset-th, hashable, HUnit, test-framework
+     , test-framework-hunit, test-framework-th, transformers
+     , unordered-containers
      }:
      mkDerivation {
        pname = "euphoria";
@@ -59507,6 +60381,9 @@ self: {
        testHaskellDepends = [
          base HUnit test-framework test-framework-hunit test-framework-th
        ];
+       benchmarkHaskellDepends = [
+         base criterion deepseq enummapset-th unordered-containers
+       ];
        homepage = "http://github.com/tsurucapital/euphoria";
        description = "Dynamic network FRP with events and continuous values";
        license = stdenv.lib.licenses.publicDomain;
@@ -59832,8 +60709,8 @@ self: {
      }) {};
 
   "exact-real" = callPackage
-    ({ mkDerivation, base, checkers, directory, doctest, filepath
-     , groups, integer-gmp, memoize, QuickCheck, random, tasty
+    ({ mkDerivation, base, checkers, criterion, directory, doctest
+     , filepath, groups, integer-gmp, memoize, QuickCheck, random, tasty
      , tasty-hunit, tasty-quickcheck, tasty-th
      }:
      mkDerivation {
@@ -59845,6 +60722,7 @@ self: {
          base checkers directory doctest filepath groups QuickCheck random
          tasty tasty-hunit tasty-quickcheck tasty-th
        ];
+       benchmarkHaskellDepends = [ base criterion ];
        homepage = "http://github.com/expipiplus1/exact-real";
        description = "Exact real arithmetic";
        license = stdenv.lib.licenses.mit;
@@ -60364,6 +61242,8 @@ self: {
        pname = "explicit-exception";
        version = "0.1.8";
        sha256 = "7fee7a3781db3c3bf82079e635d510088dbb6f4295fde887c603819ec14cd16f";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [ base deepseq transformers ];
        homepage = "http://www.haskell.org/haskellwiki/Exception";
        description = "Exceptions which are explicit in the type signature";
@@ -60962,21 +61842,23 @@ self: {
      }) {};
 
   "farmhash" = callPackage
-    ({ mkDerivation, base, bytestring, hspec, QuickCheck }:
+    ({ mkDerivation, base, bytestring, criterion, hspec, QuickCheck }:
      mkDerivation {
        pname = "farmhash";
        version = "0.1.0.5";
        sha256 = "0e685a5445f7bce88682d209bccb47d03f06065a627475df44a8e2af8bc20fa1";
        libraryHaskellDepends = [ base bytestring ];
        testHaskellDepends = [ base bytestring hspec QuickCheck ];
+       benchmarkHaskellDepends = [ base bytestring criterion ];
        homepage = "https://github.com/abhinav/farmhash";
        description = "Fast hash functions";
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
   "fast-builder" = callPackage
-    ({ mkDerivation, base, bytestring, ghc-prim, process, QuickCheck
-     , stm
+    ({ mkDerivation, aeson, base, bytestring, containers, criterion
+     , deepseq, ghc-prim, process, QuickCheck, scientific, stm
+     , template-haskell, text, true-name, unordered-containers, vector
      }:
      mkDerivation {
        pname = "fast-builder";
@@ -60984,14 +61866,19 @@ self: {
        sha256 = "4a83c2fb4e21ec43d7cf9b2412286e1fea036f7c5cbfd4dcee8914f8b2ae9e1c";
        libraryHaskellDepends = [ base bytestring ghc-prim ];
        testHaskellDepends = [ base bytestring process QuickCheck stm ];
+       benchmarkHaskellDepends = [
+         aeson base bytestring containers criterion deepseq ghc-prim
+         scientific template-haskell text true-name unordered-containers
+         vector
+       ];
        homepage = "http://github.com/takano-akio/fast-builder";
        description = "Fast ByteString Builder";
        license = stdenv.lib.licenses.publicDomain;
      }) {};
 
   "fast-digits" = callPackage
-    ({ mkDerivation, base, digits, integer-gmp, QuickCheck, smallcheck
-     , tasty, tasty-quickcheck, tasty-smallcheck
+    ({ mkDerivation, base, criterion, digits, integer-gmp, QuickCheck
+     , smallcheck, tasty, tasty-quickcheck, tasty-smallcheck
      }:
      mkDerivation {
        pname = "fast-digits";
@@ -61002,6 +61889,7 @@ self: {
          base digits QuickCheck smallcheck tasty tasty-quickcheck
          tasty-smallcheck
        ];
+       benchmarkHaskellDepends = [ base criterion digits ];
        homepage = "https://github.com/Bodigrim/fast-digits";
        description = "The fast library for integer-to-digits conversion";
        license = stdenv.lib.licenses.gpl3;
@@ -61189,8 +62077,8 @@ self: {
      }) {};
 
   "fastpbkdf2" = callPackage
-    ({ mkDerivation, base, base16-bytestring, bytestring, openssl
-     , tasty, tasty-hunit
+    ({ mkDerivation, base, base16-bytestring, bytestring, criterion
+     , cryptonite, openssl, pbkdf, tasty, tasty-hunit
      }:
      mkDerivation {
        pname = "fastpbkdf2";
@@ -61201,6 +62089,9 @@ self: {
        testHaskellDepends = [
          base base16-bytestring bytestring tasty tasty-hunit
        ];
+       benchmarkHaskellDepends = [
+         base bytestring criterion cryptonite pbkdf
+       ];
        homepage = "https://github.com/adinapoli/fastpbkdf2-hs#readme";
        description = "Haskell bindings to the fastpbkdf2 C library";
        license = stdenv.lib.licenses.bsd3;
@@ -61535,7 +62426,8 @@ self: {
      }) {};
 
   "fclabels" = callPackage
-    ({ mkDerivation, base, HUnit, mtl, template-haskell, transformers
+    ({ mkDerivation, base, criterion, HUnit, mtl, template-haskell
+     , transformers
      }:
      mkDerivation {
        pname = "fclabels";
@@ -61545,6 +62437,7 @@ self: {
        testHaskellDepends = [
          base HUnit mtl template-haskell transformers
        ];
+       benchmarkHaskellDepends = [ base criterion ];
        homepage = "https://github.com/sebastiaanvisser/fclabels";
        description = "First class accessor labels implemented as lenses";
        license = stdenv.lib.licenses.bsd3;
@@ -61820,11 +62713,11 @@ self: {
      }) {};
 
   "feldspar-compiler" = callPackage
-    ({ mkDerivation, base, bytestring, Cabal, containers, data-default
-     , directory, feldspar-language, filepath, gcc_s, ghc-paths, mtl
-     , plugins, plugins-multistage, pretty, process, QuickCheck
-     , storable-record, storable-tuple, syntactic, tasty, tasty-golden
-     , tasty-quickcheck, template-haskell
+    ({ mkDerivation, base, bytestring, Cabal, containers, criterion
+     , data-default, deepseq, directory, feldspar-language, filepath
+     , gcc_s, ghc-paths, mtl, plugins, plugins-multistage, pretty
+     , process, QuickCheck, storable-record, storable-tuple, syntactic
+     , tasty, tasty-golden, tasty-quickcheck, template-haskell
      }:
      mkDerivation {
        pname = "feldspar-compiler";
@@ -61840,6 +62733,9 @@ self: {
          base bytestring Cabal feldspar-language mtl process QuickCheck
          tasty tasty-golden tasty-quickcheck
        ];
+       benchmarkHaskellDepends = [
+         base criterion data-default deepseq feldspar-language
+       ];
        homepage = "http://feldspar.github.com";
        description = "Compiler for the Feldspar language";
        license = stdenv.lib.licenses.bsd3;
@@ -62012,6 +62908,8 @@ self: {
        pname = "ffmpeg-light";
        version = "0.11.3";
        sha256 = "57206bff8bcf82f08f0881b80d5992d2be41b32443b8eca10d198789af24adfb";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [
          base either exceptions JuicyPixels mtl transformers vector
        ];
@@ -62805,7 +63703,9 @@ self: {
      }) {inherit (pkgs) cfitsio;};
 
   "fitspec" = callPackage
-    ({ mkDerivation, base, cmdargs, leancheck, template-haskell }:
+    ({ mkDerivation, base, cmdargs, haskell-src, haskell-src-exts
+     , leancheck, pretty, template-haskell
+     }:
      mkDerivation {
        pname = "fitspec";
        version = "0.4.0";
@@ -62814,6 +63714,10 @@ self: {
          base cmdargs leancheck template-haskell
        ];
        testHaskellDepends = [ base cmdargs leancheck template-haskell ];
+       benchmarkHaskellDepends = [
+         base cmdargs haskell-src haskell-src-exts leancheck pretty
+         template-haskell
+       ];
        homepage = "https://github.com/rudymatela/fitspec#readme";
        description = "refining property sets for testing Haskell programs";
        license = stdenv.lib.licenses.bsd3;
@@ -63493,13 +64397,14 @@ self: {
      }) {};
 
   "floating-bits" = callPackage
-    ({ mkDerivation, base }:
+    ({ mkDerivation, base, criterion }:
      mkDerivation {
        pname = "floating-bits";
        version = "0.3.0.0";
        sha256 = "b2cf891588df5adc6633c26d8e75c582c0cecfcf7f48e3a889e8013d739ae2b2";
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base ];
+       benchmarkHaskellDepends = [ base criterion ];
        description = "Conversions between floating and integral values";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -63726,8 +64631,8 @@ self: {
      }:
      mkDerivation {
        pname = "fltkhs";
-       version = "0.5.1.0";
-       sha256 = "0153c9fe8224f1cf72acfd6b738f03fed28e7b498ececaec176edb98556ef184";
+       version = "0.5.1.1";
+       sha256 = "9230417d449ea9af3257dbaba15a7aada3db6289b2e26246bbd92787f3cb394c";
        isLibrary = true;
        isExecutable = true;
        setupHaskellDepends = [ base Cabal directory filepath ];
@@ -63803,9 +64708,9 @@ self: {
 
   "fluent-logger" = callPackage
     ({ mkDerivation, attoparsec, base, bytestring, cereal
-     , cereal-conduit, conduit, conduit-extra, containers, exceptions
-     , hspec, messagepack, network, network-socket-options, random, stm
-     , text, time, transformers, vector
+     , cereal-conduit, conduit, conduit-extra, containers, criterion
+     , exceptions, hspec, messagepack, network, network-socket-options
+     , random, stm, text, time, transformers, vector
      }:
      mkDerivation {
        pname = "fluent-logger";
@@ -63820,6 +64725,7 @@ self: {
          conduit-extra containers exceptions hspec messagepack network text
          time transformers
        ];
+       benchmarkHaskellDepends = [ base criterion ];
        description = "A structured logger for Fluentd (Haskell)";
        license = stdenv.lib.licenses.asl20;
      }) {};
@@ -63886,13 +64792,21 @@ self: {
      }) {};
 
   "fmt" = callPackage
-    ({ mkDerivation, base, hspec, text, text-format }:
+    ({ mkDerivation, base, base16-bytestring, base64-bytestring
+     , bytestring, containers, hspec, microlens, neat-interpolation
+     , text, text-format, vector
+     }:
      mkDerivation {
        pname = "fmt";
-       version = "0.0.0.2";
-       sha256 = "8cf2554099987e09090d8b7ac084ff1b389c934e3de1cc99c0f29d754ff0a20a";
-       libraryHaskellDepends = [ base text text-format ];
-       testHaskellDepends = [ base hspec text ];
+       version = "0.0.0.3";
+       sha256 = "a6cc32309e996acc4db281368184a1333b52072023315dfa8f20fbfa235ed81b";
+       libraryHaskellDepends = [
+         base base16-bytestring base64-bytestring bytestring microlens text
+         text-format
+       ];
+       testHaskellDepends = [
+         base bytestring containers hspec neat-interpolation text vector
+       ];
        homepage = "http://github.com/aelve/fmt";
        description = "Nice formatting library";
        license = stdenv.lib.licenses.bsd3;
@@ -63991,8 +64905,8 @@ self: {
 
   "foldl" = callPackage
     ({ mkDerivation, base, bytestring, comonad, containers
-     , contravariant, mwc-random, primitive, profunctors, text
-     , transformers, vector
+     , contravariant, criterion, mwc-random, primitive, profunctors
+     , text, transformers, vector
      }:
      mkDerivation {
        pname = "foldl";
@@ -64002,13 +64916,14 @@ self: {
          base bytestring comonad containers contravariant mwc-random
          primitive profunctors text transformers vector
        ];
+       benchmarkHaskellDepends = [ base criterion ];
        description = "Composable, streaming, and efficient left folds";
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
   "foldl-incremental" = callPackage
-    ({ mkDerivation, base, bytestring, containers, deepseq, foldl
-     , histogram-fill, mwc-random, pipes, QuickCheck, tasty
+    ({ mkDerivation, base, bytestring, containers, criterion, deepseq
+     , foldl, histogram-fill, mwc-random, pipes, QuickCheck, tasty
      , tasty-golden, tasty-hunit, tasty-quickcheck, vector
      }:
      mkDerivation {
@@ -64022,6 +64937,7 @@ self: {
          base bytestring containers foldl histogram-fill mwc-random pipes
          QuickCheck tasty tasty-golden tasty-hunit tasty-quickcheck vector
        ];
+       benchmarkHaskellDepends = [ base containers criterion foldl ];
        homepage = "https://github.com/tonyday567/foldl-incremental";
        description = "incremental folds";
        license = stdenv.lib.licenses.mit;
@@ -64029,8 +64945,8 @@ self: {
      }) {};
 
   "foldl-statistics" = callPackage
-    ({ mkDerivation, base, foldl, math-functions, profunctors
-     , quickcheck-instances, semigroups, statistics, tasty
+    ({ mkDerivation, base, criterion, foldl, math-functions, mwc-random
+     , profunctors, quickcheck-instances, semigroups, statistics, tasty
      , tasty-quickcheck, vector
      }:
      mkDerivation {
@@ -64044,6 +64960,9 @@ self: {
          base foldl profunctors quickcheck-instances semigroups statistics
          tasty tasty-quickcheck vector
        ];
+       benchmarkHaskellDepends = [
+         base criterion foldl mwc-random statistics vector
+       ];
        homepage = "http://github.com/Data61/foldl-statistics#readme";
        description = "Statistical functions from the statistics package implemented as Folds";
        license = stdenv.lib.licenses.bsd3;
@@ -64051,9 +64970,9 @@ self: {
 
   "foldl-transduce" = callPackage
     ({ mkDerivation, base, bifunctors, bytestring, comonad, containers
-     , doctest, foldl, free, monoid-subclasses, profunctors
-     , semigroupoids, semigroups, split, tasty, tasty-hunit
-     , tasty-quickcheck, text, transformers, void
+     , criterion, doctest, foldl, free, lens-family-core
+     , monoid-subclasses, profunctors, semigroupoids, semigroups, split
+     , tasty, tasty-hunit, tasty-quickcheck, text, transformers, void
      }:
      mkDerivation {
        pname = "foldl-transduce";
@@ -64068,6 +64987,9 @@ self: {
          base doctest foldl free monoid-subclasses split tasty tasty-hunit
          tasty-quickcheck text
        ];
+       benchmarkHaskellDepends = [
+         base criterion foldl lens-family-core
+       ];
        description = "Transducers for foldl folds";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -64699,7 +65621,7 @@ self: {
      }) {};
 
   "foundation" = callPackage
-    ({ mkDerivation, base, ghc-prim, mtl, QuickCheck, tasty
+    ({ mkDerivation, base, criterion, ghc-prim, mtl, QuickCheck, tasty
      , tasty-hunit, tasty-quickcheck
      }:
      mkDerivation {
@@ -64712,6 +65634,7 @@ self: {
        testHaskellDepends = [
          base mtl QuickCheck tasty tasty-hunit tasty-quickcheck
        ];
+       benchmarkHaskellDepends = [ base criterion ];
        homepage = "https://github.com/haskell-foundation/foundation";
        description = "Alternative prelude with batteries and no dependencies";
        license = stdenv.lib.licenses.bsd3;
@@ -65054,8 +65977,8 @@ self: {
      }:
      mkDerivation {
        pname = "free-functors";
-       version = "0.7.1";
-       sha256 = "051dff857638b93e574aecce065860e1985e71a8e0f07c410966cdf87880930c";
+       version = "0.7.2";
+       sha256 = "de9a834164e97e1b025ca01d58833e8d91afe68e7152e0af40e30050b3898121";
        libraryHaskellDepends = [
          algebraic-classes base bifunctors comonad constraints contravariant
          profunctors template-haskell transformers
@@ -65287,8 +66210,8 @@ self: {
          libfreenect = null;};
 
   "freer" = callPackage
-    ({ mkDerivation, base, QuickCheck, tasty, tasty-hunit
-     , tasty-quickcheck
+    ({ mkDerivation, base, criterion, free, mtl, QuickCheck, tasty
+     , tasty-hunit, tasty-quickcheck
      }:
      mkDerivation {
        pname = "freer";
@@ -65301,6 +66224,7 @@ self: {
        testHaskellDepends = [
          base QuickCheck tasty tasty-hunit tasty-quickcheck
        ];
+       benchmarkHaskellDepends = [ base criterion free mtl ];
        homepage = "https://gitlab.com/queertypes/freer";
        description = "Implementation of the Freer Monad";
        license = stdenv.lib.licenses.bsd3;
@@ -65371,6 +66295,8 @@ self: {
        pname = "freetype2";
        version = "0.1.1";
        sha256 = "da18f9d3047277ba47e162dafa0b2a4777bfb6157b39ad91f9e808ba36f65e99";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [ base ];
        description = "Haskell binding for FreeType 2 library";
        license = stdenv.lib.licenses.bsd3;
@@ -65482,6 +66408,8 @@ self: {
        pname = "friday-scale-dct";
        version = "1.0.0.1";
        sha256 = "0a40db255149c553169d8c2cc8f7ae11b511061b45a3e5c810f9be3390951b48";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [
          base base-compat carray fft friday vector
        ];
@@ -65773,6 +66701,8 @@ self: {
        pname = "ftdi";
        version = "0.2.0.1";
        sha256 = "a892fae6e1c12c3fc1db3f10e84b99c46f6145ac3fb3bcad519bcb619f5dcebe";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [
          base base-unicode-symbols bytestring safe transformers usb
        ];
@@ -65844,6 +66774,8 @@ self: {
        pname = "ftphs";
        version = "1.0.9.1";
        sha256 = "ce0b05b2fc7f93a6195184ed1a8edee69a7a9cf4aa3d15ebeb25421715571bf2";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [
          base hslogger MissingH mtl network parsec regex-compat
        ];
@@ -65907,14 +66839,17 @@ self: {
      }) {};
 
   "full-text-search" = callPackage
-    ({ mkDerivation, array, base, containers, QuickCheck, tasty
-     , tasty-quickcheck, text, vector
+    ({ mkDerivation, alex, array, base, containers, happy, QuickCheck
+     , tasty, tasty-quickcheck, text, vector
      }:
      mkDerivation {
        pname = "full-text-search";
        version = "0.2.1.3";
        sha256 = "f3de82428b67819c1284f18192922e20cda5cb3cdb447297018507b13e3ca368";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [ array base containers text vector ];
+       executableToolDepends = [ alex happy ];
        testHaskellDepends = [
          array base containers QuickCheck tasty tasty-quickcheck text vector
        ];
@@ -66222,13 +67157,16 @@ self: {
      }) {};
 
   "funnyprint" = callPackage
-    ({ mkDerivation, base, hscolour, ipprint, tasty, tasty-hspec }:
+    ({ mkDerivation, base, criterion, hscolour, ipprint, tasty
+     , tasty-hspec
+     }:
      mkDerivation {
        pname = "funnyprint";
        version = "0.0.5";
        sha256 = "8f13d87e1a47957cad27e4753af10d375406e503d90a9e1cb193aec68eeef99e";
        libraryHaskellDepends = [ base hscolour ipprint ];
        testHaskellDepends = [ base hscolour ipprint tasty tasty-hspec ];
+       benchmarkHaskellDepends = [ base criterion hscolour ipprint ];
        homepage = "https://github.com/Pitometsu/funnyprint#readme";
        description = "funnyPrint function to colorize GHCi output";
        license = stdenv.lib.licenses.mit;
@@ -66763,8 +67701,8 @@ self: {
      }:
      mkDerivation {
        pname = "gdo";
-       version = "0.1.2";
-       sha256 = "0a4612e13b97de8950ff87779a98ca837ed5de78baf9754d465b648edcc44018";
+       version = "0.1.5";
+       sha256 = "9c128b9e29799b761e289bbfa7125e655acc934a84615b84164f3ba8188d1627";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -66843,6 +67781,8 @@ self: {
        pname = "gegl";
        version = "0.0.0.4";
        sha256 = "cd938dcc3042980669f01186cc4d0a52d03a5b8cf14553598ef6c04e0748f822";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [
          babl base containers glib inline-c monad-loops random split
          template-haskell
@@ -66953,8 +67893,8 @@ self: {
      }:
      mkDerivation {
        pname = "gendocs";
-       version = "0.1.0.0";
-       sha256 = "5ed453b7811e8b43ff5d660acbf6f75e6022a63c546ca282b2ea9b3474e762f0";
+       version = "0.1.2";
+       sha256 = "60e9e403012fdf31fd99a7ec1e89034b3cabb32de167af9ad54a1d5da45c7a64";
        libraryHaskellDepends = [
          aeson aeson-pretty base bytestring safe text
        ];
@@ -66964,6 +67904,23 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "general-games" = callPackage
+    ({ mkDerivation, base, hspec, HUnit, monad-loops, MonadRandom
+     , random, random-shuffle
+     }:
+     mkDerivation {
+       pname = "general-games";
+       version = "0.4.0";
+       sha256 = "ffd2e343716ee1bc73d6abfc810c06528e85eed083878f0c73cdc3510aa30642";
+       libraryHaskellDepends = [
+         base monad-loops MonadRandom random random-shuffle
+       ];
+       testHaskellDepends = [ base hspec HUnit MonadRandom ];
+       homepage = "https://github.com/cgorski/general-games";
+       description = "Library supporting simulation of a number of games";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "general-prelude" = callPackage
     ({ mkDerivation, base, lens, pointless-fun, strict, system-filepath
      }:
@@ -67126,9 +68083,9 @@ self: {
      }) {};
 
   "generic-maybe" = callPackage
-    ({ mkDerivation, base, bytestring, containers, deepseq, directory
-     , doctest, filepath, generic-deriving, ghc-prim, hlint, mtl, nats
-     , parallel, semigroups, simple-reflect, split, text
+    ({ mkDerivation, base, bytestring, containers, criterion, deepseq
+     , directory, doctest, filepath, generic-deriving, ghc-prim, hlint
+     , mtl, nats, parallel, semigroups, simple-reflect, split, text
      , unordered-containers, vector
      }:
      mkDerivation {
@@ -67141,6 +68098,7 @@ self: {
          generic-deriving hlint mtl nats parallel semigroups simple-reflect
          split text unordered-containers vector
        ];
+       benchmarkHaskellDepends = [ base criterion deepseq ];
        homepage = "https://github.com/jfischoff/generic-maybe";
        description = "A generic version of Data.Maybe";
        license = stdenv.lib.licenses.bsd3;
@@ -68170,6 +69128,8 @@ self: {
        pname = "ghc-exactprint";
        version = "0.5.3.0";
        sha256 = "90e088b04a5b72d7c502049a201180bd593912d831d48b605582882dc9bc332d";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [
          base bytestring containers directory filepath free ghc ghc-boot
          ghc-paths mtl syb
@@ -68479,6 +69439,8 @@ self: {
        pname = "ghc-prof";
        version = "1.3.0.2";
        sha256 = "99a13463bf12803c02071206b090c1e4a1364f6f0bbc4162155c478a2c740fa1";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [
          attoparsec base containers scientific text time
        ];
@@ -68499,6 +69461,8 @@ self: {
        pname = "ghc-prof";
        version = "1.4.0";
        sha256 = "2ab282b118684c30cf10f6b69aa362dacaf274a73b7e23b668c36d6830ce4253";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [
          attoparsec base containers scientific text time
        ];
@@ -68633,6 +69597,8 @@ self: {
        pname = "ghc-time-alloc-prof";
        version = "0.1.0";
        sha256 = "61a877a8f7a7dbfc8ceeac0e7b20f63a52183b7d1690d0557b4300c0bbfe30d5";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [ attoparsec base containers text time ];
        testHaskellDepends = [
          attoparsec base directory filepath process tasty tasty-hunit
@@ -68711,6 +69677,8 @@ self: {
        pname = "ghc-typelits-presburger";
        version = "0.1.1.0";
        sha256 = "bcb005e8c4ae609a75ceef344abe5b2282d23f0dc409426bda9965e02d2d4f92";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [
          base equational-reasoning ghc ghc-tcplugins-extra presburger
          reflection
@@ -68950,8 +69918,6 @@ self: {
        pname = "ghcjs-dom-jsffi";
        version = "0.7.0.4";
        sha256 = "2a44162bf30cb0ebee18b76db5831804add52d3a4bba4c183d0229b975c15619";
-       isLibrary = false;
-       isExecutable = false;
        description = "DOM library using JSFFI and GHCJS";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -68969,6 +69935,7 @@ self: {
        ];
        description = "DOM library that supports both GHCJS and WebKitGTK";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ghcjs-hplay" = callPackage
@@ -69021,6 +69988,8 @@ self: {
        pname = "ghcjs-vdom";
        version = "0.2.0.0";
        sha256 = "4a53dba09fc79b495f172584d0fa4e60d14453466098d9e221c8f3d0dc5d68c5";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [
          base containers ghc-prim ghcjs-base ghcjs-ffiqq ghcjs-prim split
          template-haskell
@@ -69335,7 +70304,7 @@ self: {
   "gi-gstaudio" = callPackage
     ({ mkDerivation, base, bytestring, Cabal, containers, gi-glib
      , gi-gobject, gi-gst, gi-gstbase, gobjectIntrospection
-     , gst-plugins-base, haskell-gi, haskell-gi-base, text, transformers
+     , gst_plugins_base, haskell-gi, haskell-gi-base, text, transformers
      }:
      mkDerivation {
        pname = "gi-gstaudio";
@@ -69347,18 +70316,17 @@ self: {
          haskell-gi haskell-gi-base text transformers
        ];
        librarySystemDepends = [ gobjectIntrospection ];
-       libraryPkgconfigDepends = [ gst-plugins-base ];
+       libraryPkgconfigDepends = [ gst_plugins_base ];
        doHaddock = false;
        homepage = "https://github.com/haskell-gi/haskell-gi";
        description = "GStreamerAudio bindings";
        license = stdenv.lib.licenses.lgpl21;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) {inherit (pkgs) gobjectIntrospection; 
-         gst-plugins-base = pkgs.gst_all_1.gst-plugins-base;};
+     }) {inherit (pkgs) gobjectIntrospection; gst_plugins_base = null;};
 
   "gi-gstbase" = callPackage
     ({ mkDerivation, base, bytestring, Cabal, containers, gi-glib
-     , gi-gobject, gi-gst, gobjectIntrospection, gst-plugins-base
+     , gi-gobject, gi-gst, gobjectIntrospection, gst_plugins_base
      , haskell-gi, haskell-gi-base, text, transformers
      }:
      mkDerivation {
@@ -69371,19 +70339,18 @@ self: {
          haskell-gi-base text transformers
        ];
        librarySystemDepends = [ gobjectIntrospection ];
-       libraryPkgconfigDepends = [ gst-plugins-base ];
+       libraryPkgconfigDepends = [ gst_plugins_base ];
        doHaddock = false;
        homepage = "https://github.com/haskell-gi/haskell-gi";
        description = "GStreamerBase bindings";
        license = stdenv.lib.licenses.lgpl21;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) {inherit (pkgs) gobjectIntrospection; 
-         gst-plugins-base = pkgs.gst_all_1.gst-plugins-base;};
+     }) {inherit (pkgs) gobjectIntrospection; gst_plugins_base = null;};
 
   "gi-gstvideo" = callPackage
     ({ mkDerivation, base, bytestring, Cabal, containers, gi-glib
      , gi-gobject, gi-gst, gi-gstbase, gobjectIntrospection
-     , gst-plugins-base, haskell-gi, haskell-gi-base, text, transformers
+     , gst_plugins_base, haskell-gi, haskell-gi-base, text, transformers
      }:
      mkDerivation {
        pname = "gi-gstvideo";
@@ -69395,14 +70362,13 @@ self: {
          haskell-gi haskell-gi-base text transformers
        ];
        librarySystemDepends = [ gobjectIntrospection ];
-       libraryPkgconfigDepends = [ gst-plugins-base ];
+       libraryPkgconfigDepends = [ gst_plugins_base ];
        doHaddock = false;
        homepage = "https://github.com/haskell-gi/haskell-gi";
        description = "GStreamerVideo bindings";
        license = stdenv.lib.licenses.lgpl21;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) {inherit (pkgs) gobjectIntrospection; 
-         gst-plugins-base = pkgs.gst_all_1.gst-plugins-base;};
+     }) {inherit (pkgs) gobjectIntrospection; gst_plugins_base = null;};
 
   "gi-gtk" = callPackage
     ({ mkDerivation, base, bytestring, Cabal, containers, gi-atk
@@ -69566,8 +70532,8 @@ self: {
      }:
      mkDerivation {
        pname = "gi-pango";
-       version = "1.0.11";
-       sha256 = "8e709c61b8e6a8d2973d7206b15e324327d79ec4b6c301b949837d33d1f7ec66";
+       version = "1.0.12";
+       sha256 = "8a2badc09262448996bc3b4b82d6fdc69b423d4a34d57cdc859c89f8ae74250d";
        setupHaskellDepends = [ base Cabal haskell-gi ];
        libraryHaskellDepends = [
          base bytestring containers gi-glib gi-gobject haskell-gi
@@ -69595,8 +70561,8 @@ self: {
      }:
      mkDerivation {
        pname = "gi-pangocairo";
-       version = "1.0.11";
-       sha256 = "604c2759510e6987fb2ca63c4b20940147fd07fcf56f701c221bf836de0481ad";
+       version = "1.0.12";
+       sha256 = "e24214f43c50ecb1077168298bf48e447ddcb80ee8c8452fc02ef04df971a787";
        setupHaskellDepends = [ base Cabal haskell-gi ];
        libraryHaskellDepends = [
          base bytestring containers gi-cairo gi-glib gi-gobject gi-pango
@@ -69669,8 +70635,8 @@ self: {
      }:
      mkDerivation {
        pname = "gi-vte";
-       version = "2.91.12";
-       sha256 = "c286d581ad3f3e25dc4f7b5b8439d4e6a0e2d6312218e5cc528c490c07573670";
+       version = "2.91.13";
+       sha256 = "4dfce5aefb7e2e8daad8be77f3c64580bd5c1b90287513153f668497308c1b40";
        setupHaskellDepends = [ base Cabal haskell-gi ];
        libraryHaskellDepends = [
          base bytestring containers gi-atk gi-gdk gi-gio gi-glib gi-gobject
@@ -69821,7 +70787,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "ginger_0_5_0_0" = callPackage
+  "ginger_0_5_1_2" = callPackage
     ({ mkDerivation, aeson, base, bytestring, data-default, filepath
      , http-types, mtl, parsec, safe, scientific, tasty, tasty-hunit
      , tasty-quickcheck, text, time, transformers, unordered-containers
@@ -69829,8 +70795,8 @@ self: {
      }:
      mkDerivation {
        pname = "ginger";
-       version = "0.5.0.0";
-       sha256 = "619261156d6d5fa5cdde9b2f39429c22b20b9d9159dcb4e867a598f5ed5c7f5c";
+       version = "0.5.1.2";
+       sha256 = "f6eb7424e05408227d405607c12e6efce129da54693c6c56527a42cff9c82077";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -69927,6 +70893,8 @@ self: {
        pname = "giphy-api";
        version = "0.5.2.0";
        sha256 = "447111d3fa32a76ffc50b26fbec59d9e9a097d7e2facb04a7a272cb9abd97ce9";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [
          aeson base containers http-api-data http-client http-client-tls
          microlens microlens-th mtl network-uri servant servant-client text
@@ -70456,8 +71424,8 @@ self: {
      }:
      mkDerivation {
        pname = "github-backup";
-       version = "1.20161118";
-       sha256 = "5278f8f3502721cb677b4ac0de4df8c2954ddb0335ceb9e63c4b29e77912a21b";
+       version = "1.20170221";
+       sha256 = "2838227d760bb0ea933a84023ec3eeda23ffc0dc870c290dfcd6b9b19d02b869";
        isLibrary = false;
        isExecutable = true;
        setupHaskellDepends = [
@@ -70847,9 +71815,9 @@ self: {
 
   "gitson" = callPackage
     ({ mkDerivation, aeson, aeson-pretty, base, base-compat, bytestring
-     , conduit-combinators, conduit-extra, directory, doctest, errors
-     , filepath, flock, Glob, hspec, lifted-base, monad-control, process
-     , transformers
+     , conduit-combinators, conduit-extra, criterion, directory, doctest
+     , errors, filepath, flock, Glob, hspec, lifted-base, monad-control
+     , process, random, transformers
      }:
      mkDerivation {
        pname = "gitson";
@@ -70863,6 +71831,9 @@ self: {
        testHaskellDepends = [
          aeson base directory doctest Glob hspec process transformers
        ];
+       benchmarkHaskellDepends = [
+         aeson base criterion directory random transformers
+       ];
        homepage = "https://github.com/myfreeweb/gitson";
        description = "A document store library for Git + JSON";
        license = stdenv.lib.licenses.publicDomain;
@@ -71089,14 +72060,14 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "glazier_0_10_0_0" = callPackage
+  "glazier_0_11_0_0" = callPackage
     ({ mkDerivation, base, lens, mmorph, mtl, semigroupoids
      , transformers
      }:
      mkDerivation {
        pname = "glazier";
-       version = "0.10.0.0";
-       sha256 = "af7325fd898b62b8a29c106836b25fd334ab637d5d773a55da1fc25942af5167";
+       version = "0.11.0.0";
+       sha256 = "8ef0c04025f7d6942eeee13f9f376ed8019e38b6cd48e1eaffff5f5cd789c0ff";
        libraryHaskellDepends = [
          base lens mmorph mtl semigroupoids transformers
        ];
@@ -71256,8 +72227,8 @@ self: {
      }) {};
 
   "glob-posix" = callPackage
-    ({ mkDerivation, base, directory, filepath, tasty
-     , tasty-expected-failure, tasty-hunit, unix
+    ({ mkDerivation, base, criterion, directory, filepath, Glob
+     , MissingH, tasty, tasty-expected-failure, tasty-hunit, unix
      }:
      mkDerivation {
        pname = "glob-posix";
@@ -71268,6 +72239,7 @@ self: {
          base directory filepath tasty tasty-expected-failure tasty-hunit
          unix
        ];
+       benchmarkHaskellDepends = [ base criterion Glob MissingH ];
        homepage = "https://github.com/rdnetto/glob-posix#readme";
        description = "Haskell bindings for POSIX glob library";
        license = stdenv.lib.licenses.asl20;
@@ -71796,15 +72768,16 @@ self: {
      }) {inherit (pkgs.gnome2) gnome_vfs; gnome_vfs_module = null;};
 
   "gnss-converters" = callPackage
-    ({ mkDerivation, base, basic-prelude, binary-conduit, bytestring
-     , conduit, conduit-extra, exceptions, extra, HUnit-approx, lens
-     , monad-control, mtl, resourcet, rtcm, sbp, tasty, tasty-hunit
-     , time, transformers-base, unordered-containers
+    ({ mkDerivation, base, basic-prelude, binary, binary-conduit
+     , bytestring, conduit, conduit-extra, exceptions, extra
+     , HUnit-approx, lens, monad-control, mtl, resourcet, rtcm, sbp
+     , tasty, tasty-hunit, text, time, transformers-base
+     , unordered-containers
      }:
      mkDerivation {
        pname = "gnss-converters";
-       version = "0.2.1";
-       sha256 = "47732c64bb1091ac79386d142ba790cf809b4390244c710d3a5c246feb24e4c2";
+       version = "0.2.4";
+       sha256 = "0781dbaaece9a06a2ded982b193e6a5fed7a4a36f4e3ac031f89d710e97dfafd";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -71816,9 +72789,9 @@ self: {
          base basic-prelude binary-conduit conduit conduit-extra resourcet
        ];
        testHaskellDepends = [
-         base basic-prelude binary-conduit bytestring conduit conduit-extra
-         HUnit-approx lens resourcet rtcm sbp tasty tasty-hunit
-         unordered-containers
+         base basic-prelude binary binary-conduit bytestring conduit
+         conduit-extra HUnit-approx lens resourcet rtcm sbp tasty
+         tasty-hunit text unordered-containers
        ];
        homepage = "http://github.com/swift-nav/gnss-converters";
        description = "GNSS Converters";
@@ -71858,6 +72831,8 @@ self: {
        pname = "gnuplot";
        version = "0.5.4.1";
        sha256 = "fa54c95f5dad96e3af6a13429cf6852bffe97bd52bdd99bdce60ca9e78bee8f7";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [
          array base containers data-accessor data-accessor-transformers
          deepseq filepath process temporary time transformers utility-ht
@@ -74829,6 +75804,23 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "google-translate_0_4" = callPackage
+    ({ mkDerivation, aeson, base, bytestring, http-api-data
+     , http-client, servant, servant-client, text, transformers
+     }:
+     mkDerivation {
+       pname = "google-translate";
+       version = "0.4";
+       sha256 = "acd1fe031674f578e83e7736335bfa9999b430c19afbd5ca89aae97179be4929";
+       libraryHaskellDepends = [
+         aeson base bytestring http-api-data http-client servant
+         servant-client text transformers
+       ];
+       description = "Google Translate API bindings";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "googleplus" = callPackage
     ({ mkDerivation, aeson, attoparsec, base, bytestring, containers
      , enumerator, haskell98, http-enumerator, http-types, mtl, text
@@ -75019,6 +76011,8 @@ self: {
        pname = "gore-and-ash-lambdacube";
        version = "0.2.0.0";
        sha256 = "62c2bd09408ecfc4f7140cb034b993822b4246c23df72bf17a708aa1b700407d";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [
          base containers deepseq exceptions gore-and-ash hashable
          lambdacube-compiler lambdacube-gl mtl text unordered-containers
@@ -75713,6 +76707,8 @@ self: {
        pname = "graphics-drawingcombinators";
        version = "1.5.1";
        sha256 = "4e8ffecad64bc9529869059a62c3dc2ca177465dc8c3890e0be6b74b4aa61148";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [
          base bitmap bitmap-opengl FTGL OpenGL stb-image
        ];
@@ -75803,9 +76799,10 @@ self: {
      }) {};
 
   "graphql-api" = callPackage
-    ({ mkDerivation, aeson, attoparsec, base, containers, directory
-     , doctest, exceptions, hspec, protolude, QuickCheck, raw-strings-qq
-     , scientific, tasty, tasty-hspec, text, transformers
+    ({ mkDerivation, aeson, attoparsec, base, containers, criterion
+     , directory, doctest, exceptions, hspec, protolude, QuickCheck
+     , raw-strings-qq, scientific, tasty, tasty-hspec, text
+     , transformers
      }:
      mkDerivation {
        pname = "graphql-api";
@@ -75821,6 +76818,9 @@ self: {
          aeson attoparsec base containers directory doctest exceptions hspec
          protolude QuickCheck raw-strings-qq tasty tasty-hspec transformers
        ];
+       benchmarkHaskellDepends = [
+         attoparsec base criterion exceptions protolude transformers
+       ];
        homepage = "https://github.com/jml/graphql-api#readme";
        description = "Write type-safe GraphQL services in Haskell";
        license = stdenv.lib.licenses.asl20;
@@ -75863,14 +76863,17 @@ self: {
      }) {};
 
   "graphviz" = callPackage
-    ({ mkDerivation, base, bytestring, colour, containers, directory
-     , dlist, fgl, fgl-arbitrary, filepath, polyparse, process
-     , QuickCheck, temporary, text, transformers, wl-pprint-text
+    ({ mkDerivation, base, bytestring, colour, containers, criterion
+     , deepseq, directory, dlist, fgl, fgl-arbitrary, filepath
+     , polyparse, process, QuickCheck, temporary, text, transformers
+     , wl-pprint-text
      }:
      mkDerivation {
        pname = "graphviz";
        version = "2999.18.1.2";
        sha256 = "b08c2026d3810c15f6ad49a07fd7b879978d958fa477b369b719ec00741c85fc";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [
          base bytestring colour containers directory dlist fgl filepath
          polyparse process temporary text transformers wl-pprint-text
@@ -75878,6 +76881,7 @@ self: {
        testHaskellDepends = [
          base containers fgl fgl-arbitrary filepath QuickCheck text
        ];
+       benchmarkHaskellDepends = [ base criterion deepseq text ];
        homepage = "http://projects.haskell.org/graphviz/";
        description = "Bindings to Graphviz for graph visualisation";
        license = stdenv.lib.licenses.bsd3;
@@ -76157,6 +77161,8 @@ self: {
        pname = "gridland";
        version = "0.1.0.3";
        sha256 = "2936472e5eb065e1fe28bd5d2f9d524be8d63f6eba0627527acf1668ec38b760";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [
          array astar base containers grid htiled mtl random safe SDL SDL-gfx
          SDL-image SDL-mixer tuple vector
@@ -76370,8 +77376,8 @@ self: {
      }) {};
 
   "grouped-list" = callPackage
-    ({ mkDerivation, base, containers, deepseq, pointed, QuickCheck
-     , tasty, tasty-quickcheck
+    ({ mkDerivation, base, containers, criterion, deepseq, pointed
+     , QuickCheck, tasty, tasty-quickcheck
      }:
      mkDerivation {
        pname = "grouped-list";
@@ -76379,6 +77385,7 @@ self: {
        sha256 = "5bc49f34b1d9759a819c919971d789b14d37a8e22de811a5fc062675e3f8e875";
        libraryHaskellDepends = [ base containers deepseq pointed ];
        testHaskellDepends = [ base QuickCheck tasty tasty-quickcheck ];
+       benchmarkHaskellDepends = [ base criterion ];
        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;
@@ -76588,7 +77595,7 @@ self: {
 
   "gstreamer" = callPackage
     ({ mkDerivation, array, base, bytestring, Cabal, directory, glib
-     , gst-plugins-base, gstreamer, gtk2hs-buildtools, mtl
+     , gst_plugins_base, gstreamer, gtk2hs-buildtools, mtl
      }:
      mkDerivation {
        pname = "gstreamer";
@@ -76598,11 +77605,11 @@ self: {
        libraryHaskellDepends = [
          array base bytestring directory glib mtl
        ];
-       libraryPkgconfigDepends = [ gst-plugins-base gstreamer ];
+       libraryPkgconfigDepends = [ gst_plugins_base gstreamer ];
        homepage = "http://projects.haskell.org/gtk2hs/";
        description = "Binding to the GStreamer open source multimedia framework";
        license = stdenv.lib.licenses.lgpl21;
-     }) {inherit (pkgs) gst-plugins-base; inherit (pkgs) gstreamer;};
+     }) {gst_plugins_base = null; inherit (pkgs) gstreamer;};
 
   "gt-tools" = callPackage
     ({ mkDerivation, base, containers, extensible-exceptions, haskeline
@@ -76944,6 +77951,8 @@ self: {
        pname = "gtk3";
        version = "0.14.6";
        sha256 = "f4c0d3c51a5e06e5f6a8fcfc2a1303e0a3ed0242309fc6c1b9603be9de1f4258";
+       isLibrary = true;
+       isExecutable = true;
        setupHaskellDepends = [ base Cabal gtk2hs-buildtools ];
        libraryHaskellDepends = [
          array base bytestring cairo containers gio glib mtl pango text
@@ -77399,7 +78408,7 @@ self: {
   "hOpenPGP" = callPackage
     ({ mkDerivation, aeson, attoparsec, base, base16-bytestring
      , base64-bytestring, bifunctors, binary, binary-conduit, byteable
-     , bytestring, bzlib, conduit, conduit-extra, containers
+     , bytestring, bzlib, conduit, conduit-extra, containers, criterion
      , crypto-cipher-types, cryptonite, data-default-class, errors
      , hashable, incremental-parser, ixset-typed, lens, memory
      , monad-loops, nettle, network, network-uri, newtype
@@ -77432,6 +78441,16 @@ self: {
          tasty-quickcheck text time time-locale-compat transformers
          unordered-containers wl-pprint-extras zlib
        ];
+       benchmarkHaskellDepends = [
+         aeson base base16-bytestring base64-bytestring bifunctors binary
+         binary-conduit byteable bytestring bzlib conduit conduit-extra
+         containers criterion crypto-cipher-types cryptonite
+         data-default-class errors hashable incremental-parser ixset-typed
+         lens memory monad-loops nettle network network-uri newtype
+         openpgp-asciiarmor resourcet securemem semigroups split text time
+         time-locale-compat transformers unordered-containers
+         wl-pprint-extras zlib
+       ];
        homepage = "http://floss.scru.org/hOpenPGP/";
        description = "native Haskell implementation of OpenPGP (RFC4880)";
        license = stdenv.lib.licenses.mit;
@@ -78535,8 +79554,8 @@ self: {
      }:
      mkDerivation {
        pname = "hackport";
-       version = "0.5.1";
-       sha256 = "667af1dc76c2833dd1fec935c5e61cc331be3c7b20c77ff68206177f70eccdad";
+       version = "0.5.2";
+       sha256 = "fa38878313ab5075d86438d3853760b48c5a943a822a91f6a4057424abed7c63";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -79055,10 +80074,10 @@ self: {
      }) {};
 
   "hairy" = callPackage
-    ({ mkDerivation, aeson, base, data-default, heroku, hspec
-     , http-types, monad-logger, mtl, persistent, persistent-postgresql
-     , persistent-template, scotty, text, time, transformers, wai
-     , wai-extra, warp
+    ({ mkDerivation, aeson, base, criterion, data-default, heroku
+     , hspec, http-types, monad-logger, mtl, persistent
+     , persistent-postgresql, persistent-template, scotty, text, time
+     , transformers, wai, wai-extra, warp
      }:
      mkDerivation {
        pname = "hairy";
@@ -79075,6 +80094,9 @@ self: {
        testHaskellDepends = [
          base hspec http-types mtl persistent scotty time wai wai-extra
        ];
+       benchmarkHaskellDepends = [
+         base criterion http-types mtl persistent scotty time wai wai-extra
+       ];
        homepage = "https://github.com/tfausak/hairy";
        description = "A JSON REST API";
        license = stdenv.lib.licenses.mit;
@@ -79083,11 +80105,11 @@ self: {
 
   "hakaru" = callPackage
     ({ mkDerivation, aeson, array, base, bytestring, Cabal, cassava
-     , containers, directory, hmatrix, HUnit, integration, logfloat
-     , math-functions, monad-loops, mwc-random, parallel, parsec, pretty
-     , primitive, QuickCheck, random, statistics, test-framework
-     , test-framework-hunit, test-framework-quickcheck2, text
-     , transformers, vector, zlib
+     , containers, criterion, deepseq, directory, ghc-prim, hmatrix
+     , HUnit, integration, logfloat, math-functions, monad-loops
+     , mwc-random, parallel, parsec, pretty, primitive, QuickCheck
+     , random, statistics, test-framework, test-framework-hunit
+     , test-framework-quickcheck2, text, transformers, vector, zlib
      }:
      mkDerivation {
        pname = "hakaru";
@@ -79105,6 +80127,7 @@ self: {
          statistics test-framework test-framework-hunit
          test-framework-quickcheck2 vector
        ];
+       benchmarkHaskellDepends = [ base criterion deepseq ghc-prim ];
        homepage = "http://indiana.edu/~ppaml/";
        description = "A probabilistic programming embedded DSL";
        license = stdenv.lib.licenses.bsd3;
@@ -79391,8 +80414,8 @@ self: {
     ({ mkDerivation, base, hakyll, ogmarkup }:
      mkDerivation {
        pname = "hakyll-ogmarkup";
-       version = "1.0";
-       sha256 = "eee4e2f63409f209f77903cc18c86a68529b46e4af7eaa2497af849a4588ce24";
+       version = "3.0";
+       sha256 = "c7b1584e06384b18d2e1bc07ce55fbfc22c40592f330e4e155be7732bc641021";
        libraryHaskellDepends = [ base hakyll ogmarkup ];
        homepage = "https://github.com/ogma-project/hakyll-ogmarkup#readme";
        description = "Integrate ogmarkup document with Hakyll";
@@ -79534,8 +80557,8 @@ self: {
      }:
      mkDerivation {
        pname = "halive";
-       version = "0.1.2";
-       sha256 = "465255836639653f42763d8b04a39840af35bde77b3cdfc53a419a44a96f902d";
+       version = "0.1.3";
+       sha256 = "e80cb5da27691a969de1e9526bfe24cabb3bfa5f170b2af6066885518d6ece65";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -79927,6 +80950,8 @@ self: {
        pname = "hans";
        version = "3.0.1";
        sha256 = "24da2418908a3297901c8b7e273b70a44a6b7255659de31b76afa4e3ffcc57ad";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [
          array base BoundedChan bytestring cereal containers cryptonite
          hashable heaps memory monadLib psqueues random time unix
@@ -80009,6 +81034,32 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "hapistrano_0_3_0_1" = callPackage
+    ({ mkDerivation, aeson, base, directory, filepath, hspec, mtl
+     , optparse-applicative, path, path-io, process, temporary, time
+     , transformers, yaml
+     }:
+     mkDerivation {
+       pname = "hapistrano";
+       version = "0.3.0.1";
+       sha256 = "ab0da599f2b4cb7208b2bdc349844bedb28141937a4aa0b3546f57b98854a6dc";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base filepath mtl path process time transformers
+       ];
+       executableHaskellDepends = [
+         aeson base optparse-applicative path path-io yaml
+       ];
+       testHaskellDepends = [
+         base directory filepath hspec mtl path path-io process temporary
+       ];
+       homepage = "https://github.com/stackbuilders/hapistrano";
+       description = "A deployment library for Haskell applications";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "happindicator" = callPackage
     ({ mkDerivation, array, base, bytestring, containers, glib, gtk
      , gtk2hs-buildtools, libappindicator-gtk2, mtl
@@ -80033,6 +81084,8 @@ self: {
        pname = "happindicator3";
        version = "0.2.1";
        sha256 = "225156270dc7cb2bb399aee76c9273a62683d8835c7045027a7906a3cf010326";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [ base glib gtk3 ];
        libraryPkgconfigDepends = [ libappindicator-gtk3 ];
        homepage = "https://github.com/mlacorte/happindicator3";
@@ -80117,6 +81170,8 @@ self: {
        pname = "happstack";
        version = "7.0.2";
        sha256 = "d9d4f581718d4f0fedd5d1f41ce127a6e651545a9398619c0bee3debb377d5b5";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [ base happstack-server ];
        doHaddock = false;
        homepage = "http://happstack.com";
@@ -80200,6 +81255,8 @@ self: {
        pname = "happstack-contrib";
        version = "0.2.1";
        sha256 = "e550c0e74b1873ac051a886626f44571cf8543e179096f391f1cbecaa4750d33";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [
          base bytestring directory happstack-data happstack-ixset
          happstack-server happstack-state happstack-util HTTP mtl network
@@ -80222,6 +81279,8 @@ self: {
        sha256 = "889654ad957d43fd719b4f62a97b943beb622bb2f25701ae388d46db2ab1546c";
        revision = "1";
        editedCabalFile = "dbf53b1d5012ac975d184455269f3d631ba2352e9642b707b98465c47225fd06";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [
          base binary bytestring containers mtl pretty syb syb-with-class
          syb-with-class-instances-text template-haskell text time
@@ -80256,13 +81315,15 @@ self: {
      , filepath, happstack, happstack-data, happstack-hsp
      , happstack-ixset, happstack-server, happstack-state
      , happstack-util, harp, hsp, hsx, html, HTTP, json, mtl, network
-     , old-time, random, RJson, syb, text, time, utf8-string, web-routes
-     , web-routes-mtl
+     , old-time, random, RJson, syb, text, time, trhsx, utf8-string
+     , web-routes, web-routes-mtl
      }:
      mkDerivation {
        pname = "happstack-facebook";
        version = "0.30";
        sha256 = "0c517c663da5323fe6677fa73f8ba862725e1bb813566af63d38ee1f6716cde5";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [
          applicative-extras base bytestring containers filepath happstack
          happstack-data happstack-hsp happstack-ixset happstack-server
@@ -80270,6 +81331,7 @@ self: {
          network old-time random RJson syb text time utf8-string web-routes
          web-routes-mtl
        ];
+       executableToolDepends = [ trhsx ];
        homepage = "http://src.seereason.com/happstack-facebook/";
        description = "A package for building Facebook applications using Happstack";
        license = stdenv.lib.licenses.bsd3;
@@ -80440,6 +81502,8 @@ self: {
        pname = "happstack-ixset";
        version = "6.0.1";
        sha256 = "d122eeff5fa0e0321a8a76d2b1ff39f9d99cc70df5dc13be9db970e723b0d0c2";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [
          base containers happstack-data happstack-util mtl syb
          syb-with-class template-haskell
@@ -80591,6 +81655,8 @@ self: {
        pname = "happstack-state";
        version = "6.1.4";
        sha256 = "09f7d8eaa7eec13f99d59b7c5bf7e88b3d2889b6879f0f54731a9c6f4801d7f5";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [
          base binary bytestring containers directory extensible-exceptions
          filepath happstack-data happstack-util hslogger mtl old-time random
@@ -80629,6 +81695,8 @@ self: {
        pname = "happstack-util";
        version = "6.0.3";
        sha256 = "10de089778b70311d290420c7e6ad987da711b1c1961436ccf26c7cf4bd31a43";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [
          array base bytestring directory extensible-exceptions filepath
          hslogger mtl network old-locale old-time parsec process random
@@ -80976,6 +82044,8 @@ self: {
        pname = "has";
        version = "0.5.0.1";
        sha256 = "5a5cdc8fafbb89a79e6831a707ce303c18edf54e0b389aab9dc6302532e4cd7f";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [ base QuickCheck ];
        homepage = "http://github.com/nonowarn/has";
        description = "Entity based records";
@@ -81003,8 +82073,8 @@ self: {
      }:
      mkDerivation {
        pname = "hasbolt";
-       version = "0.1.0.9";
-       sha256 = "8b013b4fc84019eff89ba9d9e1cba86e84cd5570c8acb51aba9b68a958002097";
+       version = "0.1.1.1";
+       sha256 = "c715475ce67d5b311f6dc252d2d2e58cac9a12e417c007e28635c30c8ca619b1";
        libraryHaskellDepends = [
          base binary bytestring containers data-binary-ieee754 data-default
          hex network network-simple text transformers
@@ -81019,18 +82089,17 @@ self: {
      }) {};
 
   "hascal" = callPackage
-    ({ mkDerivation, base, HUnit, numbers }:
+    ({ mkDerivation, base, data-default, split }:
      mkDerivation {
        pname = "hascal";
-       version = "2.0.0.1";
-       sha256 = "344062494982b809fef504496c7bbacf0932fd7fd35c5b5716c832f1dc4003db";
+       version = "3.0.1";
+       sha256 = "012e1ed3ac556697f5b1c6888bdf0e6cab126a3fa0e01f2f07c52469856a3145";
        isLibrary = true;
        isExecutable = true;
-       libraryHaskellDepends = [ base ];
-       executableHaskellDepends = [ base numbers ];
-       testHaskellDepends = [ HUnit ];
-       homepage = "http://darcsden.com/mekeor/hascal";
-       description = "A minimalistic but extensible and precise calculator";
+       libraryHaskellDepends = [ base data-default split ];
+       executableHaskellDepends = [ base data-default split ];
+       homepage = "https://github.com/mekeor/hascal";
+       description = "tiny calculator library and command-line program";
        license = "GPL";
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
@@ -81043,8 +82112,8 @@ self: {
      }:
      mkDerivation {
        pname = "hascar";
-       version = "0.2.1.0";
-       sha256 = "1a09890e2b3d0955a966a1b7e84995957b44fab8c34c1afaabe7213610d244e1";
+       version = "0.2.1.1";
+       sha256 = "ff801c3a9595b9afa732194b7d992e1b1a264813f04bdf7bb1de097a7b5c4086";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -81183,14 +82252,16 @@ self: {
      }) {};
 
   "hashable" = callPackage
-    ({ mkDerivation, base, bytestring, ghc-prim, HUnit, integer-gmp
-     , QuickCheck, random, test-framework, test-framework-hunit
-     , test-framework-quickcheck2, text, unix
+    ({ mkDerivation, base, bytestring, criterion, ghc-prim, HUnit
+     , integer-gmp, QuickCheck, random, siphash, test-framework
+     , test-framework-hunit, test-framework-quickcheck2, text, unix
      }:
      mkDerivation {
        pname = "hashable";
        version = "1.2.5.0";
        sha256 = "153eb1614a739f3ccf8c5fcd4230a17b8b24862ab727c46dd4acd22bc15fb2bc";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [
          base bytestring ghc-prim integer-gmp text
        ];
@@ -81198,6 +82269,9 @@ self: {
          base bytestring ghc-prim HUnit QuickCheck random test-framework
          test-framework-hunit test-framework-quickcheck2 text unix
        ];
+       benchmarkHaskellDepends = [
+         base bytestring criterion ghc-prim integer-gmp siphash text
+       ];
        homepage = "http://github.com/tibbe/hashable";
        description = "A class for types that can be converted to a hash value";
        license = stdenv.lib.licenses.bsd3;
@@ -81224,7 +82298,7 @@ self: {
      }) {};
 
   "hashable-generics" = callPackage
-    ({ mkDerivation, base, ghc-prim, hashable, QuickCheck
+    ({ mkDerivation, base, criterion, ghc-prim, hashable, QuickCheck
      , test-framework, test-framework-quickcheck2
      }:
      mkDerivation {
@@ -81236,6 +82310,7 @@ self: {
          base ghc-prim hashable QuickCheck test-framework
          test-framework-quickcheck2
        ];
+       benchmarkHaskellDepends = [ base criterion ghc-prim hashable ];
        homepage = "https://github.com/wowus/hashable-generics";
        description = "Automatically generates Hashable instances with GHC.Generics.";
        license = stdenv.lib.licenses.bsd3;
@@ -81282,6 +82357,8 @@ self: {
        pname = "hashed-storage";
        version = "0.5.11";
        sha256 = "734b5e91081e355384f86fdd67f242e095e8c5196b182a62cc996fdabdb21569";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [
          base binary bytestring containers dataenc directory
          extensible-exceptions filepath mmap mtl zlib
@@ -81406,7 +82483,9 @@ self: {
      }) {};
 
   "hashtables-plus" = callPackage
-    ({ mkDerivation, base, hashable, hashtables, loch-th, placeholders
+    ({ mkDerivation, base, criterion-plus, deepseq, hashable
+     , hashtables, lens, loch-th, mtl, mwc-random, placeholders
+     , string-conversions, text, th-printf, transformers
      }:
      mkDerivation {
        pname = "hashtables-plus";
@@ -81415,6 +82494,11 @@ self: {
        libraryHaskellDepends = [
          base hashable hashtables loch-th placeholders
        ];
+       benchmarkHaskellDepends = [
+         base criterion-plus deepseq hashable hashtables lens loch-th mtl
+         mwc-random placeholders string-conversions text th-printf
+         transformers
+       ];
        homepage = "https://github.com/nikita-volkov/hashtables-plus";
        description = "Extensions for a \"hashtables\" library";
        license = stdenv.lib.licenses.mit;
@@ -82173,11 +83257,15 @@ self: {
        pname = "haskell-mpi";
        version = "1.4.0";
        sha256 = "c0aa02ffe77d4a39d5b33e3f846e7615c78b2ddfb6b36c9cdec335edb79488ab";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [
          array base bytestring cereal extensible-exceptions
        ];
        librarySystemDepends = [ open-pal open-rte openmpi ];
        libraryToolDepends = [ c2hs ];
+       executableSystemDepends = [ open-pal open-rte openmpi ];
+       executableToolDepends = [ c2hs ];
        homepage = "http://github.com/bjpop/haskell-mpi";
        description = "Distributed parallel programming in Haskell using MPI";
        license = stdenv.lib.licenses.bsd3;
@@ -82589,6 +83677,19 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "haskell-time-range" = callPackage
+    ({ mkDerivation, base, doctest, lens, semigroups, text, time }:
+     mkDerivation {
+       pname = "haskell-time-range";
+       version = "0.2.0.0";
+       sha256 = "73c6258304465cd4e243287e7012a9630a6835025104414105c29c9e9f5503c7";
+       libraryHaskellDepends = [ base lens semigroups text time ];
+       testHaskellDepends = [ base doctest ];
+       homepage = "https://github.com/mankyKitty/haskell-time-range#readme";
+       description = "Some useful wrappers and functions for building time ranges";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "haskell-token-utils" = callPackage
     ({ mkDerivation, base, containers, Diff, directory, dual-tree, ghc
      , ghc-mod, ghc-paths, ghc-prim, ghc-syb-utils, haskell-src-exts
@@ -82705,10 +83806,10 @@ self: {
      }) {};
 
   "haskell-tools-cli" = callPackage
-    ({ mkDerivation, base, bytestring, containers, directory, filepath
-     , ghc, ghc-paths, haskell-tools-ast, haskell-tools-prettyprint
-     , haskell-tools-refactor, knob, mtl, process, references, split
-     , tasty, tasty-hunit
+    ({ mkDerivation, aeson, base, bytestring, containers, criterion
+     , directory, filepath, ghc, ghc-paths, haskell-tools-ast
+     , haskell-tools-prettyprint, haskell-tools-refactor, knob, mtl
+     , process, references, split, tasty, tasty-hunit, time
      }:
      mkDerivation {
        pname = "haskell-tools-cli";
@@ -82725,6 +83826,9 @@ self: {
        testHaskellDepends = [
          base bytestring directory filepath knob tasty tasty-hunit
        ];
+       benchmarkHaskellDepends = [
+         aeson base bytestring criterion directory filepath knob split time
+       ];
        homepage = "https://github.com/haskell-tools/haskell-tools";
        description = "Command-line frontend for Haskell-tools Refact";
        license = stdenv.lib.licenses.bsd3;
@@ -82984,6 +84088,8 @@ self: {
        pname = "haskell-xmpp";
        version = "1.0.2";
        sha256 = "a9345eb03a7ea0dc4a50af3a916ad2c455fb2232c6d36830afc8e70d6c259dfc";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [
          array base HaXml html mtl network polyparse pretty random
          regex-compat stm utf8-string
@@ -83887,6 +84993,8 @@ self: {
        pname = "haskore";
        version = "0.2.0.8";
        sha256 = "b4ac45e260e8ae417347985cc84062b684e59cc3519d18e765fa2d35f7c3d429";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [
          array base bytestring containers data-accessor event-list
          haskell-src markov-chain midi non-negative parsec process random
@@ -83953,6 +85061,8 @@ self: {
        pname = "haskore-synthesizer";
        version = "0.0.3.3";
        sha256 = "64ddc8bf5a6b5c7f7f0986aada8016c8a09ca21ef3e3320565006bea53a3a4ee";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [
          base data-accessor event-list haskore non-negative numeric-prelude
          random synthesizer-core synthesizer-filter utility-ht
@@ -83981,8 +85091,8 @@ self: {
      }:
      mkDerivation {
        pname = "hasktags";
-       version = "0.69.2.1";
-       sha256 = "9d369830ac5e146f7b2a2ed584eec732b0da85af00ed7b91a72e208f6ef5144a";
+       version = "0.69.3";
+       sha256 = "4e069aa63c2a7d762332d1acbc12a3d705abdc5e24c06d55129e1a3fd66e5afa";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -84031,6 +85141,35 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "hasmin" = callPackage
+    ({ mkDerivation, attoparsec, base, bytestring, containers, doctest
+     , doctest-discover, gitrev, hopfli, hspec, hspec-attoparsec
+     , mainland-pretty, matrix, mtl, numbers, optparse-applicative
+     , parsers, QuickCheck, semigroups, text
+     }:
+     mkDerivation {
+       pname = "hasmin";
+       version = "0.3.0.1";
+       sha256 = "b4b7b8fbe3553a2b93de7a7f3a90b9e8a5410a5e79f59db15e1f08ef62777e38";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         attoparsec base bytestring containers mainland-pretty matrix mtl
+         numbers parsers semigroups text
+       ];
+       executableHaskellDepends = [
+         attoparsec base bytestring containers gitrev hopfli mainland-pretty
+         matrix mtl numbers optparse-applicative parsers text
+       ];
+       testHaskellDepends = [
+         attoparsec base doctest doctest-discover hspec hspec-attoparsec mtl
+         QuickCheck text
+       ];
+       homepage = "https://github.com/contivero/hasmin/";
+       description = "\"A CSS Minifier\"";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "hasparql-client" = callPackage
     ({ mkDerivation, base, HTTP, monads-fd, network, xml }:
      mkDerivation {
@@ -84060,11 +85199,12 @@ self: {
   "hasql" = callPackage
     ({ mkDerivation, aeson, attoparsec, base, base-prelude, bytestring
      , bytestring-tree-builder, contravariant, contravariant-extras
-     , data-default-class, dlist, either, hashable, hashtables, loch-th
-     , mtl, placeholders, postgresql-binary, postgresql-libpq
-     , profunctors, QuickCheck, quickcheck-instances, rebase, rerebase
-     , scientific, semigroups, tasty, tasty-hunit, tasty-quickcheck
-     , tasty-smallcheck, text, time, transformers, uuid, vector
+     , criterion, data-default-class, deepseq, dlist, either, hashable
+     , hashtables, loch-th, mtl, placeholders, postgresql-binary
+     , postgresql-libpq, profunctors, QuickCheck, quickcheck-instances
+     , rebase, rerebase, scientific, semigroups, tasty, tasty-hunit
+     , tasty-quickcheck, tasty-smallcheck, text, time, transformers
+     , uuid, vector
      }:
      mkDerivation {
        pname = "hasql";
@@ -84081,6 +85221,11 @@ self: {
          data-default-class QuickCheck quickcheck-instances rebase rerebase
          tasty tasty-hunit tasty-quickcheck tasty-smallcheck
        ];
+       benchmarkHaskellDepends = [
+         base base-prelude bytestring contravariant contravariant-extras
+         criterion data-default-class deepseq dlist either hashable
+         profunctors scientific text time transformers uuid vector
+       ];
        homepage = "https://github.com/nikita-volkov/hasql";
        description = "An efficient PostgreSQL driver and a flexible mapping API";
        license = stdenv.lib.licenses.mit;
@@ -84246,11 +85391,13 @@ self: {
 
   "hasql-postgres" = callPackage
     ({ mkDerivation, aeson, attoparsec, base, base-prelude, bytestring
-     , directory, doctest, either, filepath, free, hashable, hashtables
-     , hasql, hasql-backend, hspec, list-t, loch-th, mmorph, mtl-prelude
-     , old-locale, placeholders, postgresql-binary, postgresql-libpq
-     , QuickCheck, quickcheck-instances, scientific, template-haskell
-     , text, time, transformers, uuid, vector
+     , criterion-plus, deepseq, directory, doctest, either, filepath
+     , free, hashable, hashtables, hasql, hasql-backend, HDBC
+     , HDBC-postgresql, hspec, list-t, loch-th, mmorph, monad-control
+     , mtl-prelude, old-locale, placeholders, postgresql-binary
+     , postgresql-libpq, postgresql-simple, QuickCheck
+     , quickcheck-instances, scientific, template-haskell, text, time
+     , transformers, uuid, vector
      }:
      mkDerivation {
        pname = "hasql-postgres";
@@ -84268,6 +85415,11 @@ self: {
          old-locale postgresql-binary QuickCheck quickcheck-instances
          scientific text time vector
        ];
+       benchmarkHaskellDepends = [
+         base-prelude criterion-plus deepseq either hasql hasql-backend HDBC
+         HDBC-postgresql list-t monad-control mtl-prelude postgresql-simple
+         QuickCheck quickcheck-instances scientific text time vector
+       ];
        homepage = "https://github.com/nikita-volkov/hasql-postgres";
        description = "A \"PostgreSQL\" backend for the \"hasql\" library";
        license = stdenv.lib.licenses.mit;
@@ -84396,6 +85548,8 @@ self: {
        version = "0.5.5.1";
        sha256 = "c93d1dce0f0024ecae56019b1c7a5b68ca37cf32ba7a8ee7b2f248981af4865c";
        configureFlags = [ "-fportable" ];
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [
          base binary bytestring containers data-binary-ieee754 directory
          filepath ghc ghc-paths ghc-prim monads-tf network network-uri
@@ -84563,10 +85717,10 @@ self: {
 
   "hats" = callPackage
     ({ mkDerivation, aeson, async, attoparsec, base, bytestring
-     , conduit, conduit-extra, connection, deepseq, HUnit, network
-     , network-uri, process, QuickCheck, random, stm, test-framework
-     , test-framework-hunit, test-framework-quickcheck2, text
-     , transformers, unordered-containers
+     , conduit, conduit-extra, connection, criterion, deepseq, HUnit
+     , network, network-uri, process, QuickCheck, random, stm
+     , test-framework, test-framework-hunit, test-framework-quickcheck2
+     , text, transformers, unordered-containers
      }:
      mkDerivation {
        pname = "hats";
@@ -84584,6 +85738,9 @@ self: {
          aeson attoparsec base bytestring HUnit process QuickCheck
          test-framework test-framework-hunit test-framework-quickcheck2 text
        ];
+       benchmarkHaskellDepends = [
+         async attoparsec base bytestring criterion random stm
+       ];
        homepage = "https://github.com/kosmoskatten/hats";
        description = "Haskell client for the NATS messaging system";
        license = stdenv.lib.licenses.mit;
@@ -85623,8 +86780,8 @@ self: {
      }:
      mkDerivation {
        pname = "hdocs";
-       version = "0.5.0.2";
-       sha256 = "bcaf93d7febb8f04540010b2b0a244030bda1d5002b7cc158bbd05ba5acc9172";
+       version = "0.5.1.0";
+       sha256 = "bb4a43b479b1731105b7c6195bff59a3763042daf1102765c4f78d075a5ba2df";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -85687,8 +86844,8 @@ self: {
      }) {};
 
   "hdr-histogram" = callPackage
-    ({ mkDerivation, base, deepseq, hspec, primitive, QuickCheck
-     , random, tagged, vector, vector-algorithms
+    ({ mkDerivation, base, criterion, deepseq, hspec, primitive
+     , QuickCheck, random, tagged, vector, vector-algorithms
      }:
      mkDerivation {
        pname = "hdr-histogram";
@@ -85700,6 +86857,7 @@ self: {
        testHaskellDepends = [
          base hspec QuickCheck random tagged vector vector-algorithms
        ];
+       benchmarkHaskellDepends = [ base criterion deepseq primitive ];
        homepage = "http://github.com/joshbohde/hdr-histogram#readme";
        description = "Haskell implementation of High Dynamic Range (HDR) Histograms";
        license = stdenv.lib.licenses.gpl3;
@@ -85839,6 +86997,7 @@ self: {
          async base bytestring HUnit mtl slave-thread stm test-framework
          test-framework-hunit text time
        ];
+       benchmarkHaskellDepends = [ base mtl time ];
        homepage = "https://github.com/informatikr/hedis";
        description = "Client library for the Redis datastore: supports full command set, pipelining";
        license = stdenv.lib.licenses.bsd3;
@@ -85994,12 +87153,12 @@ self: {
 
   "heist" = callPackage
     ({ mkDerivation, aeson, attoparsec, base, bifunctors, blaze-builder
-     , blaze-html, bytestring, containers, directory, directory-tree
-     , dlist, filepath, hashable, HUnit, lens, lifted-base, map-syntax
-     , monad-control, mtl, process, QuickCheck, random, test-framework
-     , test-framework-hunit, test-framework-quickcheck2, text, time
-     , transformers, transformers-base, unordered-containers, vector
-     , xmlhtml
+     , blaze-html, bytestring, containers, criterion, directory
+     , directory-tree, dlist, filepath, hashable, HUnit, lens
+     , lifted-base, map-syntax, monad-control, mtl, process, QuickCheck
+     , random, statistics, test-framework, test-framework-hunit
+     , test-framework-quickcheck2, text, time, transformers
+     , transformers-base, unordered-containers, vector, xmlhtml
      }:
      mkDerivation {
        pname = "heist";
@@ -86021,6 +87180,13 @@ self: {
          test-framework-quickcheck2 text time transformers transformers-base
          unordered-containers vector xmlhtml
        ];
+       benchmarkHaskellDepends = [
+         aeson attoparsec base blaze-builder blaze-html bytestring
+         containers criterion directory directory-tree dlist filepath
+         hashable HUnit lifted-base map-syntax monad-control mtl process
+         random statistics test-framework test-framework-hunit text time
+         transformers transformers-base unordered-containers vector xmlhtml
+       ];
        homepage = "http://snapframework.com/";
        description = "An Haskell template system supporting both HTML5 and XML";
        license = stdenv.lib.licenses.bsd3;
@@ -86091,6 +87257,8 @@ self: {
        sha256 = "4cbc6fe323dd997d17b7c3724ec229d78209796133611af3379c7e5ab320721a";
        revision = "1";
        editedCabalFile = "698732187d22f634ca220584e3b4056415c873360a85bc0a4ab7c1e2c86fca3d";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [
          base bytestring bytestring-show data-default-class time unix
        ];
@@ -86112,6 +87280,8 @@ self: {
        pname = "helics-wai";
        version = "0.5.1";
        sha256 = "61ac00d92870d2c5cb86fb15bcea21a0522bf12665f35b5c2a300ca7094d2b83";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [
          base bytestring data-default-class helics vault wai
        ];
@@ -86359,8 +87529,8 @@ self: {
 
   "hemokit" = callPackage
     ({ mkDerivation, aeson, base, base64-bytestring, bytestring, cairo
-     , cipher-aes, conduit, deepseq, deepseq-generics, gtk, hidapi
-     , hspec, HUnit, mtl, network-simple, optparse-applicative
+     , cipher-aes, conduit, criterion, deepseq, deepseq-generics, gtk
+     , hidapi, hspec, HUnit, mtl, network-simple, optparse-applicative
      , pretty-show, robot, split, svgcairo, text, time, transformers
      , vector, vector-fftw, websockets
      }:
@@ -86381,6 +87551,7 @@ self: {
          transformers vector vector-fftw websockets
        ];
        testHaskellDepends = [ base bytestring hspec HUnit vector ];
+       benchmarkHaskellDepends = [ base conduit criterion mtl ];
        homepage = "https://github.com/nh2/hemokit";
        description = "Haskell port of the Emokit EEG project";
        license = stdenv.lib.licenses.mit;
@@ -86727,8 +87898,8 @@ self: {
      }) {};
 
   "hetero-dict" = callPackage
-    ({ mkDerivation, aeson, base, primitive, template-haskell, text
-     , unordered-containers
+    ({ mkDerivation, aeson, base, criterion, deepseq, hvect, primitive
+     , template-haskell, text, unordered-containers, vinyl
      }:
      mkDerivation {
        pname = "hetero-dict";
@@ -86737,6 +87908,9 @@ self: {
        libraryHaskellDepends = [
          aeson base primitive template-haskell text unordered-containers
        ];
+       benchmarkHaskellDepends = [
+         base criterion deepseq hvect template-haskell vinyl
+       ];
        description = "Fast heterogeneous data structures";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -87092,9 +88266,12 @@ self: {
        pname = "hfann";
        version = "0.4.2";
        sha256 = "5a25fc2af7f99f1ba0d25394f7f98c657c24aa5d9a193bfdce71981f3311f926";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [ base ];
        librarySystemDepends = [ doublefann ];
        libraryPkgconfigDepends = [ fann ];
+       executableSystemDepends = [ doublefann ];
        description = "Haskell binding to the FANN library";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -87402,16 +88579,18 @@ self: {
 
   "hgeometry" = callPackage
     ({ mkDerivation, array, base, bifunctors, bytestring, containers
-     , contravariant, data-clist, deepseq, directory, doctest
-     , fixed-vector, Frames, hexpat, hspec, lens, linear, mtl
-     , optparse-applicative, parsec, QuickCheck, random, semigroupoids
-     , semigroups, singletons, template-haskell, text, time, vector
-     , vinyl
+     , contravariant, criterion, data-clist, deepseq, deepseq-generics
+     , directory, doctest, fixed-vector, Frames, hexpat, hspec, lens
+     , linear, mtl, optparse-applicative, parsec, QuickCheck, random
+     , semigroupoids, semigroups, singletons, template-haskell, text
+     , time, vector, vinyl
      }:
      mkDerivation {
        pname = "hgeometry";
        version = "0.6.0.0";
        sha256 = "328e0e4438b729084b301b22f31d9f880157a5b317eacc48ddcf585d685bf0de";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [
          base bifunctors bytestring containers contravariant data-clist
          deepseq directory fixed-vector Frames hexpat lens linear mtl
@@ -87422,6 +88601,10 @@ self: {
          array base bytestring containers data-clist doctest Frames hspec
          lens linear QuickCheck random semigroups vector vinyl
        ];
+       benchmarkHaskellDepends = [
+         base criterion deepseq deepseq-generics Frames lens QuickCheck
+         semigroups
+       ];
        homepage = "https://fstaals.net/software/hgeometry";
        description = "Geometric Algorithms, Data structures, and Data types";
        license = stdenv.lib.licenses.bsd3;
@@ -87571,6 +88754,8 @@ self: {
        pname = "hgrib";
        version = "0.3.1.0";
        sha256 = "d3e0d4b1088934c230c566458e327b535733de602aa96ca68fc9236b65e3d73b";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [ base transformers ];
        librarySystemDepends = [ grib_api ];
        libraryToolDepends = [ c2hs ];
@@ -87887,7 +89072,8 @@ self: {
      }) {};
 
   "highjson" = callPackage
-    ({ mkDerivation, aeson, base, hspec, hvect, lens, QuickCheck, text
+    ({ mkDerivation, aeson, base, bytestring, criterion, deepseq, hspec
+     , hvect, lens, QuickCheck, text
      }:
      mkDerivation {
        pname = "highjson";
@@ -87895,6 +89081,9 @@ self: {
        sha256 = "c3eb05ed1abd9dd59eedcd22bd60b326059d0c3dcaee2a9f8238b0ac08a26962";
        libraryHaskellDepends = [ aeson base hvect lens text ];
        testHaskellDepends = [ aeson base hspec lens QuickCheck text ];
+       benchmarkHaskellDepends = [
+         aeson base bytestring criterion deepseq text
+       ];
        homepage = "https://github.com/agrafix/highjson";
        description = "Spec based JSON parsing/serialisation";
        license = stdenv.lib.licenses.mit;
@@ -87965,6 +89154,8 @@ self: {
        pname = "highlighter";
        version = "0.2.2";
        sha256 = "3d88a570d7e682cab28652ebc585a790a9e061c5be1d998573e23dd19e0d68f4";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [
          base blaze-html bytestring filepath mtl pcre-light text
        ];
@@ -87980,6 +89171,8 @@ self: {
        pname = "highlighter2";
        version = "0.2.5";
        sha256 = "917718f0633c61184c5f768a817002bb8c8138759c846d245e1ea62862ffcdbe";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [
          base blaze-html bytestring containers filepath mtl pcre-light text
        ];
@@ -87997,6 +89190,8 @@ self: {
        version = "0.6.4";
        sha256 = "d8b83385f5da2ea7aa59f28eb860fd7eba0d35a4c36192a5044ee7ea1e001baf";
        configureFlags = [ "-fpcre-light" ];
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [
          base blaze-html bytestring containers mtl parsec pcre-light
          utf8-string
@@ -88094,10 +89289,10 @@ self: {
      }) {};
 
   "hindent" = callPackage
-    ({ mkDerivation, base, bytestring, containers, deepseq, descriptive
-     , Diff, directory, exceptions, ghc-prim, haskell-src-exts, hspec
-     , monad-loops, mtl, path, path-io, text, transformers, unix-compat
-     , utf8-string, yaml
+    ({ mkDerivation, base, bytestring, containers, criterion, deepseq
+     , descriptive, Diff, directory, exceptions, ghc-prim
+     , haskell-src-exts, hspec, monad-loops, mtl, path, path-io, text
+     , transformers, unix-compat, utf8-string, yaml
      }:
      mkDerivation {
        pname = "hindent";
@@ -88118,6 +89313,10 @@ self: {
          base bytestring deepseq Diff directory exceptions haskell-src-exts
          hspec monad-loops mtl utf8-string
        ];
+       benchmarkHaskellDepends = [
+         base bytestring criterion deepseq directory exceptions ghc-prim
+         haskell-src-exts utf8-string
+       ];
        homepage = "http://www.github.com/chrisdone/hindent";
        description = "Extensible Haskell pretty printer";
        license = stdenv.lib.licenses.bsd3;
@@ -88374,8 +89573,9 @@ self: {
 
   "hip" = callPackage
     ({ mkDerivation, base, bytestring, Chart, Chart-diagrams, colour
-     , deepseq, directory, filepath, hspec, JuicyPixels, netpbm
-     , primitive, process, QuickCheck, repa, temporary, vector
+     , criterion, deepseq, directory, filepath, hspec, JuicyPixels
+     , netpbm, primitive, process, QuickCheck, repa, repa-algorithms
+     , temporary, vector
      }:
      mkDerivation {
        pname = "hip";
@@ -88386,6 +89586,9 @@ self: {
          filepath JuicyPixels netpbm primitive process repa temporary vector
        ];
        testHaskellDepends = [ base bytestring hspec QuickCheck ];
+       benchmarkHaskellDepends = [
+         base criterion deepseq repa repa-algorithms
+       ];
        homepage = "https://github.com/lehins/hip";
        description = "Haskell Image Processing (HIP) Library";
        license = stdenv.lib.licenses.bsd3;
@@ -88642,12 +89845,15 @@ self: {
      }) {};
 
   "histogram-fill" = callPackage
-    ({ mkDerivation, base, deepseq, ghc-prim, primitive, vector }:
+    ({ mkDerivation, base, criterion, deepseq, ghc-prim, mwc-random
+     , primitive, vector
+     }:
      mkDerivation {
        pname = "histogram-fill";
        version = "0.8.5.0";
        sha256 = "fbdd167d6f27c0d88f9aa8647ae95a313101c63a827275ac8d016d6028975133";
        libraryHaskellDepends = [ base deepseq ghc-prim primitive vector ];
+       benchmarkHaskellDepends = [ base criterion mwc-random vector ];
        homepage = "https://github.com/Shimuuar/histogram-fill/";
        description = "Library for histograms creation";
        license = stdenv.lib.licenses.bsd3;
@@ -88705,6 +89911,8 @@ self: {
        pname = "hit";
        version = "0.6.3";
        sha256 = "db86b3712029a4e40d1306dd6cc9ca2c9f4c77fe65a2b74106f1cbd2de26e471";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [
          attoparsec base byteable bytestring containers cryptohash hourglass
          mtl parsec patience random system-fileio system-filepath
@@ -88897,6 +90105,8 @@ self: {
        pname = "hlatex";
        version = "0.3.1";
        sha256 = "1ea8a1097244818b694afd3f71aa2e56e8873b3019d3dcc973885be491a28d8e";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [
          base base-unicode-symbols containers derive directory filepath mtl
          process template-haskell transformers uniplate utf8-string
@@ -88973,12 +90183,12 @@ self: {
 
   "hledger" = callPackage
     ({ mkDerivation, base, base-compat, bytestring, cmdargs, containers
-     , csv, data-default, directory, file-embed, filepath, hashable
-     , haskeline, hledger-lib, HUnit, megaparsec, mtl, mtl-compat
-     , old-time, parsec, pretty-show, process, regex-tdfa, safe
-     , shakespeare, split, tabular, temporary, terminfo, test-framework
-     , test-framework-hunit, text, time, transformers
-     , unordered-containers, utf8-string, wizards
+     , criterion, csv, data-default, directory, file-embed, filepath
+     , hashable, haskeline, hledger-lib, html, HUnit, megaparsec, mtl
+     , mtl-compat, old-time, parsec, pretty-show, process, regex-tdfa
+     , safe, shakespeare, split, tabular, temporary, terminfo
+     , test-framework, test-framework-hunit, text, time, timeit
+     , transformers, unordered-containers, utf8-string, wizards
      }:
      mkDerivation {
        pname = "hledger";
@@ -89010,6 +90220,10 @@ self: {
          test-framework-hunit text time unordered-containers utf8-string
          wizards
        ];
+       benchmarkHaskellDepends = [
+         base base-compat criterion directory file-embed filepath
+         hledger-lib html pretty-show process tabular temporary time timeit
+       ];
        homepage = "http://hledger.org";
        description = "Command-line interface for the hledger accounting tool";
        license = "GPL";
@@ -89414,6 +90628,8 @@ self: {
        sha256 = "8370a8e6d386a8342d9c4a683b3c085890ee092e95549737ccf26b4fc62fba8d";
        revision = "1";
        editedCabalFile = "5375f1b11a455cfd90aeedf16499c79fc541857e7c73d4bdb41a704f2a561283";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [ base stm transformers unix X11 ];
        homepage = "https://github.com/hpdeifel/hlwm-haskell";
        description = "Bindings to the herbstluftwm window manager";
@@ -89579,6 +90795,8 @@ self: {
        pname = "hmatrix-nipals";
        version = "0.2";
        sha256 = "322bdf452889dbaeccca42e28afb3ebd85bf594da754cdee2a1f43121dbfd529";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [ base hmatrix ];
        homepage = "http://github.com/alanfalloon/hmatrix-nipals";
        description = "NIPALS method for Principal Components Analysis on large data-sets";
@@ -89643,13 +90861,16 @@ self: {
      }) {};
 
   "hmatrix-svdlibc" = callPackage
-    ({ mkDerivation, base, hmatrix, hspec, QuickCheck, vector }:
+    ({ mkDerivation, base, criterion, hmatrix, hspec, QuickCheck
+     , vector
+     }:
      mkDerivation {
        pname = "hmatrix-svdlibc";
        version = "0.4.0";
        sha256 = "774504e862542f90441701122638c4ce11aa94792d270045eb0f0997e6f874a2";
        libraryHaskellDepends = [ base hmatrix vector ];
        testHaskellDepends = [ base hmatrix hspec QuickCheck vector ];
+       benchmarkHaskellDepends = [ base criterion hmatrix vector ];
        homepage = "http://github.com/bgamari/hmatrix-svdlibc";
        description = "SVDLIBC bindings for HMatrix";
        license = stdenv.lib.licenses.bsd3;
@@ -89684,6 +90905,7 @@ self: {
          base binary deepseq hmatrix hmatrix-gsl HUnit QuickCheck random
        ];
        testHaskellDepends = [ base HUnit QuickCheck random ];
+       benchmarkHaskellDepends = [ base HUnit QuickCheck random ];
        homepage = "https://github.com/albertoruiz/hmatrix";
        description = "Tests for hmatrix";
        license = stdenv.lib.licenses.bsd3;
@@ -89947,9 +91169,10 @@ self: {
      }) {inherit (pkgs) netcdf;};
 
   "hnix" = callPackage
-    ({ mkDerivation, ansi-wl-pprint, base, containers, data-fix
-     , deepseq, deriving-compat, parsers, semigroups, tasty, tasty-hunit
-     , tasty-th, text, transformers, trifecta, unordered-containers
+    ({ mkDerivation, ansi-wl-pprint, base, containers, criterion
+     , data-fix, deepseq, deriving-compat, parsers, semigroups, tasty
+     , tasty-hunit, tasty-th, text, transformers, trifecta
+     , unordered-containers
      }:
      mkDerivation {
        pname = "hnix";
@@ -89967,6 +91190,7 @@ self: {
        testHaskellDepends = [
          base containers data-fix tasty tasty-hunit tasty-th text
        ];
+       benchmarkHaskellDepends = [ base containers criterion text ];
        homepage = "http://github.com/jwiegley/hnix";
        description = "Haskell implementation of the Nix language";
        license = stdenv.lib.licenses.bsd3;
@@ -90045,6 +91269,8 @@ self: {
        pname = "hoauth2";
        version = "0.5.7";
        sha256 = "7b196e4b70b8207c4beb3479f5ab4476c17d9c0ec7d8f1fcb658590641e9b9ec";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [
          aeson base bytestring http-conduit http-types text
          unordered-containers
@@ -90062,6 +91288,8 @@ self: {
        pname = "hoauth2";
        version = "0.5.8";
        sha256 = "caacec1259455de9d1cb78c38fe8ca4dabc901e5b9fd8a9e7d17eaca0a820e60";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [
          aeson base bytestring http-conduit http-types text
          unordered-containers
@@ -91006,8 +92234,8 @@ self: {
      }:
      mkDerivation {
        pname = "hoppy-docs";
-       version = "0.3.0";
-       sha256 = "e6663e8654fe93daa5a4628219eea03e2b6f31d7894a9f7c4180f43f92921d8f";
+       version = "0.3.1";
+       sha256 = "be94bd36afde578e202b39f865a9f342acc97367bfaf942b49cd2bd19aee9b96";
        libraryHaskellDepends = [
          base haskell-src hoppy-generator hoppy-runtime
        ];
@@ -91023,8 +92251,8 @@ self: {
      }:
      mkDerivation {
        pname = "hoppy-generator";
-       version = "0.3.1";
-       sha256 = "162598c04c1e977b666c491dfb34451c43c08354427d9ed806b81169d6dd9c80";
+       version = "0.3.2";
+       sha256 = "eaf41f874e0d26720c374430798e77e2f334de7936b313546b2293bb9c3767eb";
        libraryHaskellDepends = [
          base containers directory filepath haskell-src mtl
        ];
@@ -91164,8 +92392,8 @@ self: {
      }) {};
 
   "hosc" = callPackage
-    ({ mkDerivation, base, binary, blaze-builder, bytestring
-     , data-binary-ieee754, network, QuickCheck, test-framework
+    ({ mkDerivation, base, binary, blaze-builder, bytestring, criterion
+     , data-binary-ieee754, deepseq, network, QuickCheck, test-framework
      , test-framework-quickcheck2, time, transformers
      }:
      mkDerivation {
@@ -91180,6 +92408,7 @@ self: {
          base bytestring QuickCheck test-framework
          test-framework-quickcheck2
        ];
+       benchmarkHaskellDepends = [ base bytestring criterion deepseq ];
        homepage = "http://rd.slavepianos.org/t/hosc";
        description = "Haskell Open Sound Control";
        license = "GPL";
@@ -91298,8 +92527,8 @@ self: {
      }) {};
 
   "hourglass" = callPackage
-    ({ mkDerivation, base, deepseq, mtl, old-locale, tasty, tasty-hunit
-     , tasty-quickcheck, time
+    ({ mkDerivation, base, bytestring, criterion, deepseq, mtl
+     , old-locale, tasty, tasty-hunit, tasty-quickcheck, time
      }:
      mkDerivation {
        pname = "hourglass";
@@ -91309,6 +92538,9 @@ self: {
        testHaskellDepends = [
          base deepseq mtl old-locale tasty tasty-hunit tasty-quickcheck time
        ];
+       benchmarkHaskellDepends = [
+         base bytestring criterion deepseq mtl old-locale time
+       ];
        homepage = "https://github.com/vincenthz/hs-hourglass";
        description = "simple performant time related library";
        license = stdenv.lib.licenses.bsd3;
@@ -91756,8 +92988,8 @@ self: {
      }:
      mkDerivation {
        pname = "hpio";
-       version = "0.8.0.6";
-       sha256 = "3e46024f61f4dda52e5edafa3bbcab1d2dfe7f5f68a32c6f8480cecfd864cb94";
+       version = "0.8.0.7";
+       sha256 = "a003f549f3d7b44c87980fc31cdf5083c7cfd8ad651d5e4cd56448d67a8ee630";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -91967,6 +93199,8 @@ self: {
        pname = "hps";
        version = "0.15";
        sha256 = "30df792e10ce0a2d2886ce5b6b081e95640cc00d02d9f2aa6426e7919eccb54e";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [ base hcg-minus ];
        homepage = "http://rd.slavepianos.org/?t=hps";
        description = "Haskell Postscript";
@@ -92222,8 +93456,8 @@ self: {
      }) {};
 
   "hs-blake2" = callPackage
-    ({ mkDerivation, base, bytestring, bytestring-arbitrary, libb2
-     , QuickCheck, tasty, tasty-quickcheck
+    ({ mkDerivation, base, bytestring, bytestring-arbitrary, criterion
+     , cryptohash, libb2, QuickCheck, tasty, tasty-quickcheck
      }:
      mkDerivation {
        pname = "hs-blake2";
@@ -92236,6 +93470,8 @@ self: {
          tasty-quickcheck
        ];
        testSystemDepends = [ libb2 ];
+       benchmarkHaskellDepends = [ base bytestring criterion cryptohash ];
+       benchmarkSystemDepends = [ libb2 ];
        homepage = "https://github.com/tsuraan/hs-blake2";
        description = "A cryptohash-inspired library for blake2";
        license = stdenv.lib.licenses.bsd3;
@@ -92754,8 +93990,9 @@ self: {
      }) {};
 
   "hs2048" = callPackage
-    ({ mkDerivation, base, doctest, Glob, hlint, hspec, HUnit, process
-     , QuickCheck, random, regex-compat
+    ({ mkDerivation, base, criterion, doctest, Glob, hastache, hlint
+     , hspec, HUnit, process, QuickCheck, random, regex-compat
+     , statistics
      }:
      mkDerivation {
        pname = "hs2048";
@@ -92769,6 +94006,9 @@ self: {
          base doctest Glob hlint hspec HUnit process QuickCheck random
          regex-compat
        ];
+       benchmarkHaskellDepends = [
+         base criterion hastache random statistics
+       ];
        homepage = "https://github.com/tfausak/hs2048";
        description = "A 2048 clone in Haskell";
        license = stdenv.lib.licenses.mit;
@@ -93223,6 +94463,8 @@ self: {
        pname = "hsc3-process";
        version = "0.10.0";
        sha256 = "ace3a309858541f5ec377403391d71176653601bcac3fa69adfa9576a74ae6c0";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [
          base bytestring containers data-default directory filepath hosc
          hsc3 process time time-compat transformers
@@ -93273,6 +94515,8 @@ self: {
        pname = "hsc3-server";
        version = "0.10.0";
        sha256 = "57bcb588adc0cabc5114919c32c240be63de704545b4803ac44e447364059c02";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [
          base bitset bytestring containers data-default failure hashtables
          hosc hsc3 hsc3-process lifted-base ListZipper monad-control
@@ -93556,10 +94800,8 @@ self: {
      }:
      mkDerivation {
        pname = "hsdev";
-       version = "0.2.1.0";
-       sha256 = "8d89f4cf2e67c2e55a94068538818e297efa07429a26b4009eff5d04724e7794";
-       revision = "1";
-       editedCabalFile = "2ed64491515bb9af5b43ee11a203925987797d5492a3c143a37ad6eae8a7c8f6";
+       version = "0.2.2.0";
+       sha256 = "844973b82ed0a0a7321d8106755e71db229889af4b0516e5da861bf6474bb932";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -93622,6 +94864,8 @@ self: {
        pname = "hsdns";
        version = "1.7";
        sha256 = "48960ac9e1f0d1e338170aac35f6fd7e064a3b36314894f4a968113385205cd3";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [ base containers network ];
        librarySystemDepends = [ adns ];
        homepage = "http://github.com/peti/hsdns";
@@ -94497,8 +95741,8 @@ self: {
      }:
      mkDerivation {
        pname = "hspec";
-       version = "2.4.1";
-       sha256 = "c6d29aea545769b116e14ca7ca2c64d7e18649fc792adb98623b119d3a80f6da";
+       version = "2.4.2";
+       sha256 = "48b7e342c0990ae38373acbb7cac5a2ef9b1bb2cca8bdf41a896f1593e677484";
        libraryHaskellDepends = [
          base call-stack hspec-core hspec-discover hspec-expectations HUnit
          QuickCheck transformers
@@ -94565,8 +95809,8 @@ self: {
      }:
      mkDerivation {
        pname = "hspec-core";
-       version = "2.4.1";
-       sha256 = "b2ea5b6a37542fa138060085ee7bf82ab0ab130f2c287a57ae05a4f83ae437da";
+       version = "2.4.2";
+       sha256 = "393ba143901824579b736fb4313c7e07e57eda45580e657bf24d1b1c32c0a318";
        libraryHaskellDepends = [
          ansi-terminal array async base call-stack deepseq directory
          filepath hspec-expectations HUnit QuickCheck quickcheck-io random
@@ -94587,8 +95831,8 @@ self: {
     ({ mkDerivation, base, directory, filepath, hspec-meta }:
      mkDerivation {
        pname = "hspec-discover";
-       version = "2.4.1";
-       sha256 = "e0670831f06a8924779cc81d4eb706b35d3a7176cba6bee5df506de961e8d5f3";
+       version = "2.4.2";
+       sha256 = "8c9ad7bc21eabcc28526e8fd8e12927c0d659c9b3179e665c30b175fa5011d2c";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base directory filepath ];
@@ -95884,6 +97128,23 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {inherit (pkgs) taglib;};
 
+  "htaglib_1_1_0" = callPackage
+    ({ mkDerivation, base, bytestring, directory, filepath, hspec
+     , taglib, text, transformers
+     }:
+     mkDerivation {
+       pname = "htaglib";
+       version = "1.1.0";
+       sha256 = "e2d2c9df136823d4c88f5e6f2c8053a713e326ec2b0de9e0e00410997c99ff00";
+       libraryHaskellDepends = [ base bytestring text transformers ];
+       librarySystemDepends = [ taglib ];
+       testHaskellDepends = [ base directory filepath hspec ];
+       homepage = "https://github.com/mrkkrp/htaglib";
+       description = "Bindings to TagLib, audio meta-data library";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {inherit (pkgs) taglib;};
+
   "htags" = callPackage
     ({ mkDerivation, base, directory, filepath, haskell-src, mtl }:
      mkDerivation {
@@ -96009,7 +97270,7 @@ self: {
      }) {};
 
   "html-email-validate" = callPackage
-    ({ mkDerivation, attoparsec, base, hspec, QuickCheck
+    ({ mkDerivation, attoparsec, base, criterion, hspec, QuickCheck
      , regex-pcre-builtin, text
      }:
      mkDerivation {
@@ -96020,6 +97281,7 @@ self: {
        testHaskellDepends = [
          attoparsec base hspec QuickCheck regex-pcre-builtin text
        ];
+       benchmarkHaskellDepends = [ base criterion text ];
        description = "Validating an email address against HTML standard";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -96068,12 +97330,17 @@ self: {
      }) {};
 
   "html-parse" = callPackage
-    ({ mkDerivation, attoparsec, base, deepseq, text }:
+    ({ mkDerivation, attoparsec, base, criterion, deepseq, tagsoup
+     , text
+     }:
      mkDerivation {
        pname = "html-parse";
        version = "0.2.0.0";
        sha256 = "9c9f8401dc86ea3a9612bfc0d430a03b7e9130183f0b8dc1fa100cd0bbb84a92";
        libraryHaskellDepends = [ attoparsec base deepseq text ];
+       benchmarkHaskellDepends = [
+         attoparsec base criterion deepseq tagsoup text
+       ];
        homepage = "http://github.com/bgamari/html-parse";
        description = "A high-performance HTML tokenizer";
        license = stdenv.lib.licenses.bsd3;
@@ -96147,12 +97414,15 @@ self: {
      }) {};
 
   "html5-entity" = callPackage
-    ({ mkDerivation, base, containers, text }:
+    ({ mkDerivation, base, containers, criterion, text }:
      mkDerivation {
        pname = "html5-entity";
        version = "0.2.0.3";
        sha256 = "2e067939e2c7d1a204ee219651f6c31205eed3ff6f43e0852ffc5bd5a1feb52e";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [ base containers text ];
+       benchmarkHaskellDepends = [ base containers criterion ];
        homepage = "https://github.com/zudov/html5-entity/";
        description = "A library for looking up and validating HTML5 entities";
        license = stdenv.lib.licenses.bsd3;
@@ -96186,9 +97456,9 @@ self: {
      }) {};
 
   "htoml" = callPackage
-    ({ mkDerivation, aeson, base, bytestring, containers, file-embed
-     , old-locale, parsec, tasty, tasty-hspec, tasty-hunit, text, time
-     , unordered-containers, vector
+    ({ mkDerivation, aeson, base, bytestring, containers, criterion
+     , file-embed, old-locale, parsec, tasty, tasty-hspec, tasty-hunit
+     , text, time, unordered-containers, vector
      }:
      mkDerivation {
        pname = "htoml";
@@ -96202,6 +97472,10 @@ self: {
          aeson base bytestring containers file-embed parsec tasty
          tasty-hspec tasty-hunit text time unordered-containers vector
        ];
+       benchmarkHaskellDepends = [
+         aeson base containers criterion parsec text time
+         unordered-containers vector
+       ];
        homepage = "https://github.com/cies/htoml";
        description = "Parser for TOML files";
        license = stdenv.lib.licenses.bsd3;
@@ -96355,37 +97629,8 @@ self: {
      }:
      mkDerivation {
        pname = "http-client";
-       version = "0.5.5";
-       sha256 = "d1fdda6035e0bab95d3294f5175ac8c3629f9cd1d32e1bce5d0aa27226751c85";
-       libraryHaskellDepends = [
-         array base base64-bytestring blaze-builder bytestring
-         case-insensitive containers cookie deepseq exceptions filepath
-         ghc-prim http-types mime-types network network-uri random
-         streaming-commons text time transformers
-       ];
-       testHaskellDepends = [
-         async base base64-bytestring blaze-builder bytestring
-         case-insensitive containers deepseq directory hspec http-types
-         monad-control network network-uri streaming-commons text time
-         transformers zlib
-       ];
-       doCheck = false;
-       homepage = "https://github.com/snoyberg/http-client";
-       description = "An HTTP client engine";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "http-client_0_5_6" = callPackage
-    ({ mkDerivation, array, async, base, base64-bytestring
-     , blaze-builder, bytestring, case-insensitive, containers, cookie
-     , deepseq, directory, exceptions, filepath, ghc-prim, hspec
-     , http-types, mime-types, monad-control, network, network-uri
-     , random, streaming-commons, text, time, transformers, zlib
-     }:
-     mkDerivation {
-       pname = "http-client";
-       version = "0.5.6";
-       sha256 = "514271d83fff7169a493111105e77ea93d11b562effa840c47117a3db912216a";
+       version = "0.5.6.1";
+       sha256 = "2c304337b88ea48cf4b1c4e4ac12ec48c5f3a241f3ab44a57965c1d9d06a2bed";
        libraryHaskellDepends = [
          array base base64-bytestring blaze-builder bytestring
          case-insensitive containers cookie deepseq exceptions filepath
@@ -96402,7 +97647,6 @@ self: {
        homepage = "https://github.com/snoyberg/http-client";
        description = "An HTTP client engine";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "http-client-auth" = callPackage
@@ -96539,19 +97783,21 @@ self: {
 
   "http-client-tls" = callPackage
     ({ mkDerivation, base, bytestring, case-insensitive, connection
-     , cryptonite, data-default-class, exceptions, hspec, http-client
-     , http-types, memory, network, tls, transformers
+     , containers, criterion, cryptonite, data-default-class, exceptions
+     , hspec, http-client, http-types, memory, network, network-uri
+     , text, tls, transformers
      }:
      mkDerivation {
        pname = "http-client-tls";
-       version = "0.3.3.1";
-       sha256 = "56317378785688a129fdc7abdf5d721fe15e46178f89f457878aa3acd1ac7d12";
+       version = "0.3.4";
+       sha256 = "37693b0ebcfa6ce796abf39647ff4df17361ab1ab1f999ac10faba67d3042bc1";
        libraryHaskellDepends = [
-         base bytestring case-insensitive connection cryptonite
+         base bytestring case-insensitive connection containers cryptonite
          data-default-class exceptions http-client http-types memory network
-         tls transformers
+         network-uri text tls transformers
        ];
        testHaskellDepends = [ base hspec http-client http-types ];
+       benchmarkHaskellDepends = [ base criterion http-client ];
        doCheck = false;
        homepage = "https://github.com/snoyberg/http-client";
        description = "http-client backend using the connection package and tls library";
@@ -96586,8 +97832,8 @@ self: {
      }:
      mkDerivation {
        pname = "http-conduit";
-       version = "2.2.3";
-       sha256 = "eee51e80fe76b3bf4b4041545f452e126e0593f70a0623a5a35ee47d72fe0dc3";
+       version = "2.2.3.1";
+       sha256 = "53ae16c601f980f323f2b24a32a776f9867b6b595e6e1929d440d1549715ca0e";
        libraryHaskellDepends = [
          aeson base bytestring conduit conduit-extra exceptions http-client
          http-client-tls http-types lifted-base monad-control mtl resourcet
@@ -96718,6 +97964,8 @@ self: {
        pname = "http-enumerator";
        version = "0.7.3.3";
        sha256 = "463f4a7086ee9226ad882ddeb51d5086b237204ef2e0780e1c544eb2debd8283";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [
          asn1-data attoparsec attoparsec-enumerator base base64-bytestring
          blaze-builder blaze-builder-enumerator bytestring case-insensitive
@@ -96731,6 +97979,18 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "http-grammar" = callPackage
+    ({ mkDerivation, attoparsec, base, bytestring }:
+     mkDerivation {
+       pname = "http-grammar";
+       version = "0.1.0.0";
+       sha256 = "47d093d24dacfda6880b2f920768323bd292fdebc70ad24d90eb2977b81d07f4";
+       libraryHaskellDepends = [ attoparsec base bytestring ];
+       homepage = "https://github.com/owensmurray/http-grammar";
+       description = "Attoparsec-based parsers for the RFC-2616 HTTP grammar rules";
+       license = stdenv.lib.licenses.asl20;
+     }) {};
+
   "http-kinder" = callPackage
     ({ mkDerivation, aeson, base, bytestring, case-insensitive
      , containers, http-media, http-types, HUnit, QuickCheck, singletons
@@ -96775,8 +98035,9 @@ self: {
 
   "http-link-header" = callPackage
     ({ mkDerivation, attoparsec, base, bytestring
-     , bytestring-conversion, errors, hspec, hspec-attoparsec
-     , http-api-data, network-uri, QuickCheck, text
+     , bytestring-conversion, criterion, directory, errors, hspec
+     , hspec-attoparsec, http-api-data, network-uri, QuickCheck, text
+     , transformers
      }:
      mkDerivation {
        pname = "http-link-header";
@@ -96789,6 +98050,9 @@ self: {
        testHaskellDepends = [
          base hspec hspec-attoparsec QuickCheck text
        ];
+       benchmarkHaskellDepends = [
+         base criterion directory network-uri text transformers
+       ];
        homepage = "https://github.com/myfreeweb/http-link-header";
        description = "A parser and writer for the HTTP Link header as specified in RFC 5988 \"Web Linking\"";
        license = stdenv.lib.licenses.publicDomain;
@@ -96841,6 +98105,8 @@ self: {
        pname = "http-monad";
        version = "0.1.1.1";
        sha256 = "ad3ea0bc4a95cf66b442d69084f99906e79bcd431ae1c0eb0237fb1ee7276355";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [
          base bytestring containers explicit-exception HTTP lazyio network
          network-uri parsec transformers utility-ht
@@ -97041,6 +98307,8 @@ self: {
        pname = "http-shed";
        version = "0.1";
        sha256 = "bb31968733cbe9d369c651b166f1ecbac9d325c371a9b2fd9723f79953224b2b";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [ base network ];
        description = "A simple websever with an interact style API";
        license = stdenv.lib.licenses.bsd3;
@@ -97156,14 +98424,17 @@ self: {
 
   "http2" = callPackage
     ({ mkDerivation, aeson, aeson-pretty, array, base, bytestring
-     , bytestring-builder, case-insensitive, containers, directory
-     , doctest, filepath, Glob, hex, hspec, psqueues, stm, text
-     , unordered-containers, vector, word8
+     , bytestring-builder, case-insensitive, containers, criterion
+     , directory, doctest, filepath, Glob, hashtables, heaps, hex, hspec
+     , mwc-random, psqueues, stm, text, unordered-containers, vector
+     , word8
      }:
      mkDerivation {
        pname = "http2";
        version = "1.6.3";
        sha256 = "61620eca0f57875a6a9bd24f9cc04c301b5c3c668bf98f85e9989aad5d069c43";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [
          array base bytestring bytestring-builder case-insensitive
          containers psqueues stm
@@ -97173,6 +98444,10 @@ self: {
          case-insensitive containers directory doctest filepath Glob hex
          hspec psqueues stm text unordered-containers vector word8
        ];
+       benchmarkHaskellDepends = [
+         array base bytestring case-insensitive containers criterion
+         hashtables heaps mwc-random psqueues stm
+       ];
        homepage = "https://github.com/kazu-yamamoto/http2";
        description = "HTTP/2 library including frames, priority queues and HPACK";
        license = stdenv.lib.licenses.bsd3;
@@ -97184,6 +98459,8 @@ self: {
        pname = "httpd-shed";
        version = "0.4.0.3";
        sha256 = "b0ff87d81e61f788d3920d952e4469d984742ba49c006df086c159886bf09218";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [ base network network-uri ];
        description = "A simple web-server with an interact style API";
        license = stdenv.lib.licenses.bsd3;
@@ -97425,13 +98702,14 @@ self: {
      }) {};
 
   "human-readable-duration" = callPackage
-    ({ mkDerivation, base, doctest, Glob }:
+    ({ mkDerivation, base, criterion, doctest, Glob }:
      mkDerivation {
        pname = "human-readable-duration";
        version = "0.2.0.3";
        sha256 = "93f3a91a2994588728ae757dcca5104e18a570b3591773aa7f03c524c97599da";
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base doctest Glob ];
+       benchmarkHaskellDepends = [ base criterion ];
        homepage = "http://github.com/yogsototh/human-readable-duration#readme";
        description = "Provide duration helper";
        license = stdenv.lib.licenses.bsd3;
@@ -97496,6 +98774,19 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "hunit-dejafu_0_4_0_0" = callPackage
+    ({ mkDerivation, base, dejafu, exceptions, HUnit, random }:
+     mkDerivation {
+       pname = "hunit-dejafu";
+       version = "0.4.0.0";
+       sha256 = "70c53e26261d0075807635c135ead2a8b96a5fec004e9f50ee9043ead136e216";
+       libraryHaskellDepends = [ base dejafu exceptions HUnit random ];
+       homepage = "https://github.com/barrucadu/dejafu";
+       description = "Deja Fu support for the HUnit test framework";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "hunit-gui" = callPackage
     ({ mkDerivation, base, cairo, gtk, haskell98, HUnit }:
      mkDerivation {
@@ -97825,8 +99116,8 @@ self: {
      }) {};
 
   "hw-balancedparens" = callPackage
-    ({ mkDerivation, base, hspec, hw-bits, hw-excess, hw-prim
-     , hw-rankselect-base, QuickCheck, vector
+    ({ mkDerivation, base, criterion, hspec, hw-bits, hw-excess
+     , hw-prim, hw-rankselect-base, QuickCheck, vector
      }:
      mkDerivation {
        pname = "hw-balancedparens";
@@ -97838,6 +99129,9 @@ self: {
        testHaskellDepends = [
          base hspec hw-bits hw-prim hw-rankselect-base QuickCheck vector
        ];
+       benchmarkHaskellDepends = [
+         base criterion hw-bits hw-prim vector
+       ];
        homepage = "http://github.com/haskell-works/hw-balancedparens#readme";
        description = "Balanced parentheses";
        license = stdenv.lib.licenses.bsd3;
@@ -97845,8 +99139,8 @@ self: {
      }) {};
 
   "hw-bits" = callPackage
-    ({ mkDerivation, base, bytestring, hspec, hw-int, hw-prim
-     , hw-string-parse, QuickCheck, safe, vector
+    ({ mkDerivation, base, bytestring, criterion, hspec, hw-int
+     , hw-prim, hw-string-parse, QuickCheck, safe, vector
      }:
      mkDerivation {
        pname = "hw-bits";
@@ -97858,6 +99152,7 @@ self: {
        testHaskellDepends = [
          base bytestring hspec hw-prim QuickCheck vector
        ];
+       benchmarkHaskellDepends = [ base criterion hw-prim vector ];
        homepage = "http://github.com/haskell-works/hw-bits#readme";
        description = "Bit manipulation";
        license = stdenv.lib.licenses.bsd3;
@@ -97866,7 +99161,7 @@ self: {
 
   "hw-conduit" = callPackage
     ({ mkDerivation, array, base, bytestring, conduit, criterion, hspec
-     , hw-bits, resourcet, word8
+     , hw-bits, mmap, resourcet, vector, word8
      }:
      mkDerivation {
        pname = "hw-conduit";
@@ -97879,6 +99174,9 @@ self: {
        ];
        executableHaskellDepends = [ base criterion ];
        testHaskellDepends = [ base bytestring hspec ];
+       benchmarkHaskellDepends = [
+         base bytestring conduit criterion mmap vector
+       ];
        homepage = "http://github.com/haskell-works/hw-conduit#readme";
        description = "Conduits for tokenizing streams";
        license = stdenv.lib.licenses.mit;
@@ -97981,6 +99279,11 @@ self: {
          hw-rankselect-base mmap parsec QuickCheck resourcet transformers
          vector
        ];
+       benchmarkHaskellDepends = [
+         base bytestring conduit criterion hw-balancedparens hw-bits
+         hw-conduit hw-prim hw-rankselect hw-rankselect-base mmap resourcet
+         vector
+       ];
        homepage = "http://github.com/haskell-works/hw-json#readme";
        description = "Memory efficient JSON parser";
        license = stdenv.lib.licenses.bsd3;
@@ -97989,11 +99292,11 @@ self: {
 
   "hw-json-lens" = callPackage
     ({ mkDerivation, ansi-wl-pprint, array, attoparsec, base
-     , bytestring, conduit, containers, dlist, hspec, hw-balancedparens
-     , hw-bits, hw-conduit, hw-diagnostics, hw-json, hw-parser, hw-prim
-     , hw-rankselect, lens, mmap, mono-traversable, parsec, QuickCheck
-     , resourcet, scientific, text, transformers, unordered-containers
-     , vector, word8
+     , bytestring, conduit, containers, criterion, dlist, hspec
+     , hw-balancedparens, hw-bits, hw-conduit, hw-diagnostics, hw-json
+     , hw-parser, hw-prim, hw-rankselect, lens, mmap, mono-traversable
+     , parsec, QuickCheck, resourcet, scientific, text, transformers
+     , unordered-containers, vector, word8
      }:
      mkDerivation {
        pname = "hw-json-lens";
@@ -98011,6 +99314,11 @@ self: {
          lens mmap parsec QuickCheck resourcet scientific transformers
          unordered-containers vector
        ];
+       benchmarkHaskellDepends = [
+         base bytestring conduit criterion hw-bits hw-conduit hw-prim
+         hw-rankselect lens mmap resourcet scientific unordered-containers
+         vector
+       ];
        homepage = "http://github.com/haskell-works/hw-json-lens#readme";
        description = "Lens for hw-json";
        license = stdenv.lib.licenses.mit;
@@ -98024,8 +99332,8 @@ self: {
      }:
      mkDerivation {
        pname = "hw-kafka-client";
-       version = "1.1.1";
-       sha256 = "be1ae93a00f627052a5f6c2d87bf26b531d59c737d69db6d0717cf0ef1b03402";
+       version = "1.1.2";
+       sha256 = "d96a9cfb09a10a1c4526a9a910f7212692c36c138bf5594468a5699f6f0ebb78";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -98158,7 +99466,7 @@ self: {
      }) {};
 
   "hw-rankselect-base" = callPackage
-    ({ mkDerivation, base, hspec, hw-bits, hw-int, hw-prim
+    ({ mkDerivation, base, criterion, hspec, hw-bits, hw-int, hw-prim
      , hw-string-parse, QuickCheck, safe, vector
      }:
      mkDerivation {
@@ -98171,6 +99479,9 @@ self: {
        testHaskellDepends = [
          base hspec hw-bits hw-prim QuickCheck vector
        ];
+       benchmarkHaskellDepends = [
+         base criterion hw-bits hw-prim vector
+       ];
        homepage = "http://github.com/haskell-works/hw-rankselect-base#readme";
        description = "Rank-select base";
        license = stdenv.lib.licenses.bsd3;
@@ -98256,6 +99567,10 @@ self: {
          hw-rankselect-base mmap parsec QuickCheck resourcet transformers
          vector
        ];
+       benchmarkHaskellDepends = [
+         base bytestring conduit criterion hw-balancedparens hw-bits
+         hw-conduit hw-prim hw-rankselect mmap resourcet vector
+       ];
        homepage = "http://github.com/haskell-works/hw-xml#readme";
        description = "Conduits for tokenizing streams";
        license = stdenv.lib.licenses.bsd3;
@@ -98282,8 +99597,8 @@ self: {
      }) {};
 
   "hweblib" = callPackage
-    ({ mkDerivation, attoparsec, base, bytestring, containers, HUnit
-     , mtl, text, transformers
+    ({ mkDerivation, attoparsec, base, bytestring, containers
+     , criterion, HUnit, mtl, text, transformers
      }:
      mkDerivation {
        pname = "hweblib";
@@ -98295,6 +99610,10 @@ self: {
        testHaskellDepends = [
          attoparsec base bytestring containers HUnit mtl transformers
        ];
+       benchmarkHaskellDepends = [
+         attoparsec base bytestring containers criterion HUnit mtl
+         transformers
+       ];
        homepage = "http://github.com/aycanirican/hweblib";
        description = "Haskell Web Library";
        license = stdenv.lib.licenses.bsd3;
@@ -98363,8 +99682,8 @@ self: {
      }) {};
 
   "hwsl2" = callPackage
-    ({ mkDerivation, base, bytestring, quickcheck-properties, tasty
-     , tasty-quickcheck
+    ({ mkDerivation, base, bytestring, Cabal, criterion, cryptohash
+     , parallel, quickcheck-properties, tasty, tasty-quickcheck
      }:
      mkDerivation {
        pname = "hwsl2";
@@ -98374,6 +99693,9 @@ self: {
        testHaskellDepends = [
          base bytestring quickcheck-properties tasty tasty-quickcheck
        ];
+       benchmarkHaskellDepends = [
+         base bytestring Cabal criterion cryptohash parallel
+       ];
        homepage = "https://github.com/srijs/hwsl2";
        description = "Hashing with SL2";
        license = stdenv.lib.licenses.mit;
@@ -98536,6 +99858,8 @@ self: {
        pname = "hxt-css";
        version = "0.1.0.3";
        sha256 = "0244fc145d5923df0522ad80949e9b221b01a028c755ebfc4740339881ef65b7";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [ base hxt parsec split ];
        homepage = "https://github.com/redneb/hxt-css";
        description = "CSS selectors for HXT";
@@ -98628,8 +99952,8 @@ self: {
      }) {};
 
   "hxt-regex-xmlschema" = callPackage
-    ({ mkDerivation, base, bytestring, HUnit, hxt-charproperties
-     , parsec, text
+    ({ mkDerivation, base, bytestring, criterion, deepseq, HUnit
+     , hxt-charproperties, parsec, text
      }:
      mkDerivation {
        pname = "hxt-regex-xmlschema";
@@ -98639,6 +99963,9 @@ self: {
          base bytestring hxt-charproperties parsec text
        ];
        testHaskellDepends = [ base bytestring HUnit parsec text ];
+       benchmarkHaskellDepends = [
+         base bytestring criterion deepseq parsec text
+       ];
        homepage = "http://www.haskell.org/haskellwiki/Regular_expressions_for_XML_Schema";
        description = "A regular expression library for W3C XML Schema regular expressions";
        license = stdenv.lib.licenses.mit;
@@ -99736,22 +101063,28 @@ self: {
      }) {};
 
   "identicon" = callPackage
-    ({ mkDerivation, base, bytestring, hspec, JuicyPixels }:
+    ({ mkDerivation, base, bytestring, criterion, hspec, JuicyPixels
+     , random, tf-random
+     }:
      mkDerivation {
        pname = "identicon";
        version = "0.2.0";
        sha256 = "c9d22c41893f50ac6c096c11ac037f91153cd3b324c76bcbdd3277b2761cb346";
        libraryHaskellDepends = [ base bytestring JuicyPixels ];
        testHaskellDepends = [ base bytestring hspec JuicyPixels ];
+       benchmarkHaskellDepends = [
+         base bytestring criterion JuicyPixels random tf-random
+       ];
        homepage = "https://github.com/mrkkrp/identicon";
        description = "Flexible generation of identicons";
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
   "identifiers" = callPackage
-    ({ mkDerivation, base, binary, cereal, containers, deepseq
-     , hashable, ListLike, QuickCheck, test-framework
-     , test-framework-quickcheck2, text, unordered-containers
+    ({ mkDerivation, base, binary, bytestring, cereal, containers
+     , criterion, deepseq, hashable, ListLike, QuickCheck
+     , test-framework, test-framework-quickcheck2, text
+     , unordered-containers
      }:
      mkDerivation {
        pname = "identifiers";
@@ -99764,6 +101097,9 @@ self: {
        testHaskellDepends = [
          base QuickCheck test-framework test-framework-quickcheck2
        ];
+       benchmarkHaskellDepends = [
+         base binary bytestring cereal criterion deepseq text
+       ];
        description = "Numeric identifiers for values";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -100376,13 +101712,17 @@ self: {
      }) {};
 
   "ilist" = callPackage
-    ({ mkDerivation, base, hspec, transformers }:
+    ({ mkDerivation, base, criterion, hspec, lens, transformers, vector
+     }:
      mkDerivation {
        pname = "ilist";
        version = "0.2.0.0";
        sha256 = "ffbfab4804e01a4b36caa3f75d77535084d6165ed6c92c0df4329b9238e03cef";
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base hspec transformers ];
+       benchmarkHaskellDepends = [
+         base criterion lens transformers vector
+       ];
        homepage = "http://github.com/aelve/ilist";
        description = "Optimised list functions for doing index-related things";
        license = stdenv.lib.licenses.bsd3;
@@ -100445,10 +101785,13 @@ self: {
        pname = "imagemagick";
        version = "0.0.4.2";
        sha256 = "1956fd48139c43e73528c358021595c1b867abb6fba8bc0334770f74d4089178";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [
          base bytestring filepath resourcet text transformers vector
        ];
        libraryPkgconfigDepends = [ imagemagick ];
+       executablePkgconfigDepends = [ imagemagick ];
        testHaskellDepends = [
          base bytestring directory filepath lifted-base QuickCheck resourcet
          tasty tasty-hunit text transformers vector
@@ -100712,8 +102055,8 @@ self: {
     ({ mkDerivation, base, blaze-builder, blaze-markup, blaze-svg
      , bytestring, containers, criterion, deepseq, directory, download
      , filepath, hspec, JuicyPixels, monads-tf, mtl, NumInstances
-     , optparse-applicative, parallel, parsec, silently, snap-core
-     , snap-server, storable-endian, text, transformers
+     , optparse-applicative, parallel, parsec, random, silently
+     , snap-core, snap-server, storable-endian, text, transformers
      , unordered-containers, vector-space
      }:
      mkDerivation {
@@ -100735,6 +102078,7 @@ self: {
          storable-endian text transformers vector-space
        ];
        testHaskellDepends = [ base containers hspec mtl parsec ];
+       benchmarkHaskellDepends = [ base criterion parsec random ];
        homepage = "http://kalli1.faikvm.com/ImplicitCAD/Stable";
        description = "Math-inspired programmatic 2&3D CAD: CSG, bevels, and shells; gcode export..";
        license = stdenv.lib.licenses.agpl3;
@@ -100878,7 +102222,9 @@ self: {
      }) {};
 
   "include-file" = callPackage
-    ({ mkDerivation, base, bytestring, random, template-haskell }:
+    ({ mkDerivation, base, bytestring, criterion, random
+     , template-haskell
+     }:
      mkDerivation {
        pname = "include-file";
        version = "0.1.0.3";
@@ -100887,13 +102233,15 @@ self: {
          base bytestring random template-haskell
        ];
        testHaskellDepends = [ base bytestring ];
+       benchmarkHaskellDepends = [ base bytestring criterion ];
        description = "Inclusion of files in executables at compile-time";
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
   "incremental-computing" = callPackage
     ({ mkDerivation, base, Cabal, cabal-test-quickcheck, containers
-     , dlist, fingertree, order-maintenance, QuickCheck, transformers
+     , deepseq, dlist, fingertree, order-maintenance, QuickCheck
+     , transformers
      }:
      mkDerivation {
        pname = "incremental-computing";
@@ -100905,6 +102253,7 @@ self: {
        testHaskellDepends = [
          base Cabal cabal-test-quickcheck containers QuickCheck
        ];
+       benchmarkHaskellDepends = [ base containers deepseq QuickCheck ];
        homepage = "http://darcs.wolfgang.jeltsch.info/haskell/incremental-computing";
        description = "Incremental computing";
        license = stdenv.lib.licenses.bsd3;
@@ -100912,8 +102261,9 @@ self: {
      }) {};
 
   "incremental-maps" = callPackage
-    ({ mkDerivation, base, Cabal, cabal-test-quickcheck, containers
-     , dlist, fingertree, order-maintenance, QuickCheck, transformers
+    ({ mkDerivation, aeson, base, Cabal, cabal-test-quickcheck
+     , containers, criterion, deepseq, deepseq-generics, dlist
+     , fingertree, order-maintenance, QuickCheck, transformers
      }:
      mkDerivation {
        pname = "incremental-maps";
@@ -100925,14 +102275,18 @@ self: {
        testHaskellDepends = [
          base Cabal cabal-test-quickcheck containers QuickCheck
        ];
+       benchmarkHaskellDepends = [
+         aeson base containers criterion deepseq deepseq-generics dlist
+         QuickCheck
+       ];
        description = "Package for doing incremental computations on maps";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "incremental-parser" = callPackage
-    ({ mkDerivation, base, checkers, monoid-subclasses, QuickCheck
-     , tasty, tasty-quickcheck
+    ({ mkDerivation, base, bytestring, checkers, criterion, deepseq
+     , monoid-subclasses, QuickCheck, tasty, tasty-quickcheck, text
      }:
      mkDerivation {
        pname = "incremental-parser";
@@ -100942,6 +102296,9 @@ self: {
        testHaskellDepends = [
          base checkers monoid-subclasses QuickCheck tasty tasty-quickcheck
        ];
+       benchmarkHaskellDepends = [
+         base bytestring criterion deepseq monoid-subclasses text
+       ];
        homepage = "https://github.com/blamario/incremental-parser";
        description = "Generic parser library capable of providing partial results from partial input";
        license = "GPL";
@@ -101046,6 +102403,8 @@ self: {
        pname = "indentparser";
        version = "0.1";
        sha256 = "5c1dd6eeeb8fb5e136528df6ffb7c0041e708b63f0bcd4e55fa297d960fd2b90";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [ base mtl parsec ];
        homepage = "http://www.cse.iitk.ac.in/users/ppk/code/HASKELL/indentparser";
        description = "A parser for indentation based structures";
@@ -101128,6 +102487,20 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "indextype" = callPackage
+    ({ mkDerivation, base, hspec }:
+     mkDerivation {
+       pname = "indextype";
+       version = "0.1.0.0";
+       sha256 = "7be4ceac4ac1dea5f8c47cf0ae638029d7ab62b0df6ec6d215aac4a1e9ae0498";
+       revision = "1";
+       editedCabalFile = "382507ce3407fd6b5c60eee31675c52dc3bdc192dc4132f7c6e7047021fa0ef2";
+       libraryHaskellDepends = [ base ];
+       testHaskellDepends = [ base hspec ];
+       description = "A series of type families and constraints for \"indexable\" types";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "indian-language-font-converter" = callPackage
     ({ mkDerivation, base, gtk, HDBC, HDBC-sqlite3 }:
      mkDerivation {
@@ -101140,13 +102513,16 @@ self: {
      }) {};
 
   "indices" = callPackage
-    ({ mkDerivation, base, QuickCheck, tagged, template-haskell }:
+    ({ mkDerivation, base, criterion, deepseq, QuickCheck, tagged
+     , template-haskell
+     }:
      mkDerivation {
        pname = "indices";
        version = "1.7.1";
        sha256 = "8505d262f5ae056e83be32084d93bb1472194c4c4d2b8e442fb3c5845f02c6eb";
        libraryHaskellDepends = [ base tagged template-haskell ];
        testHaskellDepends = [ base QuickCheck ];
+       benchmarkHaskellDepends = [ base criterion deepseq ];
        description = "Multi-dimensional statically bounded indices";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -101318,6 +102694,8 @@ self: {
        pname = "influxdb";
        version = "0.10.0";
        sha256 = "063754458bbceb4a89e70c26a979f47e2c632a0ccaf93b53360870d44c5268bb";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [
          aeson attoparsec base bytestring containers data-default-class
          dlist exceptions http-client mtl network-uri retry scientific
@@ -101443,19 +102821,23 @@ self: {
 
   "inline-c" = callPackage
     ({ mkDerivation, ansi-wl-pprint, base, binary, bytestring
-     , containers, cryptohash, directory, filepath, hashable, hspec, mtl
-     , parsec, parsers, QuickCheck, raw-strings-qq, regex-posix
-     , template-haskell, transformers, unordered-containers, vector
+     , containers, cryptohash, directory, filepath, gsl, gslcblas
+     , hashable, hspec, mtl, parsec, parsers, QuickCheck, raw-strings-qq
+     , regex-posix, template-haskell, transformers, unordered-containers
+     , vector
      }:
      mkDerivation {
        pname = "inline-c";
        version = "0.5.6.1";
        sha256 = "2daf717e6fc0046ccb6563557825fe26fcdc327c55b9771aa7b4c51473e6eb4e";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [
          ansi-wl-pprint base binary bytestring containers cryptohash
          directory filepath hashable mtl parsec parsers QuickCheck
          template-haskell transformers unordered-containers vector
        ];
+       executableSystemDepends = [ gsl gslcblas ];
        testHaskellDepends = [
          ansi-wl-pprint base containers hashable hspec parsers QuickCheck
          raw-strings-qq regex-posix template-haskell transformers
@@ -101463,7 +102845,7 @@ self: {
        ];
        description = "Write Haskell source files including C code inline. No FFI required.";
        license = stdenv.lib.licenses.mit;
-     }) {};
+     }) {inherit (pkgs) gsl; gslcblas = null;};
 
   "inline-c-cpp" = callPackage
     ({ mkDerivation, base, inline-c, template-haskell }:
@@ -101518,14 +102900,39 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "inline-java_0_6_2" = callPackage
+    ({ mkDerivation, base, binary, bytestring, Cabal, containers
+     , directory, distributed-closure, filepath, ghc-heap-view, hspec
+     , inline-c, jni, jvm, language-java, process, singletons, syb
+     , template-haskell, temporary, text, thread-local-storage, vector
+     }:
+     mkDerivation {
+       pname = "inline-java";
+       version = "0.6.2";
+       sha256 = "9c162f26c77d1030f0f5054394265aab7fded1c83df67b3ea8fe7e4bb68aa8c5";
+       libraryHaskellDepends = [
+         base binary bytestring Cabal containers directory
+         distributed-closure filepath ghc-heap-view inline-c jni jvm
+         language-java process singletons syb template-haskell temporary
+         text thread-local-storage vector
+       ];
+       testHaskellDepends = [
+         base bytestring hspec jni jvm singletons text
+       ];
+       homepage = "http://github.com/tweag/inline-java#readme";
+       description = "Java interop via inline Java code in Haskell modules";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "inline-r" = callPackage
     ({ mkDerivation, aeson, base, bytestring, c2hs, containers
-     , data-default-class, deepseq, directory, exceptions, filepath
-     , ieee754, mtl, pretty, primitive, process, quickcheck-assertions
-     , R, reflection, setenv, silently, singletons, strict, tasty
-     , tasty-expected-failure, tasty-golden, tasty-hunit
-     , tasty-quickcheck, template-haskell, temporary, text, th-lift
-     , th-orphans, transformers, unix, vector
+     , criterion, data-default-class, deepseq, directory, exceptions
+     , filepath, ieee754, mtl, pretty, primitive, process
+     , quickcheck-assertions, R, reflection, setenv, silently
+     , singletons, strict, tasty, tasty-expected-failure, tasty-golden
+     , tasty-hunit, tasty-quickcheck, template-haskell, temporary, text
+     , th-lift, th-orphans, transformers, unix, vector
      }:
      mkDerivation {
        pname = "inline-r";
@@ -101545,6 +102952,10 @@ self: {
          tasty-expected-failure tasty-golden tasty-hunit tasty-quickcheck
          template-haskell temporary text unix vector
        ];
+       benchmarkHaskellDepends = [
+         base criterion filepath primitive process singletons
+         template-haskell vector
+       ];
        homepage = "https://tweag.github.io/HaskellR";
        description = "Seamlessly call R from Haskell and vice versa. No FFI required.";
        license = stdenv.lib.licenses.bsd3;
@@ -102128,6 +103539,8 @@ self: {
        pname = "interpolation";
        version = "0.1";
        sha256 = "cad3e655c9893007058dfd8b128195a15434f0759e447c78722fb50aa50337fa";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [ base utility-ht ];
        testHaskellDepends = [
          array base containers QuickCheck utility-ht
@@ -102338,18 +103751,17 @@ self: {
      }) {};
 
   "invertible" = callPackage
-    ({ mkDerivation, arrows, base, haskell-src-meta, HList, invariant
-     , lens, partial-isomorphisms, Piso, QuickCheck, semigroupoids
-     , template-haskell, transformers, TypeCompose
+    ({ mkDerivation, base, haskell-src-meta, invariant, lens
+     , partial-isomorphisms, QuickCheck, semigroupoids, template-haskell
+     , transformers, TypeCompose
      }:
      mkDerivation {
        pname = "invertible";
-       version = "0.2.0";
-       sha256 = "3da08f518924925a547e954821eb96f15b4ecf47d541fa5770d38180963db19e";
+       version = "0.2.0.2";
+       sha256 = "eee1b66f20190b5cc87122e22c664422df4188b38f81e896e8381bf2f58385a8";
        libraryHaskellDepends = [
-         arrows base haskell-src-meta HList invariant lens
-         partial-isomorphisms Piso semigroupoids template-haskell
-         transformers TypeCompose
+         base haskell-src-meta invariant lens partial-isomorphisms
+         semigroupoids template-haskell transformers TypeCompose
        ];
        testHaskellDepends = [ base QuickCheck transformers ];
        description = "bidirectional arrows, bijective functions, and invariant functors";
@@ -102651,16 +104063,14 @@ self: {
      }) {};
 
   "ip" = callPackage
-    ({ mkDerivation, aeson, attoparsec, base, bytestring, doctest
-     , hashable, HUnit, primitive, QuickCheck, test-framework
+    ({ mkDerivation, aeson, attoparsec, base, bytestring, criterion
+     , doctest, hashable, HUnit, primitive, QuickCheck, test-framework
      , test-framework-hunit, test-framework-quickcheck2, text, vector
      }:
      mkDerivation {
        pname = "ip";
-       version = "0.8.7";
-       sha256 = "f33f12745defa0ac5aa72f8bfd1b48d905c6ece9a228c9a2209b2943c2f2c690";
-       revision = "2";
-       editedCabalFile = "121a83393fc17cfc59aee069015fcfd0a6f6d33e14314cb6688fed05396aafb6";
+       version = "0.9";
+       sha256 = "19f99c1b673f9ca924a78888fb22ae2d534b0165653c3bdd3f8332ac7ca26a0e";
        libraryHaskellDepends = [
          aeson attoparsec base bytestring hashable primitive text vector
        ];
@@ -102668,6 +104078,9 @@ self: {
          attoparsec base bytestring doctest HUnit QuickCheck test-framework
          test-framework-hunit test-framework-quickcheck2 text
        ];
+       benchmarkHaskellDepends = [
+         attoparsec base bytestring criterion text
+       ];
        homepage = "https://github.com/andrewthad/haskell-ip#readme";
        description = "Library for IP and MAC addresses";
        license = stdenv.lib.licenses.bsd3;
@@ -102776,6 +104189,8 @@ self: {
        pname = "ipopt-hs";
        version = "0.5.1.0";
        sha256 = "aaf193c06daed43998d4d37f7916d8c1bb73b61e01815755eff61bd2c472344a";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [
          ad ansi-wl-pprint base containers lens mtl template-haskell
          uu-parsinglib vector vector-space
@@ -102872,6 +104287,8 @@ self: {
        pname = "ipython-kernel";
        version = "0.8.4.0";
        sha256 = "ac4c822836d5b2cecf7ac4c61fe32ed876b09d18bcbe44760a6096bcd7338264";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [
          aeson base bytestring cereal containers directory filepath mtl
          process SHA temporary text transformers unordered-containers uuid
@@ -103346,14 +104763,14 @@ self: {
      }) {};
 
   "isobmff-builder" = callPackage
-    ({ mkDerivation, base, binary, bytestring, data-default, hspec, mtl
-     , pretty-types, QuickCheck, singletons, tagged, template-haskell
-     , text, time, type-list, type-spec, vector
+    ({ mkDerivation, base, binary, bytestring, criterion, data-default
+     , hspec, mtl, pretty-types, QuickCheck, singletons, tagged
+     , template-haskell, text, time, type-list, type-spec, vector
      }:
      mkDerivation {
        pname = "isobmff-builder";
-       version = "0.11.2.0";
-       sha256 = "062397e266687379d99ebe4acb7dd21b6289df1fdad079c3fef7d9ec45b1d220";
+       version = "0.11.3.0";
+       sha256 = "578e440f473427c7e413075de294830118a49e8043c8be75a6db9c158c5c7f42";
        libraryHaskellDepends = [
          base bytestring data-default mtl pretty-types singletons tagged
          template-haskell text time type-list type-spec vector
@@ -103362,6 +104779,9 @@ self: {
          base binary bytestring hspec mtl pretty-types QuickCheck tagged
          text type-spec
        ];
+       benchmarkHaskellDepends = [
+         base binary bytestring criterion tagged type-spec
+       ];
        homepage = "https://github.com/sheyll/isobmff-builder#readme";
        description = "A (bytestring-) builder for the ISO-14496-12 base media file format";
        license = stdenv.lib.licenses.bsd3;
@@ -103392,12 +104812,14 @@ self: {
      }:
      mkDerivation {
        pname = "isotope";
-       version = "0.1.0.0";
-       sha256 = "8b63da859be3cbf3eaabcdf123563feeb2479b2edbb98acee1632b8322b5bc78";
+       version = "0.3.3.0";
+       sha256 = "e08fac7483c11f37786f5f98f6f7d1e58a456d1470c3f0f35bc9326e88c1fa2e";
        libraryHaskellDepends = [
          base containers megaparsec template-haskell th-lift
        ];
-       testHaskellDepends = [ base containers hspec QuickCheck ];
+       testHaskellDepends = [
+         base containers hspec megaparsec QuickCheck
+       ];
        homepage = "https://github.com/Michaelt293/Element-isotopes/blob/master/README.md";
        description = "Isotopic masses and relative abundances";
        license = stdenv.lib.licenses.gpl3;
@@ -103516,10 +104938,10 @@ self: {
      }) {};
 
   "iteratee" = callPackage
-    ({ mkDerivation, base, bytestring, containers, exceptions, HUnit
-     , ListLike, monad-control, mtl, parallel, QuickCheck
-     , test-framework, test-framework-hunit, test-framework-quickcheck2
-     , transformers, transformers-base, unix
+    ({ mkDerivation, base, bytestring, containers, criterion, deepseq
+     , exceptions, HUnit, ListLike, monad-control, mtl, parallel
+     , QuickCheck, test-framework, test-framework-hunit
+     , test-framework-quickcheck2, transformers, transformers-base, unix
      }:
      mkDerivation {
        pname = "iteratee";
@@ -103536,6 +104958,10 @@ self: {
          QuickCheck test-framework test-framework-hunit
          test-framework-quickcheck2 transformers transformers-base unix
        ];
+       benchmarkHaskellDepends = [
+         base bytestring criterion deepseq exceptions ListLike monad-control
+         mtl transformers transformers-base unix
+       ];
        homepage = "http://www.tiresiaspress.us/haskell/iteratee";
        description = "Iteratee-based I/O";
        license = stdenv.lib.licenses.bsd3;
@@ -103563,6 +104989,8 @@ self: {
        pname = "iteratee-mtl";
        version = "0.5.0.0";
        sha256 = "008a7dfc38986daf8b164472dd739b8185b5564246858450d093b04753056e28";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [
          base bytestring containers ListLike MonadCatchIO-mtl mtl unix
        ];
@@ -104010,6 +105438,8 @@ self: {
        pname = "jack";
        version = "0.7.1.1";
        sha256 = "d17b5d299154edf55f479b9fc4508b662f4852e545dc47afa60b166ca7306c40";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [
          array base bytestring enumset event-list explicit-exception midi
          non-negative transformers
@@ -104093,13 +105523,14 @@ self: {
      }) {};
 
   "jalaali" = callPackage
-    ({ mkDerivation, base }:
+    ({ mkDerivation, base, deepseq, time }:
      mkDerivation {
        pname = "jalaali";
        version = "0.2.0";
        sha256 = "a01e8ade25f87e0c20c946b77be3a446e7ffa2870b601b001931ae837ef6b908";
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base ];
+       benchmarkHaskellDepends = [ base deepseq time ];
        homepage = "https://github.com/jalaali/jalaali-hs";
        description = "Convert Jalaali and Gregorian calendar systems to each other";
        license = stdenv.lib.licenses.mit;
@@ -104510,6 +105941,26 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) jdk;};
 
+  "jni_0_3_0" = callPackage
+    ({ mkDerivation, base, bytestring, choice, containers, cpphs
+     , inline-c, jdk, singletons, thread-local-storage
+     }:
+     mkDerivation {
+       pname = "jni";
+       version = "0.3.0";
+       sha256 = "1d92d232180f5ebcb4e6017febc5f7b5320ccc49bcbc3787c62eb94195a60e08";
+       libraryHaskellDepends = [
+         base bytestring choice containers inline-c singletons
+         thread-local-storage
+       ];
+       librarySystemDepends = [ jdk ];
+       libraryToolDepends = [ cpphs ];
+       homepage = "https://github.com/tweag/inline-java/tree/master/jni#readme";
+       description = "Complete JNI raw bindings";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {inherit (pkgs) jdk;};
+
   "jobqueue" = callPackage
     ({ mkDerivation, aeson, async, attoparsec, base, bytestring
      , containers, data-default, directory, fast-logger, HDBC
@@ -104628,8 +106079,8 @@ self: {
 
   "jose-jwt" = callPackage
     ({ mkDerivation, aeson, attoparsec, base, bytestring, cereal
-     , containers, cryptonite, doctest, either, hspec, HUnit, memory
-     , mtl, QuickCheck, text, time, unordered-containers, vector
+     , containers, criterion, cryptonite, doctest, either, hspec, HUnit
+     , memory, mtl, QuickCheck, text, time, unordered-containers, vector
      }:
      mkDerivation {
        pname = "jose-jwt";
@@ -104643,6 +106094,7 @@ self: {
          aeson base bytestring cryptonite doctest either hspec HUnit memory
          mtl QuickCheck text unordered-containers vector
        ];
+       benchmarkHaskellDepends = [ base bytestring criterion cryptonite ];
        homepage = "http://github.com/tekul/jose-jwt";
        description = "JSON Object Signing and Encryption Library";
        license = stdenv.lib.licenses.bsd3;
@@ -105041,6 +106493,7 @@ self: {
        libraryHaskellDepends = [
          base base-prelude bytestring scientific semigroups text
        ];
+       benchmarkHaskellDepends = [ base-prelude bytestring text ];
        homepage = "https://github.com/nikita-volkov/json-bytes-builder";
        description = "Direct-to-bytes JSON Builder";
        license = stdenv.lib.licenses.mit;
@@ -105280,6 +106733,8 @@ self: {
        pname = "json-rpc-client";
        version = "0.2.5.0";
        sha256 = "5349f5c0b0fa8f6c5433152d6effc10846cfb3480e78c5aa99adb7540bcff49c";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [
          aeson base bytestring json-rpc-server mtl text unordered-containers
          vector vector-algorithms
@@ -105324,6 +106779,8 @@ self: {
        pname = "json-rpc-server";
        version = "0.2.6.0";
        sha256 = "169e9997734bd1d7d07a13b5ae0223d5363c43de93b0d5fbb845a598f9eaccf5";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [
          aeson base bytestring deepseq mtl text unordered-containers vector
        ];
@@ -105709,8 +107166,8 @@ self: {
      }:
      mkDerivation {
        pname = "jukebox";
-       version = "0.2.15";
-       sha256 = "4ff1279e9f4d54c605a22792f411d4b84324337b454449a0cd4c7c009abb2269";
+       version = "0.2.16";
+       sha256 = "5eac14b5102b5be904142843977560cddf4829182637e059cd09e7a384b7052f";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -105797,6 +107254,25 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "jvm_0_2_0" = callPackage
+    ({ mkDerivation, base, bytestring, criterion, distributed-closure
+     , hspec, jni, singletons, text, vector
+     }:
+     mkDerivation {
+       pname = "jvm";
+       version = "0.2.0";
+       sha256 = "f766db5293100de25605f883170d4869fcca7b99e1ae2b2d418cdb92eca7ccce";
+       libraryHaskellDepends = [
+         base bytestring distributed-closure jni singletons text vector
+       ];
+       testHaskellDepends = [ base bytestring hspec text ];
+       benchmarkHaskellDepends = [ base criterion jni ];
+       homepage = "http://github.com/tweag/inline-java/tree/master/jvm#readme";
+       description = "Call JVM methods from Haskell";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "jvm-parser" = callPackage
     ({ mkDerivation, array, base, binary, bytestring, containers
      , data-binary-ieee754, fgl, fingertree, pretty, zlib
@@ -105833,6 +107309,24 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "jvm-streaming_0_2" = callPackage
+    ({ mkDerivation, base, distributed-closure, hspec, inline-java, jni
+     , jvm, singletons, streaming
+     }:
+     mkDerivation {
+       pname = "jvm-streaming";
+       version = "0.2";
+       sha256 = "2251efe0192d36845ac852357a6af923950f7e9cb007900c40cc6a1d116c30bb";
+       libraryHaskellDepends = [
+         base distributed-closure inline-java jni jvm singletons streaming
+       ];
+       testHaskellDepends = [ base hspec inline-java jvm streaming ];
+       homepage = "http://github.com/tweag/inline-java/tree/master/jvm-streaming#readme";
+       description = "Expose Java iterators as streams from the streaming package";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "jwt" = callPackage
     ({ mkDerivation, aeson, base, bytestring, containers, cryptonite
      , data-default, doctest, http-types, HUnit, lens, lens-aeson
@@ -105905,20 +107399,20 @@ self: {
      }) {};
 
   "kafka-device" = callPackage
-    ({ mkDerivation, aeson, base, binary, bytestring, cereal, milena
-     , mtl
+    ({ mkDerivation, aeson, base, binary, bytestring, cereal, linear
+     , milena, mtl
      }:
      mkDerivation {
        pname = "kafka-device";
-       version = "0.1.5.0";
-       sha256 = "e43b2e3ed49285745bf3dde7b870f61b87dc4f5ef8fdc31bda56c5ee22c18004";
+       version = "0.2.1.2";
+       sha256 = "281d1155594a4a4f44c71042e41c5151f10370d3a96a6159ae9a42c60898463b";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
-         aeson base binary bytestring cereal milena mtl
+         aeson base binary bytestring cereal linear milena mtl
        ];
        executableHaskellDepends = [
-         aeson base binary bytestring cereal milena mtl
+         aeson base binary bytestring cereal linear milena mtl
        ];
        homepage = "https://bitbucket.org/functionally/kafka-device";
        description = "UI device events via a Kafka message broker";
@@ -105927,17 +107421,15 @@ self: {
      }) {};
 
   "kafka-device-glut" = callPackage
-    ({ mkDerivation, base, GLUT, kafka-device, milena, OpenGL }:
+    ({ mkDerivation, base, GLUT, kafka-device, OpenGL }:
      mkDerivation {
        pname = "kafka-device-glut";
-       version = "0.1.3.0";
-       sha256 = "c06c42b23f1fcec14fad72e690b2360942e56a6b5d3f7d7496c379dd22887f8f";
+       version = "0.2.1.2";
+       sha256 = "69a4fbd1015b765ab5e0ef7d81a9bd6db578545b7f69cfd96681c8052b87c146";
        isLibrary = true;
        isExecutable = true;
-       libraryHaskellDepends = [ base GLUT kafka-device milena OpenGL ];
-       executableHaskellDepends = [
-         base GLUT kafka-device milena OpenGL
-       ];
+       libraryHaskellDepends = [ base GLUT kafka-device OpenGL ];
+       executableHaskellDepends = [ base GLUT kafka-device OpenGL ];
        homepage = "https://bitbucket.org/functionally/kafka-device-glut";
        description = "GLUT events via a Kafka message broker";
        license = stdenv.lib.licenses.mit;
@@ -105946,19 +107438,19 @@ self: {
 
   "kafka-device-joystick" = callPackage
     ({ mkDerivation, aeson, base, binary, bytestring, cereal
-     , kafka-device, milena
+     , kafka-device, yaml
      }:
      mkDerivation {
        pname = "kafka-device-joystick";
-       version = "0.1.5.0";
-       sha256 = "ec7cdb06a7ddc8aa54238cf3b762721ce81ff22021daa16f559abf75350798cd";
+       version = "0.2.1.2";
+       sha256 = "e07acdef7bc09038d20b5b6ab4a228fcd41877e00fde257d41014a4197c4f49e";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
-         aeson base binary bytestring cereal kafka-device milena
+         aeson base binary bytestring cereal kafka-device
        ];
        executableHaskellDepends = [
-         aeson base binary bytestring cereal kafka-device milena
+         aeson base binary bytestring cereal kafka-device yaml
        ];
        homepage = "https://bitbucket.org/functionally/kafka-device-joystick";
        description = "Linux joystick events via a Kafka message broker";
@@ -105967,20 +107459,18 @@ self: {
      }) {};
 
   "kafka-device-leap" = callPackage
-    ({ mkDerivation, aeson, base, hleap, kafka-device, milena
-     , websockets
-     }:
+    ({ mkDerivation, aeson, base, hleap, kafka-device, websockets }:
      mkDerivation {
        pname = "kafka-device-leap";
-       version = "0.1.3.0";
-       sha256 = "d9440f6991d230caed95c81940569c77d7911616c2d598a8cb5e770e41cada3a";
+       version = "0.2.1.2";
+       sha256 = "c16b2c2ea6d79354bef02ace9f86c44e2627bb5de8506935715618a2b81f9693";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
-         aeson base hleap kafka-device milena websockets
+         aeson base hleap kafka-device websockets
        ];
        executableHaskellDepends = [
-         aeson base hleap kafka-device milena websockets
+         aeson base hleap kafka-device websockets
        ];
        homepage = "https://bitbucket.org/functionally/kafka-device-leap";
        description = "Leap Motion events via a Kafka message broker";
@@ -105990,19 +107480,19 @@ self: {
 
   "kafka-device-spacenav" = callPackage
     ({ mkDerivation, aeson, base, binary, bytestring, cereal
-     , kafka-device, milena
+     , kafka-device, yaml
      }:
      mkDerivation {
        pname = "kafka-device-spacenav";
-       version = "0.1.5.0";
-       sha256 = "c501b38ef88ac3d8e870f6ce698a299508cbabb2088c472c8163bcca5d53cf7d";
+       version = "0.2.1.2";
+       sha256 = "39f0acf5ad9b6d4f4b53724080c7467aeadb6d93f76691143ec1599a1d713737";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
-         aeson base binary bytestring cereal kafka-device milena
+         aeson base binary bytestring cereal kafka-device
        ];
        executableHaskellDepends = [
-         aeson base binary bytestring cereal kafka-device milena
+         aeson base binary bytestring cereal kafka-device yaml
        ];
        homepage = "https://bitbucket.org/functionally/kafka-device-spacenav";
        description = "Linux SpaceNavigator events via a Kafka message broker";
@@ -106011,15 +107501,15 @@ self: {
      }) {};
 
   "kafka-device-vrpn" = callPackage
-    ({ mkDerivation, base, kafka-device, milena, vrpn }:
+    ({ mkDerivation, base, kafka-device, vrpn }:
      mkDerivation {
        pname = "kafka-device-vrpn";
-       version = "0.1.5.0";
-       sha256 = "27df692620b7fbd293520108c236406cad95aed665c4807afc15d8efc9c006bb";
+       version = "0.2.1.2";
+       sha256 = "9adcd43ec1851ac26083c629b07744d12150dd6dbb13f2a468d904dbb6f3b17e";
        isLibrary = true;
        isExecutable = true;
-       libraryHaskellDepends = [ base kafka-device milena vrpn ];
-       executableHaskellDepends = [ base kafka-device milena vrpn ];
+       libraryHaskellDepends = [ base kafka-device vrpn ];
+       executableHaskellDepends = [ base kafka-device vrpn ];
        homepage = "https://bitbucket.org/functionally/kafka-device-vrpn";
        description = "VRPN events via a Kafka message broker";
        license = stdenv.lib.licenses.mit;
@@ -106146,6 +107636,8 @@ self: {
        pname = "kansas-lava";
        version = "0.2.4.4";
        sha256 = "ed44a01f95c72580c3e198ea43f42a582ec44bbdc8897629fe37f874208f6c5d";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [
          base bytestring cmdargs containers data-default data-reify
          directory dotgen filepath netlist netlist-to-vhdl process random
@@ -106165,6 +107657,8 @@ self: {
        pname = "kansas-lava-cores";
        version = "0.1.2.2";
        sha256 = "15502f0da60b224fc6b5a6fed21c2507c34ddbdbc51377736c3bc254186ad01c";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [
          ansi-terminal base bytestring data-default directory filepath
          kansas-lava network sized-types
@@ -106241,11 +107735,12 @@ self: {
      }) {};
 
   "katip" = callPackage
-    ({ mkDerivation, aeson, auto-update, base, bytestring, containers
-     , directory, either, exceptions, hostname, microlens, microlens-th
-     , monad-control, mtl, old-locale, quickcheck-instances, regex-tdfa
-     , resourcet, semigroups, string-conv, tasty, tasty-golden
-     , tasty-hunit, tasty-quickcheck, template-haskell, text, time
+    ({ mkDerivation, aeson, async, auto-update, base, blaze-builder
+     , bytestring, containers, criterion, deepseq, directory, either
+     , exceptions, hostname, microlens, microlens-th, monad-control, mtl
+     , old-locale, quickcheck-instances, regex-tdfa, resourcet
+     , semigroups, string-conv, tasty, tasty-golden, tasty-hunit
+     , tasty-quickcheck, template-haskell, text, time
      , time-locale-compat, transformers, transformers-base
      , transformers-compat, unix, unordered-containers
      }:
@@ -106265,6 +107760,10 @@ self: {
          regex-tdfa tasty tasty-golden tasty-hunit tasty-quickcheck
          template-haskell text time time-locale-compat unordered-containers
        ];
+       benchmarkHaskellDepends = [
+         aeson async base blaze-builder criterion deepseq text time
+         transformers unix
+       ];
        homepage = "https://github.com/Soostone/katip";
        description = "A structured logging framework";
        license = stdenv.lib.licenses.bsd3;
@@ -106273,10 +107772,11 @@ self: {
 
   "katip-elasticsearch" = callPackage
     ({ mkDerivation, aeson, async, base, bloodhound, containers
-     , enclosed-exceptions, exceptions, http-client, http-types, katip
-     , lens, lens-aeson, quickcheck-instances, retry, scientific, stm
-     , stm-chans, tasty, tasty-hunit, tasty-quickcheck, text, time
-     , transformers, unordered-containers, uuid, vector
+     , criterion, deepseq, enclosed-exceptions, exceptions, http-client
+     , http-types, katip, lens, lens-aeson, quickcheck-instances, retry
+     , rng-utils, scientific, stm, stm-chans, tasty, tasty-hunit
+     , tasty-quickcheck, text, time, transformers, unordered-containers
+     , uuid, vector
      }:
      mkDerivation {
        pname = "katip-elasticsearch";
@@ -106292,6 +107792,10 @@ self: {
          lens-aeson quickcheck-instances scientific stm tasty tasty-hunit
          tasty-quickcheck text time transformers unordered-containers vector
        ];
+       benchmarkHaskellDepends = [
+         aeson base bloodhound criterion deepseq rng-utils text
+         unordered-containers uuid
+       ];
        description = "ElasticSearch scribe for the Katip logging framework";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -106371,9 +107875,9 @@ self: {
      }) {};
 
   "kazura-queue" = callPackage
-    ({ mkDerivation, async, atomic-primops, base, containers, deepseq
-     , doctest, exceptions, free, hspec, hspec-expectations, HUnit, mtl
-     , primitive, QuickCheck, transformers
+    ({ mkDerivation, async, atomic-primops, base, containers, criterion
+     , deepseq, doctest, exceptions, free, hspec, hspec-expectations
+     , HUnit, mtl, primitive, QuickCheck, stm, transformers
      }:
      mkDerivation {
        pname = "kazura-queue";
@@ -106386,6 +107890,7 @@ self: {
          async base containers deepseq doctest exceptions free hspec
          hspec-expectations HUnit mtl QuickCheck transformers
        ];
+       benchmarkHaskellDepends = [ async base containers criterion stm ];
        homepage = "http://github.com/asakamirai/kazura-queue";
        description = "Fast concurrent queues much inspired by unagi-chan";
        license = stdenv.lib.licenses.bsd3;
@@ -106461,7 +107966,8 @@ self: {
      }) {};
 
   "kdt" = callPackage
-    ({ mkDerivation, base, deepseq, deepseq-generics, heap, QuickCheck
+    ({ mkDerivation, base, criterion, deepseq, deepseq-generics, heap
+     , mersenne-random-pure64, MonadRandom, QuickCheck
      }:
      mkDerivation {
        pname = "kdt";
@@ -106469,6 +107975,10 @@ self: {
        sha256 = "bc0f8f9ac0cb01466273171f47b627abe170d1130bd59657fb9198b4f9479f9a";
        libraryHaskellDepends = [ base deepseq deepseq-generics heap ];
        testHaskellDepends = [ base deepseq deepseq-generics QuickCheck ];
+       benchmarkHaskellDepends = [
+         base criterion deepseq deepseq-generics heap mersenne-random-pure64
+         MonadRandom QuickCheck
+       ];
        homepage = "https://github.com/giogadi/kdt";
        description = "Fast and flexible k-d trees for various types of point queries";
        license = stdenv.lib.licenses.mit;
@@ -106933,6 +108443,8 @@ self: {
        pname = "keyring";
        version = "0.1.0.5";
        sha256 = "9565c1b08e1b5b4a11d4f3df30fe053893c6228dc79f3766602837074a2901f8";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [ base udbus ];
        homepage = "https://github.com/lunaryorn/haskell-keyring";
        description = "Keyring access";
@@ -107217,8 +108729,9 @@ self: {
      }) {};
 
   "kmeans-par" = callPackage
-    ({ mkDerivation, base, hspec, metric, normaldistribution, parallel
-     , QuickCheck, semigroups, vector
+    ({ mkDerivation, base, criterion, deepseq, hspec, metric
+     , normaldistribution, parallel, QuickCheck, random, semigroups
+     , vector
      }:
      mkDerivation {
        pname = "kmeans-par";
@@ -107229,13 +108742,17 @@ self: {
          base hspec metric normaldistribution parallel QuickCheck semigroups
          vector
        ];
+       benchmarkHaskellDepends = [
+         base criterion deepseq metric normaldistribution random vector
+       ];
        description = "Sequential and parallel implementations of Lloyd's algorithm";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "kmeans-vector" = callPackage
-    ({ mkDerivation, base, mtl, probable, vector }:
+    ({ mkDerivation, base, criterion, mtl, probable, QuickCheck, vector
+     }:
      mkDerivation {
        pname = "kmeans-vector";
        version = "0.3.2";
@@ -107244,6 +108761,7 @@ self: {
        isExecutable = true;
        libraryHaskellDepends = [ base mtl vector ];
        executableHaskellDepends = [ base probable vector ];
+       benchmarkHaskellDepends = [ base criterion QuickCheck vector ];
        homepage = "http://github.com/alpmestan/kmeans-vector";
        description = "An implementation of the kmeans clustering algorithm based on the vector package";
        license = stdenv.lib.licenses.bsd3;
@@ -107467,7 +108985,7 @@ self: {
      }) {};
 
   "krpc" = callPackage
-    ({ mkDerivation, base, bencoding, bytestring, containers
+    ({ mkDerivation, base, bencoding, bytestring, containers, criterion
      , data-default-class, hspec, lifted-base, monad-control
      , monad-logger, mtl, network, QuickCheck, quickcheck-instances
      , text, transformers
@@ -107484,6 +109002,9 @@ self: {
          base bencoding bytestring hspec monad-logger mtl network QuickCheck
          quickcheck-instances
        ];
+       benchmarkHaskellDepends = [
+         base bytestring criterion monad-logger mtl
+       ];
        homepage = "https://github.com/cobit/krpc";
        description = "KRPC protocol implementation";
        license = stdenv.lib.licenses.bsd3;
@@ -107743,6 +109264,8 @@ self: {
        pname = "laika";
        version = "0.1.3.1";
        sha256 = "a1873cd1fb75cc1ff45cca4565cf950ce25fa63bb4d15231349131f07fd63e2f";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [
          attoparsec base-prelude either record system-fileio system-filepath
          template-haskell text transformers
@@ -108009,26 +109532,26 @@ self: {
 
   "lambdabot-haskell-plugins" = callPackage
     ({ mkDerivation, array, arrows, base, bytestring, containers
-     , data-memocombinators, directory, filepath, haskell-src-exts
-     , hoogle, HTTP, IOSpec, lambdabot-core, lambdabot-reference-plugins
-     , lambdabot-trusted, lifted-base, logict, MonadRandom, mtl, mueval
-     , network, numbers, oeis, parsec, pretty, process, QuickCheck
-     , regex-tdfa, show, split, syb, transformers, utf8-string
-     , vector-space
+     , data-memocombinators, directory, filepath
+     , haskell-src-exts-simple, hoogle, HTTP, IOSpec, lambdabot-core
+     , lambdabot-reference-plugins, lambdabot-trusted, lifted-base
+     , logict, MonadRandom, mtl, mueval, network, numbers, oeis, parsec
+     , pretty, process, QuickCheck, regex-tdfa, show, split, syb
+     , transformers, utf8-string, vector-space
      }:
      mkDerivation {
        pname = "lambdabot-haskell-plugins";
-       version = "5.1";
-       sha256 = "7fe68b97aec6f62e5694bda236b73e30a94fbf45a6a9a6b5c0f1b12398cfaef7";
+       version = "5.1.0.1";
+       sha256 = "fccf7635ec1074196695b424261fb243a2b6b71e25110131fbad13278cc6b3da";
        libraryHaskellDepends = [
          array arrows base bytestring containers data-memocombinators
-         directory filepath haskell-src-exts hoogle HTTP IOSpec
+         directory filepath haskell-src-exts-simple hoogle HTTP IOSpec
          lambdabot-core lambdabot-reference-plugins lambdabot-trusted
          lifted-base logict MonadRandom mtl mueval network numbers oeis
          parsec pretty process QuickCheck regex-tdfa show split syb
          transformers utf8-string vector-space
        ];
-       homepage = "http://haskell.org/haskellwiki/Lambdabot";
+       homepage = "https://wiki.haskell.org/Lambdabot";
        description = "Lambdabot Haskell plugins";
        license = "GPL";
      }) {};
@@ -108357,6 +109880,8 @@ self: {
        pname = "lambdacube-gl";
        version = "0.5.2.3";
        sha256 = "be33bde75e5753c134cba7dd2e98e8f31870bd0bfb3787659a3cf357c677dd2b";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [
          base bytestring containers JuicyPixels lambdacube-ir mtl OpenGLRaw
          vector vector-algorithms
@@ -108481,14 +110006,37 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "lame" = callPackage
+    ({ mkDerivation, base, bytestring, data-default-class, directory
+     , exceptions, filepath, hspec, htaglib, mp3lame, temporary, text
+     , transformers, wave
+     }:
+     mkDerivation {
+       pname = "lame";
+       version = "0.1.0";
+       sha256 = "af72ca85baee296af9577c307f263e9590841063903b7feaaae164fd50692e4c";
+       libraryHaskellDepends = [
+         base bytestring data-default-class directory exceptions filepath
+         text transformers wave
+       ];
+       librarySystemDepends = [ mp3lame ];
+       testHaskellDepends = [
+         base data-default-class directory filepath hspec htaglib temporary
+         text
+       ];
+       homepage = "https://github.com/mrkkrp/lame";
+       description = "Fairly complete high-level binding to LAME encoder";
+       license = stdenv.lib.licenses.bsd3;
+     }) {mp3lame = null;};
+
   "lame-tester" = callPackage
     ({ mkDerivation, base, bifunctors, containers, semigroups, tasty
      , tasty-hunit, validation
      }:
      mkDerivation {
        pname = "lame-tester";
-       version = "1.2";
-       sha256 = "de04042967c5d7879ce46ba7d77cd315e71f2f151432121139cbc1a3108147f1";
+       version = "1.2.1";
+       sha256 = "f13129313c8c0fe5757e5ff62ba9a326f19724568dd9e311c341df21633512a6";
        libraryHaskellDepends = [
          base bifunctors containers semigroups validation
        ];
@@ -108505,6 +110053,8 @@ self: {
        pname = "language-asn1";
        version = "0.5";
        sha256 = "e3fef756ed6c53c0e9d5058291071ca804f47a418ad0cada816bb440c3c45191";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [ base parsec syb ];
        homepage = "http://patch-tag.com/r/adept/language-asn1";
        description = "Parsing of ASN1 definitions";
@@ -108573,6 +110123,26 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "language-c_0_6" = callPackage
+    ({ mkDerivation, alex, array, base, bytestring, containers
+     , directory, filepath, happy, pretty, process, syb
+     }:
+     mkDerivation {
+       pname = "language-c";
+       version = "0.6";
+       sha256 = "5699cd7d386ae5a583d703bbc1c83b46faa618f3e53ff7fe9a97f6c7acb36be6";
+       libraryHaskellDepends = [
+         array base bytestring containers directory filepath pretty process
+         syb
+       ];
+       libraryToolDepends = [ alex happy ];
+       testHaskellDepends = [ base directory filepath process ];
+       homepage = "http://visq.github.io/language-c/";
+       description = "Analysis and generation of C code";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "language-c-comments" = callPackage
     ({ mkDerivation, alex, array, base, language-c }:
      mkDerivation {
@@ -108651,6 +110221,8 @@ self: {
        pname = "language-conf";
        version = "0.2.2.0";
        sha256 = "f7413ee42c06fb62b47965e2aa1a03355e609177c5d2590d9d129ec0c2a8a39a";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [
          aeson base deepseq directory filepath megaparsec pretty scientific
          semigroups text unordered-containers vector
@@ -108699,6 +110271,8 @@ self: {
        pname = "language-dockerfile";
        version = "0.3.5.0";
        sha256 = "9667fd70217ebf229369fbaf906bf74926a8ef1651fd965862c47082d09342e5";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [
          base bytestring free mtl parsec pretty ShellCheck split
          template-haskell th-lift th-lift-instances transformers
@@ -108872,9 +110446,9 @@ self: {
      }) {};
 
   "language-hcl" = callPackage
-    ({ mkDerivation, base, deepseq, directory, filepath, hspec
-     , hspec-megaparsec, megaparsec, pretty, QuickCheck, scientific
-     , semigroups, text, transformers, unordered-containers
+    ({ mkDerivation, base, criterion, deepseq, directory, filepath
+     , hspec, hspec-megaparsec, megaparsec, pretty, QuickCheck
+     , scientific, semigroups, text, transformers, unordered-containers
      }:
      mkDerivation {
        pname = "language-hcl";
@@ -108888,6 +110462,9 @@ self: {
          base directory filepath hspec hspec-megaparsec megaparsec pretty
          QuickCheck semigroups text transformers
        ];
+       benchmarkHaskellDepends = [
+         base criterion directory filepath text
+       ];
        homepage = "https://github.com/beijaflor-io/haskell-language-hcl#readme";
        description = "HCL parsers and pretty-printers for the Haskell programming language";
        license = stdenv.lib.licenses.mit;
@@ -108979,9 +110556,9 @@ self: {
      }) {};
 
   "language-lua" = callPackage
-    ({ mkDerivation, alex, array, base, bytestring, deepseq, directory
-     , filepath, happy, QuickCheck, tasty, tasty-hunit, tasty-quickcheck
-     , text
+    ({ mkDerivation, alex, array, base, bytestring, criterion, deepseq
+     , directory, filepath, happy, QuickCheck, tasty, tasty-hunit
+     , tasty-quickcheck, text
      }:
      mkDerivation {
        pname = "language-lua";
@@ -108993,6 +110570,9 @@ self: {
          base bytestring deepseq directory filepath QuickCheck tasty
          tasty-hunit tasty-quickcheck text
        ];
+       benchmarkHaskellDepends = [
+         base criterion directory filepath text
+       ];
        homepage = "http://github.com/glguy/language-lua";
        description = "Lua parser and pretty-printer";
        license = stdenv.lib.licenses.bsd3;
@@ -109026,6 +110606,8 @@ self: {
        pname = "language-lua2";
        version = "0.1.0.5";
        sha256 = "4f24d7b015dbe1c7e9d1ead835ce426223531b8b6f408ee97b3d18904424393d";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [
          base containers Earley lexer-applicative microlens
          regex-applicative semigroups srcloc transformers
@@ -109177,6 +110759,50 @@ self: {
        hydraPlatforms = [ "x86_64-linux" ];
      }) {};
 
+  "language-puppet_1_3_6" = callPackage
+    ({ mkDerivation, aeson, ansi-wl-pprint, attoparsec, base
+     , base16-bytestring, bytestring, case-insensitive, containers
+     , cryptonite, directory, either, exceptions, filecache, formatting
+     , Glob, hashable, hruby, hslogger, hspec, hspec-megaparsec
+     , http-api-data, http-client, HUnit, lens, lens-aeson, megaparsec
+     , memory, mtl, operational, optparse-applicative, parallel-io
+     , parsec, pcre-utils, process, random, regex-pcre-builtin
+     , scientific, semigroups, servant, servant-client, split, stm
+     , strict-base-types, temporary, text, time, transformers, unix
+     , unordered-containers, vector, yaml
+     }:
+     mkDerivation {
+       pname = "language-puppet";
+       version = "1.3.6";
+       sha256 = "25acf7b9449999beb8b65c8f594c51171f94b074fb5a5228ce267f96f50d2be2";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         aeson ansi-wl-pprint attoparsec base base16-bytestring bytestring
+         case-insensitive containers cryptonite directory either exceptions
+         filecache formatting hashable hruby hslogger hspec http-api-data
+         http-client lens lens-aeson megaparsec memory mtl operational
+         parsec pcre-utils process random regex-pcre-builtin scientific
+         semigroups servant servant-client split stm strict-base-types text
+         time transformers unix unordered-containers vector yaml
+       ];
+       executableHaskellDepends = [
+         aeson base bytestring containers Glob hslogger http-client lens
+         megaparsec mtl optparse-applicative parallel-io regex-pcre-builtin
+         servant-client strict-base-types text transformers
+         unordered-containers vector yaml
+       ];
+       testHaskellDepends = [
+         ansi-wl-pprint base Glob hslogger hspec hspec-megaparsec HUnit lens
+         megaparsec mtl scientific strict-base-types temporary text
+         transformers unix unordered-containers vector
+       ];
+       homepage = "http://lpuppet.banquise.net/";
+       description = "Tools to parse and evaluate the Puppet DSL";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "language-python" = callPackage
     ({ mkDerivation, alex, array, base, containers, happy, monads-tf
      , pretty, transformers, utf8-string
@@ -109376,10 +111002,11 @@ self: {
      }) {};
 
   "large-hashable" = callPackage
-    ({ mkDerivation, aeson, base, base16-bytestring, bytes, bytestring
-     , containers, hashable, HTF, QuickCheck, scientific, strict
-     , template-haskell, text, time, transformers, unordered-containers
-     , utf8-light, vector, void
+    ({ mkDerivation, aeson, base, base16-bytestring, byteable, bytes
+     , bytestring, cereal, containers, cryptohash, deepseq, hashable
+     , HTF, QuickCheck, safecopy, scientific, strict, template-haskell
+     , text, time, transformers, unordered-containers, utf8-light
+     , vector, void
      }:
      mkDerivation {
        pname = "large-hashable";
@@ -109394,6 +111021,10 @@ self: {
          aeson base bytes bytestring containers hashable HTF QuickCheck
          scientific strict text time unordered-containers vector
        ];
+       benchmarkHaskellDepends = [
+         base base16-bytestring byteable bytes bytestring cereal cryptohash
+         deepseq safecopy text transformers
+       ];
        homepage = "https://github.com/factisresearch/large-hashable";
        description = "Efficiently hash (large) Haskell values";
        license = stdenv.lib.licenses.bsd3;
@@ -109742,6 +111373,8 @@ self: {
        pname = "lazyio";
        version = "0.1.0.4";
        sha256 = "8b54f0bccdc1c836393ce667ea0f1ad069d52c04762e61fad633d4d44916cf6c";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [ base transformers unsafe ];
        homepage = "http://www.haskell.org/haskellwiki/Lazy_IO";
        description = "Run IO actions lazily while respecting their order";
@@ -109749,13 +111382,18 @@ self: {
      }) {};
 
   "lazyset" = callPackage
-    ({ mkDerivation, base, containers, data-ordlist, HUnit }:
+    ({ mkDerivation, base, containers, data-ordlist, HUnit, time
+     , timeit
+     }:
      mkDerivation {
        pname = "lazyset";
        version = "0.1.0.0";
        sha256 = "9e62ccd181117484c63920b8dfb8d385d23119e11595ab2aa045b272c55f4bad";
        libraryHaskellDepends = [ base containers data-ordlist ];
        testHaskellDepends = [ base containers data-ordlist HUnit ];
+       benchmarkHaskellDepends = [
+         base containers data-ordlist time timeit
+       ];
        homepage = "https://github.com/happyherp/lazyset";
        description = "Set and Map from lazy/infinite lists";
        license = stdenv.lib.licenses.mit;
@@ -110296,7 +111934,7 @@ self: {
 
   "lens" = callPackage
     ({ mkDerivation, array, base, base-orphans, bifunctors, bytestring
-     , comonad, containers, contravariant, deepseq, directory
+     , comonad, containers, contravariant, criterion, deepseq, directory
      , distributive, doctest, exceptions, filepath, free
      , generic-deriving, ghc-prim, hashable, hlint, HUnit
      , kan-extensions, mtl, nats, parallel, profunctors, QuickCheck
@@ -110325,6 +111963,10 @@ self: {
          test-framework-quickcheck2 test-framework-th text transformers
          unordered-containers vector
        ];
+       benchmarkHaskellDepends = [
+         base bytestring comonad containers criterion deepseq
+         generic-deriving transformers unordered-containers vector
+       ];
        homepage = "http://github.com/ekmett/lens/";
        description = "Lenses, Folds and Traversals";
        license = stdenv.lib.licenses.bsd3;
@@ -110464,6 +112106,8 @@ self: {
        pname = "lens-regex";
        version = "0.1.0";
        sha256 = "4954b3ae395661e916c536bfe837c42a1cd8223ea81ffd86b1fdd9b6abfc5142";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [
          array base lens regex-base template-haskell
        ];
@@ -110677,6 +112321,8 @@ self: {
        pname = "leveldb-haskell";
        version = "0.6.4";
        sha256 = "25a8f9c2cdd5a32423389173a6323bd804689f69aee1082c57887ea74ead1b04";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [
          base bytestring data-default exceptions filepath resourcet
          transformers
@@ -110700,6 +112346,8 @@ self: {
        pname = "leveldb-haskell-fork";
        version = "0.3.4.4";
        sha256 = "589935f658b432546ba3e82f1473c55365a2a3fd01e3751faa93f3c2a79f2c08";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [
          base bytestring data-default filepath resourcet transformers
        ];
@@ -110733,6 +112381,8 @@ self: {
        pname = "levmar-chart";
        version = "0.2";
        sha256 = "5271f6dadec35b22d6fd00900992c819d2e7a7daa7e53016c9f19879a3684973";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [ base Chart colour data-accessor levmar ];
        description = "Plots the results of the Levenberg-Marquardt algorithm in a chart";
        license = stdenv.lib.licenses.bsd3;
@@ -110839,7 +112489,7 @@ self: {
        version = "0.10";
        sha256 = "23b3cd7479108864b5a167b3fd1b1f58bf49b1773f590c68c766dcd4a999a0f4";
        isLibrary = false;
-       isExecutable = false;
+       isExecutable = true;
        homepage = "http://lhc.seize.it/";
        description = "LHC Haskell Compiler";
        license = stdenv.lib.licenses.publicDomain;
@@ -111108,8 +112758,8 @@ self: {
      }:
      mkDerivation {
        pname = "libjenkins";
-       version = "0.8.3";
-       sha256 = "939379ae30f65d20d524d5735d6b6ec86b91ce295c64e089b1097161da1067cc";
+       version = "0.8.4";
+       sha256 = "e7602fc1312661a8305e3ddb84b365cf520c74b9afbd4c5b741e05ab8fb71123";
        libraryHaskellDepends = [
          async attoparsec base bytestring conduit containers free
          http-client http-conduit http-types monad-control mtl network
@@ -111209,6 +112859,8 @@ self: {
        pname = "libltdl";
        version = "0.1.1";
        sha256 = "9327d7108607fecc30803217eb329465a569a1c26c564b49800ceb08e362f828";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [ base ];
        homepage = "https://github.com/mainland/libltdl";
        description = "FFI interface to libltdl";
@@ -111420,6 +113072,8 @@ self: {
        pname = "libssh2";
        version = "0.2.0.3";
        sha256 = "7caa9f23ae3ff54a819ff56bbecc7953fe39aa958c77feebd52849f2bf86cd75";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [ base bytestring network syb time ];
        librarySystemDepends = [ ssh2 ];
        libraryPkgconfigDepends = [ libssh2 ];
@@ -111689,9 +113343,9 @@ self: {
      }) {};
 
   "lifted-async" = callPackage
-    ({ mkDerivation, async, base, constraints, HUnit, lifted-base
-     , monad-control, mtl, tasty, tasty-hunit, tasty-th
-     , transformers-base
+    ({ mkDerivation, async, base, constraints, criterion, deepseq
+     , HUnit, lifted-base, monad-control, mtl, tasty, tasty-hunit
+     , tasty-th, transformers-base
      }:
      mkDerivation {
        pname = "lifted-async";
@@ -111704,15 +113358,16 @@ self: {
          async base HUnit lifted-base monad-control mtl tasty tasty-hunit
          tasty-th
        ];
+       benchmarkHaskellDepends = [ async base criterion deepseq ];
        homepage = "https://github.com/maoe/lifted-async";
        description = "Run lifted IO operations asynchronously and wait for their results";
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
   "lifted-base" = callPackage
-    ({ mkDerivation, base, HUnit, monad-control, test-framework
-     , test-framework-hunit, transformers, transformers-base
-     , transformers-compat
+    ({ mkDerivation, base, criterion, HUnit, monad-control, monad-peel
+     , test-framework, test-framework-hunit, transformers
+     , transformers-base, transformers-compat
      }:
      mkDerivation {
        pname = "lifted-base";
@@ -111723,6 +113378,9 @@ self: {
          base HUnit monad-control test-framework test-framework-hunit
          transformers transformers-base transformers-compat
        ];
+       benchmarkHaskellDepends = [
+         base criterion monad-control monad-peel transformers
+       ];
        homepage = "https://github.com/basvandijk/lifted-base";
        description = "lifted IO operations from the base library";
        license = stdenv.lib.licenses.bsd3;
@@ -112296,8 +113954,8 @@ self: {
      }) {};
 
   "linkedhashmap" = callPackage
-    ({ mkDerivation, base, containers, deepseq, hashable, mtl, tasty
-     , tasty-hunit, unordered-containers
+    ({ mkDerivation, base, containers, criterion, deepseq, hashable
+     , mtl, tasty, tasty-hunit, unordered-containers
      }:
      mkDerivation {
        pname = "linkedhashmap";
@@ -112310,6 +113968,9 @@ self: {
          base containers deepseq hashable mtl tasty tasty-hunit
          unordered-containers
        ];
+       benchmarkHaskellDepends = [
+         base containers criterion deepseq hashable unordered-containers
+       ];
        homepage = "https://github.com/abasko/linkedhashmap";
        description = "Persistent LinkedHashMap data structure";
        license = stdenv.lib.licenses.bsd3;
@@ -112422,6 +114083,8 @@ self: {
        pname = "linux-file-extents";
        version = "0.2.0.0";
        sha256 = "6c7cd9e700f666f774736d31a0e6aa7bfe9bd1e075c11eed701ba95095fd9bd0";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [ base unix ];
        homepage = "https://github.com/redneb/linux-file-extents";
        description = "Retrieve file fragmentation information under Linux";
@@ -112634,7 +114297,7 @@ self: {
      }) {};
 
   "liquid" = callPackage
-    ({ mkDerivation, aeson, attoparsec, base, hashable, lens
+    ({ mkDerivation, aeson, attoparsec, base, criterion, hashable, lens
      , lens-aeson, mtl, QuickCheck, scientific, semigroups, tasty
      , tasty-hunit, tasty-quickcheck, tasty-th, text
      , unordered-containers, validation, vector
@@ -112652,6 +114315,7 @@ self: {
          semigroups tasty tasty-hunit tasty-quickcheck tasty-th text
          unordered-containers validation vector
        ];
+       benchmarkHaskellDepends = [ aeson attoparsec base criterion text ];
        homepage = "https://github.com/projectorhq/haskell-liquid";
        description = "Liquid template language library";
        license = stdenv.lib.licenses.bsd3;
@@ -112831,6 +114495,8 @@ self: {
        pname = "list-prompt";
        version = "0.1.1.0";
        sha256 = "c7323c7a802940deba1a7be46265fd8c01f548174d5f08923a607e1730ca4dee";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [
          ansi-terminal base data-default stm terminal-size vty
        ];
@@ -113296,6 +114962,8 @@ self: {
        pname = "llvm-extra";
        version = "0.7.0.1";
        sha256 = "4928e405deff09451edce864558ce7b3276549ca7f1d71dac118dcbcafe15573";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [
          base containers cpuid llvm-tf non-empty tfp transformers unsafe
          utility-ht
@@ -113312,6 +114980,8 @@ self: {
        pname = "llvm-ffi";
        version = "3.8.1";
        sha256 = "d636af82033d1fbfa5c05ed66f823afe9081db387f85eae862f97ca6db4e24c9";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [ base enumset ];
        libraryPkgconfigDepends = [ llvm ];
        homepage = "http://haskell.org/haskellwiki/LLVM";
@@ -113451,8 +115121,8 @@ self: {
     ({ mkDerivation, base, containers, monadLib, pretty }:
      mkDerivation {
        pname = "llvm-pretty";
-       version = "0.5";
-       sha256 = "d38228d980ad1fc0b833cf5daa0e78ce981c102a6ad7cad16bed2761f98cbb19";
+       version = "0.6.0.0";
+       sha256 = "f9b50885551a48624a0577c6dabaef1fc77245367d6d9afdb84d548ada328e66";
        libraryHaskellDepends = [ base containers monadLib pretty ];
        description = "A pretty printing library inspired by the llvm binding";
        license = stdenv.lib.licenses.bsd3;
@@ -113465,8 +115135,8 @@ self: {
      }:
      mkDerivation {
        pname = "llvm-pretty-bc-parser";
-       version = "0.3.0.0";
-       sha256 = "7873abf8b3acbc679642f2f1c2d639db91c084a2a97546037f049735536dfb81";
+       version = "0.3.0.1";
+       sha256 = "def47c50959ae7b270987bcf53af87e07a290275bfd34f01e3d3c50b8edf1178";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -113492,6 +115162,8 @@ self: {
        pname = "llvm-tf";
        version = "3.1.0.1";
        sha256 = "5aa4e2e733b442de88096ba0eaa7fe92e52a1e61601c423d4fbb4dc44355e2e5";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [
          base containers enumset fixed-length llvm-ffi non-empty
          storable-record tfp transformers utility-ht
@@ -113683,12 +115355,13 @@ self: {
      }) {};
 
   "located-base" = callPackage
-    ({ mkDerivation, base }:
+    ({ mkDerivation, base, criterion }:
      mkDerivation {
        pname = "located-base";
        version = "0.1.1.0";
        sha256 = "83a96081c87ec9820b6bad7200404f7e1fbed365fe8c57641d8645d95732d59f";
        libraryHaskellDepends = [ base ];
+       benchmarkHaskellDepends = [ base criterion ];
        homepage = "http://github.com/gridaphobe/located-base";
        description = "Location-aware variants of partial functions";
        license = stdenv.lib.licenses.bsd3;
@@ -113982,8 +115655,8 @@ self: {
      }:
      mkDerivation {
        pname = "log-warper";
-       version = "0.4.4";
-       sha256 = "9a2cfcf95d0c88ae6471106f67314e81e2bd370fe092a4f21d9459f1f235dbea";
+       version = "0.5.1";
+       sha256 = "8645928457c46ca217c2a9ebc75819176643552876c832ad3691a66e762798ea";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -114107,7 +115780,8 @@ self: {
      }) {};
 
   "logging-effect" = callPackage
-    ({ mkDerivation, async, base, exceptions, free, monad-control, mtl
+    ({ mkDerivation, async, base, bytestring, criterion, exceptions
+     , fast-logger, free, lifted-async, monad-control, monad-logger, mtl
      , semigroups, stm, stm-delay, text, time, transformers
      , transformers-base, wl-pprint-text
      }:
@@ -114119,11 +115793,39 @@ self: {
          async base exceptions free monad-control mtl semigroups stm
          stm-delay text time transformers transformers-base wl-pprint-text
        ];
+       benchmarkHaskellDepends = [
+         base bytestring criterion fast-logger lifted-async monad-logger
+         text time wl-pprint-text
+       ];
        homepage = "https://github.com/ocharles/logging-effect";
        description = "A mtl-style monad transformer for general purpose & compositional logging";
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "logging-effect_1_2_0" = callPackage
+    ({ mkDerivation, async, base, bytestring, criterion, exceptions
+     , fast-logger, free, lifted-async, monad-control, monad-logger, mtl
+     , semigroups, stm, stm-delay, text, time, transformers
+     , transformers-base, wl-pprint-text
+     }:
+     mkDerivation {
+       pname = "logging-effect";
+       version = "1.2.0";
+       sha256 = "be6f0121d16e9947d4147c264123b8d622102eb43f0d16e815f117505d6d8544";
+       libraryHaskellDepends = [
+         async base exceptions free monad-control mtl semigroups stm
+         stm-delay text time transformers transformers-base wl-pprint-text
+       ];
+       benchmarkHaskellDepends = [
+         base bytestring criterion fast-logger lifted-async monad-logger
+         text time wl-pprint-text
+       ];
+       homepage = "https://github.com/ocharles/logging-effect";
+       description = "A mtl-style monad transformer for general purpose & compositional logging";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "logging-facade" = callPackage
     ({ mkDerivation, base, hspec, template-haskell, transformers }:
      mkDerivation {
@@ -114342,6 +116044,8 @@ self: {
        pname = "lol";
        version = "0.6.0.0";
        sha256 = "973a5ecd6397fd01e34bb7a40e80a3b0b564ca00aeafb73dc66fb0ec988c950d";
+       revision = "1";
+       editedCabalFile = "bc9524337ed4a7608bda8a983259e6e381621d8a0914531833a5d1a761ba7971";
        libraryHaskellDepends = [
          arithmoi base bytestring constraints containers crypto-api
          data-default deepseq directory monadcryptorandom MonadRandom mtl
@@ -114356,31 +116060,35 @@ self: {
      }) {};
 
   "lol-apps" = callPackage
-    ({ mkDerivation, arithmoi, base, constraints, deepseq, DRBG, lol
-     , MonadRandom, mtl, numeric-prelude, QuickCheck, random, repa
-     , singletons, test-framework, test-framework-quickcheck2, vector
+    ({ mkDerivation, base, containers, deepseq, DRBG, filepath, lol
+     , lol-benches, lol-cpp, lol-repa, lol-tests, MonadRandom, mtl
+     , numeric-prelude, protocol-buffers, protocol-buffers-descriptor
+     , singletons, split, test-framework, time
      }:
      mkDerivation {
        pname = "lol-apps";
-       version = "0.1.1.0";
-       sha256 = "75b0d6d53161d25e77286ab0cbf43487112f6b6d944ff77d11ace6e7ef83af7e";
-       revision = "2";
-       editedCabalFile = "5d9f33a4442eff096507ba9917c86de5cd01ee1fe55f4837c69301ccaa7f4c69";
+       version = "0.2.0.2";
+       sha256 = "d082ac8f4112884878a5f8f0ce8d994b1c5dc8d62bba8f55a437b03f1f2e1c88";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
-         base deepseq lol MonadRandom numeric-prelude
+         base containers deepseq lol MonadRandom mtl numeric-prelude
+         protocol-buffers protocol-buffers-descriptor singletons split
        ];
        executableHaskellDepends = [
-         arithmoi base lol MonadRandom numeric-prelude
+         base deepseq DRBG filepath lol lol-cpp MonadRandom mtl
+         numeric-prelude singletons time
        ];
        testHaskellDepends = [
-         arithmoi base constraints deepseq DRBG lol MonadRandom mtl
-         QuickCheck random repa singletons test-framework
-         test-framework-quickcheck2 vector
+         base lol lol-cpp lol-repa lol-tests MonadRandom numeric-prelude
+         test-framework
+       ];
+       benchmarkHaskellDepends = [
+         base DRBG lol lol-benches lol-cpp lol-repa MonadRandom mtl
+         numeric-prelude
        ];
        homepage = "https://github.com/cpeikert/Lol";
-       description = "Lattice-based cryptographic applications using Lol";
+       description = "Lattice-based cryptographic applications using <https://hackage.haskell.org/package/lol lol>.";
        license = stdenv.lib.licenses.gpl2;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
@@ -114388,18 +116096,17 @@ self: {
   "lol-benches" = callPackage
     ({ mkDerivation, ansi-terminal, base, containers, criterion
      , crypto-api, deepseq, DRBG, lol, MonadRandom, split, statistics
-     , transformers, vector
      }:
      mkDerivation {
        pname = "lol-benches";
-       version = "0.0.0.3";
-       sha256 = "4ec18d88b5153220c89ec9f39bf9a0d2e6c1fdfff69f980cdabc42423ee092b5";
+       version = "0.0.0.5";
+       sha256 = "6d708ff14c3dbe0ea7742d9498fe43ad087eb43652bd20cc92bd4f5fc0671858";
        libraryHaskellDepends = [
          ansi-terminal base containers criterion crypto-api deepseq DRBG lol
-         MonadRandom split statistics transformers vector
+         MonadRandom split statistics
        ];
        homepage = "https://github.com/cpeikert/Lol";
-       description = "A library for benchmarking <https://hackage.haskell.org/package/lol Λ ∘ λ>.";
+       description = "A library for benchmarking <https://hackage.haskell.org/package/lol lol>.";
        license = stdenv.lib.licenses.gpl2;
      }) {};
 
@@ -114426,52 +116133,41 @@ self: {
      }) {};
 
   "lol-cpp" = callPackage
-    ({ mkDerivation, arithmoi, base, bytestring, constraints
-     , containers, crypto-api, data-default, deepseq, lol, lol-tests
-     , monadcryptorandom, MonadRandom, mtl, numeric-prelude
-     , protocol-buffers, protocol-buffers-descriptor, random, reflection
-     , repa, singletons, tagged-transformer, template-haskell
-     , th-desugar, transformers, vector, vector-th-unbox
+    ({ mkDerivation, base, constraints, deepseq, DRBG, lol, lol-benches
+     , lol-tests, MonadRandom, mtl, numeric-prelude, reflection, vector
      }:
      mkDerivation {
        pname = "lol-cpp";
-       version = "0.0.0.1";
-       sha256 = "86d374f5628c89a35d969c6e6cc59da9c2ca85758bf7375b25f7c0e2ddcf0b57";
+       version = "0.0.0.3";
+       sha256 = "42fe0cc6f99aabd9ab47666fa41cb8407688d0e4e18a7e9cf67f1db43e1b9325";
        libraryHaskellDepends = [
-         arithmoi base bytestring constraints containers crypto-api
-         data-default deepseq lol monadcryptorandom MonadRandom mtl
-         numeric-prelude protocol-buffers protocol-buffers-descriptor random
-         reflection repa singletons tagged-transformer template-haskell
-         th-desugar transformers vector vector-th-unbox
+         base constraints deepseq lol MonadRandom mtl numeric-prelude
+         reflection vector
        ];
        testHaskellDepends = [ base lol-tests ];
+       benchmarkHaskellDepends = [ base DRBG lol lol-benches ];
        homepage = "https://github.com/cpeikert/Lol";
-       description = "A fast C++ backend for <https://hackage.haskell.org/package/lol Λ ∘ λ>.";
+       description = "A fast C++ backend for <https://hackage.haskell.org/package/lol lol>.";
        license = stdenv.lib.licenses.gpl2;
      }) {};
 
   "lol-repa" = callPackage
-    ({ mkDerivation, arithmoi, base, bytestring, constraints
-     , containers, crypto-api, data-default, deepseq, lol, lol-tests
-     , monadcryptorandom, MonadRandom, mtl, numeric-prelude
-     , protocol-buffers, protocol-buffers-descriptor, random, reflection
-     , repa, singletons, tagged-transformer, template-haskell
-     , th-desugar, transformers, vector, vector-th-unbox
+    ({ mkDerivation, base, constraints, data-default, deepseq, DRBG
+     , lol, lol-benches, lol-tests, MonadRandom, mtl, numeric-prelude
+     , reflection, repa, singletons, vector, vector-th-unbox
      }:
      mkDerivation {
        pname = "lol-repa";
-       version = "0.0.0.1";
-       sha256 = "c175e5881ee98795a0e24adde1a7c1955102b5723048d540389f773fff239b98";
+       version = "0.0.0.2";
+       sha256 = "9545c89813d53d928ba6da0ef24118f6a80c01525d05963b6e8b1399bd3e91a4";
        libraryHaskellDepends = [
-         arithmoi base bytestring constraints containers crypto-api
-         data-default deepseq lol monadcryptorandom MonadRandom mtl
-         numeric-prelude protocol-buffers protocol-buffers-descriptor random
-         reflection repa singletons tagged-transformer template-haskell
-         th-desugar transformers vector vector-th-unbox
+         base constraints data-default deepseq lol MonadRandom mtl
+         numeric-prelude reflection repa singletons vector vector-th-unbox
        ];
        testHaskellDepends = [ base lol-tests ];
+       benchmarkHaskellDepends = [ base DRBG lol lol-benches ];
        homepage = "https://github.com/cpeikert/Lol";
-       description = "A repa backend for <https://hackage.haskell.org/package/lol Λ ∘ λ>.";
+       description = "A repa backend for <https://hackage.haskell.org/package/lol lol>.";
        license = stdenv.lib.licenses.gpl2;
      }) {};
 
@@ -114483,6 +116179,8 @@ self: {
        pname = "lol-tests";
        version = "0.0.0.1";
        sha256 = "656cbe1a7bcea84cffd271a61d0f2b731e14705309636d872afff363628a37ed";
+       revision = "1";
+       editedCabalFile = "39058c9844930c138aed3e9135879c07de330ae36259e5799c0cdf96fc9ca9d2";
        libraryHaskellDepends = [
          base lol MonadRandom QuickCheck test-framework
          test-framework-quickcheck2
@@ -114553,13 +116251,17 @@ self: {
      }) {};
 
   "loop" = callPackage
-    ({ mkDerivation, base, hspec, mtl }:
+    ({ mkDerivation, base, criterion, foldl, hspec, mtl, random, vector
+     }:
      mkDerivation {
        pname = "loop";
        version = "0.3.0";
        sha256 = "92962010bdab28cc0092dd3fe42819d6f215c717dd10d9349626d92a0d0b3ecf";
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base hspec mtl ];
+       benchmarkHaskellDepends = [
+         base criterion foldl mtl random vector
+       ];
        homepage = "https://github.com/nh2/loop";
        description = "Fast loops (for when GHC can't optimize forM_)";
        license = stdenv.lib.licenses.mit;
@@ -114591,8 +116293,8 @@ self: {
      }) {};
 
   "loops" = callPackage
-    ({ mkDerivation, base, primitive, tasty, tasty-quickcheck
-     , transformers, vector
+    ({ mkDerivation, base, criterion, primitive, tasty
+     , tasty-quickcheck, transformers, vector
      }:
      mkDerivation {
        pname = "loops";
@@ -114602,6 +116304,7 @@ self: {
        editedCabalFile = "ef9ed99ec28140d39775a0b9c44333496d3ee754995219460d76cb137a9534ce";
        libraryHaskellDepends = [ base primitive transformers vector ];
        testHaskellDepends = [ base tasty tasty-quickcheck ];
+       benchmarkHaskellDepends = [ base criterion transformers vector ];
        description = "Fast imperative-style loops";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -114777,6 +116480,8 @@ self: {
        pname = "lp-diagrams-svg";
        version = "1.1";
        sha256 = "6cc63a8bf914fbc67e42c54c0c4327e81b650d56d9aee5b189946473453463b2";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [
          base containers FontyFruity gasp JuicyPixels lens linear
          lp-diagrams lucid-svg mtl optparse-applicative svg-tree text vector
@@ -115062,8 +116767,8 @@ self: {
 
   "lucid" = callPackage
     ({ mkDerivation, base, bifunctors, blaze-builder, bytestring
-     , containers, hashable, hspec, HUnit, mmorph, mtl, parsec, text
-     , transformers, unordered-containers
+     , containers, criterion, deepseq, hashable, hspec, HUnit, mmorph
+     , mtl, parsec, text, transformers, unordered-containers
      }:
      mkDerivation {
        pname = "lucid";
@@ -115076,6 +116781,9 @@ self: {
        testHaskellDepends = [
          base bifunctors hspec HUnit mtl parsec text
        ];
+       benchmarkHaskellDepends = [
+         base blaze-builder bytestring criterion deepseq text
+       ];
        homepage = "https://github.com/chrisdone/lucid";
        description = "Clear to write, read and edit DSL for HTML";
        license = stdenv.lib.licenses.bsd3;
@@ -115351,7 +117059,8 @@ self: {
      }) {};
 
   "lz4" = callPackage
-    ({ mkDerivation, base, bytestring, cereal, hspec, HUnit, QuickCheck
+    ({ mkDerivation, base, bytestring, cereal, criterion, deepseq
+     , hspec, HUnit, QuickCheck, quicklz, snappy
      }:
      mkDerivation {
        pname = "lz4";
@@ -115359,6 +117068,9 @@ self: {
        sha256 = "98cc62bea1a359201f9e39a7db2457272f996ede25d97a2dbee3a07aa80693f1";
        libraryHaskellDepends = [ base bytestring cereal ];
        testHaskellDepends = [ base bytestring hspec HUnit QuickCheck ];
+       benchmarkHaskellDepends = [
+         base bytestring criterion deepseq quicklz snappy
+       ];
        homepage = "http://github.com/mwotton/lz4hs";
        description = "LZ4 compression for ByteStrings";
        license = stdenv.lib.licenses.bsd3;
@@ -115412,8 +117124,7 @@ self: {
        pname = "lzma-clib";
        version = "5.2.2";
        sha256 = "0aed9cb8ef3a2b0e71c429b00161ee3fb342cce2603ccb934f507fb236a09fd5";
-       isLibrary = false;
-       isExecutable = false;
+       doHaddock = false;
        description = "liblzma C library and headers for use by LZMA bindings";
        license = stdenv.lib.licenses.publicDomain;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -115565,6 +117276,8 @@ self: {
        pname = "maccatcher";
        version = "2.1.5";
        sha256 = "cbafc38151d9c4c17c3055a7f8f0702bf5d7d5240db3369c84326e94ddcaa67c";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [ base binary parsec process ];
        description = "Obtain the host MAC address on *NIX and Windows";
        license = stdenv.lib.licenses.bsd3;
@@ -115591,10 +117304,11 @@ self: {
      }) {};
 
   "machines" = callPackage
-    ({ mkDerivation, adjunctions, base, comonad, containers, directory
-     , distributive, doctest, filepath, free, mtl, pointed, profunctors
-     , semigroupoids, semigroups, transformers, transformers-compat
-     , void
+    ({ mkDerivation, adjunctions, base, comonad, conduit
+     , conduit-combinators, containers, criterion, directory
+     , distributive, doctest, filepath, free, mtl, pipes, pointed
+     , profunctors, semigroupoids, semigroups, transformers
+     , transformers-compat, void
      }:
      mkDerivation {
        pname = "machines";
@@ -115606,6 +117320,9 @@ self: {
          transformers-compat void
        ];
        testHaskellDepends = [ base directory doctest filepath ];
+       benchmarkHaskellDepends = [
+         base conduit conduit-combinators criterion mtl pipes
+       ];
        homepage = "http://github.com/ekmett/machines/";
        description = "Networked stream transducers";
        license = stdenv.lib.licenses.bsd3;
@@ -115773,8 +117490,8 @@ self: {
      }:
      mkDerivation {
        pname = "madlang";
-       version = "1.0.0.0";
-       sha256 = "d8fd8f0055eab476c13c23361cec3a780319d90e45c2b45fccd1208b0ff24120";
+       version = "1.0.0.1";
+       sha256 = "edeea8b9d3cabfaf5392fbe7ad307754e20fe8ef90294b5a846c9a7f8edb5af8";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -116953,35 +118670,35 @@ self: {
      }) {};
 
   "marvin" = callPackage
-    ({ mkDerivation, aeson, base, bytestring, configurator, deepseq
-     , directory, filepath, hashable, haskeline, http-client
-     , http-client-tls, http-types, lens, lifted-async, lifted-base
-     , marvin-interpolate, monad-control, monad-logger, monad-loops, mtl
-     , mustache, network-uri, optparse-applicative, random, stm, text
-     , text-icu, time, transformers, transformers-base
-     , unordered-containers, vector, wai, warp, warp-tls, websockets
-     , wreq, wuss
+    ({ mkDerivation, aeson, base, bytestring, conduit, configurator
+     , deepseq, directory, filepath, hashable, haskeline, http-client
+     , http-client-tls, http-types, irc-conduit, lens, lifted-async
+     , lifted-base, marvin-interpolate, monad-control, monad-logger
+     , monad-loops, mtl, mustache, network-uri, optparse-applicative
+     , random, stm, text, text-icu, time, transformers
+     , transformers-base, unordered-containers, vector, wai, warp
+     , warp-tls, websockets, wreq, wuss
      }:
      mkDerivation {
        pname = "marvin";
-       version = "0.1.5";
-       sha256 = "42cebd7af1b7d20575a08bbd1510226761aa2f494f64b0e7110d350f211b504a";
+       version = "0.2.0";
+       sha256 = "7928adc11b0fe646db3bb20333c6dcea09664a7b6a341de9d5ed3bfb639e6301";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
-         aeson base bytestring configurator deepseq hashable haskeline
-         http-client http-client-tls http-types lens lifted-async
-         lifted-base marvin-interpolate monad-control monad-logger
-         monad-loops mtl network-uri optparse-applicative random stm text
-         text-icu time transformers transformers-base unordered-containers
-         vector wai warp warp-tls websockets wreq wuss
+         aeson base bytestring conduit configurator deepseq hashable
+         haskeline http-client http-client-tls http-types irc-conduit lens
+         lifted-async lifted-base marvin-interpolate monad-control
+         monad-logger monad-loops mtl network-uri optparse-applicative
+         random stm text text-icu time transformers transformers-base
+         unordered-containers vector wai warp warp-tls websockets wreq wuss
        ];
        executableHaskellDepends = [
          aeson base bytestring configurator directory filepath mustache
          optparse-applicative text
        ];
        homepage = "https://marvin.readthedocs.io";
-       description = "A modular chat bot";
+       description = "A framework for modular, portable chat bots";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
@@ -117230,8 +118947,8 @@ self: {
      }) {eng = null; mat = null; mx = null;};
 
   "matrices" = callPackage
-    ({ mkDerivation, base, deepseq, primitive, tasty, tasty-hunit
-     , tasty-quickcheck, vector
+    ({ mkDerivation, base, criterion, deepseq, primitive, tasty
+     , tasty-hunit, tasty-quickcheck, vector
      }:
      mkDerivation {
        pname = "matrices";
@@ -117241,13 +118958,14 @@ self: {
        testHaskellDepends = [
          base tasty tasty-hunit tasty-quickcheck vector
        ];
+       benchmarkHaskellDepends = [ base criterion vector ];
        description = "native matrix based on vector";
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
   "matrix" = callPackage
-    ({ mkDerivation, base, deepseq, loop, primitive, QuickCheck, tasty
-     , tasty-quickcheck, vector
+    ({ mkDerivation, base, criterion, deepseq, loop, primitive
+     , QuickCheck, tasty, tasty-quickcheck, vector
      }:
      mkDerivation {
        pname = "matrix";
@@ -117255,6 +118973,7 @@ self: {
        sha256 = "7a3d41c0f66212360057b29ae9f81779c8da9f71b040ad7676699af7e7ca35b5";
        libraryHaskellDepends = [ base deepseq loop primitive vector ];
        testHaskellDepends = [ base QuickCheck tasty tasty-quickcheck ];
+       benchmarkHaskellDepends = [ base criterion ];
        description = "A native implementation of matrix operations";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -117733,6 +119452,74 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "mediabus" = callPackage
+    ({ mkDerivation, array, async, base, binary, bytestring, cereal
+     , conduit, conduit-combinators, conduit-extra, containers
+     , data-default, deepseq, hspec, lens, lifted-async, monad-control
+     , mtl, network, parallel, primitive, process, QuickCheck, random
+     , resourcet, singletons, spool, stm, streaming-commons, tagged
+     , template-haskell, text, time, transformers, type-spec, vector
+     }:
+     mkDerivation {
+       pname = "mediabus";
+       version = "0.2.0.2";
+       sha256 = "3dd4d11c4253eebe2ff21368222661341b64e8176171fb4be77b9ee45402f7d1";
+       libraryHaskellDepends = [
+         array async base bytestring cereal conduit conduit-combinators
+         conduit-extra containers data-default deepseq lens lifted-async
+         monad-control mtl network parallel primitive process QuickCheck
+         random resourcet spool stm streaming-commons tagged text time
+         transformers vector
+       ];
+       testHaskellDepends = [
+         array async base binary bytestring conduit conduit-combinators
+         conduit-extra containers data-default deepseq hspec lens
+         monad-control mtl QuickCheck singletons spool stm tagged
+         template-haskell text time transformers type-spec vector
+       ];
+       homepage = "https://github.com/lindenbaum/mediabus";
+       description = "Multimedia streaming on top of Conduit";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
+  "mediabus-rtp" = callPackage
+    ({ mkDerivation, array, async, base, binary, bytestring, cereal
+     , conduit, conduit-combinators, conduit-extra, containers
+     , data-default, deepseq, hspec, lens, lifted-async, mediabus
+     , monad-control, mtl, network, parallel, primitive, process
+     , QuickCheck, random, resourcet, singletons, spool, stm
+     , streaming-commons, tagged, template-haskell, text, time
+     , transformers, type-spec, vector
+     }:
+     mkDerivation {
+       pname = "mediabus-rtp";
+       version = "0.2.0.0";
+       sha256 = "f802521f6f504e1ea56a2c694a216a8b92087f21aa4d493d3c6bf11d27063d27";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         array async base bytestring cereal conduit conduit-combinators
+         conduit-extra containers data-default deepseq lens lifted-async
+         mediabus monad-control mtl network parallel primitive process
+         QuickCheck random resourcet spool stm streaming-commons tagged text
+         time transformers vector
+       ];
+       executableHaskellDepends = [
+         async base conduit conduit-combinators conduit-extra data-default
+         lens lifted-async mediabus monad-control mtl parallel QuickCheck
+         random stm streaming-commons tagged time vector
+       ];
+       testHaskellDepends = [
+         array async base binary bytestring conduit conduit-combinators
+         conduit-extra containers data-default deepseq hspec lens mediabus
+         monad-control mtl QuickCheck singletons spool stm tagged
+         template-haskell text time transformers type-spec vector
+       ];
+       homepage = "https://github.com/lindenbaum/mediabus-rtp";
+       description = "Receive and Send RTP Packets";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "median-stream" = callPackage
     ({ mkDerivation, base, heap, QuickCheck }:
      mkDerivation {
@@ -117850,9 +119637,9 @@ self: {
      }) {};
 
   "megaparsec" = callPackage
-    ({ mkDerivation, base, bytestring, containers, deepseq, exceptions
-     , hspec, hspec-expectations, mtl, QuickCheck, scientific, text
-     , transformers
+    ({ mkDerivation, base, bytestring, containers, criterion, deepseq
+     , exceptions, hspec, hspec-expectations, mtl, QuickCheck
+     , scientific, text, transformers, weigh
      }:
      mkDerivation {
        pname = "megaparsec";
@@ -117866,6 +119653,7 @@ self: {
          base bytestring containers exceptions hspec hspec-expectations mtl
          QuickCheck scientific text transformers
        ];
+       benchmarkHaskellDepends = [ base criterion deepseq weigh ];
        homepage = "https://github.com/mrkkrp/megaparsec";
        description = "Monadic parser combinators";
        license = stdenv.lib.licenses.bsd2;
@@ -117972,7 +119760,7 @@ self: {
      }) {};
 
   "memcache" = callPackage
-    ({ mkDerivation, base, binary, blaze-builder, bytestring
+    ({ mkDerivation, base, binary, blaze-builder, bytestring, criterion
      , data-default-class, hashable, network, resource-pool, time
      , vector
      }:
@@ -117987,6 +119775,7 @@ self: {
        testHaskellDepends = [
          base binary blaze-builder bytestring network
        ];
+       benchmarkHaskellDepends = [ base bytestring criterion ];
        homepage = "https://github.com/dterei/memcache-hs";
        description = "A memcached client library";
        license = stdenv.lib.licenses.bsd3;
@@ -118001,6 +119790,8 @@ self: {
        pname = "memcache-conduit";
        version = "0.0.3";
        sha256 = "f28e89dcbf1329dec98d67ce055a3eef12bc8c4ef9afeaf3c8adf10db5f632f8";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [
          attoparsec attoparsec-binary base bytestring conduit conduit-extra
          memcache-haskell mtl network resourcet split
@@ -118018,6 +119809,8 @@ self: {
        pname = "memcache-haskell";
        version = "0.0.10.1";
        sha256 = "4c1b7d9c5d12a4ae24ea73ace9489232831bb15b1d8e0d2bb53e926f53b16e48";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [
          attoparsec base bytestring hashable network split transformers
        ];
@@ -118848,19 +120641,22 @@ self: {
      }) {};
 
   "midi-simple" = callPackage
-    ({ mkDerivation, attoparsec, base, bytestring, generic-random
-     , hspec, hspec-attoparsec, QuickCheck, tasty, tasty-hspec
-     , tasty-quickcheck
+    ({ mkDerivation, attoparsec, base, bytestring, criterion
+     , generic-random, hspec, hspec-attoparsec, QuickCheck, tasty
+     , tasty-hspec, tasty-quickcheck
      }:
      mkDerivation {
        pname = "midi-simple";
        version = "0.1.0.0";
        sha256 = "f680eed206f3623e01817794b9f7dd9a7c8fb6aa935648a3a5cb24119621849a";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [ attoparsec base bytestring ];
        testHaskellDepends = [
          attoparsec base bytestring generic-random hspec hspec-attoparsec
          QuickCheck tasty tasty-hspec tasty-quickcheck
        ];
+       benchmarkHaskellDepends = [ base bytestring criterion ];
        homepage = "https://github.com/tsahyt/midi-simple#readme";
        description = "A simple and fast library for working with MIDI messages";
        license = stdenv.lib.licenses.lgpl3;
@@ -118969,8 +120765,8 @@ self: {
      }:
      mkDerivation {
        pname = "mighttpd2";
-       version = "3.3.5";
-       sha256 = "89e4e32bab7820b01e2b6e45cf70e406af1639aaf8534f769225efd89cc3730a";
+       version = "3.4.1";
+       sha256 = "0f24c72662be4a0e3d75956fff53899216e29ac7eb29dae771c7e4eb77bdd8d5";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -119443,12 +121239,13 @@ self: {
      }) {};
 
   "minisat-solver" = callPackage
-    ({ mkDerivation, base, containers, transformers }:
+    ({ mkDerivation, base, containers, easyrender, transformers }:
      mkDerivation {
        pname = "minisat-solver";
        version = "0.1";
        sha256 = "c12098dee034afb98b31ce7ac346398b93a3537c11e30e7573d25160120fd37d";
        libraryHaskellDepends = [ base containers transformers ];
+       benchmarkHaskellDepends = [ base containers easyrender ];
        homepage = "http://www.mathstat.dal.ca/~selinger/minisat-solver/";
        description = "High-level Haskell bindings for the MiniSat SAT solver";
        license = stdenv.lib.licenses.mit;
@@ -119715,6 +121512,8 @@ self: {
        pname = "mmap";
        version = "0.5.9";
        sha256 = "58fcbb04e1cb8e7c36c05823b02dce2faaa989c53d745a7f36192de2fc98b5f8";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [ base bytestring ];
        description = "Memory mapped files for POSIX and Windows";
        license = stdenv.lib.licenses.bsd3;
@@ -120049,8 +121848,8 @@ self: {
      }:
      mkDerivation {
        pname = "moesocks";
-       version = "1.0.0.41";
-       sha256 = "85905960363cb617541b0f9ec3a93e73a9b9cd761acdf37174864da865c5cb95";
+       version = "1.0.0.42";
+       sha256 = "892870056d66fecae4db37a780a0dcc6c9cb6cae281c2883a20378efc83b019d";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -120504,7 +122303,7 @@ self: {
      }) {};
 
   "monad-logger-prefix" = callPackage
-    ({ mkDerivation, base, doctest, exceptions, Glob, hspec
+    ({ mkDerivation, base, criterion, doctest, exceptions, Glob, hspec
      , monad-control, monad-logger, mtl, QuickCheck, resourcet, text
      , transformers, transformers-base
      }:
@@ -120517,6 +122316,7 @@ self: {
          transformers transformers-base
        ];
        testHaskellDepends = [ base doctest Glob hspec QuickCheck ];
+       benchmarkHaskellDepends = [ base criterion monad-logger ];
        homepage = "https://github.com/sellerlabs/monad-logger-prefix#readme";
        description = "Add prefixes to your monad-logger output";
        license = stdenv.lib.licenses.asl20;
@@ -120585,7 +122385,7 @@ self: {
      }) {};
 
   "monad-memo" = callPackage
-    ({ mkDerivation, array, base, containers, mtl, primitive
+    ({ mkDerivation, array, base, containers, criterion, mtl, primitive
      , QuickCheck, random, test-framework, test-framework-quickcheck2
      , transformers, vector
      }:
@@ -120600,6 +122400,9 @@ self: {
          array base containers mtl primitive QuickCheck random
          test-framework test-framework-quickcheck2 transformers vector
        ];
+       benchmarkHaskellDepends = [
+         array base containers criterion mtl primitive transformers vector
+       ];
        homepage = "https://github.com/EduardSergeev/monad-memo";
        description = "Memoization monad transformer";
        license = stdenv.lib.licenses.bsd3;
@@ -121375,7 +123178,7 @@ self: {
 
   "mongoDB" = callPackage
     ({ mkDerivation, array, base, base16-bytestring, base64-bytestring
-     , binary, bson, bytestring, containers, cryptohash
+     , binary, bson, bytestring, containers, criterion, cryptohash
      , data-default-class, hashtables, hspec, lifted-base, monad-control
      , mtl, network, nonce, old-locale, parsec, random, random-shuffle
      , text, time, tls, transformers-base
@@ -121391,6 +123194,12 @@ self: {
          random-shuffle text tls transformers-base
        ];
        testHaskellDepends = [ base hspec mtl old-locale text time ];
+       benchmarkHaskellDepends = [
+         array base base16-bytestring base64-bytestring binary bson
+         bytestring containers criterion cryptohash hashtables lifted-base
+         monad-control mtl network nonce parsec random random-shuffle text
+         transformers-base
+       ];
        homepage = "https://github.com/mongodb-haskell/mongodb";
        description = "Driver (client) for MongoDB, a free, scalable, fast, document DBMS";
        license = stdenv.lib.licenses.asl20;
@@ -121458,10 +123267,8 @@ self: {
      }:
      mkDerivation {
        pname = "monky";
-       version = "2.1.0.0";
-       sha256 = "044ea050aa7be67209652fb1a8cca97ad017a2effcdd41432c959a1b840439d0";
-       revision = "1";
-       editedCabalFile = "8dac5d11177a4374041712a519d50cb6b1fd41fffe201e77eff44f103257c446";
+       version = "2.1.3.0";
+       sha256 = "a80fee91a2ed4462d2f1688b59cdb13cb0aa0728205ce22592b0b0ad3b72736a";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -121490,14 +123297,15 @@ self: {
      }) {};
 
   "mono-traversable" = callPackage
-    ({ mkDerivation, base, bytestring, containers, foldl, hashable
-     , hspec, HUnit, QuickCheck, semigroups, split, text, transformers
-     , unordered-containers, vector, vector-algorithms
+    ({ mkDerivation, base, bytestring, containers, criterion, foldl
+     , hashable, hspec, HUnit, mwc-random, QuickCheck, semigroups, split
+     , text, transformers, unordered-containers, vector
+     , vector-algorithms
      }:
      mkDerivation {
        pname = "mono-traversable";
-       version = "1.0.1.2";
-       sha256 = "1875b0281b2956530c33d20cfdbc1d0e1d46d09d1f9623cff19c31b7a4d296ea";
+       version = "1.0.1.3";
+       sha256 = "2861eca0d69c759b02cb7e9669b7a3f8a6b0ede2d96984cba295b69bc9c70a72";
        libraryHaskellDepends = [
          base bytestring containers hashable split text transformers
          unordered-containers vector vector-algorithms
@@ -121506,6 +123314,7 @@ self: {
          base bytestring containers foldl hspec HUnit QuickCheck semigroups
          text transformers unordered-containers vector
        ];
+       benchmarkHaskellDepends = [ base criterion mwc-random vector ];
        homepage = "https://github.com/snoyberg/mono-traversable";
        description = "Type classes for mapping, folding, and traversing monomorphic containers";
        license = stdenv.lib.licenses.mit;
@@ -121529,6 +123338,18 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "mono-traversable-wrapper" = callPackage
+    ({ mkDerivation, base, mono-traversable }:
+     mkDerivation {
+       pname = "mono-traversable-wrapper";
+       version = "0.1.0.1";
+       sha256 = "4d441c3ca20933060c7c60dc83070ecb0059406c3c376680d76e2320390664cb";
+       libraryHaskellDepends = [ base mono-traversable ];
+       homepage = "https://github.com/oisdk/mono-traversable-wrapper";
+       description = "Wrapper providing Foldable instance for MonoFoldables";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "monoid-absorbing" = callPackage
     ({ mkDerivation, base, mtl }:
      mkDerivation {
@@ -121542,12 +123363,14 @@ self: {
      }) {};
 
   "monoid-extras" = callPackage
-    ({ mkDerivation, base, groups, semigroupoids, semigroups }:
+    ({ mkDerivation, base, criterion, groups, semigroupoids, semigroups
+     }:
      mkDerivation {
        pname = "monoid-extras";
        version = "0.4.2";
        sha256 = "13ff4e055c9656a3e599567cbc4a46ef8617c05534de46909a4239696e34281f";
        libraryHaskellDepends = [ base groups semigroupoids semigroups ];
+       benchmarkHaskellDepends = [ base criterion ];
        description = "Various extra monoid-related definitions and utilities";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -121882,16 +123705,16 @@ self: {
      }) {};
 
   "morte" = callPackage
-    ({ mkDerivation, alex, array, base, binary, containers, deepseq
-     , Earley, http-client, http-client-tls, microlens, microlens-mtl
-     , mtl, optparse-applicative, pipes, QuickCheck, system-fileio
-     , system-filepath, tasty, tasty-hunit, tasty-quickcheck, text
-     , text-format, transformers
+    ({ mkDerivation, alex, array, base, binary, code-page, containers
+     , criterion, deepseq, Earley, http-client, http-client-tls
+     , microlens, microlens-mtl, mtl, optparse-applicative, pipes
+     , QuickCheck, system-fileio, system-filepath, tasty, tasty-hunit
+     , tasty-quickcheck, text, text-format, transformers
      }:
      mkDerivation {
        pname = "morte";
-       version = "1.6.5";
-       sha256 = "49d292a44d25fe4372856da87380165e1da317c6fafc8bb0d047bbce867787c9";
+       version = "1.6.6";
+       sha256 = "c933dfa0cec4ddb0c5f552ccb70f3ac0f443b70d6bebc5a858d69c5ba8a4ce25";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -121900,11 +123723,14 @@ self: {
          system-filepath text text-format transformers
        ];
        libraryToolDepends = [ alex ];
-       executableHaskellDepends = [ base optparse-applicative text ];
+       executableHaskellDepends = [
+         base code-page optparse-applicative text text-format
+       ];
        testHaskellDepends = [
          base mtl QuickCheck system-filepath tasty tasty-hunit
          tasty-quickcheck text transformers
        ];
+       benchmarkHaskellDepends = [ base criterion system-filepath text ];
        description = "A bare-bones calculus of constructions";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -122551,6 +124377,30 @@ self: {
        license = "GPL";
      }) {};
 
+  "mud" = callPackage
+    ({ mkDerivation, base, directory, filepath, free, hspec, mtl
+     , optparse-applicative, parsec, process, QuickCheck, time, unix
+     }:
+     mkDerivation {
+       pname = "mud";
+       version = "0.1.0.0";
+       sha256 = "4043d1226482acf5bd9fd6797b95f24494a3f1b8612bbe4a469dfa0819023f47";
+       revision = "1";
+       editedCabalFile = "6d62d56fc07cd9b413ccbdddbcc517969acf89b1906b2254f0d0fb7c3b85203d";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base directory filepath free mtl optparse-applicative parsec
+         process time unix
+       ];
+       executableHaskellDepends = [ base mtl ];
+       testHaskellDepends = [
+         base directory free hspec mtl QuickCheck time unix
+       ];
+       description = "Multi-version deployer for web applications";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "mudbath" = callPackage
     ({ mkDerivation, aeson, base, bytestring, cryptohash, directory
      , github-types, http-conduit, http-types, process, random
@@ -122701,6 +124551,8 @@ self: {
        pname = "multiarg";
        version = "0.30.0.10";
        sha256 = "c9fa623a8e06d62addc2b7ad5102ceac3a6f0db6a67afbc8e693d0d0aec417a1";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [
          base QuickCheck tasty tasty-quickcheck tasty-th
@@ -122983,6 +124835,8 @@ self: {
        sha256 = "609650cbbfd102c775b44be3fd7bb4f6732127e64b21dd45ea1af057c5ffb8a6";
        revision = "1";
        editedCabalFile = "a5bd571eb919e74f8ba5313ffca801dce8c1fe1dd2c6699eadab39b0e37ae13b";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [
          base monad-control mtl tagged transformers transformers-base
        ];
@@ -123501,7 +125355,7 @@ self: {
      }) {};
 
   "mutable-containers" = callPackage
-    ({ mkDerivation, base, containers, ghc-prim, hspec
+    ({ mkDerivation, base, containers, criterion, ghc-prim, hspec
      , mono-traversable, primitive, QuickCheck, vector
      }:
      mkDerivation {
@@ -123514,6 +125368,7 @@ self: {
        testHaskellDepends = [
          base containers hspec primitive QuickCheck vector
        ];
+       benchmarkHaskellDepends = [ base containers criterion ];
        homepage = "https://github.com/snoyberg/mono-traversable";
        description = "Abstactions and concrete implementations of mutable containers";
        license = stdenv.lib.licenses.mit;
@@ -123887,8 +125742,8 @@ self: {
      }:
      mkDerivation {
        pname = "mysql-simple";
-       version = "0.4.0.0";
-       sha256 = "0f5ce026b8d45016dc90a543b394a72dae25aa115bfa5e7ae0095a516bb9f04d";
+       version = "0.4.0.1";
+       sha256 = "1b559d28555c88c6ab016b82d6cdd78357e9479d45bfd6cc1b3a88643c4cbf2d";
        libraryHaskellDepends = [
          attoparsec base base16-bytestring blaze-builder blaze-textual
          bytestring mysql old-locale pcre-light text time
@@ -124259,8 +126114,9 @@ self: {
      }) {inherit (pkgs) nanomsg;};
 
   "nanomsg-haskell" = callPackage
-    ({ mkDerivation, base, binary, bytestring, nanomsg, QuickCheck
-     , test-framework, test-framework-quickcheck2, test-framework-th
+    ({ mkDerivation, base, binary, bytestring, criterion, nanomsg
+     , QuickCheck, test-framework, test-framework-quickcheck2
+     , test-framework-th, zeromq4-haskell
      }:
      mkDerivation {
        pname = "nanomsg-haskell";
@@ -124272,6 +126128,9 @@ self: {
          base binary bytestring QuickCheck test-framework
          test-framework-quickcheck2 test-framework-th
        ];
+       benchmarkHaskellDepends = [
+         base bytestring criterion zeromq4-haskell
+       ];
        homepage = "https://github.com/ivarnymoen/nanomsg-haskell";
        description = "Bindings to the nanomsg library";
        license = stdenv.lib.licenses.mit;
@@ -124312,6 +126171,8 @@ self: {
        sha256 = "22e31d227770e55123aadb2750c35895f4d635327c7be1ef1ea2655d86180f5d";
        revision = "1";
        editedCabalFile = "ab822c8c3baab11820f06e9c34ba59c97789625020fabf476338cc17b2e74853";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [ base bytestring containers text vector ];
        librarySystemDepends = [ freeglut GLEW mesa ];
        libraryToolDepends = [ c2hs ];
@@ -124859,6 +126720,8 @@ self: {
        pname = "nested-routes";
        version = "7.2.2";
        sha256 = "f93d56283b2855aee02daac7ecd693a2b9f7e99a5da33211694a5a5746c35cd9";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [
          attoparsec base bytestring composition-extra errors exceptions
          hashable hashtables mtl poly-arity pred-set pred-trie regex-compat
@@ -124974,6 +126837,11 @@ self: {
          process QuickCheck random syb test-framework test-framework-hunit
          test-framework-quickcheck2 test-framework-th
        ];
+       benchmarkHaskellDepends = [
+         ansi-wl-pprint base bimap binary binary-strict bytestring
+         containers fgl HList hslogger mtl multiset network parsec process
+         random syb
+       ];
        homepage = "http://frenetic-lang.org";
        description = "The NetCore compiler and runtime system for OpenFlow networks";
        license = stdenv.lib.licenses.bsd3;
@@ -125034,8 +126902,8 @@ self: {
      }:
      mkDerivation {
        pname = "netlink";
-       version = "1.0.0.4";
-       sha256 = "94061ae1809a11d564ae3a45972c3a49dfbb01054a937cc4d5a2805963260a6d";
+       version = "1.1.0.0";
+       sha256 = "48f59a7822b2e3dab8baed1d1cd3a3dca1e7744a82f9078c71ec1ce3f6ddf083";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -125071,8 +126939,8 @@ self: {
 
   "netpbm" = callPackage
     ({ mkDerivation, attoparsec, attoparsec-binary, base, bytestring
-     , hspec, HUnit, storable-record, unordered-containers, vector
-     , vector-th-unbox
+     , criterion, hspec, HUnit, storable-record, unordered-containers
+     , vector, vector-th-unbox
      }:
      mkDerivation {
        pname = "netpbm";
@@ -125085,6 +126953,7 @@ self: {
          unordered-containers vector vector-th-unbox
        ];
        testHaskellDepends = [ base bytestring hspec HUnit vector ];
+       benchmarkHaskellDepends = [ base bytestring criterion ];
        homepage = "https://github.com/nh2/haskell-netpbm";
        description = "Loading PBM, PGM, PPM image files";
        license = stdenv.lib.licenses.mit;
@@ -125255,6 +127124,8 @@ self: {
        pname = "netwire-input-glfw";
        version = "0.0.6";
        sha256 = "dd095cf915005ca6d72fa75a1ea7d890e2cdde2b8f16f45a994e413e97d9dd06";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [
          base containers GLFW-b mtl netwire-input stm
        ];
@@ -125328,6 +127199,8 @@ self: {
        pname = "network-address";
        version = "0.2.0";
        sha256 = "614517e9712b1320ca86a1e77535e6cfb426850ca3e62e49f0eb776543e8e65f";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [ base Cabal ];
        testHaskellDepends = [
          base Cabal QuickCheck test-framework test-framework-quickcheck2
@@ -125872,6 +127745,8 @@ self: {
        pname = "network-service";
        version = "0.1.0.0";
        sha256 = "e41ea01bb2705fde2a862f487ee5e90deeb74ec2ec9282adcc48ba2322b840cb";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [
          base base64-bytestring bytestring network
        ];
@@ -126002,6 +127877,23 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "network-transport_0_5_1" = callPackage
+    ({ mkDerivation, base, binary, bytestring, deepseq, hashable
+     , transformers
+     }:
+     mkDerivation {
+       pname = "network-transport";
+       version = "0.5.1";
+       sha256 = "29f6e730f7f29990a657dd3750d08eb500557e51a0dd9b60798bbce0f48c8b46";
+       libraryHaskellDepends = [
+         base binary bytestring deepseq hashable transformers
+       ];
+       homepage = "http://haskell-distributed.github.com";
+       description = "Network abstraction layer";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "network-transport-amqp" = callPackage
     ({ mkDerivation, amqp, async, base, bytestring, cereal, containers
      , exceptions, lens-family, lens-family-th, network-transport
@@ -126099,14 +127991,16 @@ self: {
 
   "network-transport-zeromq" = callPackage
     ({ mkDerivation, async, base, binary, bytestring, containers
-     , data-accessor, exceptions, network-transport
-     , network-transport-tests, random, semigroups, stm, stm-chans
-     , tasty, tasty-hunit, transformers, zeromq4-haskell
+     , criterion, data-accessor, distributed-process, exceptions
+     , network-transport, network-transport-tests, random, semigroups
+     , stm, stm-chans, tasty, tasty-hunit, transformers, zeromq4-haskell
      }:
      mkDerivation {
        pname = "network-transport-zeromq";
        version = "0.2.1.1";
        sha256 = "93b56e1a2b337c24cc899874d23eed335ff640c5c1e143b69584c4d71f0cca35";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [
          async base binary bytestring containers data-accessor exceptions
          network-transport random semigroups stm stm-chans transformers
@@ -126116,6 +128010,9 @@ self: {
          base network-transport network-transport-tests tasty tasty-hunit
          zeromq4-haskell
        ];
+       benchmarkHaskellDepends = [
+         base binary bytestring criterion distributed-process
+       ];
        homepage = "https://github.com/tweag/network-transport-zeromq";
        description = "ZeroMQ backend for network-transport";
        license = stdenv.lib.licenses.bsd3;
@@ -126185,6 +128082,8 @@ self: {
        pname = "network-websocket";
        version = "0.3";
        sha256 = "75cd59bd534b39db084c73843c6d29c33e8d3557c440ba19ad24b4252acd7814";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [ base haskell98 network webserver ];
        homepage = "http://github.com/michaelmelanson/network-websocket";
        description = "WebSocket library";
@@ -126211,9 +128110,9 @@ self: {
      }) {};
 
   "neural" = callPackage
-    ({ mkDerivation, ad, array, attoparsec, base, bytestring, deepseq
-     , directory, doctest, filepath, ghc-typelits-natnormalise, Glob
-     , hspec, JuicyPixels, kan-extensions, lens, monad-par
+    ({ mkDerivation, ad, array, attoparsec, base, bytestring, criterion
+     , deepseq, directory, doctest, filepath, ghc-typelits-natnormalise
+     , Glob, hspec, JuicyPixels, kan-extensions, lens, monad-par
      , monad-par-extras, MonadRandom, mtl, parallel, pipes
      , pipes-bytestring, pipes-safe, pipes-zlib, profunctors, reflection
      , STMonadTrans, text, transformers, typelits-witnesses, vector
@@ -126235,6 +128134,7 @@ self: {
          array attoparsec base JuicyPixels MonadRandom pipes pipes-zlib text
        ];
        testHaskellDepends = [ base doctest Glob hspec MonadRandom ];
+       benchmarkHaskellDepends = [ base criterion ];
        homepage = "https://github.com/brunjlar/neural";
        description = "Neural Networks in native Haskell";
        license = stdenv.lib.licenses.mit;
@@ -126461,6 +128361,25 @@ self: {
        pname = "nfc";
        version = "0.0.1";
        sha256 = "524f46e2ccaacf26cd6058fbd7b1e9a27aa62a3338154d9209aa3b49d011d731";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [ base bytestring ];
+       librarySystemDepends = [ nfc ];
+       libraryToolDepends = [ c2hs ];
+       homepage = "https://github.com/centromere/nfc#readme";
+       description = "libnfc bindings";
+       license = stdenv.lib.licenses.publicDomain;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {nfc = null;};
+
+  "nfc_0_1_0" = callPackage
+    ({ mkDerivation, base, bytestring, c2hs, nfc }:
+     mkDerivation {
+       pname = "nfc";
+       version = "0.1.0";
+       sha256 = "63b8f1d434c9e20c1df08ab532c4e098871b0788f9d1b8a5ed84bce1abb01167";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [ base bytestring ];
        librarySystemDepends = [ nfc ];
        libraryToolDepends = [ c2hs ];
@@ -127022,6 +128941,8 @@ self: {
        pname = "nonlinear-optimization-ad";
        version = "0.2.2";
        sha256 = "b263aa4b690d8e62917c2090f0549f341858795514b35015a5b27344df03481d";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [
          ad base nonlinear-optimization primitive reflection vector
        ];
@@ -127059,8 +128980,9 @@ self: {
      }) {};
 
   "normalization-insensitive" = callPackage
-    ({ mkDerivation, base, bytestring, deepseq, hashable, HUnit
-     , test-framework, test-framework-hunit, text, unicode-transforms
+    ({ mkDerivation, base, bytestring, criterion, deepseq, hashable
+     , HUnit, test-framework, test-framework-hunit, text
+     , unicode-transforms
      }:
      mkDerivation {
        pname = "normalization-insensitive";
@@ -127073,6 +128995,7 @@ self: {
          base bytestring hashable HUnit test-framework test-framework-hunit
          text
        ];
+       benchmarkHaskellDepends = [ base bytestring criterion deepseq ];
        homepage = "https://github.com/ppelleti/normalization-insensitive";
        description = "Normalization insensitive string comparison";
        license = stdenv.lib.licenses.bsd3;
@@ -127266,8 +129189,8 @@ self: {
      }:
      mkDerivation {
        pname = "nsis";
-       version = "0.3";
-       sha256 = "03af564c2edb8f0e0d291403d3b452c496ef3e2ab33d247b73eddfdec08df570";
+       version = "0.3.1";
+       sha256 = "d747e231d8f22c810e76a1269af4bd778638da7deca3ad3480415fedb5f05c92";
        libraryHaskellDepends = [ base transformers uniplate ];
        testHaskellDepends = [
          base directory process transformers uniplate
@@ -127426,7 +129349,7 @@ self: {
      }) {};
 
   "number-length" = callPackage
-    ({ mkDerivation, base, HUnit, QuickCheck, test-framework
+    ({ mkDerivation, base, criterion, HUnit, QuickCheck, test-framework
      , test-framework-hunit, test-framework-quickcheck2
      }:
      mkDerivation {
@@ -127438,6 +129361,7 @@ self: {
          base HUnit QuickCheck test-framework test-framework-hunit
          test-framework-quickcheck2
        ];
+       benchmarkHaskellDepends = [ base criterion ];
        homepage = "https://github.com/trskop/number-length";
        description = "Number of digits in a number in decimal and hexadecimal representation";
        license = stdenv.lib.licenses.bsd3;
@@ -127486,8 +129410,8 @@ self: {
      }) {};
 
   "numerals" = callPackage
-    ({ mkDerivation, base, containers, fingertree, HUnit, integer-gmp
-     , QuickCheck, test-framework, test-framework-hunit
+    ({ mkDerivation, base, containers, criterion, fingertree, HUnit
+     , integer-gmp, QuickCheck, test-framework, test-framework-hunit
      , test-framework-quickcheck2, text
      }:
      mkDerivation {
@@ -127501,6 +129425,7 @@ self: {
          base HUnit QuickCheck test-framework test-framework-hunit
          test-framework-quickcheck2 text
        ];
+       benchmarkHaskellDepends = [ base criterion ];
        homepage = "https://github.com/roelvandijk/numerals";
        description = "Convert numbers to number words";
        license = stdenv.lib.licenses.bsd3;
@@ -127563,6 +129488,8 @@ self: {
        sha256 = "5327a9ffcc5997a062d2a9ea405130741114a0c6fe440a8e5b6d6c35fe56d8c4";
        revision = "1";
        editedCabalFile = "acbf128b14ff1177ed767ec9ebb89b1c3c0e998d5d031fdd0e4bc64ebc6bffe2";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [
          array base containers deepseq non-negative parsec QuickCheck random
          storable-record utility-ht
@@ -127983,6 +129910,8 @@ self: {
        pname = "oberon0";
        version = "0.0.2";
        sha256 = "1b96e40cacb6a00856d55d7059fbefe5aa018a15bf9002189db2868cef7d1e71";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [
          array AspectAG base containers ghc-prim HList mtl murder
          template-haskell transformers uu-parsinglib uulib
@@ -128293,6 +130222,8 @@ self: {
        pname = "oidc-client";
        version = "0.3.0.0";
        sha256 = "fcc89cd54d2493bfabbb4e5d76dd77c0f6dc3005207566cc5cf89272979daf4c";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [
          aeson attoparsec base bytestring exceptions http-client
          http-client-tls jose-jwt network network-uri text time tls
@@ -128661,6 +130592,8 @@ self: {
        pname = "opaleye";
        version = "0.5.3.0";
        sha256 = "6ceda758d97c5b0b547182fb2c7a0379f0f5843e76f4bbd0baa81a171a763d73";
+       revision = "1";
+       editedCabalFile = "0188a5df6e42350cafb8771ed56b190451291bc04767a451c0aba76582bbed28";
        libraryHaskellDepends = [
          aeson attoparsec base base16-bytestring bytestring case-insensitive
          contravariant postgresql-simple pretty product-profunctors
@@ -128728,8 +130661,8 @@ self: {
      }:
      mkDerivation {
        pname = "opaleye-trans";
-       version = "0.3.4";
-       sha256 = "84925620c5d596657a3d2467e0fbe297fad2876362da7f063d6b6034910d6e60";
+       version = "0.3.5";
+       sha256 = "9360dd3721ea49d3b738bff65ab518bcf4365d10282ffb3eea05242022ec48fd";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -128820,8 +130753,8 @@ self: {
      }) {};
 
   "open-typerep" = callPackage
-    ({ mkDerivation, base, constraints, mtl, syntactic, tagged
-     , template-haskell
+    ({ mkDerivation, base, constraints, criterion, mtl, syntactic
+     , tagged, template-haskell
      }:
      mkDerivation {
        pname = "open-typerep";
@@ -128831,6 +130764,7 @@ self: {
          base constraints mtl syntactic tagged template-haskell
        ];
        testHaskellDepends = [ base syntactic ];
+       benchmarkHaskellDepends = [ base criterion ];
        homepage = "https://github.com/emilaxelsson/open-typerep";
        description = "Open type representations and dynamic types";
        license = stdenv.lib.licenses.bsd3;
@@ -129016,6 +130950,8 @@ self: {
        pname = "openid";
        version = "0.2.0.2";
        sha256 = "5a33c21ca3e2b652bcea93bd32a96dbeabd336260d7617337331693a3e140d66";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [
          base bytestring containers HsOpenSSL HTTP monadLib network time xml
        ];
@@ -129602,8 +131538,8 @@ self: {
      }) {};
 
   "optimal-blocks" = callPackage
-    ({ mkDerivation, base, bytestring, bytestring-arbitrary, cryptohash
-     , deepseq, hex, QuickCheck, vector
+    ({ mkDerivation, base, bytestring, bytestring-arbitrary, criterion
+     , cryptohash, deepseq, hex, QuickCheck, vector
      }:
      mkDerivation {
        pname = "optimal-blocks";
@@ -129618,6 +131554,9 @@ self: {
        testHaskellDepends = [
          base bytestring bytestring-arbitrary deepseq QuickCheck vector
        ];
+       benchmarkHaskellDepends = [
+         base bytestring criterion deepseq vector
+       ];
        homepage = "https://github.com/tsuraan/optimal-blocks";
        description = "Optimal Block boundary determination for rsync-like behaviours";
        license = stdenv.lib.licenses.bsd3;
@@ -129925,13 +131864,18 @@ self: {
      }) {};
 
   "order-statistic-tree" = callPackage
-    ({ mkDerivation, base, tasty, tasty-hunit, tasty-quickcheck }:
+    ({ mkDerivation, base, containers, criterion, deepseq, random
+     , tasty, tasty-hunit, tasty-quickcheck
+     }:
      mkDerivation {
        pname = "order-statistic-tree";
        version = "0.1.1.0";
        sha256 = "0069ae9ad6ed98ca367026e9c1d6be4c553e6ec451aff0f658532e0ed6a692bd";
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base tasty tasty-hunit tasty-quickcheck ];
+       benchmarkHaskellDepends = [
+         base containers criterion deepseq random
+       ];
        description = "Order statistic trees based on weight-balanced trees";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -130340,13 +132284,14 @@ self: {
      }) {};
 
   "overture" = callPackage
-    ({ mkDerivation, base, doctest }:
+    ({ mkDerivation, base, criterion, doctest }:
      mkDerivation {
        pname = "overture";
        version = "0.0.5";
        sha256 = "fcdbff55a72636cfb27694ea6731cd6233fa57af937de08ee34afa80a78a6957";
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base doctest ];
+       benchmarkHaskellDepends = [ base criterion ];
        description = "An alternative to some of the Prelude";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -130439,9 +132384,9 @@ self: {
      }) {};
 
   "packed-dawg" = callPackage
-    ({ mkDerivation, base, binary, deepseq, HUnit, mtl, QuickCheck
-     , tasty, tasty-hunit, tasty-quickcheck, unordered-containers
-     , vector, vector-binary-instances
+    ({ mkDerivation, base, binary, criterion, deepseq, HUnit, mtl
+     , QuickCheck, tasty, tasty-hunit, tasty-quickcheck
+     , unordered-containers, vector, vector-binary-instances
      }:
      mkDerivation {
        pname = "packed-dawg";
@@ -130456,6 +132401,10 @@ self: {
          tasty-quickcheck unordered-containers vector
          vector-binary-instances
        ];
+       benchmarkHaskellDepends = [
+         base binary criterion deepseq mtl unordered-containers vector
+         vector-binary-instances
+       ];
        description = "Generation and traversal of highly compressed directed acyclic word graphs";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -130735,15 +132684,15 @@ self: {
   "pandoc" = callPackage
     ({ mkDerivation, aeson, ansi-terminal, array, base
      , base64-bytestring, binary, blaze-html, blaze-markup, bytestring
-     , cmark, containers, data-default, deepseq, Diff, directory
-     , doctemplates, executable-path, extensible-exceptions, filemanip
-     , filepath, ghc-prim, haddock-library, hslua, HTTP, http-client
-     , http-client-tls, http-types, HUnit, JuicyPixels, mtl, network
-     , network-uri, old-time, pandoc-types, parsec, process, QuickCheck
-     , random, scientific, SHA, skylighting, syb, tagsoup, temporary
-     , test-framework, test-framework-hunit, test-framework-quickcheck2
-     , texmath, text, time, unix, unordered-containers, vector, xml
-     , yaml, zip-archive, zlib
+     , cmark, containers, criterion, data-default, deepseq, Diff
+     , directory, doctemplates, executable-path, extensible-exceptions
+     , filemanip, filepath, ghc-prim, haddock-library, hslua, HTTP
+     , http-client, http-client-tls, http-types, HUnit, JuicyPixels, mtl
+     , network, network-uri, old-time, pandoc-types, parsec, process
+     , QuickCheck, random, scientific, SHA, skylighting, syb, tagsoup
+     , temporary, test-framework, test-framework-hunit
+     , test-framework-quickcheck2, texmath, text, time, unix
+     , unordered-containers, vector, xml, yaml, zip-archive, zlib
      }:
      mkDerivation {
        pname = "pandoc";
@@ -130773,6 +132722,7 @@ self: {
          skylighting syb test-framework test-framework-hunit
          test-framework-quickcheck2 text zip-archive
        ];
+       benchmarkHaskellDepends = [ base criterion syb ];
        doCheck = false;
        homepage = "http://pandoc.org";
        description = "Conversion between markup formats";
@@ -130838,16 +132788,14 @@ self: {
      }:
      mkDerivation {
        pname = "pandoc-crossref";
-       version = "0.2.4.2";
-       sha256 = "fe1121698b9b9804f8ccc43cbbb2e77e40948caa543b42e129bf4ce872a7cd3f";
-       revision = "1";
-       editedCabalFile = "32a7466f513eaacbe70d359813e5f9fbb6f3492f23019e6588d48bd58ed994c2";
+       version = "0.2.5.0";
+       sha256 = "d4d93bbe448e2cf187a0b7bcc605d0445e28021e4e31bfef890b93bee2b28491";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
          base containers data-accessor data-accessor-template
-         data-accessor-transformers data-default mtl pandoc pandoc-types
-         roman-numerals syb template-haskell utility-ht
+         data-accessor-transformers data-default directory filepath mtl
+         pandoc pandoc-types roman-numerals syb template-haskell utility-ht
        ];
        executableHaskellDepends = [ base pandoc pandoc-types ];
        testHaskellDepends = [
@@ -130902,8 +132850,8 @@ self: {
      }:
      mkDerivation {
        pname = "pandoc-include-code";
-       version = "0.1.0";
-       sha256 = "f6a14ba6e4d00a27aef573336d6da703a39d1788a5fe9a5d18f080c3486c935c";
+       version = "0.2.0";
+       sha256 = "0241672e57d3bc0a5fa6ae953cf98d6d702b36076d58eaa64490b5089f377b72";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -131618,6 +133566,8 @@ self: {
        sha256 = "3a14c02b9b8b7c72577eb90a8dd72de75d99192def87d7aa79545ee4d6e80645";
        revision = "1";
        editedCabalFile = "75eeeb51593fa2771c8dbc965ca09d830d62e08135870188a10446f842178bee";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [
          base containers extensible-exceptions random
        ];
@@ -132560,8 +134510,8 @@ self: {
     ({ mkDerivation, array, base, HUnit, split, tasty, tasty-hunit }:
      mkDerivation {
        pname = "pathfindingcore";
-       version = "1.2";
-       sha256 = "88990d5daa4beff64a134e11bfbeb81b4f67367ea0345c3c6c3697ead3e14b74";
+       version = "1.2.1";
+       sha256 = "d24f4f8af78e7588daf7fad74b9675facc4b367fc25df5e94dbc93407480dfe0";
        libraryHaskellDepends = [ array base split ];
        testHaskellDepends = [ array base HUnit tasty tasty-hunit ];
        homepage = "http://github.com/TheBizzle";
@@ -132578,6 +134528,8 @@ self: {
        pname = "pathtype";
        version = "0.8";
        sha256 = "14e3b9d03c222a061ffeb40ecc0940d980e25fddd70339d04ec86dbae6f27897";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [
          base deepseq directory old-time QuickCheck tagged time transformers
          utility-ht
@@ -133233,6 +135185,8 @@ self: {
        pname = "peggy";
        version = "0.3.2";
        sha256 = "de689373195748a273ba224adf5eae6dd91ffeee68e4c60ce6230596d521a8ce";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [
          base hashtables haskell-src-meta ListLike monad-control mtl
          template-haskell
@@ -133352,6 +135306,8 @@ self: {
        pname = "penny-lib";
        version = "0.22.0.0";
        sha256 = "272c53dc6cecc0353d4a6a53a9d8e6e57babdf485b5f9e1995f3a8b87b38c63b";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [
          action-permutations base binary bytestring cereal containers
          explicit-exception matchers multiarg ofx old-locale parsec prednote
@@ -133419,8 +135375,9 @@ self: {
      }) {};
 
   "perfecthash" = callPackage
-    ({ mkDerivation, array, base, bytestring, cmph, containers, hspec
-     , QuickCheck, time
+    ({ mkDerivation, array, base, bytestring, cmph, containers
+     , criterion, deepseq, hspec, QuickCheck, random, time
+     , unordered-containers
      }:
      mkDerivation {
        pname = "perfecthash";
@@ -133432,6 +135389,10 @@ self: {
        testHaskellDepends = [
          base bytestring cmph containers hspec QuickCheck
        ];
+       benchmarkHaskellDepends = [
+         array base bytestring containers criterion deepseq random
+         unordered-containers
+       ];
        description = "A perfect hashing library for mapping bytestrings to values";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -133795,6 +135756,8 @@ self: {
        pname = "persistent-odbc";
        version = "0.2.0.1";
        sha256 = "b751d48392f61d7b2f3b0cda149dedd04eb1a24912c2075c8640de7313956c67";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [
          aeson base bytestring conduit containers convertible HDBC HDBC-odbc
          monad-control monad-logger persistent persistent-template resourcet
@@ -133940,8 +135903,10 @@ self: {
      }:
      mkDerivation {
        pname = "persistent-sqlite";
-       version = "2.6";
-       sha256 = "628670f06cc533adb057649a253e9332aa2b3f69278af8fd32905e9bb00e0ffa";
+       version = "2.6.0.1";
+       sha256 = "84df1475478f8c4aa7790152c89ffca43a08a32cd933e4062cb219a023e4768c";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [
          aeson base bytestring conduit containers monad-control monad-logger
          old-locale persistent resource-pool resourcet text time
@@ -133984,8 +135949,8 @@ self: {
      }) {};
 
   "persistent-vector" = callPackage
-    ({ mkDerivation, base, deepseq, QuickCheck, test-framework
-     , test-framework-quickcheck2
+    ({ mkDerivation, base, containers, criterion, deepseq, QuickCheck
+     , test-framework, test-framework-quickcheck2
      }:
      mkDerivation {
        pname = "persistent-vector";
@@ -133995,6 +135960,7 @@ self: {
        testHaskellDepends = [
          base QuickCheck test-framework test-framework-quickcheck2
        ];
+       benchmarkHaskellDepends = [ base containers criterion deepseq ];
        homepage = "https://github.com/travitch/persistent-vector";
        description = "A persistent sequence based on array mapped tries";
        license = stdenv.lib.licenses.bsd3;
@@ -134320,12 +136286,13 @@ self: {
      }) {};
 
   "phantom-state" = callPackage
-    ({ mkDerivation, base, transformers }:
+    ({ mkDerivation, base, criterion, transformers, vector }:
      mkDerivation {
        pname = "phantom-state";
        version = "0.2.1.2";
        sha256 = "f978ef98e810e9a9e53f1479340ba7a28f80a64aba431322959cbf8c620c3811";
        libraryHaskellDepends = [ base transformers ];
+       benchmarkHaskellDepends = [ base criterion transformers vector ];
        description = "Phantom State Transformer. Like State Monad, but without values.";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -134721,6 +136688,8 @@ self: {
        sha256 = "130f67f8d018b4f988d434d37fa46d908d4d144ccbd005cfd2773a720ba25e4b";
        revision = "1";
        editedCabalFile = "e89ef8a03720c391eefc8a47c6f947a1b7f4a37762393f45923854e696fcb59b";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [
          base containers mtl parsec picosat pretty
        ];
@@ -134734,9 +136703,11 @@ self: {
      }) {};
 
   "picoparsec" = callPackage
-    ({ mkDerivation, array, base, bytestring, containers, deepseq
-     , monoid-subclasses, QuickCheck, quickcheck-instances
-     , quickcheck-unicode, scientific, tasty, tasty-quickcheck, text
+    ({ mkDerivation, array, attoparsec, base, bytestring
+     , case-insensitive, containers, criterion, deepseq, directory
+     , filepath, ghc-prim, hashable, http-types, monoid-subclasses
+     , parsec, QuickCheck, quickcheck-instances, quickcheck-unicode
+     , scientific, tasty, tasty-quickcheck, text, unordered-containers
      , vector
      }:
      mkDerivation {
@@ -134752,6 +136723,11 @@ self: {
          quickcheck-instances quickcheck-unicode scientific tasty
          tasty-quickcheck text vector
        ];
+       benchmarkHaskellDepends = [
+         array attoparsec base bytestring case-insensitive criterion deepseq
+         directory filepath ghc-prim hashable http-types monoid-subclasses
+         parsec scientific text unordered-containers vector
+       ];
        homepage = "https://bitbucket.org/blamario/picoparsec";
        description = "Fast combinator parsing for bytestrings and text";
        license = stdenv.lib.licenses.bsd3;
@@ -134885,6 +136861,8 @@ self: {
        pname = "pinchot";
        version = "0.24.0.0";
        sha256 = "b9769cdecb718c834d6fb04b62c08482f98cbb2a48c8a810ce83db96eff997e5";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [
          base containers Earley lens pretty-show semigroups template-haskell
          transformers
@@ -134923,8 +136901,9 @@ self: {
      }) {};
 
   "pipes" = callPackage
-    ({ mkDerivation, base, exceptions, mmorph, mtl, QuickCheck
-     , test-framework, test-framework-quickcheck2, transformers
+    ({ mkDerivation, base, criterion, exceptions, mmorph, mtl
+     , optparse-applicative, QuickCheck, test-framework
+     , test-framework-quickcheck2, transformers
      }:
      mkDerivation {
        pname = "pipes";
@@ -134937,6 +136916,9 @@ self: {
          base mtl QuickCheck test-framework test-framework-quickcheck2
          transformers
        ];
+       benchmarkHaskellDepends = [
+         base criterion mtl optparse-applicative transformers
+       ];
        description = "Compositional pipelines";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -135095,6 +137077,7 @@ self: {
          base bytestring bzlib directory hspec MonadRandom pipes
          pipes-bytestring pipes-safe QuickCheck random
        ];
+       benchmarkHaskellDepends = [ base ];
        homepage = "https://github.com/chemist/pipes-bzip";
        description = "Streaming compression/decompression via pipes";
        license = stdenv.lib.licenses.bsd3;
@@ -135107,6 +137090,8 @@ self: {
        pname = "pipes-cacophony";
        version = "0.4.1";
        sha256 = "bcf15287c4ae951ed12e83c41795dfe212b87cc9b93420dc74783b44e54c5360";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [ base bytestring cacophony memory pipes ];
        testHaskellDepends = [ base hlint ];
        homepage = "https://github.com/centromere/pipes-cacophony";
@@ -135198,6 +137183,8 @@ self: {
        pname = "pipes-cliff";
        version = "0.12.0.0";
        sha256 = "4fc4ce908899d20ed1ea8964cfe38bc547476d6901934cbb82e35e4ada5417c5";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [
          async base bytestring pipes pipes-safe process stm unix
        ];
@@ -135297,14 +137284,17 @@ self: {
      }) {};
 
   "pipes-extra" = callPackage
-    ({ mkDerivation, base, bytestring, HUnit, mtl, pipes-core
-     , test-framework, test-framework-hunit, test-framework-th-prime
-     , transformers
+    ({ mkDerivation, base, bytestring, conduit, criterion, enumerator
+     , HUnit, mtl, pipes-core, pipes-zlib, test-framework
+     , test-framework-hunit, test-framework-th-prime, transformers, zlib
+     , zlib-conduit, zlib-enum
      }:
      mkDerivation {
        pname = "pipes-extra";
        version = "0.2.0";
        sha256 = "d9ede8b4a837bdecf8fb4e87a1c0d31b5ded403d0e8d900a0e2ae9e493962b7b";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [
          base bytestring pipes-core transformers
        ];
@@ -135312,6 +137302,10 @@ self: {
          base bytestring HUnit mtl pipes-core test-framework
          test-framework-hunit test-framework-th-prime
        ];
+       benchmarkHaskellDepends = [
+         base bytestring conduit criterion enumerator pipes-core pipes-zlib
+         transformers zlib zlib-conduit zlib-enum
+       ];
        homepage = "https://github.com/pcapriotti/pipes-extra";
        description = "Various basic utilities for Pipes";
        license = stdenv.lib.licenses.bsd3;
@@ -135540,6 +137534,28 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "pipes-misc_0_3_0_0" = callPackage
+    ({ mkDerivation, base, clock, Decimal, hspec, lens, mmorph, mtl
+     , pipes, pipes-category, pipes-concurrency, semigroups, stm
+     , transformers
+     }:
+     mkDerivation {
+       pname = "pipes-misc";
+       version = "0.3.0.0";
+       sha256 = "1d204e4b329c0d44eca63ccaeaae74e2ea4e95a2934d81de9de0e09906f061f9";
+       libraryHaskellDepends = [
+         base clock Decimal lens mmorph mtl pipes pipes-category
+         pipes-concurrency semigroups stm transformers
+       ];
+       testHaskellDepends = [
+         base hspec lens mmorph pipes pipes-concurrency stm transformers
+       ];
+       homepage = "https://github.com/louispan/pipes-misc#readme";
+       description = "Miscellaneous utilities for pipes, required by glazier-tutorial";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "pipes-mongodb" = callPackage
     ({ mkDerivation, base, monad-control, mongoDB, pipes, text }:
      mkDerivation {
@@ -135884,6 +137900,8 @@ self: {
        pname = "pipes-zeromq4";
        version = "0.2.0.0";
        sha256 = "24f3ae9640eb6e2180edb8e0fc12bc420c7fa83aa32605900de1d961d93e92fe";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [
          base bytestring pipes pipes-safe semigroups zeromq4-haskell
        ];
@@ -136221,6 +138239,8 @@ self: {
        pname = "playlists-http";
        version = "0.1.1.0";
        sha256 = "2f5eaeba301115124529aeb72c8608838911209ab9a5830f705214c32dbb26cb";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [
          attoparsec base bytestring either exceptions http-client mtl
          playlists text
@@ -136437,10 +138457,8 @@ self: {
      }:
      mkDerivation {
        pname = "plugins";
-       version = "1.5.5.0";
-       sha256 = "57012217c22dce398b3574f45af22404be38de96145e5862d1453c599816f6a2";
-       revision = "1";
-       editedCabalFile = "84dab5882c330bdc39bcecdbc9d8834c4c964241cd4a1ce87d4987947add924a";
+       version = "1.5.6.0";
+       sha256 = "18d17e53eb9068f7da3fe26b45af8d76a7e76645f7ec59f81552e3486c8a80d0";
        libraryHaskellDepends = [
          array base Cabal containers directory filepath ghc ghc-paths
          ghc-prim haskell-src process random
@@ -137186,16 +139204,16 @@ self: {
 
   "pontarius-xmpp" = callPackage
     ({ mkDerivation, async, attoparsec, base, base64-bytestring, binary
-     , bytestring, Cabal, conduit, configurator, containers, crypto-api
-     , crypto-random, cryptohash, cryptohash-cryptoapi, data-default
-     , derive, directory, dns, doctest, exceptions, filepath, hslogger
-     , hspec, hspec-expectations, HUnit, iproute, lens, lens-family
-     , lifted-base, mtl, network, profunctors, pureMD5, QuickCheck
-     , quickcheck-instances, random, ranges, resourcet, smallcheck
-     , split, stm, stringprep, tasty, tasty-hspec, tasty-hunit
-     , tasty-quickcheck, tasty-th, template-haskell, text, tls
-     , transformers, unbounded-delays, void, x509-system, xml-conduit
-     , xml-picklers, xml-types
+     , bytestring, Cabal, conduit, configurator, containers, criterion
+     , crypto-api, crypto-random, cryptohash, cryptohash-cryptoapi
+     , data-default, derive, directory, dns, doctest, exceptions
+     , filepath, hslogger, hspec, hspec-expectations, HUnit, iproute
+     , lens, lens-family, lifted-base, mtl, network, profunctors
+     , pureMD5, QuickCheck, quickcheck-instances, random, ranges
+     , resourcet, smallcheck, split, stm, stringprep, tasty, tasty-hspec
+     , tasty-hunit, tasty-quickcheck, tasty-th, template-haskell, text
+     , tls, transformers, unbounded-delays, void, x509-system
+     , xml-conduit, xml-picklers, xml-types
      }:
      mkDerivation {
        pname = "pontarius-xmpp";
@@ -137218,6 +139236,7 @@ self: {
          tasty-quickcheck tasty-th text tls transformers xml-picklers
          xml-types
        ];
+       benchmarkHaskellDepends = [ base criterion ];
        homepage = "https://github.com/pontarius/pontarius-xmpp/";
        description = "An XMPP client library";
        license = stdenv.lib.licenses.bsd3;
@@ -137297,6 +139316,8 @@ self: {
        pname = "pooled-io";
        version = "0.0.2.1";
        sha256 = "7d405a8876d55a9c077a304dd378854bc9e6e20f643c357c82bd3f38297ff9d0";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [
          base concurrent-split containers deepseq transformers unsafe
          utility-ht
@@ -137520,7 +139541,8 @@ self: {
      }) {};
 
   "posix-paths" = callPackage
-    ({ mkDerivation, base, bytestring, doctest, HUnit, QuickCheck, unix
+    ({ mkDerivation, base, bytestring, criterion, directory, doctest
+     , filepath, HUnit, process, QuickCheck, unix
      }:
      mkDerivation {
        pname = "posix-paths";
@@ -137530,6 +139552,9 @@ self: {
        testHaskellDepends = [
          base bytestring doctest HUnit QuickCheck unix
        ];
+       benchmarkHaskellDepends = [
+         base bytestring criterion directory filepath process unix
+       ];
        description = "POSIX filepath/directory functionality";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -137635,10 +139660,10 @@ self: {
   "postgresql-binary" = callPackage
     ({ mkDerivation, aeson, base, base-prelude, binary-parser
      , bytestring, conversion, conversion-bytestring, conversion-text
-     , foldl, json-ast, loch-th, placeholders, postgresql-libpq
-     , QuickCheck, quickcheck-instances, rerebase, scientific, tasty
-     , tasty-hunit, tasty-quickcheck, tasty-smallcheck, text, time
-     , transformers, uuid, vector
+     , criterion, foldl, json-ast, loch-th, placeholders
+     , postgresql-libpq, QuickCheck, quickcheck-instances, rerebase
+     , scientific, tasty, tasty-hunit, tasty-quickcheck
+     , tasty-smallcheck, text, time, transformers, uuid, vector
      }:
      mkDerivation {
        pname = "postgresql-binary";
@@ -137654,6 +139679,7 @@ self: {
          quickcheck-instances rerebase tasty tasty-hunit tasty-quickcheck
          tasty-smallcheck
        ];
+       benchmarkHaskellDepends = [ criterion rerebase ];
        homepage = "https://github.com/nikita-volkov/postgresql-binary";
        description = "Encoders and decoders for the PostgreSQL's binary format";
        license = stdenv.lib.licenses.mit;
@@ -137849,21 +139875,20 @@ self: {
      }) {};
 
   "postgresql-simple-bind" = callPackage
-    ({ mkDerivation, attoparsec, base, bytestring, case-conversion
-     , data-default, exceptions, heredoc, hspec, postgresql-simple
-     , template-haskell, text, time
+    ({ mkDerivation, attoparsec, base, bytestring, data-default
+     , exceptions, heredoc, hspec, postgresql-simple, template-haskell
+     , text, time
      }:
      mkDerivation {
        pname = "postgresql-simple-bind";
-       version = "0.3.0.0";
-       sha256 = "d80ea7b091a66eac0e3da8fc22804a39ccbb1ca6e4cfa0f2b3b2ffd569e0999a";
+       version = "0.4.0";
+       sha256 = "a313032f8a8a0c6b97094d396afcd81a04a2d017699a08b5e2cbc2b8309cf284";
        libraryHaskellDepends = [
          attoparsec base bytestring data-default exceptions heredoc
          postgresql-simple template-haskell text time
        ];
        testHaskellDepends = [
-         attoparsec base bytestring case-conversion data-default hspec
-         postgresql-simple text
+         base bytestring hspec postgresql-simple text
        ];
        description = "FFI-like bindings for PostgreSQL stored functions";
        license = stdenv.lib.licenses.bsd3;
@@ -138084,6 +140109,8 @@ self: {
        pname = "postie";
        version = "0.5.0.0";
        sha256 = "93e32bd30b22c7f6474958abc3f65bf467c1fea403aa130996dab396233f0fc7";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [
          attoparsec base bytestring cprng-aes data-default-class mtl network
          pipes pipes-parse stringsearch tls transformers uuid
@@ -138101,6 +140128,8 @@ self: {
        pname = "postmark";
        version = "0.1.1";
        sha256 = "5c3d4c458d6b2683a2ec36380c216b05c297ba053cac4ede801531dba35f01ca";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [
          aeson attoparsec base bytestring containers http-client-tls
          http-types network-api-support text
@@ -138111,6 +140140,22 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "postmark-streams" = callPackage
+    ({ mkDerivation, aeson, attoparsec, base, base64-bytestring, binary
+     , bytestring, http-streams, io-streams, text, time
+     }:
+     mkDerivation {
+       pname = "postmark-streams";
+       version = "0.1.0.0";
+       sha256 = "5bc30a4c0688b85a93c91c12b17df0e68449dc45d9da5ba7a75db5e9e3b4fc4e";
+       libraryHaskellDepends = [
+         aeson attoparsec base base64-bytestring binary bytestring
+         http-streams io-streams text time
+       ];
+       description = "Send email via Postmark using io-streams";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "postmaster" = callPackage
     ({ mkDerivation, adns, base, bytestring, containers, directory
      , hopenssl, hsdns, hsemail, hsyslog, mtl, network, old-time
@@ -138219,9 +140264,9 @@ self: {
      }) {};
 
   "powerqueue-levelmem" = callPackage
-    ({ mkDerivation, async, base, bytestring, cereal, dlist, filepath
-     , focus, hspec, leveldb, leveldb-haskell, list-t, powerqueue
-     , snappy, stm, stm-containers, temporary, unagi-chan
+    ({ mkDerivation, async, base, bytestring, cereal, criterion, dlist
+     , filepath, focus, hspec, leveldb, leveldb-haskell, list-t
+     , powerqueue, snappy, stm, stm-containers, temporary, unagi-chan
      }:
      mkDerivation {
        pname = "powerqueue-levelmem";
@@ -138235,6 +140280,10 @@ self: {
          async base cereal hspec powerqueue temporary
        ];
        testSystemDepends = [ leveldb snappy ];
+       benchmarkHaskellDepends = [
+         base cereal criterion powerqueue temporary
+       ];
+       benchmarkSystemDepends = [ leveldb snappy ];
        homepage = "https://github.com/agrafix/powerqueue#readme";
        description = "A high performance in memory and LevelDB backend for powerqueue";
        license = stdenv.lib.licenses.bsd3;
@@ -138428,9 +140477,10 @@ self: {
 
   "pred-trie" = callPackage
     ({ mkDerivation, attoparsec, base, composition-extra, containers
-     , deepseq, errors, hashable, hashtables, mtl, poly-arity, pred-set
-     , QuickCheck, quickcheck-instances, semigroups, tasty, tasty-hunit
-     , tasty-quickcheck, text, tries, unordered-containers
+     , criterion, deepseq, errors, hashable, hashtables, mtl, poly-arity
+     , pred-set, QuickCheck, quickcheck-instances, semigroups, sets
+     , tasty, tasty-hunit, tasty-quickcheck, text, tries
+     , unordered-containers
      }:
      mkDerivation {
        pname = "pred-trie";
@@ -138446,6 +140496,11 @@ self: {
          poly-arity QuickCheck quickcheck-instances semigroups tasty
          tasty-hunit tasty-quickcheck text tries unordered-containers
        ];
+       benchmarkHaskellDepends = [
+         attoparsec base composition-extra criterion deepseq hashable mtl
+         poly-arity QuickCheck semigroups sets text tries
+         unordered-containers
+       ];
        description = "Predicative tries";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -138547,6 +140602,8 @@ self: {
        pname = "prefork";
        version = "0.0.9";
        sha256 = "883b866c1c9b3adf2aa1b368db8ac1619666bd0506d3c3f5486e79c49eef2a7f";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [
          base containers data-default process stm system-argv0
          system-filepath unix
@@ -138656,6 +140713,8 @@ self: {
        pname = "prelude-plus";
        version = "0.0.0.6";
        sha256 = "5b4ec409806660b7f06e51e9df2e06caf88219a78785202424fd050750012b8d";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [ base utf8-string ];
        description = "Prelude for rest of us";
        license = stdenv.lib.licenses.bsd3;
@@ -138933,17 +140992,20 @@ self: {
      }) {};
 
   "pretty-simple" = callPackage
-    ({ mkDerivation, ansi-terminal, base, containers, doctest, Glob
-     , mtl, parsec, text, transformers
+    ({ mkDerivation, ansi-terminal, base, containers, criterion
+     , doctest, Glob, mtl, parsec, text, transformers
      }:
      mkDerivation {
        pname = "pretty-simple";
        version = "2.0.0.0";
        sha256 = "e64bfc73a962bba3f773e8e271d63e3e25924e1a6febbea7d3935d37ae856fbe";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [
          ansi-terminal base containers mtl parsec text transformers
        ];
        testHaskellDepends = [ base doctest Glob ];
+       benchmarkHaskellDepends = [ base criterion ];
        homepage = "https://github.com/cdepillabout/pretty-simple";
        description = "pretty printer for data types with a 'Show' instance";
        license = stdenv.lib.licenses.bsd3;
@@ -139008,13 +141070,16 @@ self: {
      }) {};
 
   "prim-spoon" = callPackage
-    ({ mkDerivation, base, ghc-prim, HUnit, QuickCheck, spoon }:
+    ({ mkDerivation, base, criterion, ghc-prim, HUnit, QuickCheck
+     , spoon
+     }:
      mkDerivation {
        pname = "prim-spoon";
        version = "0.1.0";
        sha256 = "3349b21d56c9c635c89b679d805e155cf658a26a675f553cbb261d61b776a27c";
        libraryHaskellDepends = [ base ghc-prim spoon ];
        testHaskellDepends = [ base HUnit QuickCheck spoon ];
+       benchmarkHaskellDepends = [ base criterion ghc-prim spoon ];
        homepage = "https://github.com/michaeljklein/prim-spoon";
        description = "Catch errors thrown from pure computations using primops";
        license = stdenv.lib.licenses.bsd3;
@@ -139089,12 +141154,15 @@ self: {
      }) {};
 
   "primitive-simd" = callPackage
-    ({ mkDerivation, base, ghc-prim, primitive, vector }:
+    ({ mkDerivation, base, criterion, deepseq, ghc-prim, primitive
+     , random, vector
+     }:
      mkDerivation {
        pname = "primitive-simd";
        version = "0.1.0.0";
        sha256 = "d131c7a6aedc55c113e71fbc22cd79e2105186fb5e359236de04abe46433b58d";
        libraryHaskellDepends = [ base ghc-prim primitive vector ];
+       benchmarkHaskellDepends = [ base criterion deepseq random vector ];
        description = "SIMD data types and functions";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -139309,8 +141377,8 @@ self: {
      }) {};
 
   "probable" = callPackage
-    ({ mkDerivation, base, mtl, mwc-random, primitive, statistics
-     , transformers, vector
+    ({ mkDerivation, base, criterion, mtl, mwc-random, mwc-random-monad
+     , primitive, statistics, transformers, vector
      }:
      mkDerivation {
        pname = "probable";
@@ -139319,6 +141387,9 @@ self: {
        libraryHaskellDepends = [
          base mtl mwc-random primitive statistics transformers vector
        ];
+       benchmarkHaskellDepends = [
+         base criterion mwc-random mwc-random-monad vector
+       ];
        homepage = "http://github.com/alpmestan/probable";
        description = "Easy and reasonably efficient probabilistic programming and random generation";
        license = stdenv.lib.licenses.bsd3;
@@ -139356,14 +141427,14 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
-  "process_1_5_0_0" = callPackage
+  "process_1_6_0_0" = callPackage
     ({ mkDerivation, base, bytestring, deepseq, directory, filepath
      , unix
      }:
      mkDerivation {
        pname = "process";
-       version = "1.5.0.0";
-       sha256 = "a87b228f52272ef20dd15260e40b3b4550205bac7d42ef0f0c0ad31d1f475c77";
+       version = "1.6.0.0";
+       sha256 = "3534c9a7e48a0d4417c230f4c6abbc3991e7919ea5a68c7de22729f7fcd8da0b";
        libraryHaskellDepends = [ base deepseq directory filepath unix ];
        testHaskellDepends = [ base bytestring directory ];
        description = "Process libraries";
@@ -139655,6 +141726,24 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "product-profunctors_0_8_0_3" = callPackage
+    ({ mkDerivation, base, contravariant, profunctors, tagged
+     , template-haskell
+     }:
+     mkDerivation {
+       pname = "product-profunctors";
+       version = "0.8.0.3";
+       sha256 = "4fa4b1c6ba4f84305ef11e001695a7027f37d4a88bf34996ed3724233ac40cc9";
+       libraryHaskellDepends = [
+         base contravariant profunctors tagged template-haskell
+       ];
+       testHaskellDepends = [ base profunctors ];
+       homepage = "https://github.com/tomjaguarpaw/product-profunctors";
+       description = "product-profunctors";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "prof2dot" = callPackage
     ({ mkDerivation, base, containers, filepath, haskell98, parsec }:
      mkDerivation {
@@ -139769,6 +141858,8 @@ self: {
        pname = "progressbar";
        version = "0.0.1";
        sha256 = "da0e18e771284738de24858b87c96b135c591df5158b1a212b9edcc6fad5ce27";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [ base io-reactive ];
        description = "Progressbar API";
        license = stdenv.lib.licenses.bsd3;
@@ -139965,8 +142056,8 @@ self: {
 
   "prometheus-client" = callPackage
     ({ mkDerivation, atomic-primops, base, bytestring, containers
-     , doctest, hspec, mtl, QuickCheck, random-shuffle, stm, time
-     , transformers, utf8-string
+     , criterion, doctest, hspec, mtl, QuickCheck, random
+     , random-shuffle, stm, time, transformers, utf8-string
      }:
      mkDerivation {
        pname = "prometheus-client";
@@ -139980,6 +142071,9 @@ self: {
          atomic-primops base bytestring containers doctest hspec mtl
          QuickCheck random-shuffle stm time transformers utf8-string
        ];
+       benchmarkHaskellDepends = [
+         base bytestring criterion random utf8-string
+       ];
        homepage = "https://github.com/fimad/prometheus-haskell";
        description = "Haskell client library for http://prometheus.io.";
        license = stdenv.lib.licenses.asl20;
@@ -140063,8 +142157,8 @@ self: {
      }:
      mkDerivation {
        pname = "propellor";
-       version = "3.3.0";
-       sha256 = "dba271f7078786ba229c5dfe72caf4f03b92044506fab82e1a0ed24c555d9172";
+       version = "3.3.1";
+       sha256 = "32f2d2f709a94805fc89b4368d87cba556e0e80984dceb8b0df242a93a69f635";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -140166,6 +142260,8 @@ self: {
        pname = "proteaaudio";
        version = "0.6.5";
        sha256 = "37c7d4272502afe08736bdbab192c95da578a71a6c1ae3ae7beea1fa797b342e";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [ base ];
        librarySystemDepends = [ alsaLib ];
        libraryToolDepends = [ c2hs ];
@@ -140643,9 +142739,10 @@ self: {
      }) {};
 
   "psqueues" = callPackage
-    ({ mkDerivation, array, base, deepseq, ghc-prim, hashable, HUnit
-     , QuickCheck, tagged, test-framework, test-framework-hunit
-     , test-framework-quickcheck2
+    ({ mkDerivation, array, base, containers, criterion, deepseq
+     , fingertree-psqueue, ghc-prim, hashable, HUnit, mtl, PSQueue
+     , QuickCheck, random, tagged, test-framework, test-framework-hunit
+     , test-framework-quickcheck2, unordered-containers
      }:
      mkDerivation {
        pname = "psqueues";
@@ -140656,6 +142753,10 @@ self: {
          array base deepseq ghc-prim hashable HUnit QuickCheck tagged
          test-framework test-framework-hunit test-framework-quickcheck2
        ];
+       benchmarkHaskellDepends = [
+         base containers criterion deepseq fingertree-psqueue ghc-prim
+         hashable mtl PSQueue random unordered-containers
+       ];
        description = "Pure priority search queues";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -140697,13 +142798,16 @@ self: {
      }) {};
 
   "publicsuffix" = callPackage
-    ({ mkDerivation, base, filepath, hspec, template-haskell }:
+    ({ mkDerivation, base, criterion, filepath, hspec, random
+     , template-haskell
+     }:
      mkDerivation {
        pname = "publicsuffix";
        version = "0.20170109";
        sha256 = "1b8c8b6c4eb93604598f5f6b7b671cc72b2f0d50a4dfe174e97a72d9919c1844";
        libraryHaskellDepends = [ base filepath template-haskell ];
        testHaskellDepends = [ base hspec ];
+       benchmarkHaskellDepends = [ base criterion random ];
        homepage = "https://github.com/wereHamster/publicsuffix-haskell/";
        description = "The publicsuffix list exposed as proper Haskell types";
        license = stdenv.lib.licenses.mit;
@@ -140947,6 +143051,8 @@ self: {
        pname = "pulseaudio";
        version = "0.0.2.0";
        sha256 = "72cbacaf7c94bdaa27c9e0d299a00fe3f31e0cc0f9c2d6e7de9690b3154c078e";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [ base containers stm unix ];
        librarySystemDepends = [ libpulseaudio ];
        description = "A low-level (incomplete) wrapper around the pulseaudio client asynchronous api";
@@ -141085,7 +143191,7 @@ self: {
   "pure-zlib" = callPackage
     ({ mkDerivation, array, base, base-compat, bytestring
      , bytestring-builder, containers, filepath, fingertree, HUnit
-     , QuickCheck, tasty, tasty-hunit, tasty-quickcheck
+     , QuickCheck, tasty, tasty-hunit, tasty-quickcheck, time
      }:
      mkDerivation {
        pname = "pure-zlib";
@@ -141102,6 +143208,7 @@ self: {
          base base-compat bytestring filepath HUnit QuickCheck tasty
          tasty-hunit tasty-quickcheck
        ];
+       benchmarkHaskellDepends = [ base base-compat bytestring time ];
        homepage = "http://github.com/GaloisInc/pure-zlib";
        description = "A Haskell-only implementation of zlib / DEFLATE";
        license = stdenv.lib.licenses.bsd3;
@@ -141304,6 +143411,22 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "pushbullet-types" = callPackage
+    ({ mkDerivation, aeson, base, http-api-data, microlens
+     , microlens-th, scientific, text, time, unordered-containers
+     }:
+     mkDerivation {
+       pname = "pushbullet-types";
+       version = "0.1.0.0";
+       sha256 = "0b9ecf81378eb74d27102c2253b4ecef75032b25f40242fcb99c7fbbe99df4b4";
+       libraryHaskellDepends = [
+         aeson base http-api-data microlens microlens-th scientific text
+         time unordered-containers
+       ];
+       description = "Datatypes used by the Pushbullet APIs";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "pusher-haskell" = callPackage
     ({ mkDerivation, aeson, base, bytestring, hspec, HTTP, MissingH
      , mtl, SHA, time
@@ -141759,8 +143882,8 @@ self: {
      }:
      mkDerivation {
        pname = "qr-imager";
-       version = "1.0.0.1";
-       sha256 = "ab437b12f05962d92a54a9dbaec62bb1df4cf688434b42ea3d3c958ee2a8278e";
+       version = "1.0.0.2";
+       sha256 = "b9c758375936269cfc16bd28b82adcbab3e8ed79e48e88fc2e23a8e89ec0d504";
        libraryHaskellDepends = [
          aeson base bytestring cryptonite directory haskell-qrencode
          jose-jwt JuicyPixels lens MissingH optparse-applicative process
@@ -142097,6 +144220,8 @@ self: {
        pname = "questioner";
        version = "0.1.1.0";
        sha256 = "83ab4047671f59832eaa377e3fb3fce547439550f57479dd09e0ad4975250617";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [
          ansi-terminal base readline terminal-size
        ];
@@ -142895,22 +145020,24 @@ self: {
      }) {};
 
   "raaz" = callPackage
-    ({ mkDerivation, base, bytestring, deepseq, hspec, HUnit, mtl
-     , QuickCheck, transformers, vector
+    ({ mkDerivation, base, blaze-builder, bytestring, criterion
+     , deepseq, hspec, HUnit, mtl, pretty, QuickCheck, transformers
+     , vector
      }:
      mkDerivation {
        pname = "raaz";
-       version = "0.0.2";
-       sha256 = "89009f7ef7f7f995781f124ef99322eec0f2b820ca926eb529f41680c52b2f7a";
+       version = "0.1.0";
+       sha256 = "40f9ec9f735fbf45310d717ee39937740a09e8509f16d4950a5f3446a50e8650";
        isLibrary = true;
        isExecutable = true;
-       libraryHaskellDepends = [
-         base bytestring deepseq mtl transformers vector
-       ];
+       libraryHaskellDepends = [ base bytestring deepseq mtl vector ];
        executableHaskellDepends = [ base ];
        testHaskellDepends = [
          base bytestring hspec HUnit QuickCheck transformers vector
        ];
+       benchmarkHaskellDepends = [
+         base blaze-builder bytestring criterion pretty
+       ];
        homepage = "http://github.com/raaz-crypto/raaz";
        description = "The raaz cryptographic library";
        license = stdenv.lib.licenses.bsd3;
@@ -143015,8 +145142,8 @@ self: {
      }) {};
 
   "rados-haskell" = callPackage
-    ({ mkDerivation, async, base, bytestring, containers, hspec, HUnit
-     , mtl, rados, uuid
+    ({ mkDerivation, async, base, bytestring, containers, criterion
+     , hspec, HUnit, mtl, rados, transformers, uuid
      }:
      mkDerivation {
        pname = "rados-haskell";
@@ -143030,6 +145157,9 @@ self: {
          async base bytestring hspec HUnit mtl uuid
        ];
        testSystemDepends = [ rados ];
+       benchmarkHaskellDepends = [
+         async base bytestring criterion mtl transformers
+       ];
        homepage = "github";
        description = "librados haskell bindings";
        license = stdenv.lib.licenses.bsd3;
@@ -143239,13 +145369,15 @@ self: {
      }) {};
 
   "ramus" = callPackage
-    ({ mkDerivation, base, hspec, QuickCheck, quickcheck-io }:
+    ({ mkDerivation, base, criterion, hspec, QuickCheck, quickcheck-io
+     }:
      mkDerivation {
        pname = "ramus";
        version = "0.1.2";
        sha256 = "dcddddc416e79c401604565b7297a945f814edeed056fb3b897eda5f4f0b794e";
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base hspec QuickCheck quickcheck-io ];
+       benchmarkHaskellDepends = [ base criterion ];
        homepage = "https://github.com/NickSeagull/ramus#readme";
        description = "Elm signal system for Haskell";
        license = stdenv.lib.licenses.mit;
@@ -143681,16 +145813,17 @@ self: {
   "rasa" = callPackage
     ({ mkDerivation, async, base, bifunctors, containers, data-default
      , free, hspec, lens, mtl, pipes, pipes-concurrency, pipes-parse
-     , QuickCheck, quickcheck-instances, text, text-lens, transformers
-     , yi-rope
+     , profunctors, QuickCheck, quickcheck-instances, text, text-lens
+     , transformers, yi-rope
      }:
      mkDerivation {
        pname = "rasa";
-       version = "0.1.9";
-       sha256 = "8dd969c39222963cf97033e13a141fbc9b1f075b8c7af6428ef72bef9439cf3c";
+       version = "0.1.10";
+       sha256 = "970bd5b3dfac3a8050e2daea281d15b3b1dc499824cad392225d1e4d483527e8";
        libraryHaskellDepends = [
-         async base bifunctors containers data-default free lens mtl pipes
-         pipes-concurrency pipes-parse text text-lens transformers yi-rope
+         async base bifunctors containers data-default free hspec lens mtl
+         pipes pipes-concurrency pipes-parse profunctors text text-lens
+         transformers yi-rope
        ];
        testHaskellDepends = [
          base hspec lens QuickCheck quickcheck-instances text yi-rope
@@ -143701,20 +145834,19 @@ self: {
      }) {};
 
   "rasa-example-config" = callPackage
-    ({ mkDerivation, base, lens, mtl, rasa, rasa-ext-cursors
-     , rasa-ext-files, rasa-ext-logger, rasa-ext-slate
-     , rasa-ext-status-bar, rasa-ext-style, rasa-ext-views, rasa-ext-vim
+    ({ mkDerivation, base, data-default, lens, mtl, rasa
+     , rasa-ext-cursors, rasa-ext-files, rasa-ext-logger, rasa-ext-slate
+     , rasa-ext-views, rasa-ext-vim, yi-rope
      }:
      mkDerivation {
        pname = "rasa-example-config";
-       version = "0.1.3";
-       sha256 = "471525573811177d6d5aaaeff5353ce154f1f44ccf1f29a865439d94b5ceca93";
+       version = "0.1.4";
+       sha256 = "160d148c51615b71900053186cefa5f12e5530aaae6328424d62bbaca6e7e6cd";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
-         base lens mtl rasa rasa-ext-cursors rasa-ext-files rasa-ext-logger
-         rasa-ext-slate rasa-ext-status-bar rasa-ext-style rasa-ext-views
-         rasa-ext-vim
+         base data-default lens mtl rasa rasa-ext-cursors rasa-ext-files
+         rasa-ext-logger rasa-ext-slate rasa-ext-views rasa-ext-vim yi-rope
        ];
        homepage = "https://github.com/ChrisPenner/rasa/";
        description = "Example user config for Rasa";
@@ -143754,16 +145886,15 @@ self: {
      }) {};
 
   "rasa-ext-cursors" = callPackage
-    ({ mkDerivation, base, data-default, lens, mtl, rasa
-     , rasa-ext-style, text, text-lens, yi-rope
+    ({ mkDerivation, base, data-default, lens, mtl, rasa, text
+     , text-lens, yi-rope
      }:
      mkDerivation {
        pname = "rasa-ext-cursors";
-       version = "0.1.5";
-       sha256 = "81c949b85bf60cb814cedf0fd58d1082cc161ee820caacd86d8754e8dd9f2d93";
+       version = "0.1.6";
+       sha256 = "c1407b36255825f4708ccffb9b04cdb1cd93da417cc2c337033b10306626390e";
        libraryHaskellDepends = [
-         base data-default lens mtl rasa rasa-ext-style text text-lens
-         yi-rope
+         base data-default lens mtl rasa text text-lens yi-rope
        ];
        homepage = "https://github.com/ChrisPenner/rasa/";
        description = "Rasa Ext adding cursor(s)";
@@ -143771,16 +145902,16 @@ self: {
      }) {};
 
   "rasa-ext-files" = callPackage
-    ({ mkDerivation, base, data-default, lens, rasa, rasa-ext-cmd
-     , rasa-ext-status-bar, rasa-ext-views, text, yi-rope
+    ({ mkDerivation, base, data-default, lens, mtl, rasa, rasa-ext-cmd
+     , rasa-ext-views, text, yi-rope
      }:
      mkDerivation {
        pname = "rasa-ext-files";
-       version = "0.1.3";
-       sha256 = "094f8127c8266a0f988661ada65d0ff08979025cb1939edff8199cdcfd0da06f";
+       version = "0.1.4";
+       sha256 = "d824e1eec8ce6b92453e957c10859351c23306463b08bdcdfc5d635471147957";
        libraryHaskellDepends = [
-         base data-default lens rasa rasa-ext-cmd rasa-ext-status-bar
-         rasa-ext-views text yi-rope
+         base data-default lens mtl rasa rasa-ext-cmd rasa-ext-views text
+         yi-rope
        ];
        homepage = "https://github.com/ChrisPenner/rasa/";
        description = "Rasa Ext for filesystem actions";
@@ -143802,16 +145933,15 @@ self: {
 
   "rasa-ext-slate" = callPackage
     ({ mkDerivation, base, lens, mtl, rasa, rasa-ext-logger
-     , rasa-ext-status-bar, rasa-ext-style, rasa-ext-views
-     , recursion-schemes, text, vty, yi-rope
+     , rasa-ext-views, recursion-schemes, text, vty, yi-rope
      }:
      mkDerivation {
        pname = "rasa-ext-slate";
-       version = "0.1.6";
-       sha256 = "0e11bf0c2e01faf5279dc8b4e2c19f4318d74bc29eb3652966b590b906c2cca8";
+       version = "0.1.7";
+       sha256 = "6773e509862723cc02776cd05db0dea70a179433a57ab635f37124964738d312";
        libraryHaskellDepends = [
-         base lens mtl rasa rasa-ext-logger rasa-ext-status-bar
-         rasa-ext-style rasa-ext-views recursion-schemes text vty yi-rope
+         base lens mtl rasa rasa-ext-logger rasa-ext-views recursion-schemes
+         text vty yi-rope
        ];
        homepage = "https://github.com/ChrisPenner/rasa/";
        description = "Rasa extension for rendering to terminal with vty";
@@ -143845,14 +145975,15 @@ self: {
 
   "rasa-ext-views" = callPackage
     ({ mkDerivation, base, bifunctors, data-default, lens, mtl, rasa
-     , recursion-schemes
+     , recursion-schemes, yi-rope
      }:
      mkDerivation {
        pname = "rasa-ext-views";
-       version = "0.1.3";
-       sha256 = "28413cc5643edb08b4095deaf973525a77496ce6d17df22915fa17daf2495691";
+       version = "0.1.4";
+       sha256 = "5542a37a779efe0e97ecbadbed2409414c99705a9298d0dfc5915f56682e11c0";
        libraryHaskellDepends = [
          base bifunctors data-default lens mtl rasa recursion-schemes
+         yi-rope
        ];
        homepage = "https://github.com/ChrisPenner/rasa/";
        description = "Rasa Ext managing rendering views";
@@ -143862,16 +145993,16 @@ self: {
 
   "rasa-ext-vim" = callPackage
     ({ mkDerivation, base, data-default, hspec, lens, mtl, rasa
-     , rasa-ext-cursors, rasa-ext-files, rasa-ext-status-bar
-     , rasa-ext-views, text, text-lens, yi-rope
+     , rasa-ext-cursors, rasa-ext-files, rasa-ext-views, text, text-lens
+     , yi-rope
      }:
      mkDerivation {
        pname = "rasa-ext-vim";
-       version = "0.1.5";
-       sha256 = "bb90b7cf5c3e1a7cf212690e8ae1b58cb58a7ead5defa6e21bd6d0fd5136b9e6";
+       version = "0.1.6";
+       sha256 = "e97e6d096eee5f02ed022407276653ed33657f82ef708ad8095a3caf1fddb22a";
        libraryHaskellDepends = [
          base data-default lens mtl rasa rasa-ext-cursors rasa-ext-files
-         rasa-ext-status-bar rasa-ext-views text text-lens yi-rope
+         rasa-ext-views text text-lens yi-rope
        ];
        testHaskellDepends = [ base hspec ];
        homepage = "https://github.com/ChrisPenner/rasa/";
@@ -144123,8 +146254,8 @@ self: {
      }) {};
 
   "rawr" = callPackage
-    ({ mkDerivation, base, deepseq, doctest, ghc-datasize, ghc-prim
-     , lens, tasty, tasty-hunit, template-haskell
+    ({ mkDerivation, base, criterion, deepseq, doctest, ghc-datasize
+     , ghc-prim, lens, tasty, tasty-hunit, template-haskell
      }:
      mkDerivation {
        pname = "rawr";
@@ -144134,6 +146265,7 @@ self: {
        testHaskellDepends = [
          base deepseq doctest ghc-datasize lens tasty tasty-hunit
        ];
+       benchmarkHaskellDepends = [ base criterion deepseq ];
        homepage = "https://github.com/pkmx/rawr";
        description = "Anonymous extensible records";
        license = stdenv.lib.licenses.bsd3;
@@ -144153,13 +146285,18 @@ self: {
      }) {};
 
   "raz" = callPackage
-    ({ mkDerivation, base, deepseq, MonadRandom }:
+    ({ mkDerivation, base, containers, criterion, deepseq, MonadRandom
+     , random, transformers
+     }:
      mkDerivation {
        pname = "raz";
        version = "0.1.0.0";
        sha256 = "ee0c0fcff08e7f2faf28218b61cd5cb0b04031d13c73b71f2f735694eb96c215";
        libraryHaskellDepends = [ base deepseq MonadRandom ];
        testHaskellDepends = [ base MonadRandom ];
+       benchmarkHaskellDepends = [
+         base containers criterion deepseq MonadRandom random transformers
+       ];
        homepage = "https://github.com/Lysxia/raz.haskell";
        description = "Random Access Zippers";
        license = stdenv.lib.licenses.mit;
@@ -144258,8 +146395,8 @@ self: {
      }) {};
 
   "rdf" = callPackage
-    ({ mkDerivation, attoparsec, base, bytestring, deepseq, dlist, fgl
-     , text, transformers
+    ({ mkDerivation, attoparsec, base, bytestring, criterion, deepseq
+     , dlist, fgl, text, transformers
      }:
      mkDerivation {
        pname = "rdf";
@@ -144268,16 +146405,20 @@ self: {
        libraryHaskellDepends = [
          attoparsec base bytestring deepseq dlist fgl text transformers
        ];
+       benchmarkHaskellDepends = [
+         base bytestring criterion deepseq text
+       ];
        homepage = "https://github.com/traviswhitaker/rdf";
        description = "Representation and Incremental Processing of RDF Data";
        license = stdenv.lib.licenses.mit;
      }) {};
 
   "rdf4h" = callPackage
-    ({ mkDerivation, base, binary, bytestring, containers, deepseq
-     , directory, hashable, hgal, HTTP, HUnit, hxt, network, network-uri
-     , parsec, QuickCheck, safe, tasty, tasty-hunit, tasty-quickcheck
-     , text, text-binary, unordered-containers, utf8-string
+    ({ mkDerivation, base, binary, bytestring, containers, criterion
+     , deepseq, directory, hashable, hgal, HTTP, HUnit, hxt, network
+     , network-uri, parsec, QuickCheck, safe, tasty, tasty-hunit
+     , tasty-quickcheck, text, text-binary, unordered-containers
+     , utf8-string
      }:
      mkDerivation {
        pname = "rdf4h";
@@ -144297,6 +146438,7 @@ self: {
          base bytestring containers directory HUnit network network-uri
          QuickCheck safe tasty tasty-hunit tasty-quickcheck text
        ];
+       benchmarkHaskellDepends = [ base criterion text ];
        homepage = "https://github.com/robstewart57/rdf4h";
        description = "A library for RDF processing in Haskell";
        license = stdenv.lib.licenses.bsd3;
@@ -144371,6 +146513,8 @@ self: {
        pname = "react-flux";
        version = "1.2.3";
        sha256 = "65c868e8b6522b1042d4d53aa9eb0e5cd4fe34a0e6bbae8f56279440bfbfb1c7";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [
          aeson base bytestring deepseq mtl template-haskell text time
          unordered-containers
@@ -144526,8 +146670,8 @@ self: {
      }:
      mkDerivation {
        pname = "reactive-banana-gi-gtk";
-       version = "0.1.0.0";
-       sha256 = "adb56a19f5021b446929620bdb6a3977194d1e47698f192173f7e7e169821f30";
+       version = "0.2.0.0";
+       sha256 = "8ae81b3609e83f24765f31c0c50ccca88da9cd70a2a8566bff4727673becf615";
        libraryHaskellDepends = [
          base gi-gtk haskell-gi-base reactive-banana text transformers
        ];
@@ -144574,6 +146718,8 @@ self: {
        pname = "reactive-banana-threepenny";
        version = "0.7.1.3";
        sha256 = "2a51bbecf637916ac67cd8803fd08072927bb38024c10e857a5677960f5e60b9";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [ base reactive-banana threepenny-gui ];
        homepage = "http://haskell.org/haskellwiki/Reactive-banana";
        description = "Examples for the reactive-banana library, using threepenny-gui";
@@ -144588,6 +146734,8 @@ self: {
        version = "1.1.1.0";
        sha256 = "790e671d7eadfeacd7a21e4e415e7e79b1e885ef3b01aa1c6848ca8b0dabfefb";
        configureFlags = [ "-f-buildexamples" ];
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [
          base cabal-macosx reactive-banana wx wxcore
        ];
@@ -144768,6 +146916,8 @@ self: {
        pname = "read-editor";
        version = "0.1.0.2";
        sha256 = "ed8aeca86823fbaf11a0a543fd106c9c3abe65216ea974ed56050cbebf777085";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [ base directory process ];
        homepage = "https://github.com/yamadapc/haskell-read-editor";
        description = "Opens a temporary file on the system's EDITOR and returns the resulting edits";
@@ -144812,6 +146962,18 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "readcsv" = callPackage
+    ({ mkDerivation, base }:
+     mkDerivation {
+       pname = "readcsv";
+       version = "0.1";
+       sha256 = "dc30c00dd05156749ff38d42eed15c73a493fc0b66b630eab256c4e359456c88";
+       libraryHaskellDepends = [ base ];
+       homepage = "https://github.com/george-steel/readcsv";
+       description = "Lightweight CSV parser/emitter based on ReadP";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "readline" = callPackage
     ({ mkDerivation, base, ncurses, process, readline }:
      mkDerivation {
@@ -145038,8 +147200,8 @@ self: {
      }) {};
 
   "record-preprocessor" = callPackage
-    ({ mkDerivation, base, base-prelude, conversion, conversion-text
-     , record-syntax, text
+    ({ mkDerivation, base, base-prelude, basic-lens, conversion
+     , conversion-text, record, record-syntax, text
      }:
      mkDerivation {
        pname = "record-preprocessor";
@@ -145050,6 +147212,7 @@ self: {
        executableHaskellDepends = [
          base base-prelude conversion conversion-text record-syntax text
        ];
+       benchmarkHaskellDepends = [ base-prelude basic-lens record ];
        doHaddock = false;
        homepage = "https://github.com/nikita-volkov/record-preprocessor";
        description = "Compiler preprocessor introducing a syntactic extension for anonymous records";
@@ -145073,6 +147236,9 @@ self: {
        testHaskellDepends = [
          base base-prelude directory doctest filepath hspec record
        ];
+       benchmarkHaskellDepends = [
+         base-prelude conversion conversion-text record text
+       ];
        homepage = "https://github.com/nikita-volkov/record-syntax";
        description = "A library for parsing and processing the Haskell syntax sprinkled with anonymous records";
        license = stdenv.lib.licenses.mit;
@@ -145236,8 +147402,8 @@ self: {
 
   "redis-io" = callPackage
     ({ mkDerivation, async, attoparsec, auto-update, base, bytestring
-     , bytestring-conversion, containers, exceptions, iproute
-     , monad-control, mtl, network, operational, redis-resp
+     , bytestring-conversion, containers, criterion, exceptions, hedis
+     , iproute, monad-control, mtl, network, operational, redis-resp
      , resource-pool, semigroups, stm, tasty, tasty-hunit, time, tinylog
      , transformers, transformers-base
      }:
@@ -145255,6 +147421,9 @@ self: {
          async base bytestring bytestring-conversion containers redis-resp
          tasty tasty-hunit tinylog transformers
        ];
+       benchmarkHaskellDepends = [
+         base bytestring criterion hedis redis-resp tinylog transformers
+       ];
        homepage = "https://gitlab.com/twittner/redis-io/";
        description = "Yet another redis client";
        license = stdenv.lib.licenses.mpl20;
@@ -145367,14 +147536,16 @@ self: {
      }) {};
 
   "reedsolomon" = callPackage
-    ({ mkDerivation, base, bytestring, exceptions, gitrev, loop, mtl
-     , primitive, profunctors, QuickCheck, random, tasty, tasty-ant-xml
-     , tasty-hunit, tasty-quickcheck, vector
+    ({ mkDerivation, base, bytestring, criterion, exceptions, gitrev
+     , loop, mtl, primitive, profunctors, QuickCheck, random, tasty
+     , tasty-ant-xml, tasty-hunit, tasty-quickcheck, vector
      }:
      mkDerivation {
        pname = "reedsolomon";
        version = "0.0.4.3";
        sha256 = "b74acd24ee1524e684860a20a8bf44eea5524ff8fd22c6efd0baf20bb5a0a42b";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [
          base bytestring exceptions gitrev loop mtl primitive profunctors
          vector
@@ -145384,6 +147555,9 @@ self: {
          QuickCheck random tasty tasty-ant-xml tasty-hunit tasty-quickcheck
          vector
        ];
+       benchmarkHaskellDepends = [
+         base criterion exceptions loop mtl primitive vector
+       ];
        homepage = "http://github.com/NicolasT/reedsolomon";
        description = "Reed-Solomon Erasure Coding in Haskell";
        license = stdenv.lib.licenses.mit;
@@ -145602,10 +147776,11 @@ self: {
      }) {};
 
   "reflex" = callPackage
-    ({ mkDerivation, base, containers, dependent-map, dependent-sum
-     , exception-transformers, haskell-src-exts, haskell-src-meta
-     , MemoTrie, mtl, primitive, ref-tf, semigroups, syb
-     , template-haskell, these, transformers, transformers-compat
+    ({ 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 {
        pname = "reflex";
@@ -145621,6 +147796,10 @@ self: {
        testHaskellDepends = [
          base containers dependent-map MemoTrie mtl ref-tf
        ];
+       benchmarkHaskellDepends = [
+         base containers criterion deepseq dependent-map dependent-sum mtl
+         primitive ref-tf split stm transformers
+       ];
        homepage = "https://github.com/reflex-frp/reflex";
        description = "Higher-order Functional Reactive Programming";
        license = stdenv.lib.licenses.bsd3;
@@ -145897,6 +148076,8 @@ self: {
        pname = "refresht";
        version = "0.1.1.0";
        sha256 = "07350b47c06d2a1466419b33fa6983dd289fa33713c046b57f2ec92303bc633f";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [ base data-default exceptions lens mtl ];
        homepage = "https://github.com/konn/refresht#readme";
        description = "Environment Monad with automatic resource refreshment";
@@ -145925,8 +148106,8 @@ self: {
      }:
      mkDerivation {
        pname = "regex";
-       version = "0.2.0.1";
-       sha256 = "43ee04802ef3a4d6884cd97c73a261277d89eaa80abc31f148bd0b8f9c6f4a31";
+       version = "0.3.0.0";
+       sha256 = "f0f8c9722a601edfc2fb7963956f331f3dd1e1655fafb07758aad6defea579de";
        libraryHaskellDepends = [
          array base base-compat bytestring containers hashable heredoc
          regex-base regex-pcre-builtin regex-tdfa regex-tdfa-text
@@ -146084,8 +148265,8 @@ self: {
      }:
      mkDerivation {
        pname = "regex-examples";
-       version = "0.2.0.1";
-       sha256 = "73b95d1ca92342fff14b2a5f634b8b1a703d22e6a32140a6f0faea2c68ca55a1";
+       version = "0.3.0.0";
+       sha256 = "c274ffacf3eeecb9e9530d07fd44dd0539c8225923ae0cb82b5d48ad6333903b";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -146712,13 +148893,16 @@ self: {
      }) {};
 
   "reinterpret-cast" = callPackage
-    ({ mkDerivation, array, base, data-binary-ieee754, hspec, loop }:
+    ({ mkDerivation, array, base, criterion, data-binary-ieee754, hspec
+     , loop
+     }:
      mkDerivation {
        pname = "reinterpret-cast";
        version = "0.1.0";
        sha256 = "5654622c904b42c62f2473c64624715dbd458ea00209ed9ab39396eabc1353e4";
        libraryHaskellDepends = [ array base ];
        testHaskellDepends = [ base data-binary-ieee754 hspec loop ];
+       benchmarkHaskellDepends = [ base criterion data-binary-ieee754 ];
        homepage = "https://github.com/nh2/reinterpret-cast";
        description = "Memory reinterpretation casts for Float/Double and Word32/Word64";
        license = stdenv.lib.licenses.mit;
@@ -146857,6 +149041,8 @@ self: {
        pname = "relational-record-examples";
        version = "0.3.1.1";
        sha256 = "56d726b946e454390b4efbda9e7effe11343c88aeb6390f9516b51445e96a242";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [
          base HDBC HDBC-session HDBC-sqlite3 persistable-record
          relational-query relational-query-HDBC relational-schemas
@@ -147328,8 +149514,9 @@ self: {
      }) {};
 
   "repa-fftw" = callPackage
-    ({ mkDerivation, base, carray, fft, repa, storable-complex, tasty
-     , tasty-hunit, tasty-quickcheck
+    ({ mkDerivation, base, carray, criterion, deepseq, fft, random
+     , repa, repa-algorithms, storable-complex, tasty, tasty-hunit
+     , tasty-quickcheck
      }:
      mkDerivation {
        pname = "repa-fftw";
@@ -147339,6 +149526,9 @@ self: {
        testHaskellDepends = [
          base repa tasty tasty-hunit tasty-quickcheck
        ];
+       benchmarkHaskellDepends = [
+         base criterion deepseq random repa repa-algorithms
+       ];
        description = "Perform fft with repa via FFTW";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -147447,6 +149637,8 @@ self: {
        pname = "repa-sndfile";
        version = "3.2.3.3";
        sha256 = "68bee7a0b5fb4afefc77235987b2bff74b8e60c0d0b46aa3ba8a057d226cf95d";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [ base hsndfile repa ];
        testHaskellDepends = [
          base directory filepath hsndfile hsndfile-vector repa vector
@@ -147707,7 +149899,7 @@ self: {
 
   "req-conduit" = callPackage
     ({ mkDerivation, base, bytestring, conduit, conduit-extra, hspec
-     , http-client, req, resourcet, temporary, transformers
+     , http-client, req, resourcet, temporary, transformers, weigh
      }:
      mkDerivation {
        pname = "req-conduit";
@@ -147722,6 +149914,9 @@ self: {
          base bytestring conduit conduit-extra hspec req resourcet temporary
          transformers
        ];
+       benchmarkHaskellDepends = [
+         base bytestring conduit conduit-extra req resourcet temporary weigh
+       ];
        homepage = "https://github.com/mrkkrp/req-conduit";
        description = "Conduit helpers for the req HTTP client library";
        license = stdenv.lib.licenses.bsd3;
@@ -147773,8 +149968,9 @@ self: {
      }) {};
 
   "reroute" = callPackage
-    ({ mkDerivation, base, deepseq, hashable, hspec, http-api-data
-     , hvect, mtl, text, unordered-containers, vector
+    ({ mkDerivation, base, criterion, deepseq, graph-core, hashable
+     , hspec, http-api-data, hvect, mtl, random, regex-compat, text
+     , unordered-containers, vector
      }:
      mkDerivation {
        pname = "reroute";
@@ -147787,6 +149983,10 @@ self: {
        testHaskellDepends = [
          base hspec hvect mtl text unordered-containers vector
        ];
+       benchmarkHaskellDepends = [
+         base criterion deepseq graph-core hashable http-api-data hvect mtl
+         random regex-compat text unordered-containers vector
+       ];
        homepage = "http://github.com/agrafix/Spock";
        description = "abstract implementation of typed and untyped web routing";
        license = stdenv.lib.licenses.mit;
@@ -148294,20 +150494,24 @@ self: {
      }) {};
 
   "rethinkdb" = callPackage
-    ({ mkDerivation, aeson, base, base64-bytestring, binary, bytestring
-     , containers, data-default, doctest, mtl, network, scientific, text
-     , time, unordered-containers, utf8-string, vector
+    ({ mkDerivation, aeson, async, base, base64-bytestring, binary
+     , bytestring, containers, criterion, data-default, doctest, mtl
+     , network, scientific, text, time, unordered-containers
+     , utf8-string, vector
      }:
      mkDerivation {
        pname = "rethinkdb";
        version = "2.2.0.8";
        sha256 = "444938d62cba4cbe8606507e3c0abd341f45fd9acf6000102f1743ddb5a0e50f";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [
          aeson base base64-bytestring binary bytestring containers
          data-default mtl network scientific text time unordered-containers
          utf8-string vector
        ];
        testHaskellDepends = [ base doctest ];
+       benchmarkHaskellDepends = [ aeson async base criterion text ];
        homepage = "http://github.com/atnnn/haskell-rethinkdb";
        description = "A driver for RethinkDB 2.2";
        license = stdenv.lib.licenses.asl20;
@@ -148315,9 +150519,9 @@ self: {
 
   "rethinkdb-client-driver" = callPackage
     ({ mkDerivation, aeson, base, binary, bytestring, containers
-     , hashable, hspec, hspec-smallcheck, mtl, network, old-locale
-     , scientific, smallcheck, stm, template-haskell, text, time
-     , unordered-containers, vector
+     , criterion, hashable, hspec, hspec-smallcheck, mtl, network
+     , old-locale, scientific, smallcheck, stm, template-haskell, text
+     , time, unordered-containers, vector
      }:
      mkDerivation {
        pname = "rethinkdb-client-driver";
@@ -148334,6 +150538,9 @@ self: {
          base hspec hspec-smallcheck smallcheck text time
          unordered-containers vector
        ];
+       benchmarkHaskellDepends = [
+         base criterion text time unordered-containers vector
+       ];
        homepage = "https://github.com/wereHamster/rethinkdb-client-driver";
        description = "Client driver for RethinkDB";
        license = stdenv.lib.licenses.mit;
@@ -148574,6 +150781,8 @@ self: {
        pname = "rfc5051";
        version = "0.1.0.3";
        sha256 = "e38dab28a5625774be60545c8c99e647b79bbc0ac0bc9c65fe6b2ebef160642b";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [ base bytestring containers ];
        description = "Simple unicode collation as per RFC5051";
        license = stdenv.lib.licenses.bsd3;
@@ -148600,7 +150809,7 @@ self: {
 
   "riak" = callPackage
     ({ mkDerivation, aeson, attoparsec, base, binary, blaze-builder
-     , bytestring, containers, data-default-class, deepseq
+     , bytestring, containers, criterion, data-default-class, deepseq
      , enclosed-exceptions, exceptions, hashable, HUnit
      , mersenne-random-pure64, monad-control, mtl, network
      , protocol-buffers, pureMD5, QuickCheck, random, resource-pool
@@ -148623,6 +150832,7 @@ self: {
          base bytestring containers data-default-class HUnit mtl QuickCheck
          riak-protobuf semigroups tasty tasty-hunit tasty-quickcheck text
        ];
+       benchmarkHaskellDepends = [ base bytestring criterion semigroups ];
        homepage = "http://github.com/markhibberd/riak-haskell-client";
        description = "A Haskell client for the Riak decentralized data store";
        license = "unknown";
@@ -148993,26 +151203,23 @@ self: {
   "rlwe-challenges" = callPackage
     ({ mkDerivation, ansi-terminal, base, bytestring, containers
      , directory, DRBG, filepath, http-client, http-conduit, lol
-     , MonadRandom, mtl, nist-beacon, options, parsec, protocol-buffers
-     , protocol-buffers-descriptor, reflection, tagged, time
-     , transformers
+     , lol-cpp, MonadRandom, mtl, nist-beacon, options, parsec
+     , protocol-buffers, protocol-buffers-descriptor, reflection, tagged
+     , time
      }:
      mkDerivation {
        pname = "rlwe-challenges";
-       version = "0.0.0.1";
-       sha256 = "6a4c81357d92850790834fd570cd32c50bf07f0d80cf5f1c402c044588dc76f5";
-       revision = "7";
-       editedCabalFile = "71843308056de4beca80a87b7585129e14f2da528abc559f328af1b1c039d0f1";
+       version = "0.1.0.1";
+       sha256 = "f6e944ae436badc1bb3da258e54ef097eb1bd1fc05a656b89fb973a389f9f9e3";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
-         base lol MonadRandom protocol-buffers protocol-buffers-descriptor
-       ];
-       executableHaskellDepends = [
          ansi-terminal base bytestring containers directory DRBG filepath
-         http-client http-conduit lol MonadRandom mtl nist-beacon options
-         parsec protocol-buffers reflection tagged time transformers
+         http-client http-conduit lol lol-cpp MonadRandom mtl nist-beacon
+         parsec protocol-buffers protocol-buffers-descriptor reflection
+         tagged time
        ];
+       executableHaskellDepends = [ ansi-terminal base options time ];
        homepage = "https://github.com/cpeikert/Lol";
        description = "Ring-LWE/LWR challenges using Lol";
        license = stdenv.lib.licenses.gpl2;
@@ -149038,9 +151245,9 @@ self: {
 
   "rncryptor" = callPackage
     ({ mkDerivation, base, base16-bytestring, bytestring
-     , bytestring-arbitrary, cryptonite, fastpbkdf2, io-streams, memory
-     , mtl, QuickCheck, random, tasty, tasty-hunit, tasty-quickcheck
-     , text
+     , bytestring-arbitrary, criterion, cryptonite, fastpbkdf2
+     , io-streams, memory, mtl, QuickCheck, random, tasty, tasty-hunit
+     , tasty-quickcheck, text
      }:
      mkDerivation {
        pname = "rncryptor";
@@ -149059,6 +151266,7 @@ self: {
          base base16-bytestring bytestring bytestring-arbitrary cryptonite
          io-streams QuickCheck tasty tasty-hunit tasty-quickcheck text
        ];
+       benchmarkHaskellDepends = [ base bytestring criterion ];
        description = "Haskell implementation of the RNCryptor file format";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -149339,8 +151547,8 @@ self: {
      }:
      mkDerivation {
        pname = "rosa";
-       version = "0.3.0.0";
-       sha256 = "3779cc49176bc37088ce1d08fe35c45c6292e8645ddd3c64e97e9cfe2f13634c";
+       version = "0.3.1.0";
+       sha256 = "b363a0669623bd0edc46bf755ecdb34dc59121c302735515fd56a808567e7e42";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -149352,9 +151560,9 @@ self: {
      }) {};
 
   "rose-trees" = callPackage
-    ({ mkDerivation, base, containers, deepseq, hashable, mtl
-     , QuickCheck, quickcheck-instances, semigroupoids, semigroups, sets
-     , tasty, tasty-quickcheck, unordered-containers, witherable
+    ({ mkDerivation, base, containers, criterion, deepseq, hashable
+     , mtl, QuickCheck, quickcheck-instances, semigroupoids, semigroups
+     , sets, tasty, tasty-quickcheck, unordered-containers, witherable
      }:
      mkDerivation {
        pname = "rose-trees";
@@ -149370,6 +151578,11 @@ self: {
          semigroupoids semigroups sets tasty tasty-quickcheck
          unordered-containers witherable
        ];
+       benchmarkHaskellDepends = [
+         base containers criterion deepseq hashable mtl QuickCheck
+         quickcheck-instances semigroupoids semigroups sets
+         unordered-containers witherable
+       ];
        description = "A collection of rose tree structures";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -149628,6 +151841,8 @@ self: {
        pname = "roundtrip-xml";
        version = "0.3.0.5";
        sha256 = "35599e1f8ed46f1583dbcfd53caab4c3956dd7ad9c18d5705c41aaa8742286be";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [
          base blaze-builder blaze-builder-enumerator bytestring containers
          enumerator mtl pretty reference roundtrip roundtrip-string safe
@@ -149749,6 +151964,8 @@ self: {
        pname = "rpm";
        version = "0.0.1";
        sha256 = "9f2c95adfa873b55e56516ebb2a3c320914931d300b50ad1659d704669706af3";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [ base directory filepath HaXml process ];
        description = "Cozy little project to question unruly rpm packages";
        license = stdenv.lib.licenses.bsd3;
@@ -149852,6 +152069,8 @@ self: {
        pname = "rss-conduit";
        version = "0.3.0.0";
        sha256 = "370a507c6df71af1bdce4c27381ebaa2c87664c5ae6e853e9f43c927e3345f5c";
+       revision = "1";
+       editedCabalFile = "3f56fc5d8b09d690e1d7bd4059cd31361cea9f1300b0ce909def41066376f7a5";
        libraryHaskellDepends = [
          base conduit conduit-combinators containers lens-simple
          mono-traversable safe safe-exceptions text time timerep
@@ -149928,8 +152147,8 @@ self: {
      }:
      mkDerivation {
        pname = "rtcm";
-       version = "0.1.7";
-       sha256 = "1d9628bceacfbfad0d5d6add0e302ea6aae6aa4ae4fd179f23aa83fdada17f75";
+       version = "0.1.9";
+       sha256 = "f5187739a6c450ed71299c1bb2b077751c45df297d18be8af80e0c8941b6f850";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -150292,6 +152511,8 @@ self: {
        pname = "s-cargot";
        version = "0.1.1.1";
        sha256 = "5ac3d9e1a58763943249b3d7ac174ff3f17dec7a7508f984b8c1efc2a1c51c60";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [ base containers parsec text ];
        testHaskellDepends = [ base parsec QuickCheck text ];
        homepage = "https://github.com/aisamanra/s-cargot";
@@ -150811,6 +153032,8 @@ self: {
        pname = "sample-frame";
        version = "0.0.3";
        sha256 = "5baf301a4f7b2d52e6b9b9c06b10afd3938de0be6d09736d0188616cd9027247";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [ base QuickCheck storable-record ];
        homepage = "http://www.haskell.org/haskellwiki/Synthesizer";
        description = "Handling of samples in an (audio) signal";
@@ -150830,8 +153053,8 @@ self: {
      }) {};
 
   "sampling" = callPackage
-    ({ mkDerivation, base, containers, foldl, mwc-random, primitive
-     , vector
+    ({ mkDerivation, base, containers, criterion, foldl, mwc-random
+     , primitive, vector
      }:
      mkDerivation {
        pname = "sampling";
@@ -150841,6 +153064,7 @@ self: {
          base containers foldl mwc-random primitive vector
        ];
        testHaskellDepends = [ base ];
+       benchmarkHaskellDepends = [ base criterion ];
        homepage = "https://github.com/jtobin/sampling";
        description = "Sample values from collections";
        license = stdenv.lib.licenses.mit;
@@ -150852,9 +153076,13 @@ self: {
        pname = "samtools";
        version = "0.2.4.3";
        sha256 = "da91b82c0ce87b1f1f2775f7b1dd05352ceb918e79a926fc32ede324a9582086";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [ base bytestring seqloc vector ];
        librarySystemDepends = [ zlib ];
        libraryToolDepends = [ c2hs ];
+       executableSystemDepends = [ zlib ];
+       executableToolDepends = [ c2hs ];
        homepage = "http://www.ingolia-lab.org/samtools-tutorial.html";
        description = "Binding to the C samtools library";
        license = stdenv.lib.licenses.mit;
@@ -150904,6 +153132,8 @@ self: {
        pname = "samtools-iteratee";
        version = "0.2.2.1";
        sha256 = "d4807605be6092c876ca779b2e74beb1ea4c8f8d0338fdcc28ba804a07b82c8d";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [
          base bytestring iteratee samtools transformers
        ];
@@ -150913,8 +153143,9 @@ self: {
      }) {};
 
   "sandi" = callPackage
-    ({ mkDerivation, base, bytestring, conduit, exceptions, HUnit
-     , stringsearch, tasty, tasty-hunit, tasty-quickcheck, tasty-th
+    ({ mkDerivation, base, bytestring, conduit, criterion, exceptions
+     , HUnit, stringsearch, tasty, tasty-hunit, tasty-quickcheck
+     , tasty-th
      }:
      mkDerivation {
        pname = "sandi";
@@ -150926,6 +153157,7 @@ self: {
        testHaskellDepends = [
          base bytestring HUnit tasty tasty-hunit tasty-quickcheck tasty-th
        ];
+       benchmarkHaskellDepends = [ base bytestring criterion ];
        homepage = "http://hackage.haskell.org/package/sandi";
        description = "Data encoding library";
        license = stdenv.lib.licenses.bsd3;
@@ -151158,8 +153390,8 @@ self: {
      }) {};
 
   "say" = callPackage
-    ({ mkDerivation, base, bytestring, hspec, temporary, text
-     , transformers
+    ({ mkDerivation, base, bytestring, criterion, hspec, temporary
+     , text, transformers
      }:
      mkDerivation {
        pname = "say";
@@ -151167,6 +153399,9 @@ self: {
        sha256 = "f26fdb94ed81a2ae503beca0dcea74da7ee37408ba2e41ab3fdcaa9a7622fc40";
        libraryHaskellDepends = [ base bytestring text transformers ];
        testHaskellDepends = [ base bytestring hspec temporary text ];
+       benchmarkHaskellDepends = [
+         base bytestring criterion temporary text
+       ];
        homepage = "https://github.com/fpco/say#readme";
        description = "Initial project template from stack";
        license = stdenv.lib.licenses.mit;
@@ -151175,10 +153410,10 @@ self: {
   "sbp" = callPackage
     ({ mkDerivation, aeson, array, base, base64-bytestring
      , basic-prelude, binary, binary-conduit, bytestring, conduit
-     , conduit-combinators, conduit-extra, data-binary-ieee754, lens
-     , monad-loops, QuickCheck, resourcet, tasty, tasty-hunit
-     , tasty-quickcheck, template-haskell, text, unordered-containers
-     , yaml
+     , conduit-combinators, conduit-extra, criterion
+     , data-binary-ieee754, lens, monad-loops, QuickCheck, resourcet
+     , tasty, tasty-hunit, tasty-quickcheck, template-haskell, text
+     , unordered-containers, yaml
      }:
      mkDerivation {
        pname = "sbp";
@@ -151199,6 +153434,10 @@ self: {
          aeson base base64-bytestring basic-prelude bytestring QuickCheck
          tasty tasty-hunit tasty-quickcheck
        ];
+       benchmarkHaskellDepends = [
+         aeson base base64-bytestring basic-prelude binary bytestring
+         criterion
+       ];
        homepage = "https://github.com/swift-nav/libsbp";
        description = "SwiftNav's SBP Library";
        license = stdenv.lib.licenses.lgpl3;
@@ -151392,8 +153631,9 @@ self: {
      }) {};
 
   "scalpel-core" = callPackage
-    ({ mkDerivation, base, bytestring, containers, data-default, fail
-     , HUnit, regex-base, regex-tdfa, tagsoup, text, vector
+    ({ mkDerivation, base, bytestring, containers, criterion
+     , data-default, fail, HUnit, regex-base, regex-tdfa, tagsoup, text
+     , vector
      }:
      mkDerivation {
        pname = "scalpel-core";
@@ -151404,6 +153644,7 @@ self: {
          tagsoup text vector
        ];
        testHaskellDepends = [ base HUnit regex-base regex-tdfa tagsoup ];
+       benchmarkHaskellDepends = [ base criterion tagsoup text ];
        homepage = "https://github.com/fimad/scalpel";
        description = "A high level web scraping library for Haskell";
        license = stdenv.lib.licenses.asl20;
@@ -151437,13 +153678,18 @@ self: {
      }) {};
 
   "scanner" = callPackage
-    ({ mkDerivation, base, bytestring, hspec }:
+    ({ mkDerivation, attoparsec, base, bytestring, cereal, criterion
+     , hspec, text
+     }:
      mkDerivation {
        pname = "scanner";
        version = "0.2";
        sha256 = "3a020d68a0372a5211c72e55eeb299738ea608d17184bc68f74d31ebe667a5e9";
        libraryHaskellDepends = [ base bytestring ];
        testHaskellDepends = [ base bytestring hspec ];
+       benchmarkHaskellDepends = [
+         attoparsec base bytestring cereal criterion text
+       ];
        homepage = "https://github.com/Yuras/scanner";
        description = "Fast non-backtracking incremental combinator parsing for bytestrings";
        license = stdenv.lib.licenses.bsd3;
@@ -151615,8 +153861,8 @@ self: {
 
   "scholdoc" = callPackage
     ({ mkDerivation, aeson, base, base64-bytestring, binary, blaze-html
-     , blaze-markup, bytestring, containers, data-default, Diff
-     , directory, executable-path, extensible-exceptions, filepath
+     , blaze-markup, bytestring, containers, criterion, data-default
+     , Diff, directory, executable-path, extensible-exceptions, filepath
      , highlighting-kate, hslua, HTTP, http-client, http-client-tls
      , http-types, HUnit, JuicyPixels, mtl, network, network-uri
      , old-locale, old-time, parsec, process, QuickCheck, random
@@ -151651,6 +153897,7 @@ self: {
          HUnit process QuickCheck scholdoc-types syb test-framework
          test-framework-hunit test-framework-quickcheck2
        ];
+       benchmarkHaskellDepends = [ base criterion ];
        homepage = "http://scholdoc.scholarlymarkdown.com";
        description = "Converts ScholarlyMarkdown documents to HTML5/LaTeX/Docx format";
        license = "GPL";
@@ -151700,6 +153947,8 @@ self: {
        pname = "scholdoc-texmath";
        version = "0.1.0.1";
        sha256 = "2939f906890eb13f488013f787f09ef1e35ee12b29cf06e729638fe15a29cb17";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [
          base containers mtl parsec scholdoc-types syb xml
        ];
@@ -151781,10 +154030,10 @@ self: {
      }) {};
 
   "scientific" = callPackage
-    ({ mkDerivation, base, binary, bytestring, containers, deepseq
-     , ghc-prim, hashable, integer-gmp, integer-logarithms, QuickCheck
-     , smallcheck, tasty, tasty-ant-xml, tasty-hunit, tasty-quickcheck
-     , tasty-smallcheck, text, vector
+    ({ mkDerivation, base, binary, bytestring, containers, criterion
+     , deepseq, ghc-prim, hashable, integer-gmp, integer-logarithms
+     , QuickCheck, smallcheck, tasty, tasty-ant-xml, tasty-hunit
+     , tasty-quickcheck, tasty-smallcheck, text, vector
      }:
      mkDerivation {
        pname = "scientific";
@@ -151798,6 +154047,7 @@ self: {
          base binary bytestring QuickCheck smallcheck tasty tasty-ant-xml
          tasty-hunit tasty-quickcheck tasty-smallcheck text
        ];
+       benchmarkHaskellDepends = [ base criterion ];
        homepage = "https://github.com/basvandijk/scientific";
        description = "Numbers represented using scientific notation";
        license = stdenv.lib.licenses.bsd3;
@@ -152411,6 +154661,8 @@ self: {
        pname = "sdl2";
        version = "2.2.0";
        sha256 = "5a3a83fad8936539a4ff1a4a845f2a30b859d2d62e1cda7ab1f39cb59378c484";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [
          base bytestring exceptions linear StateVar text transformers vector
        ];
@@ -152426,6 +154678,8 @@ self: {
        pname = "sdl2-cairo";
        version = "0.1.0.2";
        sha256 = "e536adc0c2439267d3496cb5d33899c83d2e6d8debf2d56c69abd3c947704a86";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [ base cairo linear mtl random sdl2 time ];
        description = "Render with Cairo on SDL textures. Includes optional convenience drawing API.";
        license = stdenv.lib.licenses.mit;
@@ -152454,6 +154708,8 @@ self: {
        pname = "sdl2-compositor";
        version = "1.2.0.5";
        sha256 = "233b6fa622703849d4f7d69ac2202a0787b4e1048341b09767a3b5fa2e3ee255";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [
          base lens linear lrucache QuickCheck sdl2 StateVar stm text
          transformers
@@ -152557,11 +154813,12 @@ self: {
 
   "sdr" = callPackage
     ({ mkDerivation, array, base, bytestring, cairo, cereal, Chart
-     , Chart-cairo, colour, containers, Decimal, dynamic-graph, either
-     , fftwRaw, GLFW-b, mwc-random, OpenGL, optparse-applicative, pango
-     , pipes, pipes-bytestring, pipes-concurrency, primitive
-     , pulse-simple, QuickCheck, rtlsdr, storable-complex
-     , test-framework, test-framework-quickcheck2, time, tuple, vector
+     , Chart-cairo, colour, containers, criterion, Decimal
+     , dynamic-graph, either, fftwRaw, GLFW-b, mwc-random, OpenGL
+     , optparse-applicative, pango, pipes, pipes-bytestring
+     , pipes-concurrency, primitive, pulse-simple, QuickCheck, rtlsdr
+     , storable-complex, test-framework, test-framework-quickcheck2
+     , time, tuple, vector
      }:
      mkDerivation {
        pname = "sdr";
@@ -152578,6 +154835,9 @@ self: {
          base primitive QuickCheck storable-complex test-framework
          test-framework-quickcheck2 vector
        ];
+       benchmarkHaskellDepends = [
+         base criterion primitive storable-complex vector
+       ];
        homepage = "https://github.com/adamwalker/sdr";
        description = "A software defined radio library";
        license = stdenv.lib.licenses.bsd3;
@@ -152614,8 +154874,8 @@ self: {
     ({ mkDerivation, base, bytestring, free, mtl, text }:
      mkDerivation {
        pname = "seakale";
-       version = "0.1.0.0";
-       sha256 = "c1aebae23aaa611db361eb2327fba0d90b3559d5ab8702417696e80c6e6254ea";
+       version = "0.2.0.0";
+       sha256 = "cdbab7220b1935ef18dd78113fd87981371492d904a1e07d2911c94dcf2b2349";
        libraryHaskellDepends = [ base bytestring free mtl text ];
        description = "Pure SQL layer on top of other libraries";
        license = stdenv.lib.licenses.bsd3;
@@ -152627,8 +154887,8 @@ self: {
      }:
      mkDerivation {
        pname = "seakale-postgresql";
-       version = "0.1.1.0";
-       sha256 = "e13909695f1c4b1aa4615c2e2d586a352e42a144cbb7552fe0d029702d9f5533";
+       version = "0.2.0.0";
+       sha256 = "f7205329cf6388331f77da685cfc9e742130e6714d6a2103e57a5cd6cf49b9ac";
        libraryHaskellDepends = [
          base bytestring free mtl postgresql-libpq seakale time
        ];
@@ -152642,8 +154902,8 @@ self: {
      }:
      mkDerivation {
        pname = "seakale-tests";
-       version = "0.1.0.0";
-       sha256 = "bbd5c83a6335dca7f06bf8b7943e80bd3186530ff621d25b00b3a8a3950cec52";
+       version = "0.1.0.1";
+       sha256 = "ac54690de63000b5492d85b4009e5e6d3baab645726e06d4f099b990ce707508";
        libraryHaskellDepends = [
          base bytestring free mtl recursion-schemes seakale
        ];
@@ -153140,6 +155400,8 @@ self: {
        pname = "semiring";
        version = "0.3";
        sha256 = "befab81cfef9ae6499f44fdd93a2bc892f118b335462bcf2010aba4254f1a6ac";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [ base Boolean containers monoids ];
        homepage = "http://github.com/srush/SemiRings/tree/master";
        description = "Semirings, ring-like structures used for dynamic programming applications";
@@ -153177,8 +155439,8 @@ self: {
      }) {};
 
   "semver" = callPackage
-    ({ mkDerivation, attoparsec, base, deepseq, tasty, tasty-hunit
-     , text
+    ({ mkDerivation, attoparsec, base, criterion, deepseq, tasty
+     , tasty-hunit, text
      }:
      mkDerivation {
        pname = "semver";
@@ -153186,6 +155448,7 @@ self: {
        sha256 = "36d3369706836d60f3bc517f30c6860734481866363723904b8768823b6bc8b1";
        libraryHaskellDepends = [ attoparsec base deepseq text ];
        testHaskellDepends = [ base tasty tasty-hunit text ];
+       benchmarkHaskellDepends = [ base criterion text ];
        homepage = "https://github.com/brendanhay/semver";
        description = "Representation, manipulation, and de/serialisation of Semantic Versions";
        license = "unknown";
@@ -153517,6 +155780,8 @@ self: {
        pname = "sequent-core";
        version = "0.5.0.1";
        sha256 = "cd0a56a9fad3b7b0f53fd2e913f16a7d3c9472d0925f2ec56ed0da6c41ce39e1";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [
          base bytestring containers ghc transformers
        ];
@@ -153883,14 +156148,17 @@ self: {
 
   "servant-auth-cookie" = callPackage
     ({ mkDerivation, base, base64-bytestring, blaze-builder, bytestring
-     , cereal, cookie, cryptonite, data-default, deepseq, exceptions
-     , hspec, http-api-data, http-types, memory, mtl, QuickCheck
-     , servant, servant-server, tagged, time, transformers, wai
+     , cereal, cookie, criterion, cryptonite, data-default, deepseq
+     , exceptions, hspec, http-api-data, http-types, memory, mtl
+     , QuickCheck, servant, servant-server, tagged, time, transformers
+     , wai
      }:
      mkDerivation {
        pname = "servant-auth-cookie";
-       version = "0.4.3.2";
-       sha256 = "faf62ad020d449638c3059847f16af7d72bfa623d9f5a8ad375e2add9f2c2e3c";
+       version = "0.4.3.3";
+       sha256 = "40376b033b2bd4d78ad327d0b83c2d2dcce05406fb5fbb4fd49e306f30dfee10";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [
          base base64-bytestring blaze-builder bytestring cereal cookie
          cryptonite data-default exceptions http-api-data http-types memory
@@ -153900,6 +156168,9 @@ self: {
          base bytestring cereal cryptonite data-default deepseq hspec
          QuickCheck servant-server time
        ];
+       benchmarkHaskellDepends = [
+         base bytestring criterion cryptonite servant-server
+       ];
        description = "Authentication via encrypted cookies";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -154012,22 +156283,23 @@ self: {
      }:
      mkDerivation {
        pname = "servant-auth-server";
-       version = "0.2.2.0";
-       sha256 = "ffec3373f25cabc2b182ea7226fff9e43a151c02e603780e5848a5ea03ee48b4";
+       version = "0.2.4.0";
+       sha256 = "c61e2d4b8de2aee42713fd30f37532ae60c19527ea06601e656c595102c6bbf2";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
          aeson base base64-bytestring blaze-builder bytestring
          bytestring-conversion case-insensitive cookie crypto-api
-         data-default-class entropy http-api-data jose lens monad-time mtl
-         servant-auth servant-server text time unordered-containers wai
+         data-default-class entropy http-api-data http-types jose lens
+         monad-time mtl servant-auth servant-server text time
+         unordered-containers wai
        ];
        executableHaskellDepends = [
          aeson base base64-bytestring blaze-builder bytestring
          bytestring-conversion case-insensitive cookie crypto-api
-         data-default-class entropy http-api-data jose lens markdown-unlit
-         monad-time mtl servant-auth servant-server text time transformers
-         unordered-containers wai warp
+         data-default-class entropy http-api-data http-types jose lens
+         markdown-unlit monad-time mtl servant-auth servant-server text time
+         transformers unordered-containers wai warp
        ];
        testHaskellDepends = [
          aeson base base64-bytestring blaze-builder bytestring
@@ -154254,6 +156526,8 @@ self: {
        pname = "servant-db-postgresql";
        version = "0.2.1.0";
        sha256 = "6f3cefb7b24bf3d4e50efe84d903e79edc936b85950cc260855af4a50ac11071";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [
          base bytestring containers postgresql-query postgresql-simple
          servant servant-db text
@@ -154382,6 +156656,8 @@ self: {
        pname = "servant-elm";
        version = "0.4.0.1";
        sha256 = "69b3a5dcbb680fc1e923d76afa8255987d4613e0d4387eb493de071c9842ffc5";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [
          base elm-export lens servant servant-foreign text wl-pprint-text
        ];
@@ -154523,6 +156799,8 @@ self: {
        pname = "servant-jquery";
        version = "0.4.4.7";
        sha256 = "f3e7ba3e47ab318fc448f0539b4e58e8d82a5e9b32e3a6a6b5dea849dd7d11b1";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [ base charset lens servant text ];
        testHaskellDepends = [
          base hspec hspec-expectations language-ecmascript lens servant
@@ -154540,10 +156818,10 @@ self: {
      }:
      mkDerivation {
        pname = "servant-js";
-       version = "0.9.1";
-       sha256 = "bbc8a860d7b84f716fcff7337654115cf6b7ba756d9a325cc0b1124cf82ade27";
-       revision = "2";
-       editedCabalFile = "babc912d297dfde6d2f7ae019458ae5d5f363b5930566a7827df219746aad537";
+       version = "0.9.2";
+       sha256 = "ad4676667cdd72f5bafac5c2d6de710b9c0082131b72dd117026fecb0d544369";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [
          base base-compat charset lens servant servant-foreign text
        ];
@@ -154769,17 +157047,18 @@ self: {
 
   "servant-pushbullet-client" = callPackage
     ({ mkDerivation, aeson, base, http-api-data, http-client
-     , http-client-tls, microlens, microlens-th, scientific, servant
-     , servant-client, text, time, unordered-containers
+     , http-client-tls, microlens, microlens-th, pushbullet-types
+     , scientific, servant, servant-client, text, time
+     , unordered-containers
      }:
      mkDerivation {
        pname = "servant-pushbullet-client";
-       version = "0.0.3.0";
-       sha256 = "f6374498a3f6cfd59b8562cd506408dcbd6805cb107d2a756c1e3700aef09b9d";
+       version = "0.1.0.0";
+       sha256 = "185b20038906ae4e74dc08eb6723502444c9a9aa272f0051aed8325c31be6a1f";
        libraryHaskellDepends = [
          aeson base http-api-data http-client http-client-tls microlens
-         microlens-th scientific servant servant-client text time
-         unordered-containers
+         microlens-th pushbullet-types scientific servant servant-client
+         text time unordered-containers
        ];
        description = "Bindings to the Pushbullet API using servant-client";
        license = stdenv.lib.licenses.mit;
@@ -155407,6 +157686,8 @@ self: {
        pname = "set-cover";
        version = "0.0.8";
        sha256 = "186d3a1b6e824e3bd1d479347d8310dba9f1cba98e90bc03d885c42558ea95d1";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [
          base containers enummapset psqueues utility-ht
        ];
@@ -155530,7 +157811,7 @@ self: {
 
   "sets" = callPackage
     ({ mkDerivation, base, commutative, composition, containers
-     , contravariant, hashable, keys, mtl, QuickCheck
+     , contravariant, criterion, hashable, keys, mtl, QuickCheck
      , quickcheck-instances, semigroupoids, semigroups, tasty
      , tasty-hunit, tasty-quickcheck, transformers, transformers-base
      , unordered-containers, witherable
@@ -155549,6 +157830,10 @@ self: {
          quickcheck-instances tasty tasty-hunit tasty-quickcheck
          unordered-containers
        ];
+       benchmarkHaskellDepends = [
+         base commutative containers contravariant criterion
+         unordered-containers
+       ];
        description = "Ducktyped set interface for Haskell containers";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -155605,10 +157890,10 @@ self: {
      }) {};
 
   "sexp-grammar" = callPackage
-    ({ mkDerivation, alex, array, base, bytestring, containers, happy
-     , mtl, profunctors, QuickCheck, scientific, semigroups, split
-     , tagged, tasty, tasty-hunit, tasty-quickcheck, template-haskell
-     , text, transformers, wl-pprint-text
+    ({ mkDerivation, alex, array, base, bytestring, containers
+     , criterion, happy, mtl, profunctors, QuickCheck, scientific
+     , semigroups, split, tagged, tasty, tasty-hunit, tasty-quickcheck
+     , template-haskell, text, transformers, wl-pprint-text
      }:
      mkDerivation {
        pname = "sexp-grammar";
@@ -155624,6 +157909,9 @@ self: {
          base QuickCheck scientific semigroups tasty tasty-hunit
          tasty-quickcheck text
        ];
+       benchmarkHaskellDepends = [
+         base bytestring criterion scientific semigroups text
+       ];
        homepage = "https://github.com/esmolanka/sexp-grammar";
        description = "Invertible parsers for S-expressions";
        license = stdenv.lib.licenses.bsd3;
@@ -155651,6 +157939,8 @@ self: {
        pname = "sexpr";
        version = "0.2.1";
        sha256 = "7724dc079ba390c8302079483ddf5f12bb425c2461133f94be71fe62402edab9";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [
          base base64-string binary bytestring pretty
        ];
@@ -156488,6 +158778,8 @@ self: {
        sha256 = "e5a32f7552779667d1f0164d271e99c9ddcabdf1a7a1503cd6fc8ba0bb4445cd";
        revision = "1";
        editedCabalFile = "455095701152d4564c2b0a6e553f3add129b7bd0a91174a3bc2bc2292bdd5501";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [
          async base bytestring containers directory enclosed-exceptions
          exceptions lifted-async lifted-base monad-control mtl process
@@ -157145,11 +159437,13 @@ self: {
      }) {};
 
   "simple-conduit" = callPackage
-    ({ mkDerivation, base, bifunctors, bytestring, chunked-data
-     , containers, either, exceptions, filepath, free, lifted-async
-     , lifted-base, mmorph, monad-control, mono-traversable, mtl
-     , mwc-random, primitive, semigroups, stm, streaming-commons, text
-     , transformers, transformers-base, vector
+    ({ mkDerivation, base, bifunctors, bytestring, CC-delcont
+     , chunked-data, conduit, conduit-combinators, conduit-extra
+     , containers, criterion, either, exceptions, filepath, foldl, free
+     , hspec, lifted-async, lifted-base, mmorph, monad-control
+     , mono-traversable, mtl, mwc-random, primitive, QuickCheck
+     , semigroups, stm, streaming-commons, text, transformers
+     , transformers-base, vector, void
      }:
      mkDerivation {
        pname = "simple-conduit";
@@ -157161,6 +159455,14 @@ self: {
          monad-control mono-traversable mtl mwc-random primitive semigroups
          stm streaming-commons text transformers transformers-base vector
        ];
+       benchmarkHaskellDepends = [
+         base bifunctors bytestring CC-delcont chunked-data conduit
+         conduit-combinators conduit-extra containers criterion either
+         exceptions filepath foldl free hspec lifted-async lifted-base
+         mmorph monad-control mono-traversable mtl mwc-random primitive
+         QuickCheck semigroups stm streaming-commons text transformers
+         transformers-base vector void
+       ];
        homepage = "http://github.com/jwiegley/simple-conduit";
        description = "A simple streaming I/O library based on monadic folds";
        license = stdenv.lib.licenses.bsd3;
@@ -157219,8 +159521,9 @@ self: {
      }) {};
 
   "simple-effects" = callPackage
-    ({ mkDerivation, array, base, exceptions, list-t, monad-control
-     , MonadRandom, mtl, text, transformers, transformers-base
+    ({ mkDerivation, array, base, criterion, exceptions, list-t
+     , monad-control, MonadRandom, mtl, text, transformers
+     , transformers-base
      }:
      mkDerivation {
        pname = "simple-effects";
@@ -157231,6 +159534,7 @@ self: {
          transformers transformers-base
        ];
        testHaskellDepends = [ base ];
+       benchmarkHaskellDepends = [ base criterion mtl transformers ];
        homepage = "https://gitlab.com/LukaHorvat/simple-effects";
        description = "A simple effect system that integrates with MTL";
        license = stdenv.lib.licenses.bsd3;
@@ -157653,6 +159957,8 @@ self: {
        pname = "simple-sql-parser";
        version = "0.4.2";
        sha256 = "ba720de50c82b47a90a1774e7b50365483801cfcb19e664cd184e04003ec7b04";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [ base mtl parsec pretty ];
        testHaskellDepends = [
          base HUnit mtl parsec pretty test-framework test-framework-hunit
@@ -157727,8 +160033,8 @@ self: {
      }) {};
 
   "simple-vec3" = callPackage
-    ({ mkDerivation, base, QuickCheck, tasty, tasty-quickcheck
-     , tasty-th, vector, vector-th-unbox
+    ({ mkDerivation, base, criterion, QuickCheck, tasty
+     , tasty-quickcheck, tasty-th, vector, vector-th-unbox
      }:
      mkDerivation {
        pname = "simple-vec3";
@@ -157739,6 +160045,9 @@ self: {
          base QuickCheck tasty tasty-quickcheck tasty-th vector
          vector-th-unbox
        ];
+       benchmarkHaskellDepends = [
+         base criterion QuickCheck vector vector-th-unbox
+       ];
        homepage = "https://github.com/dzhus/simple-vec3#readme";
        description = "Three-dimensional vectors of doubles with basic operations";
        license = stdenv.lib.licenses.bsd3;
@@ -158053,24 +160362,25 @@ self: {
 
   "siphon" = callPackage
     ({ mkDerivation, attoparsec, base, bytestring, colonnade
-     , contravariant, either, HUnit, pipes, QuickCheck, test-framework
-     , test-framework-hunit, test-framework-quickcheck2, text, vector
+     , contravariant, either, HUnit, pipes, profunctors, QuickCheck
+     , test-framework, test-framework-hunit, test-framework-quickcheck2
+     , text, vector
      }:
      mkDerivation {
        pname = "siphon";
-       version = "0.2";
-       sha256 = "e55afce422fa4724636f7383624239a817f580cfedae68714df10ab0ff6ecc2d";
+       version = "0.6";
+       sha256 = "5776b99c6ef4262278ab7f76ecc9c83ee5ab7c137c3cdb9ee9c5badac24e2511";
        libraryHaskellDepends = [
          attoparsec base bytestring colonnade contravariant pipes text
          vector
        ];
        testHaskellDepends = [
          base bytestring colonnade contravariant either HUnit pipes
-         QuickCheck test-framework test-framework-hunit
+         profunctors QuickCheck test-framework test-framework-hunit
          test-framework-quickcheck2 text
        ];
        homepage = "https://github.com/andrewthad/colonnade#readme";
-       description = "Generic types and functions for columnar encoding and decoding";
+       description = "Encode and decode CSV files";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
@@ -158165,6 +160475,8 @@ self: {
        sha256 = "c76772fc89028f5407906bc699e7dd98e02328d0fe98c151706100e49f4899db";
        revision = "3";
        editedCabalFile = "ecf77e6598e7fbe7a12fc5bbb3cce000f14ffe87bee8386c95912e49f9a31e54";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [
          array base base-compat containers singletons
        ];
@@ -158341,16 +160653,42 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "skylark-client" = callPackage
+    ({ mkDerivation, base, conduit, conduit-extra, http-conduit
+     , http-types, lifted-async, optparse-generic, preamble, shakers
+     , stm, stm-conduit
+     }:
+     mkDerivation {
+       pname = "skylark-client";
+       version = "0.1.5";
+       sha256 = "e50e874a1f16ce71721d92118740853c53ee8822d43e173e670b47297dbb3ff7";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base conduit http-conduit http-types lifted-async preamble stm
+         stm-conduit
+       ];
+       executableHaskellDepends = [
+         base conduit-extra optparse-generic preamble shakers
+       ];
+       homepage = "https://github.com/githubuser/skylark-client#readme";
+       description = "Skylark client";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "skylighting" = callPackage
     ({ mkDerivation, aeson, base, blaze-html, bytestring
-     , case-insensitive, containers, Diff, directory, filepath, HUnit
-     , hxt, mtl, pretty-show, random, regex-pcre-builtin, safe, tasty
-     , tasty-golden, tasty-hunit, text, utf8-string
+     , case-insensitive, containers, criterion, Diff, directory
+     , filepath, HUnit, hxt, mtl, pretty-show, random
+     , regex-pcre-builtin, safe, tasty, tasty-golden, tasty-hunit, text
+     , utf8-string
      }:
      mkDerivation {
        pname = "skylighting";
        version = "0.1.1.5";
        sha256 = "0a4b666b2ccfeed35386bd364d663e919adc1815547e6360e83487253e33b13c";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [
          aeson base blaze-html bytestring case-insensitive containers
          directory filepath hxt mtl regex-pcre-builtin safe text utf8-string
@@ -158359,30 +160697,40 @@ self: {
          aeson base bytestring containers Diff directory filepath HUnit
          pretty-show random tasty tasty-golden tasty-hunit text
        ];
+       benchmarkHaskellDepends = [
+         base criterion directory filepath text
+       ];
        homepage = "https://github.com/jgm/skylighting";
        description = "syntax highlighting library";
        license = stdenv.lib.licenses.gpl2;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "skylighting_0_3" = callPackage
-    ({ mkDerivation, aeson, base, binary, blaze-html, bytestring
-     , case-insensitive, containers, Diff, directory, filepath, HUnit
-     , hxt, mtl, pretty-show, random, regex-pcre-builtin, safe, tasty
-     , tasty-golden, tasty-hunit, text, utf8-string
+  "skylighting_0_3_1" = callPackage
+    ({ mkDerivation, aeson, attoparsec, base, binary, blaze-html
+     , bytestring, case-insensitive, containers, criterion, Diff
+     , directory, filepath, HUnit, hxt, mtl, pretty-show, random
+     , regex-pcre-builtin, safe, tasty, tasty-golden, tasty-hunit, text
+     , utf8-string
      }:
      mkDerivation {
        pname = "skylighting";
-       version = "0.3";
-       sha256 = "ebfb2d5c8ce5769522826a2d5744064c578291d25d3671dcfe89a41f694ebf59";
+       version = "0.3.1";
+       sha256 = "d93ee3b15d74ab66fd729c4b56741c052fe331b4cfc78bad2a433827417d4f74";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [
-         aeson base binary blaze-html bytestring case-insensitive containers
-         directory filepath hxt mtl regex-pcre-builtin safe text utf8-string
+         aeson attoparsec base binary blaze-html bytestring case-insensitive
+         containers directory filepath hxt mtl regex-pcre-builtin safe text
+         utf8-string
        ];
        testHaskellDepends = [
          aeson base bytestring containers Diff directory filepath HUnit
          pretty-show random tasty tasty-golden tasty-hunit text
        ];
+       benchmarkHaskellDepends = [
+         base containers criterion directory filepath text
+       ];
        homepage = "https://github.com/jgm/skylighting";
        description = "syntax highlighting library";
        license = stdenv.lib.licenses.gpl2;
@@ -158490,6 +160838,24 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "slack-web" = callPackage
+    ({ mkDerivation, aeson, base, generics-sop, http-api-data
+     , http-client, http-client-tls, servant, servant-client, text
+     , transformers
+     }:
+     mkDerivation {
+       pname = "slack-web";
+       version = "0.1.0";
+       sha256 = "82186c8bfe6857856034c9d53b0259e61b0575519d1cb22cb024f8464fb5f380";
+       libraryHaskellDepends = [
+         aeson base generics-sop http-api-data http-client http-client-tls
+         servant servant-client text transformers
+       ];
+       homepage = "https://github.com/jpvillaisaza/slack-web";
+       description = "Bindings for the Slack web API";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "slave-thread" = callPackage
     ({ mkDerivation, base, base-prelude, HTF, list-t, mmorph
      , partial-handler, QuickCheck, quickcheck-instances, SafeSemaphore
@@ -159373,6 +161739,8 @@ self: {
        pname = "snap-extras";
        version = "0.12.0.0";
        sha256 = "76ec979fa905a305392a545f24c6a33217e83aeedd0a8eec311623722b26e494";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [
          aeson base blaze-builder blaze-html bytestring case-insensitive
          configurator containers data-default digestive-functors
@@ -159482,12 +161850,12 @@ self: {
   "snap-server" = callPackage
     ({ mkDerivation, attoparsec, base, base16-bytestring, blaze-builder
      , bytestring, bytestring-builder, case-insensitive, clock
-     , containers, deepseq, directory, filepath, HsOpenSSL, http-common
-     , http-streams, HUnit, io-streams, io-streams-haproxy, lifted-base
-     , monad-control, mtl, network, old-locale, openssl-streams
-     , parallel, QuickCheck, random, snap-core, test-framework
-     , test-framework-hunit, test-framework-quickcheck2, text, threads
-     , time, transformers, unix, unix-compat, vector
+     , containers, criterion, deepseq, directory, filepath, HsOpenSSL
+     , http-common, http-streams, HUnit, io-streams, io-streams-haproxy
+     , lifted-base, monad-control, mtl, network, old-locale
+     , openssl-streams, parallel, QuickCheck, random, snap-core
+     , test-framework, test-framework-hunit, test-framework-quickcheck2
+     , text, threads, time, transformers, unix, unix-compat, vector
      }:
      mkDerivation {
        pname = "snap-server";
@@ -159496,6 +161864,8 @@ self: {
        revision = "1";
        editedCabalFile = "5b9b8071df32b8590c28df9cf4eb4afd77ee4554ff536b7e5a1d617f5e32f9a7";
        configureFlags = [ "-fopenssl" ];
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [
          attoparsec base blaze-builder bytestring bytestring-builder
          case-insensitive clock containers filepath HsOpenSSL io-streams
@@ -159511,6 +161881,10 @@ self: {
          test-framework test-framework-hunit test-framework-quickcheck2 text
          threads time transformers unix unix-compat vector
        ];
+       benchmarkHaskellDepends = [
+         attoparsec base blaze-builder bytestring bytestring-builder
+         criterion io-streams io-streams-haproxy snap-core vector
+       ];
        homepage = "http://snapframework.com/";
        description = "A web server for the Snap Framework";
        license = stdenv.lib.licenses.bsd3;
@@ -160582,9 +162956,10 @@ self: {
      }) {};
 
   "snowball" = callPackage
-    ({ mkDerivation, base, bytestring, HUnit, QuickCheck
-     , quickcheck-instances, test-framework-hunit
-     , test-framework-quickcheck2, test-framework-th, text, text-icu
+    ({ mkDerivation, base, bytestring, criterion, HUnit
+     , language-haskell-extract, QuickCheck, quickcheck-instances
+     , test-framework-hunit, test-framework-quickcheck2
+     , test-framework-th, text, text-icu
      }:
      mkDerivation {
        pname = "snowball";
@@ -160595,6 +162970,9 @@ self: {
          base HUnit QuickCheck quickcheck-instances test-framework-hunit
          test-framework-quickcheck2 test-framework-th text
        ];
+       benchmarkHaskellDepends = [
+         base criterion language-haskell-extract text
+       ];
        homepage = "http://hub.darcs.net/dag/snowball";
        description = "Bindings to the Snowball library";
        license = stdenv.lib.licenses.bsd3;
@@ -160771,6 +163149,24 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "socket_0_8_0_1" = callPackage
+    ({ mkDerivation, async, base, bytestring, QuickCheck, tasty
+     , tasty-hunit, tasty-quickcheck
+     }:
+     mkDerivation {
+       pname = "socket";
+       version = "0.8.0.1";
+       sha256 = "745f6d1ef2299e321ad646918b9b733c82b4ded51b3b6aab6755c85182ab09a2";
+       libraryHaskellDepends = [ base bytestring ];
+       testHaskellDepends = [
+         async base bytestring QuickCheck tasty tasty-hunit tasty-quickcheck
+       ];
+       homepage = "https://github.com/lpeterse/haskell-socket";
+       description = "An extensible socket library";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "socket-activation" = callPackage
     ({ mkDerivation, base, network, transformers, unix }:
      mkDerivation {
@@ -160821,8 +163217,8 @@ self: {
      }:
      mkDerivation {
        pname = "socket-unix";
-       version = "0.1.1.0";
-       sha256 = "7541dd005761c6d08f8a87fe8157e1cfde128437c3bb3b9a72f3052f799ebd0f";
+       version = "0.2.0.0";
+       sha256 = "4d7591116dcbf70f9aea4a4f80fe9261abc19b03184b46a6463e09d020f435ac";
        libraryHaskellDepends = [ base bytestring socket ];
        testHaskellDepends = [
          async base bytestring socket tasty tasty-hunit unix
@@ -161016,8 +163412,8 @@ self: {
      }) {};
 
   "sophia" = callPackage
-    ({ mkDerivation, base, bindings-sophia, bytestring, directory
-     , tasty, tasty-hunit
+    ({ mkDerivation, base, binary, bindings-sophia, bytestring
+     , criterion, directory, tasty, tasty-hunit
      }:
      mkDerivation {
        pname = "sophia";
@@ -161027,6 +163423,9 @@ self: {
        testHaskellDepends = [
          base bindings-sophia bytestring directory tasty tasty-hunit
        ];
+       benchmarkHaskellDepends = [
+         base binary bindings-sophia bytestring criterion directory
+       ];
        description = "Bindings to Sophia library";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -161061,12 +163460,13 @@ self: {
      }) {};
 
   "sorted-list" = callPackage
-    ({ mkDerivation, base, deepseq }:
+    ({ mkDerivation, base, criterion, deepseq }:
      mkDerivation {
        pname = "sorted-list";
        version = "0.2.0.0";
        sha256 = "cc52c787b056f4d3a9ecc59f06701695602558a4233042ff8f613cdd4985d138";
        libraryHaskellDepends = [ base deepseq ];
+       benchmarkHaskellDepends = [ base criterion ];
        homepage = "https://github.com/Daniel-Diaz/sorted-list/blob/master/README.md";
        description = "Type-enforced sorted lists and related functions";
        license = stdenv.lib.licenses.bsd3;
@@ -161161,8 +163561,8 @@ self: {
      }) {};
 
   "sourcemap" = callPackage
-    ({ mkDerivation, aeson, attoparsec, base, bytestring, process, text
-     , unordered-containers, utf8-string
+    ({ mkDerivation, aeson, attoparsec, base, bytestring, criterion
+     , process, random, text, unordered-containers, utf8-string
      }:
      mkDerivation {
        pname = "sourcemap";
@@ -161177,6 +163577,7 @@ self: {
        testHaskellDepends = [
          aeson base bytestring process text unordered-containers utf8-string
        ];
+       benchmarkHaskellDepends = [ base bytestring criterion random ];
        description = "Implementation of source maps as proposed by Google and Mozilla";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -161229,6 +163630,8 @@ self: {
        pname = "soxlib";
        version = "0.0.3";
        sha256 = "18b555beb0eaafce25550feea23575ec68477728654bd2fbaad67d448f5dcd8b";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [
          base bytestring containers explicit-exception extensible-exceptions
          sample-frame storablevector transformers utility-ht
@@ -161286,8 +163689,8 @@ self: {
      }) {};
 
   "spaceprobe" = callPackage
-    ({ mkDerivation, base, clock, containers, erf, mtl, QuickCheck
-     , test-framework, test-framework-quickcheck2
+    ({ mkDerivation, base, clock, containers, criterion, erf, mtl
+     , QuickCheck, test-framework, test-framework-quickcheck2
      }:
      mkDerivation {
        pname = "spaceprobe";
@@ -161298,6 +163701,7 @@ self: {
          base clock containers erf mtl QuickCheck test-framework
          test-framework-quickcheck2
        ];
+       benchmarkHaskellDepends = [ base criterion ];
        homepage = "https://github.com/SeanRBurton/spaceprobe";
        description = "Optimization over arbitrary search spaces";
        license = stdenv.lib.licenses.bsd3;
@@ -161347,12 +163751,37 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "sparkle_0_5_0_1" = callPackage
+    ({ mkDerivation, base, binary, bytestring, choice
+     , distributed-closure, filepath, jni, jvm, jvm-streaming, process
+     , regex-tdfa, singletons, streaming, text, vector, zip-archive
+     }:
+     mkDerivation {
+       pname = "sparkle";
+       version = "0.5.0.1";
+       sha256 = "6b3458a12a880567c1ab2a8b51d3e0a2186e8d2621ce8c3dcf72f8dca183d133";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base binary bytestring choice distributed-closure jni jvm
+         jvm-streaming singletons streaming text vector
+       ];
+       executableHaskellDepends = [
+         base bytestring filepath process regex-tdfa text zip-archive
+       ];
+       homepage = "http://github.com/tweag/sparkle#readme";
+       description = "Distributed Apache Spark applications in Haskell";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "sparse" = callPackage
-    ({ mkDerivation, base, bytestring, containers, contravariant
-     , deepseq, directory, doctest, filepath, hlint, hybrid-vectors
-     , lens, linear, mtl, primitive, QuickCheck, semigroups
-     , simple-reflect, test-framework, test-framework-quickcheck2
-     , test-framework-th, transformers, vector, vector-algorithms
+    ({ mkDerivation, array, base, bytestring, containers, contravariant
+     , criterion, deepseq, directory, doctest, filepath, hlint
+     , hybrid-vectors, lens, linear, mtl, primitive, QuickCheck
+     , semigroups, simple-reflect, test-framework
+     , test-framework-quickcheck2, test-framework-th, transformers
+     , vector, vector-algorithms
      }:
      mkDerivation {
        pname = "sparse";
@@ -161368,6 +163797,7 @@ self: {
          test-framework test-framework-quickcheck2 test-framework-th
          transformers vector
        ];
+       benchmarkHaskellDepends = [ array base criterion deepseq vector ];
        homepage = "http://github.com/ekmett/sparse";
        description = "A playground of sparse linear algebra primitives using Morton ordering";
        license = stdenv.lib.licenses.bsd3;
@@ -161393,21 +163823,21 @@ self: {
      }) {};
 
   "sparse-linear-algebra" = callPackage
-    ({ mkDerivation, base, containers, criterion, exceptions, hspec
-     , mtl, mwc-random, primitive, QuickCheck, transformers, vector
-     , vector-algorithms, vector-space
+    ({ mkDerivation, base, containers, exceptions, hspec
+     , matrix-market-attoparsec, mtl, mwc-random, primitive, QuickCheck
+     , scientific, transformers, vector, vector-algorithms, vector-space
      }:
      mkDerivation {
        pname = "sparse-linear-algebra";
-       version = "0.2.9.4";
-       sha256 = "5d97d81653785f08783cd29107f0f87c01611cf5b1ad1395ef1a8b799a04adf6";
+       version = "0.2.9.7";
+       sha256 = "f807cccc34abde9b33235b18739ca69f4b94500b932350a04c0107bb56d8536b";
        libraryHaskellDepends = [
          base containers exceptions mtl transformers vector
          vector-algorithms vector-space
        ];
        testHaskellDepends = [
-         base containers criterion exceptions hspec mtl mwc-random primitive
-         QuickCheck vector-space
+         base containers exceptions hspec matrix-market-attoparsec mtl
+         mwc-random primitive QuickCheck scientific vector-space
        ];
        homepage = "https://github.com/ocramz/sparse-linear-algebra";
        description = "Numerical computation in native Haskell";
@@ -161844,8 +164274,9 @@ self: {
      }) {};
 
   "splines" = callPackage
-    ({ mkDerivation, base, containers, polynomial, QuickCheck
-     , test-framework, test-framework-quickcheck2, vector, vector-space
+    ({ mkDerivation, base, containers, criterion, polynomial
+     , QuickCheck, test-framework, test-framework-quickcheck2, vector
+     , vector-space
      }:
      mkDerivation {
        pname = "splines";
@@ -161858,6 +164289,7 @@ self: {
          base containers polynomial QuickCheck test-framework
          test-framework-quickcheck2 vector vector-space
        ];
+       benchmarkHaskellDepends = [ base criterion polynomial vector ];
        description = "B-Splines, other splines, and NURBS";
        license = stdenv.lib.licenses.publicDomain;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -162035,6 +164467,8 @@ self: {
        pname = "spreadsheet";
        version = "0.1.3.4";
        sha256 = "7e4a26ac4e565cb6fbc5845f010e0930b0ce2beff05dca998f312cd3d40249c2";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [
          base explicit-exception transformers utility-ht
        ];
@@ -162176,8 +164610,9 @@ self: {
      }) {};
 
   "spsa" = callPackage
-    ({ mkDerivation, base, hmatrix, HUnit, mtl, QuickCheck, random
-     , test-framework, test-framework-hunit, test-framework-quickcheck2
+    ({ mkDerivation, base, criterion, hmatrix, HUnit, mtl, QuickCheck
+     , random, test-framework, test-framework-hunit
+     , test-framework-quickcheck2
      }:
      mkDerivation {
        pname = "spsa";
@@ -162188,6 +164623,7 @@ self: {
          base hmatrix HUnit QuickCheck random test-framework
          test-framework-hunit test-framework-quickcheck2
        ];
+       benchmarkHaskellDepends = [ base criterion hmatrix random ];
        homepage = "https://github.com/yanatan16/haskell-spsa";
        description = "Simultaneous Perturbation Stochastic Approximation Optimization Algorithm";
        license = stdenv.lib.licenses.mit;
@@ -162341,8 +164777,8 @@ self: {
      }:
      mkDerivation {
        pname = "sqlite-simple";
-       version = "0.4.12.1";
-       sha256 = "2f24f4dfea3b3bc1657b26c786666abd041bb89e09c22d084eaea43d67112227";
+       version = "0.4.13.0";
+       sha256 = "59b124c667b9c80cb59bcaf5ed9319b248daec81a70754063571a61b1771f9e8";
        libraryHaskellDepends = [
          attoparsec base blaze-builder blaze-textual bytestring containers
          direct-sqlite text time transformers
@@ -162578,6 +165014,8 @@ self: {
        pname = "ssh-known-hosts";
        version = "0.2.0.0";
        sha256 = "0a93cbeae395701ff1cd609c29aaa2b59d507304b91612a28193156faac210fe";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [ base iproute text ];
        testHaskellDepends = [
          base HUnit iproute QuickCheck test-framework test-framework-hunit
@@ -162693,12 +165131,17 @@ self: {
      }) {};
 
   "stable-heap" = callPackage
-    ({ mkDerivation, base }:
+    ({ mkDerivation, base, criterion, fingertree, heaps, mwc-random
+     , pqueue, vector
+     }:
      mkDerivation {
        pname = "stable-heap";
        version = "0.1.0.0";
        sha256 = "410f316118037f3fed6dcd58c667b5ad278f4e5bac6053c6366d8b59a9209d93";
        libraryHaskellDepends = [ base ];
+       benchmarkHaskellDepends = [
+         base criterion fingertree heaps mwc-random pqueue vector
+       ];
        homepage = "http://hub.darcs.net/jmcarthur/stable-heap";
        description = "Purely functional stable heaps (fair priority queues)";
        license = stdenv.lib.licenses.mit;
@@ -162770,8 +165213,8 @@ self: {
      }) {};
 
   "stache" = callPackage
-    ({ mkDerivation, aeson, base, bytestring, containers, deepseq
-     , directory, exceptions, file-embed, filepath, hspec
+    ({ mkDerivation, aeson, base, bytestring, containers, criterion
+     , deepseq, directory, exceptions, file-embed, filepath, hspec
      , hspec-megaparsec, megaparsec, mtl, template-haskell, text
      , unordered-containers, vector, yaml
      }:
@@ -162790,6 +165233,9 @@ self: {
          aeson base bytestring containers file-embed hspec hspec-megaparsec
          megaparsec text yaml
        ];
+       benchmarkHaskellDepends = [
+         aeson base criterion deepseq megaparsec text
+       ];
        homepage = "https://github.com/stackbuilders/stache";
        description = "Mustache templates for Haskell";
        license = stdenv.lib.licenses.bsd3;
@@ -163430,7 +165876,8 @@ self: {
      }) {};
 
   "stateWriter" = callPackage
-    ({ mkDerivation, base, free, hspec, mtl, QuickCheck, transformers
+    ({ mkDerivation, base, containers, criterion, deepseq, dlist, free
+     , hspec, lens, mtl, QuickCheck, transformers, vector
      }:
      mkDerivation {
        pname = "stateWriter";
@@ -163438,6 +165885,10 @@ self: {
        sha256 = "dbed209ec350b751b2c56388ab751149874f6b76c0d7a6725de1583682ccc6e2";
        libraryHaskellDepends = [ base mtl transformers ];
        testHaskellDepends = [ base free hspec mtl QuickCheck ];
+       benchmarkHaskellDepends = [
+         base containers criterion deepseq dlist lens mtl transformers
+         vector
+       ];
        description = "A faster variant of the RWS monad transformers";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -163969,7 +166420,8 @@ self: {
      }) {};
 
   "stitch" = callPackage
-    ({ mkDerivation, base, Cabal, containers, hspec, text, transformers
+    ({ mkDerivation, base, Cabal, containers, criterion, hspec, text
+     , transformers
      }:
      mkDerivation {
        pname = "stitch";
@@ -163977,6 +166429,7 @@ self: {
        sha256 = "72c114222abde4dbee6f087def13105bde3036a039ac6ded9e0f44462691ad77";
        libraryHaskellDepends = [ base containers text transformers ];
        testHaskellDepends = [ base Cabal hspec text ];
+       benchmarkHaskellDepends = [ base criterion ];
        description = "lightweight CSS DSL";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -164057,9 +166510,10 @@ self: {
      }) {};
 
   "stm-containers" = callPackage
-    ({ mkDerivation, base, base-prelude, focus, free, hashable, HTF
-     , list-t, loch-th, mtl, mtl-prelude, placeholders, primitive
-     , QuickCheck, transformers, unordered-containers
+    ({ mkDerivation, async, base, base-prelude, containers, criterion
+     , focus, free, hashable, hashtables, HTF, list-t, loch-th, mtl
+     , mtl-prelude, mwc-random, mwc-random-monad, placeholders
+     , primitive, QuickCheck, text, transformers, unordered-containers
      }:
      mkDerivation {
        pname = "stm-containers";
@@ -164073,6 +166527,11 @@ self: {
          mtl-prelude placeholders primitive QuickCheck transformers
          unordered-containers
        ];
+       benchmarkHaskellDepends = [
+         async base base-prelude containers criterion focus free hashable
+         hashtables list-t loch-th mtl mtl-prelude mwc-random
+         mwc-random-monad placeholders text unordered-containers
+       ];
        homepage = "https://github.com/nikita-volkov/stm-containers";
        description = "Containers for STM";
        license = stdenv.lib.licenses.mit;
@@ -164408,6 +166867,8 @@ self: {
        pname = "storable-record";
        version = "0.0.3.1";
        sha256 = "74e5ceee49e0b7625d13759597d21e714843406b8b80e9168a0bb1199ffdadba";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [ base transformers utility-ht ];
        homepage = "http://code.haskell.org/~thielema/storable-record/";
        description = "Elegant definition of Storable instances for records";
@@ -164442,7 +166903,8 @@ self: {
 
   "storablevector" = callPackage
     ({ mkDerivation, base, bytestring, deepseq, non-negative
-     , QuickCheck, random, syb, transformers, unsafe, utility-ht
+     , QuickCheck, random, sample-frame, syb, transformers, unsafe
+     , utility-ht
      }:
      mkDerivation {
        pname = "storablevector";
@@ -164455,6 +166917,7 @@ self: {
        testHaskellDepends = [
          base bytestring QuickCheck random utility-ht
        ];
+       benchmarkHaskellDepends = [ base deepseq sample-frame utility-ht ];
        homepage = "http://www.haskell.org/haskellwiki/Storable_Vector";
        description = "Fast, packed, strict storable arrays with a list interface like ByteString";
        license = stdenv.lib.licenses.bsd3;
@@ -164478,6 +166941,8 @@ self: {
        pname = "storablevector-streamfusion";
        version = "0.0";
        sha256 = "d52cd96003f494733840cba6e0f83fd2a5900ceaa5e180b38a48b800f254f6e1";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [
          base storablevector stream-fusion utility-ht
        ];
@@ -164524,6 +166989,16 @@ self: {
          time transformers unordered-containers vector
          vector-binary-instances void weigh
        ];
+       benchmarkHaskellDepends = [
+         array async base base-orphans base64-bytestring bytestring conduit
+         containers contravariant criterion cryptohash deepseq directory
+         filepath free ghc-prim hashable hspec hspec-smallcheck integer-gmp
+         lifted-base monad-control mono-traversable network primitive
+         resourcet safe semigroups smallcheck store-core streaming-commons
+         syb template-haskell text th-lift th-lift-instances th-orphans
+         th-reify-many th-utilities time transformers unordered-containers
+         vector void
+       ];
        homepage = "https://github.com/fpco/store#readme";
        description = "Fast binary serialization";
        license = stdenv.lib.licenses.mit;
@@ -164573,6 +167048,8 @@ self: {
        pname = "stratosphere";
        version = "0.4.0";
        sha256 = "27c7b48ff3f78231711eab021b4a54b82b3b58e0dfa43e02b8c41a8be9c4527d";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [
          aeson aeson-pretty base bytestring hashable lens template-haskell
          text unordered-containers
@@ -164693,8 +167170,8 @@ self: {
      }) {};
 
   "stream" = callPackage
-    ({ mkDerivation, base, bytestring, exceptions, hspec, mtl
-     , streaming-commons, temporary, transformers
+    ({ mkDerivation, base, bytestring, criterion, exceptions, ghc-prim
+     , hspec, mtl, streaming-commons, temporary, transformers, vector
      }:
      mkDerivation {
        pname = "stream";
@@ -164704,6 +167181,9 @@ self: {
          base bytestring exceptions mtl streaming-commons transformers
        ];
        testHaskellDepends = [ base bytestring hspec temporary ];
+       benchmarkHaskellDepends = [
+         base bytestring criterion ghc-prim temporary vector
+       ];
        homepage = "https://github.com/githubuser/stream#readme";
        description = "Initial project template from stack";
        license = stdenv.lib.licenses.mit;
@@ -164729,6 +167209,8 @@ self: {
        pname = "stream-monad";
        version = "0.4.0.2";
        sha256 = "86cd5770f903184b47113c42978cc409a483a5bdd2619c9e11f5a2339491210c";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [ base logict ];
        homepage = "http://github.com/sebfisch/stream-monad";
        description = "Simple, Fair and Terminating Backtracking Monad";
@@ -164798,8 +167280,8 @@ self: {
 
   "streaming-commons" = callPackage
     ({ mkDerivation, array, async, base, blaze-builder, bytestring
-     , deepseq, directory, hspec, network, process, QuickCheck, random
-     , stm, text, transformers, unix, zlib
+     , criterion, deepseq, directory, hspec, network, process
+     , QuickCheck, random, stm, text, transformers, unix, zlib
      }:
      mkDerivation {
        pname = "streaming-commons";
@@ -164813,6 +167295,9 @@ self: {
          array async base blaze-builder bytestring deepseq hspec network
          QuickCheck text unix zlib
        ];
+       benchmarkHaskellDepends = [
+         base blaze-builder bytestring criterion deepseq text
+       ];
        homepage = "https://github.com/fpco/streaming-commons";
        description = "Common lower-level functions needed by various streaming data libraries";
        license = stdenv.lib.licenses.mit;
@@ -164851,6 +167336,7 @@ self: {
        testHaskellDepends = [
          base containers tasty tasty-hunit tasty-quickcheck
        ];
+       benchmarkHaskellDepends = [ base criterion ];
        license = stdenv.lib.licenses.asl20;
      }) {};
 
@@ -164863,6 +167349,8 @@ self: {
        pname = "streaming-png";
        version = "0.1.0.0";
        sha256 = "ecb3509c29481d7deb3b65c976cc08fb9a859cff9f52ad48c16402d9439420ca";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [
          base bytestring cereal exceptions JuicyPixels mmorph mtl resourcet
          streaming streaming-bytestring streaming-commons transformers
@@ -165273,13 +167761,16 @@ self: {
      }) {};
 
   "string-similarity" = callPackage
-    ({ mkDerivation, base, bytestring, hspec, QuickCheck, suffixtree }:
+    ({ mkDerivation, base, bytestring, criterion, hspec, QuickCheck
+     , suffixtree
+     }:
      mkDerivation {
        pname = "string-similarity";
        version = "0.1.0.0";
        sha256 = "bb2e18741f084bef90531050a5b14712aca4e78d05de12d3ec6b803a5e9e034c";
        libraryHaskellDepends = [ base suffixtree ];
        testHaskellDepends = [ base bytestring hspec QuickCheck ];
+       benchmarkHaskellDepends = [ base criterion ];
        homepage = "http://github.com/mwotton/string-similarity";
        description = "longest common substring";
        license = stdenv.lib.licenses.bsd3;
@@ -165637,12 +168128,12 @@ self: {
      }) {};
 
   "structures" = callPackage
-    ({ mkDerivation, base, bytestring, containers, contravariant
-     , deepseq, directory, doctest, filepath, free, ghc, ghc-prim
-     , hashable, hlint, hybrid-vectors, lens, monad-st, parallel
-     , primitive, QuickCheck, semigroups, tasty, tasty-quickcheck
-     , tasty-th, transformers, unordered-containers, vector
-     , vector-algorithms
+    ({ mkDerivation, array, base, bytestring, containers, contravariant
+     , criterion, deepseq, directory, doctest, filepath, free, ghc
+     , ghc-prim, hashable, hlint, hybrid-vectors, lens, monad-st
+     , MonadRandom, parallel, primitive, QuickCheck, semigroups, tasty
+     , tasty-quickcheck, tasty-th, transformers, unordered-containers
+     , vector, vector-algorithms
      }:
      mkDerivation {
        pname = "structures";
@@ -165658,6 +168149,10 @@ self: {
          QuickCheck semigroups tasty tasty-quickcheck tasty-th
          unordered-containers
        ];
+       benchmarkHaskellDepends = [
+         array base containers criterion deepseq MonadRandom
+         unordered-containers vector
+       ];
        homepage = "http://github.com/ekmett/structures";
        description = "\"Advanced\" Data Structures";
        license = stdenv.lib.licenses.bsd3;
@@ -165804,10 +168299,11 @@ self: {
 
   "subhask" = callPackage
     ({ mkDerivation, approximate, array, base, bloomfilter, bytes
-     , bytestring, cassava, containers, deepseq, erf, gamma, ghc-prim
-     , hmatrix, hyperloglog, lens, monad-primitive, MonadRandom, mtl
-     , parallel, primitive, QuickCheck, semigroups, template-haskell
-     , test-framework, test-framework-quickcheck2, vector
+     , bytestring, cassava, containers, criterion, deepseq, erf, gamma
+     , ghc-prim, hmatrix, hyperloglog, lens, monad-primitive
+     , MonadRandom, mtl, parallel, primitive, QuickCheck, semigroups
+     , template-haskell, test-framework, test-framework-quickcheck2
+     , vector
      }:
      mkDerivation {
        pname = "subhask";
@@ -165822,6 +168318,7 @@ self: {
        testHaskellDepends = [
          base test-framework test-framework-quickcheck2
        ];
+       benchmarkHaskellDepends = [ base criterion MonadRandom ];
        homepage = "http://github.com/mikeizbicki/subhask";
        description = "Type safe interface for programming in subcategories of Hask";
        license = stdenv.lib.licenses.bsd3;
@@ -165929,8 +168426,8 @@ self: {
      }) {};
 
   "suffix-array" = callPackage
-    ({ mkDerivation, array, base, containers, tasty, tasty-hunit
-     , tasty-quickcheck
+    ({ mkDerivation, array, base, containers, criterion, random, tasty
+     , tasty-hunit, tasty-quickcheck
      }:
      mkDerivation {
        pname = "suffix-array";
@@ -165943,6 +168440,7 @@ self: {
        testHaskellDepends = [
          array base containers tasty tasty-hunit tasty-quickcheck
        ];
+       benchmarkHaskellDepends = [ base criterion random ];
        homepage = "https://github.com/kadoban/suffix-array#readme";
        description = "Simple and moderately efficient suffix array implementation";
        license = stdenv.lib.licenses.bsd3;
@@ -166142,13 +168640,18 @@ self: {
      }) {};
 
   "superbuffer" = callPackage
-    ({ mkDerivation, async, base, bytestring, HTF, QuickCheck }:
+    ({ mkDerivation, async, base, buffer-builder, bytestring, criterion
+     , HTF, QuickCheck
+     }:
      mkDerivation {
        pname = "superbuffer";
        version = "0.2.0.1";
        sha256 = "ced2a0ed729661412d28da1248d39a5b47bb4513847deae59219a0fc12b51166";
        libraryHaskellDepends = [ base bytestring ];
        testHaskellDepends = [ async base bytestring HTF QuickCheck ];
+       benchmarkHaskellDepends = [
+         async base buffer-builder bytestring criterion
+       ];
        homepage = "https://github.com/agrafix/superbuffer#readme";
        description = "Efficiently build a bytestring from smaller chunks";
        license = stdenv.lib.licenses.bsd3;
@@ -166162,6 +168665,8 @@ self: {
        pname = "supercollider-ht";
        version = "0.3";
        sha256 = "3cceb4e622bf1d6d7887cbefcd8d68e277c0d638de522276d4aa09db1cc316ed";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [
          base hosc hsc3 opensoundcontrol-ht process random transformers
        ];
@@ -166804,10 +169309,10 @@ self: {
      }) {};
 
   "sync-mht" = callPackage
-    ({ mkDerivation, array, base, base16-bytestring, byteable, bytes
-     , bytestring, cereal, containers, cryptohash, directory, exceptions
-     , filepath, HUnit, io-streams, mtl, process, random, regex-compat
-     , temporary, text, time, transformers, unix, zlib
+    ({ mkDerivation, aeson, array, base, base16-bytestring, byteable
+     , bytes, bytestring, cereal, containers, cryptohash, directory
+     , exceptions, filepath, HUnit, io-streams, mtl, process, random
+     , regex-compat, temporary, text, time, transformers, unix, zlib
      }:
      mkDerivation {
        pname = "sync-mht";
@@ -166833,6 +169338,9 @@ self: {
          io-streams mtl process random regex-compat temporary text time
          transformers unix zlib
        ];
+       benchmarkHaskellDepends = [
+         aeson base bytestring directory filepath process temporary time
+       ];
        homepage = "https://github.com/ekarayel/sync-mht";
        description = "Fast incremental file transfer using Merkle-Hash-Trees";
        license = stdenv.lib.licenses.mit;
@@ -166905,10 +169413,10 @@ self: {
      }) {Synt = null;};
 
   "syntactic" = callPackage
-    ({ mkDerivation, base, constraints, containers, data-hash, deepseq
-     , mtl, QuickCheck, syb, tagged, tasty, tasty-golden
-     , tasty-quickcheck, tasty-th, template-haskell, tree-view
-     , utf8-string
+    ({ mkDerivation, base, constraints, containers, criterion
+     , data-hash, deepseq, mtl, QuickCheck, syb, tagged, tasty
+     , tasty-golden, tasty-quickcheck, tasty-th, template-haskell
+     , tree-view, utf8-string
      }:
      mkDerivation {
        pname = "syntactic";
@@ -166922,6 +169430,7 @@ self: {
          base containers mtl QuickCheck tagged tasty tasty-golden
          tasty-quickcheck tasty-th utf8-string
        ];
+       benchmarkHaskellDepends = [ base criterion deepseq ];
        homepage = "https://github.com/emilaxelsson/syntactic";
        description = "Generic representation and manipulation of abstract syntax";
        license = stdenv.lib.licenses.bsd3;
@@ -167085,6 +169594,8 @@ self: {
        pname = "synthesizer";
        version = "0.2.0.1";
        sha256 = "6dfc0790c370fe8743052ee4ead7eb341d8ac44b126cc7911241a01e0c38b9d8";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [
          array base binary bytestring containers event-list filepath gnuplot
          non-negative numeric-prelude numeric-quest process QuickCheck
@@ -167106,6 +169617,8 @@ self: {
        pname = "synthesizer-alsa";
        version = "0.5.0.5";
        sha256 = "aa9ac69ac0f0e1728b635cd06a1753d67a877ecfb24e6d51cbab15660f13ce26";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [
          alsa-core alsa-pcm alsa-seq base event-list midi midi-alsa
          non-negative numeric-prelude old-time random sox storablevector
@@ -167120,10 +169633,11 @@ self: {
 
   "synthesizer-core" = callPackage
     ({ mkDerivation, array, base, binary, bytestring, containers
-     , deepseq, event-list, explicit-exception, filepath, non-empty
-     , non-negative, numeric-prelude, numeric-quest, process, QuickCheck
-     , random, sample-frame-np, sox, storable-record, storable-tuple
-     , storablevector, transformers, utility-ht
+     , deepseq, directory, event-list, explicit-exception, filepath
+     , non-empty, non-negative, numeric-prelude, numeric-quest, old-time
+     , process, QuickCheck, random, sample-frame-np, sox
+     , storable-record, storable-tuple, storablevector, timeit
+     , transformers, utility-ht
      }:
      mkDerivation {
        pname = "synthesizer-core";
@@ -167140,6 +169654,10 @@ self: {
          base containers event-list non-empty non-negative numeric-prelude
          QuickCheck random storable-tuple storablevector utility-ht
        ];
+       benchmarkHaskellDepends = [
+         array base binary bytestring directory numeric-prelude old-time
+         storable-tuple storablevector timeit utility-ht
+       ];
        homepage = "http://www.haskell.org/haskellwiki/Synthesizer";
        description = "Audio signal processing coded in Haskell: Low level part";
        license = "GPL";
@@ -167155,6 +169673,8 @@ self: {
        pname = "synthesizer-dimensional";
        version = "0.8.0.2";
        sha256 = "d687c5907132d106952e033618ab7256885aa03bc462840c68131fbd4ec1a19d";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [
          base bytestring event-list non-negative numeric-prelude random sox
          storable-record storablevector synthesizer-core transformers
@@ -167192,6 +169712,8 @@ self: {
        pname = "synthesizer-inference";
        version = "0.2";
        sha256 = "2ba794a3c1331a8f5c6e7927c6a4f06ea389d1692d1bac4cdf14e63d4e6b501e";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [
          base event-list non-negative numeric-prelude random
          synthesizer-core transformers UniqueLogicNP utility-ht
@@ -167213,6 +169735,8 @@ self: {
        pname = "synthesizer-llvm";
        version = "0.8.1.2";
        sha256 = "29fe7aacb673c44726a7aefa627759e4545cee369c09f1197784b1b8a2aa74e6";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [
          base containers event-list llvm-extra llvm-tf midi non-empty
          non-negative numeric-prelude pathtype random sox storable-record
@@ -167240,6 +169764,8 @@ self: {
        pname = "synthesizer-midi";
        version = "0.6.0.4";
        sha256 = "607da1d5dd809228f89a73fc7caa26f5f7b7c41da0c8fa928848610835c47ff5";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [
          array base containers data-accessor data-accessor-transformers
          deepseq event-list midi non-negative numeric-prelude sox
@@ -167465,10 +169991,10 @@ self: {
      }) {};
 
   "system-random-effect" = callPackage
-    ({ mkDerivation, base, bytestring, crypto-api, extensible-effects
-     , HUnit, mersenne-random-pure64, primitive, QuickCheck, statistics
-     , test-framework, test-framework-hunit, test-framework-quickcheck2
-     , vector, vector-algorithms
+    ({ mkDerivation, base, bytestring, criterion, crypto-api, deepseq
+     , extensible-effects, HUnit, mersenne-random-pure64, primitive
+     , QuickCheck, statistics, test-framework, test-framework-hunit
+     , test-framework-quickcheck2, vector, vector-algorithms
      }:
      mkDerivation {
        pname = "system-random-effect";
@@ -167483,6 +170009,9 @@ self: {
          base extensible-effects HUnit QuickCheck test-framework
          test-framework-hunit test-framework-quickcheck2 vector
        ];
+       benchmarkHaskellDepends = [
+         base criterion deepseq extensible-effects vector
+       ];
        homepage = "https://github.com/wowus/system-random-effect";
        description = "Random number generation for extensible effects";
        license = stdenv.lib.licenses.bsd3;
@@ -167552,11 +170081,14 @@ self: {
        pname = "system-uuid";
        version = "2.1.1";
        sha256 = "8b911863eab0109f0030282af3b94fa233988de78ef2050bd30ebbfeb02a8089";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [
          base binary bytestring containers murmur-hash parsec
          template-haskell
        ];
        librarySystemDepends = [ libossp_uuid ];
+       executableSystemDepends = [ libossp_uuid ];
        homepage = "http://github.com/solidsnack/system-uuid/";
        description = "Bindings to system UUID functions";
        license = stdenv.lib.licenses.bsd3;
@@ -167935,17 +170467,23 @@ self: {
 
   "tagchup" = callPackage
     ({ mkDerivation, base, bytestring, containers, data-accessor
-     , explicit-exception, transformers, utility-ht, xml-basic
+     , explicit-exception, old-time, transformers, utility-ht, xml-basic
      }:
      mkDerivation {
        pname = "tagchup";
        version = "0.4.0.5";
        sha256 = "c0c12eeec562a7769deb165c7edae8a8dbc0087d5788655b72864df122a0fa35";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [
          base bytestring containers data-accessor explicit-exception
          transformers utility-ht xml-basic
        ];
        testHaskellDepends = [ base xml-basic ];
+       benchmarkHaskellDepends = [
+         base bytestring containers data-accessor explicit-exception
+         old-time transformers utility-ht xml-basic
+       ];
        homepage = "http://code.haskell.org/~thielema/tagchup/";
        description = "alternative package for processing of tag soups";
        license = "GPL";
@@ -168088,8 +170626,8 @@ self: {
 
   "taggy" = callPackage
     ({ mkDerivation, attoparsec, base, blaze-html, blaze-markup
-     , directory, hspec, hspec-attoparsec, text, unordered-containers
-     , vector
+     , criterion, directory, hspec, hspec-attoparsec, tagsoup, text
+     , unordered-containers, vector
      }:
      mkDerivation {
        pname = "taggy";
@@ -168108,6 +170646,9 @@ self: {
          attoparsec base blaze-html blaze-markup directory hspec
          hspec-attoparsec text unordered-containers vector
        ];
+       benchmarkHaskellDepends = [
+         attoparsec base criterion tagsoup text vector
+       ];
        homepage = "http://github.com/alpmestan/taggy";
        description = "Efficient and simple HTML/XML parsing library";
        license = stdenv.lib.licenses.bsd3;
@@ -168194,8 +170735,10 @@ self: {
     ({ mkDerivation, base, bytestring, containers, text }:
      mkDerivation {
        pname = "tagsoup";
-       version = "0.14";
-       sha256 = "90822d8bb9d3a40d070a1f282fb2f7f6beec13f01f958f716de9d005e2e9ea1e";
+       version = "0.14.1";
+       sha256 = "028be660a864e0918f99f90471caea72af2bfbf8a64a423e181b2b29f9c64aeb";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [ base bytestring containers text ];
        homepage = "https://github.com/ndmitchell/tagsoup#readme";
        description = "Parsing and extracting information from (possibly malformed) HTML/XML documents";
@@ -168386,6 +170929,8 @@ self: {
        pname = "takusen-oracle";
        version = "0.9.4.1";
        sha256 = "492159551e80b58cff2318546f3649dd1c2b08eb4ff4f94d855d713df4ec868b";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [ base mtl old-time time ];
        librarySystemDepends = [ clntsh ];
        homepage = "https://github.com/paulrzcz/takusen-oracle.git";
@@ -168530,8 +171075,8 @@ self: {
 
   "tar" = callPackage
     ({ mkDerivation, array, base, bytestring, bytestring-handle
-     , containers, deepseq, directory, filepath, QuickCheck, tasty
-     , tasty-quickcheck, time
+     , containers, criterion, deepseq, directory, filepath, old-time
+     , QuickCheck, tasty, tasty-quickcheck, time
      }:
      mkDerivation {
        pname = "tar";
@@ -168544,6 +171089,10 @@ self: {
          array base bytestring bytestring-handle containers deepseq
          directory filepath QuickCheck tasty tasty-quickcheck time
        ];
+       benchmarkHaskellDepends = [
+         array base bytestring containers criterion deepseq directory
+         filepath old-time time
+       ];
        description = "Reading, writing and manipulating \".tar\" archive files.";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -168575,12 +171124,13 @@ self: {
      }) {};
 
   "target" = callPackage
-    ({ mkDerivation, array, base, containers, deepseq, directory
-     , exceptions, filepath, ghc, ghc-paths, ghc-prim, hint
-     , liquid-fixpoint, liquidhaskell, mtl, pretty, process, QuickCheck
-     , syb, tagged, tasty, tasty-hunit, template-haskell, text
-     , text-format, th-lift, transformers, unordered-containers, vector
-     , z3
+    ({ mkDerivation, aeson, array, base, bytestring, cassava
+     , containers, data-timeout, deepseq, directory, exceptions
+     , filepath, ghc, ghc-paths, ghc-prim, hint, liquid-fixpoint
+     , liquidhaskell, mtl, pretty, process, QuickCheck, random
+     , SafeSemaphore, smallcheck, syb, tagged, tasty, tasty-hunit
+     , template-haskell, text, text-format, th-lift, time, transformers
+     , unordered-containers, vector, xml-conduit, z3
      }:
      mkDerivation {
        pname = "target";
@@ -168601,6 +171151,12 @@ self: {
          unordered-containers
        ];
        testSystemDepends = [ z3 ];
+       benchmarkHaskellDepends = [
+         aeson base bytestring cassava containers data-timeout deepseq ghc
+         liquid-fixpoint liquidhaskell mtl QuickCheck random SafeSemaphore
+         smallcheck tagged template-haskell time unordered-containers vector
+         xml-conduit
+       ];
        description = "Generate test-suites from refinement types";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -168718,6 +171274,25 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "tasty-ant-xml_1_0_5" = callPackage
+    ({ mkDerivation, base, containers, directory, filepath
+     , generic-deriving, ghc-prim, mtl, stm, tagged, tasty, transformers
+     , xml
+     }:
+     mkDerivation {
+       pname = "tasty-ant-xml";
+       version = "1.0.5";
+       sha256 = "642d440fcce4c4025b7d33ac49d2c4f017d72397f494bae0401843bb42925436";
+       libraryHaskellDepends = [
+         base containers directory filepath generic-deriving ghc-prim mtl
+         stm tagged tasty transformers xml
+       ];
+       homepage = "http://github.com/ocharles/tasty-ant-xml";
+       description = "Render tasty output to XML for Jenkins";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "tasty-auto" = callPackage
     ({ mkDerivation, base, directory, filepath, tasty, tasty-hspec
      , tasty-hunit, tasty-quickcheck, tasty-smallcheck
@@ -168752,6 +171327,19 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "tasty-dejafu_0_4_0_0" = callPackage
+    ({ mkDerivation, base, dejafu, random, tagged, tasty }:
+     mkDerivation {
+       pname = "tasty-dejafu";
+       version = "0.4.0.0";
+       sha256 = "b2e4f21f9ccc2777d36090f71f560fbff0c3fde3bf43d966339b3fc2bf19577e";
+       libraryHaskellDepends = [ base dejafu random tagged tasty ];
+       homepage = "https://github.com/barrucadu/dejafu";
+       description = "Deja Fu support for the Tasty test framework";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "tasty-discover" = callPackage
     ({ mkDerivation, base, directory, filepath, tasty, tasty-hspec
      , tasty-hunit, tasty-quickcheck, tasty-th
@@ -169076,8 +171664,8 @@ self: {
      }:
      mkDerivation {
        pname = "tasty-stats";
-       version = "0.2.0.1";
-       sha256 = "0957921fffb8ecc225694ab16812d329dbb3ab60c4905cd08bca6b087faa4311";
+       version = "0.2.0.2";
+       sha256 = "f6871db08e37ce62802d85040c59742f5611bc2450a2c1ceab6a6e80d58dc6a5";
        libraryHaskellDepends = [
          base containers directory process stm tagged tasty time
        ];
@@ -169260,6 +171848,29 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "tcp-streams_1_0_0_0" = callPackage
+    ({ mkDerivation, base, bytestring, data-default-class, directory
+     , HUnit, io-streams, network, pem, test-framework
+     , test-framework-hunit, tls, x509, x509-store, x509-system
+     }:
+     mkDerivation {
+       pname = "tcp-streams";
+       version = "1.0.0.0";
+       sha256 = "eb47251fa998f141bf5969e50980e5573da4531461d733e707695d504cca00b8";
+       libraryHaskellDepends = [
+         base bytestring data-default-class io-streams network pem tls x509
+         x509-store x509-system
+       ];
+       testHaskellDepends = [
+         base bytestring directory HUnit io-streams network test-framework
+         test-framework-hunit
+       ];
+       homepage = "https://github.com/didi-FP/tcp-streams";
+       description = "One stop solution for tcp client and server with tls support";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "tcp-streams-openssl" = callPackage
     ({ mkDerivation, base, bytestring, directory, HsOpenSSL
      , HsOpenSSL-x509-system, HUnit, io-streams, network, QuickCheck
@@ -169285,6 +171896,29 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "tcp-streams-openssl_1_0_0_0" = callPackage
+    ({ mkDerivation, base, bytestring, HsOpenSSL, HsOpenSSL-x509-system
+     , HUnit, io-streams, network, tcp-streams, test-framework
+     , test-framework-hunit
+     }:
+     mkDerivation {
+       pname = "tcp-streams-openssl";
+       version = "1.0.0.0";
+       sha256 = "779dde5cac1fd61a8ee04ded3075bcad61e4851c7e685104196ac44fedf22f47";
+       libraryHaskellDepends = [
+         base bytestring HsOpenSSL HsOpenSSL-x509-system io-streams network
+         tcp-streams
+       ];
+       testHaskellDepends = [
+         base bytestring HUnit io-streams network tcp-streams test-framework
+         test-framework-hunit
+       ];
+       homepage = "https://github.com/didi-FP/tcp-streams";
+       description = "Tcp streams using openssl for tls support";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "tdd-util" = callPackage
     ({ mkDerivation, base, bytestring, HUnit, lens
      , MonadCatchIO-transformers, parallel-io, process, QuickCheck
@@ -169315,8 +171949,10 @@ self: {
 
   "tdigest" = callPackage
     ({ mkDerivation, base, base-compat, binary, bytes, Cabal
-     , cabal-doctest, deepseq, directory, doctest, filepath, reducers
-     , semigroups, tasty, tasty-quickcheck, vector, vector-algorithms
+     , cabal-doctest, Chart, Chart-diagrams, deepseq, directory, doctest
+     , filepath, machines, mwc-random, optparse-applicative, parallel
+     , reducers, semigroups, statistics, tasty, tasty-quickcheck, time
+     , vector, vector-algorithms
      }:
      mkDerivation {
        pname = "tdigest";
@@ -169331,6 +171967,11 @@ self: {
          base base-compat binary bytes deepseq directory doctest filepath
          semigroups tasty tasty-quickcheck vector vector-algorithms
        ];
+       benchmarkHaskellDepends = [
+         base base-compat binary Chart Chart-diagrams deepseq machines
+         mwc-random optparse-applicative parallel semigroups statistics time
+         vector vector-algorithms
+       ];
        homepage = "https://github.com/futurice/haskell-tdigest#readme";
        description = "On-line accumulation of rank-based statistics";
        license = stdenv.lib.licenses.bsd3;
@@ -169855,8 +172496,8 @@ self: {
      }:
      mkDerivation {
        pname = "term-rewriting";
-       version = "0.2";
-       sha256 = "2154905572f2b12c37d4a6ec3dd57d1bdd243057216aaf584432538af2635d1d";
+       version = "0.2.1.1";
+       sha256 = "81ea2a0712af3b6f8f802c29f2fbc2dfb8e48db81dd4da48c42aa5382987e64e";
        libraryHaskellDepends = [
          ansi-wl-pprint array base containers mtl multiset parsec
          union-find-array
@@ -169893,6 +172534,8 @@ self: {
        pname = "terminal-progress-bar";
        version = "0.1.1";
        sha256 = "2053a7ac9113378a6ae8852447b4e7ba430c014776443046788e84183dc9f380";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [ base stm stm-chans ];
        testHaskellDepends = [
          base HUnit test-framework test-framework-hunit
@@ -170059,6 +172702,8 @@ self: {
        sha256 = "7883626a5aebb1df327bf26dbd382208946250a79f9cc3bf9a9eb0b0767bb273";
        revision = "1";
        editedCabalFile = "a6d9dbedbb574271e85c6e5ef9a9f935d87501a9b99b473bf306e3dcd36bdd9e";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [
          ansi-terminal ansi-wl-pprint base containers hostname old-locale
          random regex-posix time xml
@@ -170266,13 +172911,16 @@ self: {
      }) {};
 
   "test-invariant" = callPackage
-    ({ mkDerivation, base, QuickCheck, tasty, tasty-quickcheck }:
+    ({ mkDerivation, base, criterion, QuickCheck, tasty
+     , tasty-quickcheck
+     }:
      mkDerivation {
        pname = "test-invariant";
        version = "0.4.5.0";
        sha256 = "306fbfcd1b7fea5a88b757ac90550ae6083f64e9dae7da5a3a26c87acf9c6332";
        libraryHaskellDepends = [ base QuickCheck ];
        testHaskellDepends = [ base QuickCheck tasty tasty-quickcheck ];
+       benchmarkHaskellDepends = [ base criterion QuickCheck ];
        homepage = "https://github.com/knupfer/test-invariant";
        description = "Provide common invariants to be checked with QuickCheck";
        license = stdenv.lib.licenses.bsd3;
@@ -170434,6 +173082,8 @@ self: {
        pname = "testbench";
        version = "0.1.0.0";
        sha256 = "66592406ff6e1a03d3ae994560e0bf04e500398fd0a9c9be6bca34a3b86f3e83";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [
          base boxes criterion deepseq HUnit statistics transformers
        ];
@@ -170573,6 +173223,8 @@ self: {
        pname = "texmath";
        version = "0.9.1";
        sha256 = "cafb98d25da63bdd76f75b29bf395c9e023cf46d753db9a1534e84879cb8697e";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [
          base containers mtl pandoc-types parsec syb xml
        ];
@@ -170674,7 +173326,7 @@ self: {
      }) {};
 
   "text-builder" = callPackage
-    ({ mkDerivation, base, base-prelude, bytestring
+    ({ mkDerivation, base, base-prelude, bytestring, criterion
      , quickcheck-instances, rerebase, semigroups, tasty, tasty-hunit
      , tasty-quickcheck, tasty-smallcheck, text
      }:
@@ -170689,6 +173341,7 @@ self: {
          quickcheck-instances rerebase tasty tasty-hunit tasty-quickcheck
          tasty-smallcheck
        ];
+       benchmarkHaskellDepends = [ criterion rerebase ];
        homepage = "https://github.com/nikita-volkov/text-builder";
        description = "An efficient strict text builder";
        license = stdenv.lib.licenses.mit;
@@ -170937,13 +173590,14 @@ self: {
      }) {};
 
   "text-manipulate" = callPackage
-    ({ mkDerivation, base, tasty, tasty-hunit, text }:
+    ({ mkDerivation, base, criterion, tasty, tasty-hunit, text }:
      mkDerivation {
        pname = "text-manipulate";
        version = "0.2.0.1";
        sha256 = "e0e9c71d9b1cfb7d3bca3d0a500d939b3efc6684515c0d7bd685503aa4f49d2f";
        libraryHaskellDepends = [ base text ];
        testHaskellDepends = [ base tasty tasty-hunit text ];
+       benchmarkHaskellDepends = [ base criterion text ];
        homepage = "https://github.com/brendanhay/text-manipulate";
        description = "Case conversion, word boundary manipulation, and textual subjugation";
        license = "unknown";
@@ -170967,13 +173621,15 @@ self: {
      }) {};
 
   "text-metrics" = callPackage
-    ({ mkDerivation, base, hspec, QuickCheck, text }:
+    ({ mkDerivation, base, criterion, deepseq, hspec, QuickCheck, text
+     }:
      mkDerivation {
        pname = "text-metrics";
        version = "0.2.0";
        sha256 = "082304ce14ac6182cbb93f51207d90b91d104e5d1fc1b17bbe1c9280ebffe43a";
        libraryHaskellDepends = [ base text ];
        testHaskellDepends = [ base hspec QuickCheck text ];
+       benchmarkHaskellDepends = [ base criterion deepseq text ];
        homepage = "https://github.com/mrkkrp/text-metrics";
        description = "Calculate various string metrics efficiently";
        license = stdenv.lib.licenses.bsd3;
@@ -171132,10 +173788,10 @@ self: {
   "text-show" = callPackage
     ({ mkDerivation, array, base, base-compat, base-orphans, bifunctors
      , bytestring, bytestring-builder, containers, contravariant
-     , deriving-compat, generic-deriving, ghc-boot-th, ghc-prim, hspec
-     , integer-gmp, nats, QuickCheck, quickcheck-instances, semigroups
-     , tagged, template-haskell, text, th-lift, transformers
-     , transformers-compat, void
+     , criterion, deepseq, deriving-compat, generic-deriving
+     , ghc-boot-th, ghc-prim, hspec, integer-gmp, nats, QuickCheck
+     , quickcheck-instances, semigroups, tagged, template-haskell, text
+     , th-lift, transformers, transformers-compat, void
      }:
      mkDerivation {
        pname = "text-show";
@@ -171154,6 +173810,12 @@ self: {
          QuickCheck quickcheck-instances semigroups tagged template-haskell
          text th-lift transformers transformers-compat void
        ];
+       benchmarkHaskellDepends = [
+         array base base-compat bifunctors bytestring bytestring-builder
+         containers contravariant criterion deepseq generic-deriving
+         ghc-boot-th ghc-prim integer-gmp nats semigroups tagged
+         template-haskell text th-lift transformers transformers-compat void
+       ];
        homepage = "https://github.com/RyanGlScott/text-show";
        description = "Efficient conversion of values into Text";
        license = stdenv.lib.licenses.bsd3;
@@ -171195,7 +173857,8 @@ self: {
      }) {};
 
   "text-stream-decode" = callPackage
-    ({ mkDerivation, base, bytestring, deepseq, hspec, text }:
+    ({ mkDerivation, base, bytestring, criterion, deepseq, hspec, text
+     }:
      mkDerivation {
        pname = "text-stream-decode";
        version = "0.1.0.5";
@@ -171204,6 +173867,7 @@ self: {
        editedCabalFile = "d4ea8ff401a3ccbd8a6ce2918385bac4859150047ce9b7f752ff5575db71e9fd";
        libraryHaskellDepends = [ base bytestring text ];
        testHaskellDepends = [ base bytestring deepseq hspec text ];
+       benchmarkHaskellDepends = [ base bytestring criterion text ];
        homepage = "http://github.com/fpco/text-stream-decode";
        description = "Streaming decoding functions for UTF encodings. (deprecated)";
        license = stdenv.lib.licenses.mit;
@@ -172117,13 +174781,14 @@ self: {
      }) {};
 
   "thread-local-storage" = callPackage
-    ({ mkDerivation, atomic-primops, base, containers }:
+    ({ mkDerivation, atomic-primops, base, containers, criterion }:
      mkDerivation {
        pname = "thread-local-storage";
        version = "0.1.1";
        sha256 = "11a0dfa77abf3d39e33529975aade945b0a6720143b3b134fd9460b0889845ca";
        libraryHaskellDepends = [ base containers ];
        testHaskellDepends = [ atomic-primops base ];
+       benchmarkHaskellDepends = [ atomic-primops base criterion ];
        homepage = "https://github.com/rrnewton/thread-local-storage";
        description = "Several options for thread-local-storage (TLS) in Haskell";
        license = stdenv.lib.licenses.bsd3;
@@ -172264,6 +174929,8 @@ self: {
        pname = "threepenny-gui";
        version = "0.7.0.1";
        sha256 = "b5802dbb6c43304d613373f464d6fd16a4f219a5d289be003a28c2c46cae44c8";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [
          aeson async base bytestring containers data-default deepseq
          filepath hashable network-uri safe snap-core snap-server stm
@@ -172403,9 +175070,10 @@ self: {
 
   "thyme" = callPackage
     ({ mkDerivation, aeson, attoparsec, base, bytestring, Cabal
-     , containers, cpphs, deepseq, directory, filepath, mtl, old-locale
-     , profunctors, QuickCheck, random, system-posix-redirect, text
-     , time, vector, vector-space, vector-th-unbox
+     , containers, cpphs, criterion, deepseq, directory, filepath, mtl
+     , old-locale, profunctors, QuickCheck, random
+     , system-posix-redirect, text, time, vector, vector-space
+     , vector-th-unbox
      }:
      mkDerivation {
        pname = "thyme";
@@ -172422,6 +175090,10 @@ self: {
          old-locale profunctors QuickCheck random system-posix-redirect text
          time vector-space
        ];
+       benchmarkHaskellDepends = [
+         base criterion mtl old-locale profunctors QuickCheck random time
+         vector vector-space
+       ];
        homepage = "https://github.com/liyang/thyme";
        description = "A faster time library";
        license = stdenv.lib.licenses.bsd3;
@@ -172471,8 +175143,8 @@ self: {
      }:
      mkDerivation {
        pname = "tibetan-utils";
-       version = "0.1.1.0";
-       sha256 = "008b976ca9b9bbd5ebe620e64bddccde31e0eed95ddcda20378cac96d3ca8115";
+       version = "0.1.1.1";
+       sha256 = "fa38e4f2062e801c5f8bccb2afea945cfcf40bd24671d9080bf538e0533bbb2a";
        libraryHaskellDepends = [
          base composition either megaparsec text text-show
        ];
@@ -173007,6 +175679,8 @@ self: {
        pname = "time-w3c";
        version = "0.1.0.1";
        sha256 = "6fb9bd6dcaf5d95093d7d24b6d37edfae71c22dab8158b650b7ba2b019dc168a";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [ base convertible parsec time ];
        homepage = "http://cielonegro.org/W3CDateTime.html";
        description = "Parse, format and convert W3C Date and Time";
@@ -173177,14 +175851,16 @@ self: {
      }) {};
 
   "timemap" = callPackage
-    ({ mkDerivation, base, containers, focus, hashable, list-t
-     , QuickCheck, quickcheck-instances, stm, stm-containers, tasty
-     , tasty-hunit, tasty-quickcheck, time, unordered-containers
+    ({ mkDerivation, base, containers, criterion, focus, hashable
+     , list-t, QuickCheck, quickcheck-instances, stm, stm-containers
+     , tasty, tasty-hunit, tasty-quickcheck, time, unordered-containers
      }:
      mkDerivation {
        pname = "timemap";
        version = "0.0.4";
        sha256 = "6e7c85c727fd9152db635c33ddb72cab5dca9ae240d41fcb653883f1bcd1d9e3";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [
          base containers focus hashable list-t stm stm-containers time
          unordered-containers
@@ -173194,6 +175870,10 @@ self: {
          quickcheck-instances stm stm-containers tasty tasty-hunit
          tasty-quickcheck time unordered-containers
        ];
+       benchmarkHaskellDepends = [
+         base containers criterion focus hashable list-t stm stm-containers
+         time unordered-containers
+       ];
        description = "A mutable hashmap, implicitly indexed by UTCTime";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -173526,8 +176206,8 @@ self: {
      }) {};
 
   "tinylog" = callPackage
-    ({ mkDerivation, base, bytestring, containers, double-conversion
-     , fast-logger, text, transformers, unix-time
+    ({ mkDerivation, base, bytestring, containers, criterion
+     , double-conversion, fast-logger, text, transformers, unix-time
      }:
      mkDerivation {
        pname = "tinylog";
@@ -173537,6 +176217,7 @@ self: {
          base bytestring containers double-conversion fast-logger text
          transformers unix-time
        ];
+       benchmarkHaskellDepends = [ base bytestring criterion ];
        homepage = "https://gitlab.com/twittner/tinylog/";
        description = "Simplistic logging using fast-logger";
        license = stdenv.lib.licenses.mpl20;
@@ -173677,7 +176358,7 @@ self: {
        pname = "tkyprof";
        version = "0.2.2.2";
        sha256 = "ea40c354d37843757b76152cbde1d9612000593fae4a515ad2d2cbf5940adef7";
-       isLibrary = false;
+       isLibrary = true;
        isExecutable = true;
        executableHaskellDepends = [
          aeson attoparsec base bytestring cmdargs conduit conduit-extra
@@ -173707,9 +176388,9 @@ self: {
 
   "tls" = callPackage
     ({ mkDerivation, asn1-encoding, asn1-types, async, base, bytestring
-     , cereal, cryptonite, data-default-class, hourglass, memory, mtl
-     , network, QuickCheck, tasty, tasty-quickcheck, transformers, x509
-     , x509-store, x509-validation
+     , cereal, criterion, cryptonite, data-default-class, hourglass
+     , memory, mtl, network, QuickCheck, tasty, tasty-quickcheck
+     , transformers, x509, x509-store, x509-validation
      }:
      mkDerivation {
        pname = "tls";
@@ -173724,6 +176405,10 @@ self: {
          base bytestring cereal cryptonite data-default-class hourglass mtl
          QuickCheck tasty tasty-quickcheck x509 x509-validation
        ];
+       benchmarkHaskellDepends = [
+         base bytestring criterion cryptonite data-default-class hourglass
+         mtl QuickCheck tasty-quickcheck x509 x509-validation
+       ];
        homepage = "http://github.com/vincenthz/hs-tls";
        description = "TLS/SSL protocol native implementation (Server and Client)";
        license = stdenv.lib.licenses.bsd3;
@@ -173758,6 +176443,8 @@ self: {
        pname = "tls-extra";
        version = "0.6.6";
        sha256 = "dbf782edbb82321b6484105518fe8e2ff6d51992b20a545a5d3bd380ed901a4c";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [
          base bytestring certificate cipher-aes cipher-rc4 crypto-pubkey
          crypto-random cryptohash mtl network pem time tls vector
@@ -173973,12 +176660,17 @@ self: {
      }) {};
 
   "tokenize" = callPackage
-    ({ mkDerivation, base, split, text }:
+    ({ mkDerivation, base, bytestring, criterion, deepseq, filepath
+     , split, text
+     }:
      mkDerivation {
        pname = "tokenize";
        version = "0.3.0";
        sha256 = "0e88490f06efb45c17138ebbc9bec206b87b98361c2c949ca16546e3f9ab91b5";
        libraryHaskellDepends = [ base split text ];
+       benchmarkHaskellDepends = [
+         base bytestring criterion deepseq filepath split text
+       ];
        homepage = "https://bitbucket.org/gchrupala/lingo/overview";
        description = "Simple tokenizer for English text";
        license = stdenv.lib.licenses.bsd3;
@@ -174137,8 +176829,8 @@ self: {
     ({ mkDerivation, base, void }:
      mkDerivation {
        pname = "total";
-       version = "1.0.4";
-       sha256 = "eadd2440d593a5df926f8ed77c6455c235e25948240d235a0ae7bd6bff15807e";
+       version = "1.0.5";
+       sha256 = "922078be30b4ef27b37c9c7ecafa19e892ac8e19e5c99056ba0456d4c492694f";
        libraryHaskellDepends = [ base void ];
        description = "Exhaustive pattern matching using lenses, traversals, and prisms";
        license = stdenv.lib.licenses.bsd3;
@@ -174200,6 +176892,24 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "tower" = callPackage
+    ({ mkDerivation, base, HUnit, protolude, QuickCheck, smallcheck
+     , tasty, tasty-hunit, tasty-quickcheck, tasty-smallcheck, vector
+     }:
+     mkDerivation {
+       pname = "tower";
+       version = "0.1.0";
+       sha256 = "0a9daecc7b1ab68b5dfdf108df6d324f27b3798b4eb43e275d957cd4313cd90b";
+       libraryHaskellDepends = [ base protolude QuickCheck vector ];
+       testHaskellDepends = [
+         base HUnit protolude QuickCheck smallcheck tasty tasty-hunit
+         tasty-quickcheck tasty-smallcheck
+       ];
+       homepage = "https://github.com/tonyday567/tower";
+       description = "A numeric tower";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "toxcore" = callPackage
     ({ mkDerivation, base, bytestring, bytestring-arbitrary
      , data-default-class, hspec, QuickCheck, saltine, toxcore
@@ -174224,7 +176934,7 @@ self: {
 
   "toysolver" = callPackage
     ({ mkDerivation, array, base, bytestring, bytestring-builder
-     , containers, data-default-class, data-interval, deepseq
+     , containers, criterion, data-default-class, data-interval, deepseq
      , exceptions, extended-reals, filepath, finite-field, ghc-prim
      , hashable, haskeline, heaps, intern, loop, mtl, multiset
      , mwc-random, OptDir, parse-dimacs, parsec, prettyclass, primes
@@ -174263,6 +176973,9 @@ self: {
          tasty tasty-hunit tasty-quickcheck tasty-th transformers
          transformers-compat vector vector-space
        ];
+       benchmarkHaskellDepends = [
+         array base criterion data-default-class parse-dimacs vector
+       ];
        description = "Assorted decision procedures for SAT, Max-SAT, PB, MIP, etc";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -174294,12 +177007,41 @@ self: {
          base binary containers distributed-process exceptions
          network-transport-inmemory pipes QuickCheck stm transformers
        ];
+       benchmarkHaskellDepends = [
+         async base binary bytestring containers distributed-process errors
+         exceptions ghc-prim heaps network network-transport-tcp
+         optparse-applicative pipes pipes-bytestring pipes-concurrency
+         pipes-safe process stm transformers trifecta
+       ];
        homepage = "http://github.com/bgamari/tpar/";
        description = "simple, parallel job scheduling";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "tpb" = callPackage
+    ({ mkDerivation, aeson, ansi-wl-pprint, base, boxes, bytestring
+     , directory, filepath, free, http-client, http-client-tls
+     , libnotify, microlens, mtl, optparse-applicative, pushbullet-types
+     , servant, servant-client, servant-pushbullet-client, text, time
+     , websockets, wuss
+     }:
+     mkDerivation {
+       pname = "tpb";
+       version = "0.1.1.1";
+       sha256 = "816c0381011987955c8aa1b379f90077334547edf5675e1540d7562acafe5c70";
+       isLibrary = false;
+       isExecutable = true;
+       executableHaskellDepends = [
+         aeson ansi-wl-pprint base boxes bytestring directory filepath free
+         http-client http-client-tls libnotify microlens mtl
+         optparse-applicative pushbullet-types servant servant-client
+         servant-pushbullet-client text time websockets wuss
+       ];
+       description = "Applications for interacting with the Pushbullet API";
+       license = stdenv.lib.licenses.gpl3;
+     }) {};
+
   "tpdb" = callPackage
     ({ mkDerivation, base, bytestring, containers, filepath, hashable
      , HaXml, hxt, mtl, parsec, pretty, text, time, wl-pprint-text
@@ -174394,6 +177136,8 @@ self: {
        sha256 = "12d0eb7923a905fff4b92c7f4f187a4715ba95883ac1df5e0a7efb59427f5115";
        revision = "1";
        editedCabalFile = "9e20b69ed0c5280699565c000bcd8f8b70ae6bc2275e37669af70bbca5d4f77a";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [
          base bifunctors containers json mtl transformers
        ];
@@ -174427,9 +177171,9 @@ self: {
      }) {};
 
   "traildb" = callPackage
-    ({ mkDerivation, base, bytestring, containers, directory
-     , exceptions, Judy, lens, primitive, text, time, traildb
-     , transformers, unix, vector
+    ({ mkDerivation, base, bytestring, cereal, containers, criterion
+     , deepseq, directory, exceptions, Judy, lens, primitive, random
+     , text, time, traildb, transformers, unix, vector
      }:
      mkDerivation {
        pname = "traildb";
@@ -174440,6 +177184,9 @@ self: {
          time transformers unix vector
        ];
        librarySystemDepends = [ Judy traildb ];
+       benchmarkHaskellDepends = [
+         base bytestring cereal criterion deepseq directory random
+       ];
        description = "TrailDB bindings for Haskell";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -174628,7 +177375,8 @@ self: {
      }) {};
 
   "transformers-eff" = callPackage
-    ({ mkDerivation, base, free, list-transformer, mmorph, transformers
+    ({ mkDerivation, base, criterion, effect-interpreters, free
+     , list-transformer, mmorph, mtl, pipes, transformers
      }:
      mkDerivation {
        pname = "transformers-eff";
@@ -174637,6 +177385,9 @@ self: {
        libraryHaskellDepends = [
          base free list-transformer mmorph transformers
        ];
+       benchmarkHaskellDepends = [
+         base criterion effect-interpreters mtl pipes transformers
+       ];
        homepage = "https://github.com/ocharles/transformers-eff";
        description = "An approach to managing composable effects, ala mtl/transformers/extensible-effects/Eff";
        license = stdenv.lib.licenses.bsd3;
@@ -174743,6 +177494,8 @@ self: {
        pname = "translatable-intset";
        version = "0.1";
        sha256 = "7556dd009fa229c94ad47dfc7ef86b1e5e5bf76feee8db9b704419820b0d685f";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [ base fingertree ];
        description = "Integer sets with a constant time translate operation";
        license = stdenv.lib.licenses.mit;
@@ -174968,6 +177721,8 @@ self: {
        pname = "treeviz";
        version = "2.0.3";
        sha256 = "dab7dd9935cde4259dab1604b732292a0076e1e8a277476abf822ea2819f26a9";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [ base containers mtl QuickCheck random ];
        homepage = "http://www.haskell.org/haskellwiki/Treeviz";
        description = "Visualization of computation decomposition trees";
@@ -175020,9 +177775,9 @@ self: {
 
   "tries" = callPackage
     ({ mkDerivation, base, bytestring, bytestring-trie, composition
-     , composition-extra, containers, deepseq, hashable, keys, mtl
-     , QuickCheck, quickcheck-instances, rose-trees, semigroups, sets
-     , tasty, tasty-quickcheck, unordered-containers
+     , composition-extra, containers, criterion, deepseq, hashable, keys
+     , mtl, QuickCheck, quickcheck-instances, rose-trees, semigroups
+     , sets, tasty, tasty-quickcheck, unordered-containers
      }:
      mkDerivation {
        pname = "tries";
@@ -175039,6 +177794,12 @@ self: {
          quickcheck-instances rose-trees semigroups sets tasty
          tasty-quickcheck unordered-containers
        ];
+       benchmarkHaskellDepends = [
+         base bytestring bytestring-trie composition composition-extra
+         containers criterion deepseq hashable keys mtl QuickCheck
+         quickcheck-instances rose-trees semigroups sets
+         unordered-containers
+       ];
        description = "Various trie implementations in Haskell";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -175294,6 +178055,8 @@ self: {
        pname = "tsparse";
        version = "0.4.0.0";
        sha256 = "511b4bca012747f7fc97a78f620ea3d9dca4e1a6d7a0b2fb17d8f010f7a5bb68";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [
          base Decimal parsec pretty process split time
        ];
@@ -175376,9 +178139,11 @@ self: {
      }) {};
 
   "ttrie" = callPackage
-    ({ mkDerivation, atomic-primops, base, containers, hashable
-     , primitive, QuickCheck, stm, test-framework
-     , test-framework-quickcheck2
+    ({ mkDerivation, async, atomic-primops, base, bifunctors
+     , containers, criterion-plus, deepseq, hashable, mwc-random
+     , primitive, QuickCheck, stm, stm-containers, stm-stats
+     , test-framework, test-framework-quickcheck2, text, transformers
+     , unordered-containers, vector
      }:
      mkDerivation {
        pname = "ttrie";
@@ -175391,6 +178156,11 @@ self: {
          base containers hashable QuickCheck stm test-framework
          test-framework-quickcheck2
        ];
+       benchmarkHaskellDepends = [
+         async base bifunctors containers criterion-plus deepseq mwc-random
+         primitive stm stm-containers stm-stats text transformers
+         unordered-containers vector
+       ];
        homepage = "http://github.com/mcschroeder/ttrie";
        description = "Contention-free STM hash map";
        license = stdenv.lib.licenses.mit;
@@ -175673,8 +178443,8 @@ self: {
 
   "turtle" = callPackage
     ({ mkDerivation, ansi-wl-pprint, async, base, bytestring, clock
-     , directory, doctest, foldl, hostname, managed, optional-args
-     , optparse-applicative, process, stm, system-fileio
+     , criterion, directory, doctest, foldl, hostname, managed
+     , optional-args, optparse-applicative, process, stm, system-fileio
      , system-filepath, temporary, text, time, transformers, unix
      , unix-compat
      }:
@@ -175689,6 +178459,7 @@ self: {
          unix-compat
        ];
        testHaskellDepends = [ base doctest ];
+       benchmarkHaskellDepends = [ base criterion text ];
        description = "Shell programming, Haskell-style";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -176686,6 +179457,8 @@ self: {
        pname = "type-natural";
        version = "0.7.1.3";
        sha256 = "56d3962fb5c7a9e858f75603e1dc8d73c8a8adea65a0097bdf5ef033b0529ee2";
+       revision = "1";
+       editedCabalFile = "97d8c20d880fd2296ff023ced046b16a9291fa32922c45532027dda1e228db23";
        libraryHaskellDepends = [
          base constraints equational-reasoning ghc-typelits-natnormalise
          ghc-typelits-presburger monomorphic singletons template-haskell
@@ -177165,10 +179938,11 @@ self: {
      }) {};
 
   "tz" = callPackage
-    ({ mkDerivation, base, binary, bytestring, containers, data-default
-     , deepseq, HUnit, QuickCheck, template-haskell, test-framework
-     , test-framework-hunit, test-framework-quickcheck2
-     , test-framework-th, time, tzdata, vector
+    ({ mkDerivation, base, binary, bytestring, containers, criterion
+     , data-default, deepseq, HUnit, lens, QuickCheck, template-haskell
+     , test-framework, test-framework-hunit, test-framework-quickcheck2
+     , test-framework-th, thyme, time, timezone-olson, timezone-series
+     , tzdata, vector
      }:
      mkDerivation {
        pname = "tz";
@@ -177182,6 +179956,9 @@ self: {
          base HUnit QuickCheck test-framework test-framework-hunit
          test-framework-quickcheck2 test-framework-th time tzdata
        ];
+       benchmarkHaskellDepends = [
+         base criterion lens thyme time timezone-olson timezone-series
+       ];
        preConfigure = "export TZDIR=${pkgs.tzdata}/share/zoneinfo";
        homepage = "https://github.com/nilcons/haskell-tz";
        description = "Efficient time zone handling";
@@ -177249,9 +180026,9 @@ self: {
      }) {};
 
   "ua-parser" = callPackage
-    ({ mkDerivation, aeson, base, bytestring, data-default, file-embed
-     , filepath, HUnit, pcre-light, tasty, tasty-hunit, tasty-quickcheck
-     , text, yaml
+    ({ mkDerivation, aeson, base, bytestring, criterion, data-default
+     , deepseq, file-embed, filepath, HUnit, pcre-light, tasty
+     , tasty-hunit, tasty-quickcheck, text, yaml
      }:
      mkDerivation {
        pname = "ua-parser";
@@ -177264,6 +180041,10 @@ self: {
          aeson base bytestring data-default file-embed filepath HUnit
          pcre-light tasty tasty-hunit tasty-quickcheck text yaml
        ];
+       benchmarkHaskellDepends = [
+         aeson base bytestring criterion data-default deepseq file-embed
+         filepath pcre-light text yaml
+       ];
        description = "A library for parsing User-Agent strings, official Haskell port of ua-parser";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -177336,6 +180117,8 @@ self: {
        pname = "udbus";
        version = "0.2.1";
        sha256 = "d325b0c1f2a7b1eabde17d85734175f622c6597e9dfc40704894da94a09ef328";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [
          base binary bytestring cereal containers ghc-prim mtl network unix
          utf8-string
@@ -177352,6 +180135,8 @@ self: {
        pname = "udbus-model";
        version = "0.2.1";
        sha256 = "517ea7b540848f782f3dd6890a5cf41747eca445952649827c2addd3c11f3f76";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [ base bytestring udbus xml ];
        homepage = "http://github.com/vincenthz/hs-udbus";
        description = "Model API for udbus introspection and definitions";
@@ -177376,6 +180161,8 @@ self: {
        pname = "udev";
        version = "0.1.0.0";
        sha256 = "a2bb00c7c75ff9beb1951dfec706c628f5354a6a9d58abcb5e9d6950dc29b1a8";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [ base bytestring posix-paths unix ];
        libraryPkgconfigDepends = [ libudev ];
        homepage = "https://github.com/pxqr/udev";
@@ -177552,6 +180339,8 @@ self: {
        pname = "unagi-bloomfilter";
        version = "0.1.1.0";
        sha256 = "4cdbd8c483c0c2285737e5f12f6a9c512c6697683b4be5e2e5cb286199db5a0f";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [
          atomic-primops base bytestring hashabler primitive
        ];
@@ -177561,8 +180350,8 @@ self: {
      }) {};
 
   "unagi-chan" = callPackage
-    ({ mkDerivation, atomic-primops, base, containers, ghc-prim
-     , primitive
+    ({ mkDerivation, async, atomic-primops, base, containers, criterion
+     , ghc-prim, primitive
      }:
      mkDerivation {
        pname = "unagi-chan";
@@ -177572,6 +180361,7 @@ self: {
        testHaskellDepends = [
          atomic-primops base containers ghc-prim primitive
        ];
+       benchmarkHaskellDepends = [ async base criterion ];
        description = "Fast concurrent queues with a Chan-like API, and more";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -177594,6 +180384,8 @@ self: {
        pname = "unamb";
        version = "0.2.5";
        sha256 = "3359f05602ae61095c13f8db1df9222030b60ce83ad64faa705a387c18c58b89";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [ base ];
        homepage = "http://haskell.org/haskellwiki/unamb";
        description = "Unambiguous choice";
@@ -177634,9 +180426,10 @@ self: {
      }) {};
 
   "unbound-generics" = callPackage
-    ({ mkDerivation, base, containers, contravariant, deepseq, mtl
-     , profunctors, QuickCheck, tasty, tasty-hunit, tasty-quickcheck
-     , template-haskell, transformers, transformers-compat
+    ({ mkDerivation, base, containers, contravariant, criterion
+     , deepseq, deepseq-generics, mtl, profunctors, QuickCheck, tasty
+     , tasty-hunit, tasty-quickcheck, template-haskell, transformers
+     , transformers-compat
      }:
      mkDerivation {
        pname = "unbound-generics";
@@ -177649,6 +180442,9 @@ self: {
        testHaskellDepends = [
          base mtl QuickCheck tasty tasty-hunit tasty-quickcheck
        ];
+       benchmarkHaskellDepends = [
+         base criterion deepseq deepseq-generics
+       ];
        homepage = "http://github.com/lambdageek/unbound-generics";
        description = "Support for programming with names and binders using GHC Generics";
        license = stdenv.lib.licenses.bsd3;
@@ -177905,6 +180701,8 @@ self: {
        pname = "unicode";
        version = "0.0";
        sha256 = "d41708f5800a83a2b7f44d10f74371625fbc50dd4a9520dd6fc53762904cc83b";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [ base containers ];
        testHaskellDepends = [ base containers utility-ht ];
        homepage = "http://code.haskell.org/~thielema/unicode/";
@@ -177992,8 +180790,9 @@ self: {
      }) {};
 
   "unicode-transforms" = callPackage
-    ({ mkDerivation, base, bitarray, bytestring, deepseq
-     , getopt-generics, QuickCheck, split, text
+    ({ mkDerivation, base, bitarray, bytestring, criterion, deepseq
+     , filepath, getopt-generics, optparse-applicative, path, path-io
+     , QuickCheck, split, text
      }:
      mkDerivation {
        pname = "unicode-transforms";
@@ -178003,14 +180802,19 @@ self: {
        testHaskellDepends = [
          base deepseq getopt-generics QuickCheck split text
        ];
+       benchmarkHaskellDepends = [
+         base criterion deepseq filepath optparse-applicative path path-io
+         text
+       ];
        homepage = "http://github.com/harendra-kumar/unicode-transforms";
        description = "Unicode normalization";
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
   "unicode-transforms_0_3_0" = callPackage
-    ({ mkDerivation, base, bitarray, bytestring, deepseq
-     , getopt-generics, QuickCheck, split, text
+    ({ mkDerivation, base, bitarray, bytestring, criterion, deepseq
+     , filepath, getopt-generics, optparse-applicative, path, path-io
+     , QuickCheck, split, text
      }:
      mkDerivation {
        pname = "unicode-transforms";
@@ -178020,6 +180824,10 @@ self: {
        testHaskellDepends = [
          base deepseq getopt-generics QuickCheck split text
        ];
+       benchmarkHaskellDepends = [
+         base criterion deepseq filepath optparse-applicative path path-io
+         text
+       ];
        homepage = "http://github.com/harendra-kumar/unicode-transforms";
        description = "Unicode normalization";
        license = stdenv.lib.licenses.bsd3;
@@ -178102,12 +180910,15 @@ self: {
      }) {};
 
   "union" = callPackage
-    ({ mkDerivation, base, deepseq, profunctors, tagged, vinyl }:
+    ({ mkDerivation, base, criterion, deepseq, lens, profunctors
+     , tagged, vinyl
+     }:
      mkDerivation {
        pname = "union";
        version = "0.1.1.1";
        sha256 = "819e57439061cde958467e6a52ca9f9aeac6e61c84b8ead4f8c2489995ca44f4";
        libraryHaskellDepends = [ base deepseq profunctors tagged vinyl ];
+       benchmarkHaskellDepends = [ base criterion deepseq lens ];
        description = "Extensible type-safe unions";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -178587,6 +181398,8 @@ self: {
        pname = "unix-fcntl";
        version = "0.0.0";
        sha256 = "69c1852fa11e98c99e0f61052bd642e66f2e491ffba1e0ee6d7cd5d049f832a3";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [ base foreign-var ];
        homepage = "https://github.com/maoe/unix-fcntl";
        description = "Comprehensive bindings to fcntl(2)";
@@ -178754,8 +181567,9 @@ self: {
      }) {};
 
   "unordered-containers" = callPackage
-    ({ mkDerivation, base, ChasingBottoms, containers, deepseq
-     , hashable, HUnit, QuickCheck, test-framework, test-framework-hunit
+    ({ mkDerivation, base, bytestring, ChasingBottoms, containers
+     , criterion, deepseq, deepseq-generics, hashable, hashmap, HUnit
+     , mtl, QuickCheck, random, test-framework, test-framework-hunit
      , test-framework-quickcheck2
      }:
      mkDerivation {
@@ -178767,6 +181581,10 @@ self: {
          base ChasingBottoms containers hashable HUnit QuickCheck
          test-framework test-framework-hunit test-framework-quickcheck2
        ];
+       benchmarkHaskellDepends = [
+         base bytestring containers criterion deepseq deepseq-generics
+         hashable hashmap mtl random
+       ];
        homepage = "https://github.com/tibbe/unordered-containers";
        description = "Efficient hashing-based container types";
        license = stdenv.lib.licenses.bsd3;
@@ -178866,6 +181684,8 @@ self: {
        pname = "unsafely";
        version = "0.2.0.0";
        sha256 = "19341a7d3d2e4d4ae3a4a232c566edb071c895a17e5f1d1ad092b1d3fe026583";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [ base ];
        homepage = "http://github.com/konn/unsafely";
        description = "Flexible access control for unsafe operations and instances";
@@ -179150,27 +181970,63 @@ self: {
 
   "uri-bytestring" = callPackage
     ({ mkDerivation, attoparsec, base, blaze-builder, bytestring
-     , containers, generics-sop, HUnit, lens-simple, QuickCheck
-     , quickcheck-instances, semigroups, tasty, tasty-hunit
-     , tasty-quickcheck
+     , containers, criterion, deepseq, deepseq-generics, generics-sop
+     , HUnit, lens-simple, network-uri, QuickCheck, quickcheck-instances
+     , semigroups, tasty, tasty-hunit, tasty-quickcheck
+     , template-haskell, th-lift-instances
      }:
      mkDerivation {
        pname = "uri-bytestring";
-       version = "0.2.2.1";
-       sha256 = "9185e8f05d5c5154348c0d57d0df2b92ba6d09153fbdebded995b2f54e71c67e";
+       version = "0.2.3.0";
+       sha256 = "50178faac44a67095602412846682040b8b72ae8af5289e73dabe2cc49a639dd";
        libraryHaskellDepends = [
          attoparsec base blaze-builder bytestring containers
+         template-haskell th-lift-instances
        ];
        testHaskellDepends = [
          attoparsec base blaze-builder bytestring containers generics-sop
          HUnit lens-simple QuickCheck quickcheck-instances semigroups tasty
          tasty-hunit tasty-quickcheck
        ];
+       benchmarkHaskellDepends = [
+         base blaze-builder bytestring criterion deepseq deepseq-generics
+         network-uri
+       ];
        homepage = "https://github.com/Soostone/uri-bytestring";
        description = "Haskell URI parsing as ByteStrings";
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "uri-bytestring_0_2_3_1" = callPackage
+    ({ mkDerivation, attoparsec, base, blaze-builder, bytestring
+     , containers, criterion, deepseq, deepseq-generics, generics-sop
+     , HUnit, lens-simple, network-uri, QuickCheck, quickcheck-instances
+     , semigroups, tasty, tasty-hunit, tasty-quickcheck
+     , template-haskell, th-lift-instances
+     }:
+     mkDerivation {
+       pname = "uri-bytestring";
+       version = "0.2.3.1";
+       sha256 = "1d2814b8ca76c8b72fcf995d4d863c492b22bc80c62d990dad2d969cbef1b16d";
+       libraryHaskellDepends = [
+         attoparsec base blaze-builder bytestring containers
+         template-haskell th-lift-instances
+       ];
+       testHaskellDepends = [
+         attoparsec base blaze-builder bytestring containers generics-sop
+         HUnit lens-simple QuickCheck quickcheck-instances semigroups tasty
+         tasty-hunit tasty-quickcheck
+       ];
+       benchmarkHaskellDepends = [
+         base blaze-builder bytestring criterion deepseq deepseq-generics
+         network-uri
+       ];
+       homepage = "https://github.com/Soostone/uri-bytestring";
+       description = "Haskell URI parsing as ByteStrings";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "uri-conduit" = callPackage
     ({ mkDerivation, base, bytestring, conduit, containers, deepseq
      , failure, monad-control, network, system-fileio, system-filepath
@@ -179197,6 +182053,8 @@ self: {
        pname = "uri-encode";
        version = "1.5.0.5";
        sha256 = "e82b588aad63112d34f6bad6f1ef72489b9edebfe14f2f523dc1dabdcbe2b186";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [
          base bytestring network-uri text utf8-string
        ];
@@ -179356,6 +182214,8 @@ self: {
        pname = "urlencoded";
        version = "0.4.1";
        sha256 = "91431808fc26a7a9d2d18100c93c8b0a815de519e33547e8f60da9ed66976799";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [ base mtl network network-uri split ];
        homepage = "https://github.com/pheaver/urlencoded";
        description = "Generate or process x-www-urlencoded data";
@@ -179468,6 +182328,8 @@ self: {
        pname = "usb-id-database";
        version = "0.4.0.9";
        sha256 = "4187f776f53c50423e1064753c0bf5446db871a6a4113ec8d970d24a5ffe26ca";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [
          base base-unicode-symbols bytestring containers
          containers-unicode-symbols parsimony
@@ -179888,9 +182750,10 @@ self: {
      }) {};
 
   "uuid" = callPackage
-    ({ mkDerivation, base, binary, bytestring, cryptohash-md5
-     , cryptohash-sha1, entropy, HUnit, network-info, QuickCheck, random
-     , tasty, tasty-hunit, tasty-quickcheck, text, time, uuid-types
+    ({ mkDerivation, base, binary, bytestring, criterion
+     , cryptohash-md5, cryptohash-sha1, entropy, HUnit
+     , mersenne-random-pure64, network-info, QuickCheck, random, tasty
+     , tasty-hunit, tasty-quickcheck, text, time, uuid-types
      }:
      mkDerivation {
        pname = "uuid";
@@ -179904,6 +182767,9 @@ self: {
          base bytestring HUnit QuickCheck random tasty tasty-hunit
          tasty-quickcheck
        ];
+       benchmarkHaskellDepends = [
+         base criterion mersenne-random-pure64 random
+       ];
        homepage = "https://github.com/hvr/uuid";
        description = "For creating, comparing, parsing and printing Universally Unique Identifiers";
        license = stdenv.lib.licenses.bsd3;
@@ -179961,8 +182827,9 @@ self: {
      }) {};
 
   "uuid-types" = callPackage
-    ({ mkDerivation, base, binary, bytestring, deepseq, hashable, HUnit
-     , QuickCheck, random, tasty, tasty-hunit, tasty-quickcheck, text
+    ({ mkDerivation, base, binary, bytestring, containers, criterion
+     , deepseq, hashable, HUnit, QuickCheck, random, tasty, tasty-hunit
+     , tasty-quickcheck, text
      }:
      mkDerivation {
        pname = "uuid-types";
@@ -179976,6 +182843,9 @@ self: {
        testHaskellDepends = [
          base bytestring HUnit QuickCheck tasty tasty-hunit tasty-quickcheck
        ];
+       benchmarkHaskellDepends = [
+         base bytestring containers criterion deepseq random
+       ];
        homepage = "https://github.com/aslatter/uuid";
        description = "Type definitions for Universally Unique Identifiers";
        license = stdenv.lib.licenses.bsd3;
@@ -180382,8 +183252,8 @@ self: {
      }) {};
 
   "var" = callPackage
-    ({ mkDerivation, base, QuickCheck, test-framework
-     , test-framework-quickcheck2, transformers
+    ({ mkDerivation, array, base, criterion, deepseq, QuickCheck
+     , test-framework, test-framework-quickcheck2, transformers
      }:
      mkDerivation {
        pname = "var";
@@ -180393,6 +183263,7 @@ self: {
        testHaskellDepends = [
          base QuickCheck test-framework test-framework-quickcheck2
        ];
+       benchmarkHaskellDepends = [ array base criterion deepseq ];
        homepage = "http://github.com/sonyandy/var";
        description = "Mutable variables and tuples";
        license = stdenv.lib.licenses.bsd3;
@@ -180450,7 +183321,9 @@ self: {
      }) {};
 
   "varying" = callPackage
-    ({ mkDerivation, base, hspec, QuickCheck, time, transformers }:
+    ({ mkDerivation, base, criterion, hspec, QuickCheck, time
+     , transformers
+     }:
      mkDerivation {
        pname = "varying";
        version = "0.7.0.3";
@@ -180460,6 +183333,7 @@ self: {
        libraryHaskellDepends = [ base transformers ];
        executableHaskellDepends = [ base time transformers ];
        testHaskellDepends = [ base hspec QuickCheck time transformers ];
+       benchmarkHaskellDepends = [ base criterion time transformers ];
        homepage = "https://github.com/schell/varying";
        description = "FRP through value streams and monadic splines";
        license = stdenv.lib.licenses.mit;
@@ -180803,6 +183677,8 @@ self: {
        sha256 = "ed460a41ca068f568bc2027579ab14185fbb72c7ac469b5179ae5f8a52719070";
        revision = "1";
        editedCabalFile = "82d67db49c85c1e136b6e6e44f99c908b405628a17b0d220c95aed34845426a5";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [ base bytestring primitive vector ];
        testHaskellDepends = [
          base bytestring containers QuickCheck vector
@@ -180825,13 +183701,18 @@ self: {
      }) {};
 
   "vector-binary-instances" = callPackage
-    ({ mkDerivation, base, binary, tasty, tasty-quickcheck, vector }:
+    ({ mkDerivation, base, binary, bytestring, criterion, deepseq
+     , tasty, tasty-quickcheck, vector
+     }:
      mkDerivation {
        pname = "vector-binary-instances";
        version = "0.2.3.4";
        sha256 = "f3cef04ff645bbf25198c2c0c33d0c13e44bfe63602e1e694c2be9abf0e57d00";
        libraryHaskellDepends = [ base binary vector ];
        testHaskellDepends = [ base binary tasty tasty-quickcheck vector ];
+       benchmarkHaskellDepends = [
+         base binary bytestring criterion deepseq vector
+       ];
        homepage = "https://github.com/bos/vector-binary-instances";
        description = "Instances of Data.Binary and Data.Serialize for vector";
        license = stdenv.lib.licenses.bsd3;
@@ -180886,6 +183767,8 @@ self: {
        pname = "vector-bytestring";
        version = "0.0.0.1";
        sha256 = "641eef86c91a0c742d74c1ea0f29ca69d9105379296ad622cb5f991142d53376";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [
          base bytestring deepseq ghc-prim primitive vector
        ];
@@ -181167,8 +184050,9 @@ self: {
      }) {};
 
   "vectortiles" = callPackage
-    ({ mkDerivation, base, bytestring, cereal, containers, deepseq, hex
-     , protobuf, tasty, tasty-hunit, text, transformers, vector
+    ({ mkDerivation, base, bytestring, cereal, containers, criterion
+     , deepseq, hex, microlens, microlens-platform, protobuf, tasty
+     , tasty-hunit, text, transformers, vector
      }:
      mkDerivation {
        pname = "vectortiles";
@@ -181181,6 +184065,10 @@ self: {
        testHaskellDepends = [
          base bytestring cereal hex protobuf tasty tasty-hunit text vector
        ];
+       benchmarkHaskellDepends = [
+         base bytestring cereal containers criterion microlens
+         microlens-platform protobuf text
+       ];
        homepage = "https://github.com/fosskers/vectortiles";
        description = "GIS Vector Tiles, as defined by Mapbox";
        license = stdenv.lib.licenses.asl20;
@@ -181237,6 +184125,8 @@ self: {
        pname = "verdict-json";
        version = "0.0.0.0";
        sha256 = "7b64ab1ec3ae42db778f8adc52219a472af76ea0dd4d91d9376ad57dc9abaf4a";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [
          aeson base containers text unordered-containers vector verdict
        ];
@@ -181321,6 +184211,8 @@ self: {
        pname = "vhd";
        version = "0.2.2";
        sha256 = "7c678f076395f44d853f87a4538635bc83d7a10319933dec9e06b40ce409ea7c";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [
          base byteable bytestring cereal cipher-aes cryptohash directory
          filepath mmap random storable-endian text time
@@ -181513,13 +184405,18 @@ self: {
      }) {};
 
   "vinyl" = callPackage
-    ({ mkDerivation, base, doctest, ghc-prim, lens, singletons }:
+    ({ mkDerivation, base, criterion, doctest, ghc-prim, lens, linear
+     , mwc-random, singletons, vector
+     }:
      mkDerivation {
        pname = "vinyl";
        version = "0.5.3";
        sha256 = "00f86a43def432c564226daae42b130a67c5fb413f3b097f43a14fbfb57608a6";
        libraryHaskellDepends = [ base ghc-prim ];
        testHaskellDepends = [ base doctest lens singletons ];
+       benchmarkHaskellDepends = [
+         base criterion lens linear mwc-random vector
+       ];
        description = "Extensible Records";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -181619,6 +184516,8 @@ self: {
        pname = "vinyl-vectors";
        version = "0.2.0";
        sha256 = "6f9b6b8772937c967ad2b51e062cab27cb94fdbfb6d5e35eaae7c396e42362d7";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [
          base bytestring constraints data-default primitive template-haskell
          text vector vinyl
@@ -182639,6 +185538,35 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "wai-middleware-auth" = callPackage
+    ({ mkDerivation, aeson, base, base64-bytestring, binary
+     , blaze-builder, blaze-html, bytestring, case-insensitive, cereal
+     , clientsession, cookie, exceptions, hoauth2, http-client
+     , http-client-tls, http-conduit, http-reverse-proxy, http-types
+     , optparse-simple, regex-posix, safe-exceptions, shakespeare, text
+     , unix-compat, unordered-containers, vault, wai, wai-app-static
+     , wai-extra, warp, yaml
+     }:
+     mkDerivation {
+       pname = "wai-middleware-auth";
+       version = "0.1.1.0";
+       sha256 = "f951faa7f3b143b36268b3c3b0250779d229490b0a4bad8722cda3ea0a60a1a1";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         aeson base base64-bytestring binary blaze-builder blaze-html
+         bytestring case-insensitive cereal clientsession cookie exceptions
+         hoauth2 http-client http-client-tls http-conduit http-reverse-proxy
+         http-types regex-posix safe-exceptions shakespeare text unix-compat
+         unordered-containers vault wai wai-app-static wai-extra yaml
+       ];
+       executableHaskellDepends = [
+         base bytestring cereal clientsession optparse-simple warp
+       ];
+       description = "Authentication middleware that secures WAI application";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "wai-middleware-cache" = callPackage
     ({ mkDerivation, base, binary, blaze-builder-conduit, bytestring
      , conduit, crypto-conduit, http-types, HUnit, pureMD5
@@ -182759,6 +185687,8 @@ self: {
        pname = "wai-middleware-consul";
        version = "0.1.0.2";
        sha256 = "d89d5a5bf0b08cf4fcd300d9e16c351a146119c34a9f31949498a874699c0763";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [
          async base base-prelude bytestring conduit conduit-extra
          consul-haskell enclosed-exceptions http-client http-types
@@ -182910,6 +185840,8 @@ self: {
        pname = "wai-middleware-hmac-client";
        version = "0.1.0.2";
        sha256 = "ba419c0e9a6d00e7ab03150219012128908bc3018b43d7d4cb46cbb01babaeca";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [
          base base64-bytestring byteable bytestring case-insensitive
          cryptohash http-client http-types mtl old-locale time transformers
@@ -182921,9 +185853,9 @@ self: {
      }) {};
 
   "wai-middleware-metrics" = callPackage
-    ({ mkDerivation, base, bytestring, ekg-core, http-types, QuickCheck
-     , scotty, tasty, tasty-hunit, tasty-quickcheck, text, time
-     , transformers, wai, wai-extra
+    ({ mkDerivation, base, bytestring, criterion, ekg-core, http-types
+     , QuickCheck, scotty, tasty, tasty-hunit, tasty-quickcheck, text
+     , time, transformers, wai, wai-extra
      }:
      mkDerivation {
        pname = "wai-middleware-metrics";
@@ -182934,6 +185866,10 @@ self: {
          base bytestring ekg-core http-types QuickCheck scotty tasty
          tasty-hunit tasty-quickcheck text time transformers wai wai-extra
        ];
+       benchmarkHaskellDepends = [
+         base bytestring criterion ekg-core http-types scotty text time wai
+         wai-extra
+       ];
        homepage = "https://github.com/Helkafen/wai-middleware-metrics";
        description = "A WAI middleware to collect EKG request metrics";
        license = stdenv.lib.licenses.bsd3;
@@ -183073,6 +186009,8 @@ self: {
        pname = "wai-middleware-verbs";
        version = "0.3.2";
        sha256 = "691fa97fda7204d84e1fa8f953334ca51cb1055577a5ec1d56cc5f07491aaa66";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [
          base errors exceptions hashable http-types mmorph monad-logger mtl
          resourcet transformers transformers-base unordered-containers wai
@@ -183106,7 +186044,7 @@ self: {
 
   "wai-request-spec" = callPackage
     ({ mkDerivation, base, bytestring, case-insensitive, containers
-     , http-types, text, wai
+     , criterion, http-types, text, wai
      }:
      mkDerivation {
        pname = "wai-request-spec";
@@ -183115,6 +186053,9 @@ self: {
        libraryHaskellDepends = [
          base bytestring case-insensitive containers http-types text wai
        ];
+       benchmarkHaskellDepends = [
+         base bytestring criterion http-types text wai
+       ];
        homepage = "https://gitlab.com/queertypes/wai-request-spec";
        description = "Declarative request parsing";
        license = stdenv.lib.licenses.bsd3;
@@ -183194,8 +186135,8 @@ self: {
   "wai-routing" = callPackage
     ({ mkDerivation, attoparsec, base, blaze-builder, bytestring
      , bytestring-conversion, case-insensitive, containers, cookie
-     , http-types, tasty, tasty-hunit, tasty-quickcheck, transformers
-     , wai, wai-predicates, wai-route
+     , criterion, http-types, tasty, tasty-hunit, tasty-quickcheck
+     , transformers, wai, wai-predicates, wai-route
      }:
      mkDerivation {
        pname = "wai-routing";
@@ -183210,6 +186151,9 @@ self: {
          case-insensitive containers http-types tasty tasty-hunit
          tasty-quickcheck wai wai-predicates
        ];
+       benchmarkHaskellDepends = [
+         base criterion http-types wai wai-predicates
+       ];
        homepage = "https://gitlab.com/twittner/wai-routing/";
        description = "Declarative routing for WAI";
        license = stdenv.lib.licenses.mpl20;
@@ -183503,6 +186447,8 @@ self: {
        sha256 = "5610c69eb377e2714c3e502cf47fff7e116e356890aefb1f4144d3e6c1b16c12";
        revision = "2";
        editedCabalFile = "7b2f9d4fe0358eb303c3993233b05c1505f4021ebee41fccfad0b6badbf8bd8f";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [
          aeson base bytestring directory filepath http-types
          regex-applicative template-haskell text wai
@@ -183547,15 +186493,16 @@ self: {
   "warp" = callPackage
     ({ mkDerivation, array, async, auto-update, base, blaze-builder
      , bytestring, bytestring-builder, case-insensitive, containers
-     , directory, doctest, ghc-prim, hashable, hspec, HTTP, http-date
-     , http-types, http2, HUnit, iproute, lifted-base, network, process
-     , QuickCheck, silently, simple-sendfile, stm, streaming-commons
-     , text, time, transformers, unix, unix-compat, vault, wai, word8
+     , criterion, directory, doctest, ghc-prim, hashable, hspec, HTTP
+     , http-date, http-types, http2, HUnit, iproute, lifted-base
+     , network, process, QuickCheck, silently, simple-sendfile, stm
+     , streaming-commons, text, time, transformers, unix, unix-compat
+     , vault, wai, word8
      }:
      mkDerivation {
        pname = "warp";
-       version = "3.2.11";
-       sha256 = "193e6cd899c09850819c09ae4a4368f569ee65559eef3f440be83b6c2b2cffac";
+       version = "3.2.11.1";
+       sha256 = "853f672c48893936902a0c6b3e4711f58c0fd02f36e8badb46a0c8b58067e5fe";
        libraryHaskellDepends = [
          array async auto-update base blaze-builder bytestring
          bytestring-builder case-insensitive containers ghc-prim hashable
@@ -183570,6 +186517,10 @@ self: {
          simple-sendfile stm streaming-commons text time transformers unix
          unix-compat vault wai word8
        ];
+       benchmarkHaskellDepends = [
+         auto-update base bytestring containers criterion hashable http-date
+         http-types network unix unix-compat
+       ];
        homepage = "http://github.com/yesodweb/wai";
        description = "A fast, light-weight web server for WAI applications";
        license = stdenv.lib.licenses.mit;
@@ -183641,6 +186592,8 @@ self: {
        pname = "warp-tls-uid";
        version = "0.1.0.4";
        sha256 = "beacad56f701aa913e0912a7a319a8b95d8e5100dddbf1f8655d7ce4a64c5b85";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [
          base bytestring certificate conduit crypto-random network
          network-conduit pem tls tls-extra unix wai warp
@@ -183823,6 +186776,8 @@ self: {
        pname = "wcwidth";
        version = "0.0.2";
        sha256 = "ffc68736a3bbde3e8157710f29f4a99c0ca593c41194579c54a92c62f6c12ed8";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [ base containers ];
        homepage = "http://github.com/solidsnack/wcwidth/";
        description = "Native wcwidth";
@@ -183878,6 +186833,8 @@ self: {
        pname = "web-encodings";
        version = "0.3.0.9";
        sha256 = "a30b0e0c596a1e9953fb1d5a5aa2ebe1710561d662294088d0cea657f5dae951";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [
          base bytestring directory failure old-locale text time
        ];
@@ -183954,6 +186911,8 @@ self: {
        pname = "web-page";
        version = "0.2.0";
        sha256 = "143301e4a9ff9f01507ef2b4548aebce01811090b176d52adc3dc87bcce5f8c3";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [
          base blaze-builder blaze-html bytestring clay containers jmacro
          lens mtl Stream text vector wl-pprint-text
@@ -184070,6 +187029,8 @@ self: {
        pname = "web-routes-quasi";
        version = "0.7.1.1";
        sha256 = "aeb63d0670b2229a246530cb05666957bfa15387d2617104856d1e0b62f50be7";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [ base path-pieces template-haskell text ];
        homepage = "http://docs.yesodweb.com/web-routes-quasi/";
        description = "Define data types and parse/build functions for web-routes via a quasi-quoted DSL (deprecated)";
@@ -184134,8 +187095,8 @@ self: {
      }) {};
 
   "web-routing" = callPackage
-    ({ mkDerivation, base, bytestring, doctest, primitive, text
-     , types-compat, unordered-containers
+    ({ mkDerivation, base, bytestring, criterion, doctest, primitive
+     , text, types-compat, unordered-containers
      }:
      mkDerivation {
        pname = "web-routing";
@@ -184147,6 +187108,7 @@ self: {
          base bytestring primitive text types-compat unordered-containers
        ];
        testHaskellDepends = [ base doctest ];
+       benchmarkHaskellDepends = [ base criterion text ];
        homepage = "https://github.com/philopon/web-routing";
        description = "simple routing library";
        license = stdenv.lib.licenses.mit;
@@ -184160,8 +187122,8 @@ self: {
      }:
      mkDerivation {
        pname = "web3";
-       version = "0.5.3.0";
-       sha256 = "258d2344367d7ceb3c1a43acd99b05bb23afbc5c5476be4d341e3ca2f56ae91d";
+       version = "0.5.4.0";
+       sha256 = "a33d6944539d6f7f811c8e0fffed8a8a291d6a0e147f29199cd9eadaada69e01";
        libraryHaskellDepends = [
          aeson attoparsec base base16-bytestring bytestring cryptonite
          http-client http-client-tls memory template-haskell text
@@ -184458,6 +187420,7 @@ self: {
        homepage = "http://projects.haskell.org/gtk2hs/";
        description = "Binding to the Webkit library";
        license = stdenv.lib.licenses.lgpl21;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {webkit = null;};
 
   "webkit-javascriptcore" = callPackage
@@ -184504,6 +187467,7 @@ self: {
        homepage = "http://projects.haskell.org/gtk2hs/";
        description = "Binding to the Webkit library";
        license = stdenv.lib.licenses.lgpl21;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {webkit = null;};
 
   "webkitgtk3-javascriptcore" = callPackage
@@ -184517,6 +187481,7 @@ self: {
        libraryPkgconfigDepends = [ webkit ];
        description = "JavaScriptCore FFI from webkitgtk";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {webkit = null;};
 
   "webpage" = callPackage
@@ -184586,6 +187551,8 @@ self: {
        pname = "websockets";
        version = "0.10.0.0";
        sha256 = "3ee56fa6683912928a7d336d591c43e4948886037b5aa72cbab2f33fb43fa2eb";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [
          attoparsec base base64-bytestring binary blaze-builder bytestring
          case-insensitive containers entropy network random SHA text
@@ -184707,6 +187674,8 @@ self: {
        pname = "weighted-regexp";
        version = "0.3.1.2";
        sha256 = "f963773841854c56d36f329dae51ec08b9028832eee53b62a9ba7df5ef2de664";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [ array base ];
        libraryToolDepends = [ happy ];
        homepage = "http://sebfisch.github.com/haskell-regexp";
@@ -184958,13 +187927,18 @@ self: {
      }) {};
 
   "wigner-symbols" = callPackage
-    ({ mkDerivation, base, bytestring, cryptonite }:
+    ({ mkDerivation, base, bytestring, criterion, cryptonite, primitive
+     , random, vector
+     }:
      mkDerivation {
        pname = "wigner-symbols";
        version = "1.0.0";
        sha256 = "0d2ae52728e6ef32519a6b648033185617291e76c4996c7107b9a3caf73db28e";
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base bytestring cryptonite ];
+       benchmarkHaskellDepends = [
+         base criterion primitive random vector
+       ];
        homepage = "https://github.com/Rufflewind/wigner-symbols";
        description = "CG coefficients and Wigner symbols";
        license = stdenv.lib.licenses.mit;
@@ -185098,6 +188072,8 @@ self: {
        pname = "windowslive";
        version = "0.3";
        sha256 = "7fc9617306ccbe99a8f910ca442bfeabd8e78b8668db773defefa5b41b1fb395";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [
          base Crypto dataenc mtl network parsec pretty split time urlencoded
        ];
@@ -185113,8 +188089,7 @@ self: {
        pname = "winerror";
        version = "1.0.1";
        sha256 = "0d527e4024967909171d3aea30d43abb0fd84306f77aa26625466c0f3de95575";
-       isLibrary = false;
-       isExecutable = false;
+       doHaddock = false;
        description = "Error handling for foreign calls to the Windows API";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -185139,19 +188114,26 @@ self: {
      }) {kernel32 = null; ws2_32 = null;};
 
   "wire-streams" = callPackage
-    ({ mkDerivation, base, binary, binary-parsers, bytestring
-     , io-streams, QuickCheck, tasty, tasty-quickcheck
+    ({ mkDerivation, base, binary, binary-parsers, bytestring, cereal
+     , cereal-conduit, conduit, conduit-extra, criterion, io-streams
+     , QuickCheck, tasty, tasty-quickcheck, transformers
      }:
      mkDerivation {
        pname = "wire-streams";
        version = "0.1.1.0";
        sha256 = "96dffb70c08c89589881c96f199d271b55e4a5b3cc5be0f3e24e101858e2fb27";
+       revision = "1";
+       editedCabalFile = "08816c7fa53b20f52e5c465252c106d9de8e6d9580ec0b6d9f000a34c7bcefc8";
        libraryHaskellDepends = [
          base binary binary-parsers bytestring io-streams
        ];
        testHaskellDepends = [
          base binary bytestring io-streams QuickCheck tasty tasty-quickcheck
        ];
+       benchmarkHaskellDepends = [
+         base binary bytestring cereal cereal-conduit conduit conduit-extra
+         criterion io-streams transformers
+       ];
        homepage = "https://github.com/winterland1989/wire-streams";
        description = "Fast binary io-streams adapter";
        license = stdenv.lib.licenses.bsd3;
@@ -185165,6 +188147,8 @@ self: {
        pname = "wires";
        version = "0.1.0";
        sha256 = "4145f1870301d1ba7af683ec17877450dbeaa93afa002d0cf9a36b1ef4248c65";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [
          base deepseq profunctors semigroupoids these
        ];
@@ -185583,8 +188567,8 @@ self: {
      }) {};
 
   "word24" = callPackage
-    ({ mkDerivation, base, deepseq, QuickCheck, test-framework
-     , test-framework-quickcheck2
+    ({ mkDerivation, base, criterion, deepseq, QuickCheck
+     , test-framework, test-framework-quickcheck2
      }:
      mkDerivation {
        pname = "word24";
@@ -185594,6 +188578,7 @@ self: {
        testHaskellDepends = [
          base deepseq QuickCheck test-framework test-framework-quickcheck2
        ];
+       benchmarkHaskellDepends = [ base criterion deepseq ];
        homepage = "https://github.com/winterland1989/word24";
        description = "24-bit word and int types for GHC";
        license = stdenv.lib.licenses.bsd3;
@@ -185601,13 +188586,14 @@ self: {
      }) {};
 
   "word8" = callPackage
-    ({ mkDerivation, base, hspec }:
+    ({ mkDerivation, base, bytestring, criterion, hspec }:
      mkDerivation {
        pname = "word8";
        version = "0.1.2";
        sha256 = "3cbae3755a078ecff46524b3f6e0018f7e796e6dac9c710fe09b433c544676dd";
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base hspec ];
+       benchmarkHaskellDepends = [ base bytestring criterion ];
        description = "Word8 library";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -185763,7 +188749,7 @@ self: {
        pname = "workflow-windows";
        version = "0.0.0";
        sha256 = "4c922f26ea5580022b8ecd184ce473eabead4a035cc95ea9394f9fc04efdff92";
-       isLibrary = false;
+       isLibrary = true;
        isExecutable = true;
        executableHaskellDepends = [ base ];
        testHaskellDepends = [ base doctest hspec QuickCheck ];
@@ -185821,6 +188807,8 @@ self: {
        pname = "wraxml";
        version = "0.4.4.1";
        sha256 = "828d9250db9472c321c55d08f9daa2c4c9995e95d2fd964ef0c1d16b32c75613";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [
          base containers data-accessor explicit-exception HaXml hxt
          hxt-filter polyparse tagchup tagsoup transformers utility-ht
@@ -185893,6 +188881,8 @@ self: {
        pname = "wreq";
        version = "0.5.0.0";
        sha256 = "15e5787791148991d6055ad1269b9d9cb22db04e16b0bd1d266e2f00cec1f4d5";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [
          aeson attoparsec authenticate-oauth base base16-bytestring byteable
          bytestring case-insensitive containers cryptohash exceptions
@@ -185929,6 +188919,8 @@ self: {
        pname = "wreq-sb";
        version = "0.4.0.0";
        sha256 = "dfc9c0a13696bbe2521a9d440bd9c8a57b8dccef270bdffb011bf320a7971b54";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [
          aeson attoparsec authenticate-oauth base base16-bytestring byteable
          bytestring case-insensitive containers cryptohash exceptions
@@ -186766,6 +189758,8 @@ self: {
        pname = "xenstore";
        version = "0.1.1";
        sha256 = "c2b538c9ce6716f4a1b4c0cb63ed5c6e5ee3e69e80dbb7826ee7f5392f45e874";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [ base bytestring cereal mtl network ];
        description = "Xenstore client access";
        license = stdenv.lib.licenses.bsd3;
@@ -186781,10 +189775,14 @@ self: {
        sha256 = "9febbf8349f27fa184c56959a01db2f78176bd534f103f6b1be0bb01b7fac360";
        revision = "1";
        editedCabalFile = "ce4bb3ab326d8e4c0a4fc2576045b589305b12f7ca28b79a69fcc367c429d33c";
+       isLibrary = true;
+       isExecutable = true;
        setupHaskellDepends = [ base Cabal containers directory filepath ];
        libraryHaskellDepends = [ base glib ];
        libraryPkgconfigDepends = [ libxfconf ];
        libraryToolDepends = [ gtk2hs-buildtools ];
+       executablePkgconfigDepends = [ libxfconf ];
+       executableToolDepends = [ gtk2hs-buildtools ];
        homepage = "http://patch-tag.com/r/obbele/xfconf/home";
        description = "FFI bindings to xfconf";
        license = stdenv.lib.licenses.gpl3;
@@ -186943,6 +189941,8 @@ self: {
        pname = "xing-api";
        version = "0.1.3";
        sha256 = "b3e21b098ef46e9d496efa4257172fa5a872149e708f694cd0ea60ef192d23fc";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [
          aeson authenticate-oauth base bytestring containers http-conduit
          http-types lifted-base monad-control resourcet text time
@@ -186974,8 +189974,9 @@ self: {
 
   "xkbcommon" = callPackage
     ({ mkDerivation, base, bytestring, Cabal, cpphs, data-flags
-     , directory, filepath, libxkbcommon, process, storable-record
-     , template-haskell, text, transformers, unix
+     , directory, filepath, libxkbcommon, process, random
+     , storable-record, template-haskell, text, time, transformers, unix
+     , vector
      }:
      mkDerivation {
        pname = "xkbcommon";
@@ -186990,6 +189991,7 @@ self: {
        ];
        librarySystemDepends = [ libxkbcommon ];
        testHaskellDepends = [ base unix ];
+       benchmarkHaskellDepends = [ base random time vector ];
        description = "Haskell bindings for libxkbcommon";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -187288,6 +190290,8 @@ self: {
        pname = "xml-enumerator-combinators";
        version = "0.1";
        sha256 = "63c9e2548ef8c83116fff84160b48494974b1cf34852fe2e6377cab53ef754d8";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [
          base containers enumerator xml-enumerator xml-types
        ];
@@ -187351,6 +190355,8 @@ self: {
        pname = "xml-html-conduit-lens";
        version = "0.3.2.2";
        sha256 = "bf2b242411168e2287d2189e8c74c4c3751afac03003a852ee6068ce7cc643ac";
+       revision = "1";
+       editedCabalFile = "4673f03cf274523d25c1b07e4fddd6b1729e42a372ef7e1967705b808eda52a8";
        libraryHaskellDepends = [
          base bytestring containers html-conduit lens text xml-conduit
        ];
@@ -187386,6 +190392,26 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "xml-indexed-cursor" = callPackage
+    ({ mkDerivation, base, bytestring, containers, data-default
+     , doctest, Glob, tasty, tasty-hunit, text, xml-conduit
+     }:
+     mkDerivation {
+       pname = "xml-indexed-cursor";
+       version = "0.1.1.0";
+       sha256 = "46d622fc738e8cc1513f598207ee5e6cda790c79e0697fe02d2da6ad02a6da74";
+       libraryHaskellDepends = [
+         base bytestring containers data-default text xml-conduit
+       ];
+       testHaskellDepends = [
+         base bytestring data-default doctest Glob tasty tasty-hunit text
+         xml-conduit
+       ];
+       homepage = "https://github.com/cdepillabout/xml-indexed-cursor";
+       description = "Indexed XML cursors similar to 'Text.XML.Cursor' from xml-conduit";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "xml-isogen" = callPackage
     ({ mkDerivation, base, dom-parser, lens, mtl, QuickCheck
      , semigroups, template-haskell, text, xml-conduit-writer
@@ -187719,7 +190745,8 @@ self: {
 
   "xmlgen" = callPackage
     ({ mkDerivation, base, blaze-builder, bytestring, containers
-     , filepath, HUnit, hxt, mtl, process, QuickCheck, text, unix
+     , criterion, filepath, HUnit, hxt, mtl, process, QuickCheck, text
+     , unix
      }:
      mkDerivation {
        pname = "xmlgen";
@@ -187732,6 +190759,7 @@ self: {
          base bytestring containers filepath HUnit hxt process QuickCheck
          text unix
        ];
+       benchmarkHaskellDepends = [ base bytestring criterion text ];
        description = "Fast XML generation library";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -188029,20 +191057,20 @@ self: {
      }) {};
 
   "xmonad-vanessa" = callPackage
-    ({ mkDerivation, base, containers, process, transformers, X11
-     , xmonad, xmonad-contrib, xmonad-extras
+    ({ mkDerivation, base, containers, hspec, process, transformers
+     , X11, xmonad, xmonad-contrib
      }:
      mkDerivation {
        pname = "xmonad-vanessa";
-       version = "0.1.0.3";
-       sha256 = "2ec997506b554282bbbddf02d9bb72326637ce5c6cd5634604b93a7e6e2b9ffa";
+       version = "0.1.0.6";
+       sha256 = "7abfe1bdaf7a9bbecdfa89b36b7144fe590d5b6344cc4838fb287e8f5ded52c4";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
          base containers process transformers X11 xmonad xmonad-contrib
-         xmonad-extras
        ];
        executableHaskellDepends = [ base ];
+       testHaskellDepends = [ base hspec xmonad ];
        homepage = "https://github.com/vmchale/xmonad-vanessa#readme";
        description = "Custom xmonad, which uses stack and sets various defaults";
        license = stdenv.lib.licenses.bsd3;
@@ -188353,8 +191381,8 @@ self: {
      }) {};
 
   "xxhash" = callPackage
-    ({ mkDerivation, base, bytestring, crypto-api, hspec, QuickCheck
-     , tagged
+    ({ mkDerivation, base, bytestring, criterion, crypto-api, deepseq
+     , digest, hashable, hspec, murmur-hash, QuickCheck, tagged
      }:
      mkDerivation {
        pname = "xxhash";
@@ -188362,6 +191390,9 @@ self: {
        sha256 = "4f5cc71564d71b7ab1e9f70ce9b8d32a3d73cb0b1e08ff96bc54298b21eb2f27";
        libraryHaskellDepends = [ base bytestring crypto-api tagged ];
        testHaskellDepends = [ base bytestring hspec QuickCheck ];
+       benchmarkHaskellDepends = [
+         base bytestring criterion deepseq digest hashable murmur-hash
+       ];
        description = "A Haskell implementation of the xxHash algorithm";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -188551,37 +191582,6 @@ self: {
 
   "yaml" = callPackage
     ({ mkDerivation, aeson, aeson-qq, attoparsec, base, base-compat
-     , bytestring, conduit, containers, directory, enclosed-exceptions
-     , filepath, hspec, HUnit, libyaml, mockery, resourcet, scientific
-     , semigroups, template-haskell, temporary, text, transformers
-     , unordered-containers, vector
-     }:
-     mkDerivation {
-       pname = "yaml";
-       version = "0.8.21.2";
-       sha256 = "441cf712cd20ac6b0ded900562ca33770c8752702963ab267bff72b0657fef29";
-       configureFlags = [ "-fsystem-libyaml" ];
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         aeson attoparsec base bytestring conduit containers directory
-         enclosed-exceptions filepath resourcet scientific semigroups
-         template-haskell text transformers unordered-containers vector
-       ];
-       libraryPkgconfigDepends = [ libyaml ];
-       executableHaskellDepends = [ aeson base bytestring ];
-       testHaskellDepends = [
-         aeson aeson-qq base base-compat bytestring conduit directory hspec
-         HUnit mockery resourcet temporary text transformers
-         unordered-containers vector
-       ];
-       homepage = "http://github.com/snoyberg/yaml/";
-       description = "Support for parsing and rendering YAML documents";
-       license = stdenv.lib.licenses.bsd3;
-     }) {inherit (pkgs) libyaml;};
-
-  "yaml_0_8_22" = callPackage
-    ({ mkDerivation, aeson, aeson-qq, attoparsec, base, base-compat
      , bytestring, conduit, containers, directory, filepath, hspec
      , HUnit, libyaml, mockery, resourcet, scientific, semigroups
      , template-haskell, temporary, text, transformers
@@ -188609,7 +191609,6 @@ self: {
        homepage = "http://github.com/snoyberg/yaml/";
        description = "Support for parsing and rendering YAML documents";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) libyaml;};
 
   "yaml-config" = callPackage
@@ -188781,6 +191780,8 @@ self: {
        sha256 = "167c8dc3992d98d879eb281b27a0dbf6fde21ca69992e384df4b5babcdda3e3c";
        revision = "1";
        editedCabalFile = "98e99a555170a8b7281116b4e9c829c011b2401f21589f55ae80333ff2d6f34a";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [ base blank-canvas stm time Yampa ];
        description = "blank-canvas frontend for Yampa";
        license = stdenv.lib.licenses.bsd3;
@@ -188814,6 +191815,8 @@ self: {
        pname = "yampa-glut";
        version = "0.1.1.1";
        sha256 = "f7c2b8aec210261341310f0c63f2eed3f80952077ad907ebff4427902ce4c304";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [
          base GLUT newtype OpenGL vector-space Yampa-core
        ];
@@ -188984,9 +191987,9 @@ self: {
      }) {};
 
   "yeller" = callPackage
-    ({ mkDerivation, aeson, base, bytestring, containers, hspec
-     , http-client, http-client-tls, http-types, network, stm, text
-     , unordered-containers
+    ({ mkDerivation, aeson, base, bytestring, containers, criterion
+     , deepseq, hspec, http-client, http-client-tls, http-types, network
+     , stm, text, unordered-containers
      }:
      mkDerivation {
        pname = "yeller";
@@ -189000,6 +192003,10 @@ self: {
          aeson base bytestring containers hspec http-client http-client-tls
          http-types network stm text unordered-containers
        ];
+       benchmarkHaskellDepends = [
+         aeson base bytestring containers criterion deepseq http-client
+         http-client-tls http-types network stm text unordered-containers
+       ];
        homepage = "http://yellerapp.com";
        description = "A Yeller Client For Haskell";
        license = stdenv.lib.licenses.mit;
@@ -189073,6 +192080,31 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "yesod_1_4_5" = callPackage
+    ({ mkDerivation, aeson, base, blaze-html, blaze-markup, bytestring
+     , conduit, conduit-extra, data-default-class, directory
+     , fast-logger, monad-control, monad-logger, resourcet, semigroups
+     , shakespeare, streaming-commons, template-haskell, text
+     , transformers, unix, unordered-containers, wai, wai-extra
+     , wai-logger, warp, yaml, yesod-core, yesod-form, yesod-persistent
+     }:
+     mkDerivation {
+       pname = "yesod";
+       version = "1.4.5";
+       sha256 = "267c8780b27cc0ae8199f80b3063683fb2cd62eeb9696c4b155a298fb035e6e9";
+       libraryHaskellDepends = [
+         aeson base blaze-html blaze-markup bytestring conduit conduit-extra
+         data-default-class directory fast-logger monad-control monad-logger
+         resourcet semigroups shakespeare streaming-commons template-haskell
+         text transformers unix unordered-containers wai wai-extra
+         wai-logger warp yaml yesod-core yesod-form yesod-persistent
+       ];
+       homepage = "http://www.yesodweb.com/";
+       description = "Creation of type-safe, RESTful web applications";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "yesod-angular" = callPackage
     ({ mkDerivation, aeson, base, containers, shakespeare
      , template-haskell, text, transformers, yesod
@@ -189137,6 +192169,36 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "yesod-auth_1_4_17" = 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.17";
+       sha256 = "444a9b4b913e5f7addb1b9c5aa778f32d2b9e040d9b1c4d8a232fae908392891";
+       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;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "yesod-auth-account" = callPackage
     ({ mkDerivation, base, blaze-html, bytestring, hspec, monad-logger
      , mtl, nonce, persistent, persistent-sqlite, pwstore-fast
@@ -189384,8 +192446,8 @@ self: {
      }:
      mkDerivation {
        pname = "yesod-auth-oauth";
-       version = "1.4.1.1";
-       sha256 = "2dd9eda01b3b7625711b0a1dafce82915e82154976cd94c6076c8fa929d80773";
+       version = "1.4.2";
+       sha256 = "c115b0cd142423642e83775d81feee450e7bea2785ea882cd197bf3926ca7927";
        libraryHaskellDepends = [
          authenticate-oauth base bytestring lifted-base text transformers
          yesod-auth yesod-core yesod-form
@@ -189405,6 +192467,8 @@ self: {
        pname = "yesod-auth-oauth2";
        version = "0.2.2";
        sha256 = "6276f3bef0c992084ce55cdefb64dbb63b9a27b3ccfed515318f043ea7b85c33";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [
          aeson authenticate base bytestring hoauth2 http-client http-conduit
          http-types lifted-base network-uri random text transformers vector
@@ -189504,6 +192568,41 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "yesod-bin_1_5_2" = callPackage
+    ({ mkDerivation, async, attoparsec, base, base64-bytestring
+     , blaze-builder, bytestring, Cabal, conduit, conduit-extra
+     , containers, data-default-class, deepseq, directory, file-embed
+     , filepath, fsnotify, http-client, http-client-tls
+     , http-reverse-proxy, http-types, lifted-base, network
+     , optparse-applicative, parsec, process, project-template
+     , resourcet, safe-exceptions, say, shakespeare, split, stm
+     , streaming-commons, tar, template-haskell, text, time
+     , transformers, transformers-compat, typed-process, unix-compat
+     , unordered-containers, wai, wai-extra, warp, warp-tls, yaml, zlib
+     }:
+     mkDerivation {
+       pname = "yesod-bin";
+       version = "1.5.2";
+       sha256 = "b37087eb7e167c2250dd23452e8f4858190db11570e540df44809c197219439a";
+       isLibrary = false;
+       isExecutable = true;
+       executableHaskellDepends = [
+         async attoparsec base base64-bytestring blaze-builder bytestring
+         Cabal conduit conduit-extra containers data-default-class deepseq
+         directory file-embed filepath fsnotify http-client http-client-tls
+         http-reverse-proxy http-types lifted-base network
+         optparse-applicative parsec process project-template resourcet
+         safe-exceptions say shakespeare split stm streaming-commons tar
+         template-haskell text time transformers transformers-compat
+         typed-process unix-compat unordered-containers wai wai-extra warp
+         warp-tls yaml zlib
+       ];
+       homepage = "http://www.yesodweb.com/";
+       description = "The yesod helper executable";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "yesod-bootstrap" = callPackage
     ({ mkDerivation, base, blaze-html, blaze-markup, bootstrap-types
      , shakespeare, text, transformers, yesod-core, yesod-elements
@@ -189527,8 +192626,8 @@ self: {
      }:
      mkDerivation {
        pname = "yesod-colonnade";
-       version = "0.4";
-       sha256 = "3cdb1f10dee36cdf4adebc5799fb108e4112065659051aed025ef4359b3509d7";
+       version = "1.1.0";
+       sha256 = "163fbe1c8618c01d17900ba205e7df8bd9e0a7abc5475ae6436417afafbf0a34";
        libraryHaskellDepends = [
          base blaze-html blaze-markup colonnade text yesod-core
        ];
@@ -189605,9 +192704,9 @@ self: {
     ({ mkDerivation, aeson, async, auto-update, base, blaze-builder
      , blaze-html, blaze-markup, byteable, bytestring, case-insensitive
      , cereal, clientsession, conduit, conduit-extra, containers, cookie
-     , data-default, deepseq, deepseq-generics, directory, exceptions
-     , fast-logger, hspec, hspec-expectations, http-types, HUnit
-     , lifted-base, monad-control, monad-logger, mtl, mwc-random
+     , criterion, data-default, deepseq, deepseq-generics, directory
+     , exceptions, fast-logger, hspec, hspec-expectations, http-types
+     , HUnit, lifted-base, monad-control, monad-logger, mtl, mwc-random
      , network, old-locale, parsec, path-pieces, primitive, QuickCheck
      , random, resourcet, safe, semigroups, shakespeare
      , streaming-commons, template-haskell, text, time, transformers
@@ -189636,9 +192735,56 @@ self: {
          resourcet shakespeare streaming-commons template-haskell text
          transformers wai wai-extra
        ];
+       benchmarkHaskellDepends = [
+         base blaze-html bytestring criterion shakespeare text transformers
+       ];
+       homepage = "http://www.yesodweb.com/";
+       description = "Creation of type-safe, RESTful web applications";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
+  "yesod-core_1_4_32" = callPackage
+    ({ mkDerivation, aeson, async, auto-update, base, blaze-builder
+     , blaze-html, blaze-markup, byteable, bytestring, case-insensitive
+     , cereal, clientsession, conduit, conduit-extra, containers, cookie
+     , criterion, data-default, deepseq, deepseq-generics, directory
+     , exceptions, fast-logger, hspec, hspec-expectations, http-types
+     , HUnit, lifted-base, monad-control, monad-logger, mtl, mwc-random
+     , network, old-locale, parsec, path-pieces, primitive, QuickCheck
+     , random, resourcet, safe, semigroups, shakespeare
+     , streaming-commons, template-haskell, text, time, transformers
+     , transformers-base, unix-compat, unordered-containers, vector, wai
+     , wai-extra, wai-logger, warp, word8
+     }:
+     mkDerivation {
+       pname = "yesod-core";
+       version = "1.4.32";
+       sha256 = "0a3389e0e5d188c0bfcb99bb39856adcde28a1ebf572c0aebf8afa0e34946869";
+       libraryHaskellDepends = [
+         aeson auto-update base blaze-builder blaze-html blaze-markup
+         byteable bytestring case-insensitive cereal clientsession conduit
+         conduit-extra containers cookie data-default deepseq
+         deepseq-generics directory exceptions fast-logger http-types
+         lifted-base monad-control monad-logger mtl mwc-random old-locale
+         parsec path-pieces primitive random resourcet safe semigroups
+         shakespeare template-haskell text time transformers
+         transformers-base unix-compat unordered-containers vector wai
+         wai-extra wai-logger warp word8
+       ];
+       testHaskellDepends = [
+         async base blaze-builder bytestring clientsession conduit
+         conduit-extra containers cookie hspec hspec-expectations http-types
+         HUnit lifted-base mwc-random network path-pieces QuickCheck random
+         resourcet shakespeare streaming-commons template-haskell text
+         transformers wai wai-extra
+       ];
+       benchmarkHaskellDepends = [
+         base blaze-html bytestring criterion shakespeare text transformers
+       ];
        homepage = "http://www.yesodweb.com/";
        description = "Creation of type-safe, RESTful web applications";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "yesod-crud" = callPackage
@@ -189796,6 +192942,24 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "yesod-eventsource_1_4_1" = callPackage
+    ({ mkDerivation, base, blaze-builder, conduit, transformers, wai
+     , wai-eventsource, wai-extra, yesod-core
+     }:
+     mkDerivation {
+       pname = "yesod-eventsource";
+       version = "1.4.1";
+       sha256 = "4019782d074ed5c23719e8e96f604b63990d9fd49255e14b7f5b769e7f3d3e13";
+       libraryHaskellDepends = [
+         base blaze-builder conduit transformers wai wai-eventsource
+         wai-extra yesod-core
+       ];
+       homepage = "http://www.yesodweb.com/";
+       description = "Server-sent events support for Yesod apps";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "yesod-examples" = callPackage
     ({ mkDerivation, base, blaze-html, bytestring, data-object
      , data-object-yaml, hamlet, persistent-sqlite, persistent-template
@@ -189880,6 +193044,31 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "yesod-form_1_4_11" = callPackage
+    ({ mkDerivation, aeson, attoparsec, base, blaze-builder, blaze-html
+     , blaze-markup, byteable, bytestring, containers, data-default
+     , email-validate, hspec, network-uri, persistent, resourcet
+     , semigroups, shakespeare, template-haskell, text, time
+     , transformers, wai, xss-sanitize, yesod-core, yesod-persistent
+     }:
+     mkDerivation {
+       pname = "yesod-form";
+       version = "1.4.11";
+       sha256 = "45edd3ea97a09968426ab20ea4595389b61f5fc2c9e328cecbdeed4a78dcd8d6";
+       libraryHaskellDepends = [
+         aeson attoparsec base blaze-builder blaze-html blaze-markup
+         byteable bytestring containers data-default email-validate
+         network-uri persistent resourcet semigroups shakespeare
+         template-haskell text time transformers wai xss-sanitize yesod-core
+         yesod-persistent
+       ];
+       testHaskellDepends = [ base hspec text time ];
+       homepage = "http://www.yesodweb.com/";
+       description = "Form handling support for Yesod Web Framework";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "yesod-form-json" = callPackage
     ({ mkDerivation, aeson, base, bytestring, containers, text
      , unordered-containers, yesod-core, yesod-form
@@ -189991,6 +193180,8 @@ self: {
        pname = "yesod-job-queue";
        version = "0.3.0.1";
        sha256 = "a58805e218e5b0e6c623a5447f06484004d72a357f4b2e30d476da56618b734f";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [
          aeson api-field-json-th base bytestring cron file-embed hedis lens
          monad-control monad-logger stm text time transformers uuid yesod
@@ -190048,6 +193239,8 @@ self: {
        pname = "yesod-mangopay";
        version = "1.12";
        sha256 = "a53c0d1e8e1654a4c251b1830264f581a1ed668fffb303c05993e10e20932754";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [
          base containers http-conduit http-types lifted-base mangopay
          persistent-template text time yesod yesod-core
@@ -190149,8 +193342,10 @@ self: {
      }:
      mkDerivation {
        pname = "yesod-paginator";
-       version = "0.10.1";
-       sha256 = "06dd2e4ffb031176e3e9538f5ed5051e4e188ad803b8071bbc69a95e59d576c3";
+       version = "0.11.0";
+       sha256 = "60afa9b2a11f8c61a5ca090d3e0b0effe35162f67038e9c833a6e100b28aeb96";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [
          base persistent resourcet text transformers yesod
        ];
@@ -190198,6 +193393,29 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "yesod-persistent_1_4_2" = callPackage
+    ({ mkDerivation, base, blaze-builder, conduit, hspec, persistent
+     , persistent-sqlite, persistent-template, resource-pool, resourcet
+     , text, transformers, wai-extra, yesod-core
+     }:
+     mkDerivation {
+       pname = "yesod-persistent";
+       version = "1.4.2";
+       sha256 = "d938894209e27a7f2a6e41906a9db02cf5c66df2236a864361571ba4e63b1056";
+       libraryHaskellDepends = [
+         base blaze-builder conduit persistent persistent-template
+         resource-pool resourcet transformers yesod-core
+       ];
+       testHaskellDepends = [
+         base blaze-builder conduit hspec persistent persistent-sqlite text
+         wai-extra yesod-core
+       ];
+       homepage = "http://www.yesodweb.com/";
+       description = "Some helpers for using Persistent from Yesod";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "yesod-platform" = callPackage
     ({ mkDerivation, ansi-terminal, ansi-wl-pprint, asn1-encoding
      , asn1-parse, asn1-types, attoparsec-conduit, authenticate
@@ -190613,6 +193831,42 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "yesod-static_1_5_2" = callPackage
+    ({ mkDerivation, async, attoparsec, base, base64-bytestring
+     , blaze-builder, byteable, bytestring, conduit, conduit-extra
+     , containers, cryptohash, cryptohash-conduit, css-text
+     , data-default, directory, exceptions, file-embed, filepath
+     , hashable, hjsmin, hspec, http-types, HUnit, mime-types, old-time
+     , process, resourcet, template-haskell, text, transformers
+     , unix-compat, unordered-containers, wai, wai-app-static, wai-extra
+     , yesod-core, yesod-test
+     }:
+     mkDerivation {
+       pname = "yesod-static";
+       version = "1.5.2";
+       sha256 = "b949c5f6087d9e32c7ff2f41ed647b1df605bbe1ce2cbcfe59cc46dc4a72099e";
+       libraryHaskellDepends = [
+         async attoparsec base base64-bytestring blaze-builder byteable
+         bytestring conduit conduit-extra containers cryptohash
+         cryptohash-conduit css-text data-default directory exceptions
+         file-embed filepath hashable hjsmin http-types mime-types old-time
+         process resourcet template-haskell text transformers unix-compat
+         unordered-containers wai wai-app-static yesod-core
+       ];
+       testHaskellDepends = [
+         async base base64-bytestring byteable bytestring conduit
+         conduit-extra containers cryptohash cryptohash-conduit data-default
+         directory exceptions file-embed filepath hjsmin hspec http-types
+         HUnit mime-types old-time process resourcet template-haskell text
+         transformers unix-compat unordered-containers wai wai-app-static
+         wai-extra yesod-core yesod-test
+       ];
+       homepage = "http://www.yesodweb.com/";
+       description = "Static file serving subsite for Yesod Web Framework";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "yesod-static-angular" = callPackage
     ({ mkDerivation, aeson, base, blaze-builder, blaze-markup
      , bytestring, data-default, directory, filepath, hamlet, hspec
@@ -190623,6 +193877,8 @@ self: {
        pname = "yesod-static-angular";
        version = "0.1.8";
        sha256 = "97b3ef260a7e6c70b811cbf3b2b3532a003c5028bd6a0df52fc14bd45ce03beb";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [
          aeson base blaze-builder blaze-markup bytestring data-default
          directory filepath hamlet language-javascript mime-types
@@ -190692,6 +193948,34 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "yesod-test_1_5_5" = callPackage
+    ({ mkDerivation, attoparsec, base, blaze-builder, blaze-html
+     , blaze-markup, bytestring, case-insensitive, containers, cookie
+     , hspec, hspec-core, html-conduit, http-types, HUnit, lifted-base
+     , monad-control, network, persistent, pretty-show, text, time
+     , transformers, wai, wai-extra, xml-conduit, xml-types, yesod-core
+     , yesod-form
+     }:
+     mkDerivation {
+       pname = "yesod-test";
+       version = "1.5.5";
+       sha256 = "44425bf59542649ff0b1ba4c976d8c35060c17c082e8b9f75a81ff89e16f0a39";
+       libraryHaskellDepends = [
+         attoparsec base blaze-builder blaze-html blaze-markup bytestring
+         case-insensitive containers cookie hspec-core html-conduit
+         http-types HUnit monad-control network persistent pretty-show text
+         time transformers wai wai-extra xml-conduit xml-types yesod-core
+       ];
+       testHaskellDepends = [
+         base bytestring containers hspec html-conduit http-types HUnit
+         lifted-base text wai xml-conduit yesod-core yesod-form
+       ];
+       homepage = "http://www.yesodweb.com";
+       description = "integration testing for WAI/Yesod Applications";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "yesod-test-json" = callPackage
     ({ mkDerivation, aeson, base, bytestring, conduit, hspec
      , http-types, HUnit, text, transformers, wai, wai-test
@@ -190809,6 +194093,25 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "yesod-websockets_0_2_6" = callPackage
+    ({ mkDerivation, async, base, conduit, enclosed-exceptions
+     , monad-control, transformers, wai, wai-websockets, websockets
+     , yesod-core
+     }:
+     mkDerivation {
+       pname = "yesod-websockets";
+       version = "0.2.6";
+       sha256 = "98111901a0f33f4c43459a20310dbf20a3fda142c5d42c30cfe9c53eeabeee29";
+       libraryHaskellDepends = [
+         async base conduit enclosed-exceptions monad-control transformers
+         wai wai-websockets websockets yesod-core
+       ];
+       homepage = "https://github.com/yesodweb/yesod";
+       description = "WebSockets support for Yesod";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "yesod-websockets-extra" = callPackage
     ({ mkDerivation, base, enclosed-exceptions, transformers
      , websockets, yesod-websockets
@@ -191238,7 +194541,7 @@ self: {
 
   "yi-rope" = callPackage
     ({ mkDerivation, base, binary, bytestring, charsetdetect-ae
-     , data-default, deepseq, fingertree, hspec, QuickCheck
+     , criterion, data-default, deepseq, fingertree, hspec, QuickCheck
      , quickcheck-instances, text, text-icu
      }:
      mkDerivation {
@@ -191252,6 +194555,7 @@ self: {
        testHaskellDepends = [
          base hspec QuickCheck quickcheck-instances text
        ];
+       benchmarkHaskellDepends = [ base criterion deepseq text ];
        description = "A rope data structure used by Yi";
        license = stdenv.lib.licenses.gpl2;
      }) {};
@@ -191626,6 +194930,8 @@ self: {
        pname = "z3";
        version = "4.1.0";
        sha256 = "096f9f4b92f5c9591d3098022b0b4047d1d6c4b970dc7d3ead6129d67fe4f5ee";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [ base containers mtl ];
        librarySystemDepends = [ gomp z3 ];
        testHaskellDepends = [ base hspec QuickCheck ];
@@ -191960,8 +195266,8 @@ self: {
      }:
      mkDerivation {
        pname = "zip";
-       version = "0.1.7";
-       sha256 = "8b7e4f597e926db852397bb2cbad04d05c718a222702076fbbdfcccb62679c9e";
+       version = "0.1.8";
+       sha256 = "3b6addaaf314df1587baf8b5e0423cbfa9fc256a09a20c70e1a746a8067370d1";
        libraryHaskellDepends = [
          base bytestring bzlib-conduit case-insensitive cereal conduit
          conduit-extra containers digest exceptions filepath mtl path
@@ -191987,6 +195293,8 @@ self: {
        sha256 = "dc83366e44d735df4088eb174c02c35a522e6228c04fecc35fe9493299fc97c7";
        revision = "1";
        editedCabalFile = "f9284c6bdf1e6c9f85091c602faae19dfad856ac6628531d999a611994f3da86";
+       isLibrary = true;
+       isExecutable = true;
        setupHaskellDepends = [ base Cabal ];
        libraryHaskellDepends = [
          array base binary bytestring containers digest directory filepath
@@ -192004,9 +195312,10 @@ self: {
 
   "zip-conduit" = callPackage
     ({ mkDerivation, base, bytestring, cereal, conduit, conduit-extra
-     , digest, directory, filepath, hpc, HUnit, mtl, old-time, resourcet
-     , temporary, test-framework, test-framework-hunit, time
-     , transformers, utf8-string
+     , criterion, digest, directory, filepath, hpc, HUnit, LibZip, mtl
+     , old-time, random, resourcet, temporary, test-framework
+     , test-framework-hunit, time, transformers, utf8-string
+     , zip-archive
      }:
      mkDerivation {
        pname = "zip-conduit";
@@ -192022,6 +195331,10 @@ self: {
          base bytestring conduit directory filepath hpc HUnit mtl resourcet
          temporary test-framework test-framework-hunit time
        ];
+       benchmarkHaskellDepends = [
+         base bytestring criterion directory filepath LibZip random
+         temporary zip-archive
+       ];
        homepage = "https://github.com/tymmym/zip-conduit";
        description = "Working with zip archives via conduits";
        license = stdenv.lib.licenses.bsd3;
@@ -192072,8 +195385,8 @@ self: {
      }) {};
 
   "zippers" = callPackage
-    ({ mkDerivation, base, directory, doctest, filepath, lens
-     , profunctors, semigroupoids
+    ({ mkDerivation, base, criterion, directory, doctest, filepath
+     , lens, profunctors, semigroupoids
      }:
      mkDerivation {
        pname = "zippers";
@@ -192081,6 +195394,7 @@ self: {
        sha256 = "d9c499cec6f60e0556b9874d2bf3b801b0a022b226a396200d11b91d3a1aede7";
        libraryHaskellDepends = [ base lens profunctors semigroupoids ];
        testHaskellDepends = [ base directory doctest filepath ];
+       benchmarkHaskellDepends = [ base criterion lens ];
        homepage = "http://github.com/ekmett/zippers/";
        description = "Traversal based zippers";
        license = stdenv.lib.licenses.bsd3;
@@ -192164,6 +195478,8 @@ self: {
        pname = "zlib-enum";
        version = "0.2.3.1";
        sha256 = "e43dc9ea85ceea02c4f4204c95e8d8540205839c58079f9399dfa96e63fdccd9";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [
          base bytestring enumerator transformers zlib-bindings
        ];
@@ -192393,8 +195709,8 @@ self: {
      }) {};
 
   "zstd" = callPackage
-    ({ mkDerivation, base, bytestring, deepseq, ghc-prim, QuickCheck
-     , test-framework, test-framework-quickcheck2
+    ({ mkDerivation, base, bytestring, criterion, deepseq, ghc-prim
+     , QuickCheck, test-framework, test-framework-quickcheck2, zlib
      }:
      mkDerivation {
        pname = "zstd";
@@ -192405,6 +195721,9 @@ self: {
          base bytestring QuickCheck test-framework
          test-framework-quickcheck2
        ];
+       benchmarkHaskellDepends = [
+         base bytestring criterion ghc-prim zlib
+       ];
        homepage = "https://github.com/facebookexperimental/hs-zstd";
        description = "Haskell bindings to the Zstandard compression algorithm";
        license = stdenv.lib.licenses.bsd3;