From 40a3d775a5887ccc944d009032f70f0dd2b891f7 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 27 Dec 2017 21:43:12 +0100
Subject: [PATCH] hackage-packages.nix: automatic Haskell package set update

This update was generated by hackage2nix v2.7.1-1-gc1b61fc from Hackage revision
https://github.com/commercialhaskell/all-cabal-hashes/commit/246f2ece36e4026fe6eee5ee491beea6bf1c7299.
---
 .../haskell-modules/hackage-packages.nix      | 839 +++++++++++++++---
 1 file changed, 699 insertions(+), 140 deletions(-)

diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index 055129a41d56..f163abc47a06 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -10675,6 +10675,24 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "JuicyPixels_3_2_9_2" = callPackage
+    ({ mkDerivation, base, binary, bytestring, containers, deepseq, mtl
+     , primitive, transformers, vector, zlib
+     }:
+     mkDerivation {
+       pname = "JuicyPixels";
+       version = "3.2.9.2";
+       sha256 = "077pn3mwv16p0pkxzkbs3cn4057la5r5yvv50ckly5m2xspba17y";
+       libraryHaskellDepends = [
+         base binary bytestring containers deepseq mtl primitive
+         transformers vector zlib
+       ];
+       homepage = "https://github.com/Twinside/Juicy.Pixels";
+       description = "Picture loading/serialization (in png, jpeg, bitmap, gif, tga, tiff and radiance)";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "JuicyPixels-canvas" = callPackage
     ({ mkDerivation, base, containers, JuicyPixels }:
      mkDerivation {
@@ -26090,6 +26108,20 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "ansigraph_0_3_0_5" = callPackage
+    ({ mkDerivation, ansi-terminal, base, hspec, QuickCheck }:
+     mkDerivation {
+       pname = "ansigraph";
+       version = "0.3.0.5";
+       sha256 = "03ks75ik0jyfz55iz3gcccxgg73v1dw2nn0myl40c2rc31mwz39f";
+       libraryHaskellDepends = [ ansi-terminal base ];
+       testHaskellDepends = [ base hspec QuickCheck ];
+       homepage = "https://github.com/BlackBrane/ansigraph";
+       description = "Terminal-based graphing via ANSI and Unicode";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "antagonist" = callPackage
     ({ mkDerivation, antisplice, base, chatty, chatty-utils, ironforge
      , mtl, shakespeare, text, time, time-locale-compat, yesod
@@ -27215,26 +27247,26 @@ self: {
      }) {arbb_dev = null;};
 
   "arbtt" = callPackage
-    ({ mkDerivation, aeson, array, base, binary, bytestring
-     , bytestring-progress, containers, deepseq, directory, filepath
-     , libXScrnSaver, parsec, pcre-light, process-extras, strict, tasty
-     , tasty-golden, tasty-hunit, terminal-progress-bar, time
-     , transformers, unix, utf8-string, X11
+    ({ mkDerivation, aeson, array, attoparsec, base, binary, bytestring
+     , bytestring-progress, conduit, conduit-extra, containers, deepseq
+     , directory, exceptions, filepath, mtl, parsec, pcre-light
+     , process-extras, strict, tasty, tasty-golden, tasty-hunit
+     , terminal-progress-bar, time, transformers, unix, utf8-string, X11
      }:
      mkDerivation {
        pname = "arbtt";
-       version = "0.9.0.13";
-       sha256 = "0ga0jq47s83w36ipmz1wdcrg6ir5z2klppx6kcxpmkikf8f85gl9";
+       version = "0.10";
+       sha256 = "0klxsxyq4yij11c9z11jgrarmz1fya2rpx0zax7kqpvc26xbc24n";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
-         aeson array base binary bytestring bytestring-progress containers
-         deepseq directory filepath parsec pcre-light strict
-         terminal-progress-bar time transformers unix utf8-string X11
+         aeson array attoparsec base binary bytestring bytestring-progress
+         conduit conduit-extra containers deepseq directory exceptions
+         filepath mtl parsec pcre-light strict terminal-progress-bar time
+         transformers unix utf8-string X11
        ];
-       executableSystemDepends = [ libXScrnSaver ];
        testHaskellDepends = [
-         base binary bytestring containers deepseq directory parsec
+         base binary bytestring containers deepseq directory mtl parsec
          pcre-light process-extras tasty tasty-golden tasty-hunit time
          transformers unix utf8-string
        ];
@@ -27242,7 +27274,7 @@ self: {
        description = "Automatic Rule-Based Time Tracker";
        license = "GPL";
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) {inherit (pkgs.xorg) libXScrnSaver;};
+     }) {};
 
   "arcgrid" = callPackage
     ({ mkDerivation, base, parsec, parsec-numeric }:
@@ -29014,8 +29046,8 @@ self: {
      }:
      mkDerivation {
        pname = "ats-format";
-       version = "0.1.0.6";
-       sha256 = "04r12ssp9ih4rrynlab2swn7krklzrb5m1xz0xh99adhfvap4fmf";
+       version = "0.1.0.7";
+       sha256 = "03ps4c40zf4mipdkg3cmr5x656xjdqfb5466h0prcywbh076ry2l";
        isLibrary = true;
        isExecutable = true;
        enableSeparateDataOutput = true;
@@ -37072,7 +37104,7 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "brick_0_30" = callPackage
+  "brick_0_32" = callPackage
     ({ mkDerivation, base, config-ini, containers, contravariant
      , data-clist, deepseq, dlist, microlens, microlens-mtl
      , microlens-th, stm, template-haskell, text, text-zipper
@@ -37080,8 +37112,8 @@ self: {
      }:
      mkDerivation {
        pname = "brick";
-       version = "0.30";
-       sha256 = "0annvmb68vazmk3cabk01n9i00lifijxmxkbq1280yhack2q0mzz";
+       version = "0.32";
+       sha256 = "0n9gg58ky1bn6p9s1yxz2yiml46sa4hxjhmy41w90v6gwgw8i4cr";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -39617,8 +39649,8 @@ self: {
      }:
      mkDerivation {
        pname = "cabal2nix";
-       version = "2.7";
-       sha256 = "1ypzldvifqm4nv9bwzvm5pfsxxn4mp19z50fpkxk84fhb5pb6nbd";
+       version = "2.7.1";
+       sha256 = "0skwm7fds2m7gkzd0af59bbgj09cwr0vapz8gxl6cb9m5cjsd05x";
        isLibrary = true;
        isExecutable = true;
        setupHaskellDepends = [ base Cabal cabal-doctest ];
@@ -43022,6 +43054,86 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "chr-core" = callPackage
+    ({ mkDerivation, base, chr-data, chr-pretty, containers, hashable
+     , logict-state, mtl, pqueue, unordered-containers
+     }:
+     mkDerivation {
+       pname = "chr-core";
+       version = "0.1.0.0";
+       sha256 = "19sihdl4fld1f7aq0gydpy6vhag98fp8kg1qla0yzzx2qaz8bnw7";
+       libraryHaskellDepends = [
+         base chr-data chr-pretty containers hashable logict-state mtl
+         pqueue unordered-containers
+       ];
+       homepage = "https://github.com/atzedijkstra/chr";
+       description = "Constraint Handling Rules";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
+  "chr-data" = callPackage
+    ({ mkDerivation, array, base, chr-pretty, containers, fclabels
+     , hashable, microlens, microlens-mtl, microlens-th, mtl
+     , template-haskell, unordered-containers, vector
+     }:
+     mkDerivation {
+       pname = "chr-data";
+       version = "0.1.0.0";
+       sha256 = "0igcqrqbxy3l26b3girh6qpmls5z2jcgzywxid2qq348jan88bgh";
+       libraryHaskellDepends = [
+         array base chr-pretty containers fclabels hashable microlens
+         microlens-mtl microlens-th mtl template-haskell
+         unordered-containers vector
+       ];
+       homepage = "https://github.com/atzedijkstra/chr";
+       description = "Datatypes required for chr library";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
+  "chr-lang" = callPackage
+    ({ mkDerivation, base, chr-core, chr-data, chr-parse, chr-pretty
+     , containers, fgl, hashable, mtl, time, unordered-containers
+     }:
+     mkDerivation {
+       pname = "chr-lang";
+       version = "0.1.0.0";
+       sha256 = "0rn2hv1a8jxzyg4qkbz0m9h0id3q353yg2j85pik49s00hnmqh3p";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base chr-core chr-data chr-parse chr-pretty containers fgl hashable
+         mtl time unordered-containers
+       ];
+       executableHaskellDepends = [ base chr-data ];
+       homepage = "https://github.com/atzedijkstra/chr";
+       description = "AST + surface language around chr";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
+  "chr-parse" = callPackage
+    ({ mkDerivation, base, containers, uulib }:
+     mkDerivation {
+       pname = "chr-parse";
+       version = "0.1.0.0";
+       sha256 = "00jlfpanzkawiz0fh5gc4czda9ip5r203pnjwllcqhmy9w04ip9k";
+       libraryHaskellDepends = [ base containers uulib ];
+       homepage = "https://github.com/atzedijkstra/chr";
+       description = "Parsing for chr library";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
+  "chr-pretty" = callPackage
+    ({ mkDerivation, base, containers }:
+     mkDerivation {
+       pname = "chr-pretty";
+       version = "0.1.0.0";
+       sha256 = "0flm7phvi5x84m8vbkvhd3xq3dwnj1vxwi27fw78ikbzx91q376n";
+       libraryHaskellDepends = [ base containers ];
+       homepage = "https://github.com/atzedijkstra/chr";
+       description = "Pretty printing for chr library";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "chronograph" = callPackage
     ({ mkDerivation, base, deepseq, ghc-prim, thyme, vector-space }:
      mkDerivation {
@@ -46021,8 +46133,8 @@ self: {
      }) {};
 
   "collection-json" = callPackage
-    ({ mkDerivation, aeson, base, bytestring, hspec, network-uri
-     , network-uri-json, QuickCheck, quickcheck-instances
+    ({ mkDerivation, aeson, base, bytestring, hspec, hspec-discover
+     , network-uri, network-uri-json, QuickCheck, quickcheck-instances
      , test-invariant, text
      }:
      mkDerivation {
@@ -46036,6 +46148,7 @@ self: {
          aeson base bytestring hspec network-uri network-uri-json QuickCheck
          quickcheck-instances test-invariant text
        ];
+       testToolDepends = [ hspec-discover ];
        homepage = "https://github.com/alunduil/collection-json.hs";
        description = "Collection+JSON—Hypermedia Type Tools";
        license = stdenv.lib.licenses.mit;
@@ -63998,8 +64111,8 @@ self: {
      }:
      mkDerivation {
        pname = "egison";
-       version = "3.7.9";
-       sha256 = "1jx6nrp2v581nbwgblrpqv052lbnbba5nppd3m8npbx5pvpda994";
+       version = "3.7.10";
+       sha256 = "129g0xw951pkizs4rmbn5mhy1w0lhqw06hj2sr8sf7r2wnqmn0dy";
        isLibrary = true;
        isExecutable = true;
        enableSeparateDataOutput = true;
@@ -72139,8 +72252,8 @@ self: {
      }:
      mkDerivation {
        pname = "fltkhs";
-       version = "0.5.4.2";
-       sha256 = "1zhrc5b0czz69lh2dm5z4kxrf2clm3j4xbljf0chg9xkvid063x9";
+       version = "0.5.4.3";
+       sha256 = "1cn98f0lzzgyrjcw2xr68xm5129wl9zr3jy4la8hw4fwbvcjphnv";
        isLibrary = true;
        isExecutable = true;
        setupHaskellDepends = [ base Cabal directory filepath ];
@@ -75272,6 +75385,28 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "fuzzyset_0_1_0_3" = callPackage
+    ({ mkDerivation, base, base-unicode-symbols, data-default, hspec
+     , ieee754, lens, text, text-metrics, unordered-containers, vector
+     }:
+     mkDerivation {
+       pname = "fuzzyset";
+       version = "0.1.0.3";
+       sha256 = "11sbdqmcvmqzb9xhvs4bgjj8wb1i2ls5gm1pgiy757h4clcyl4k1";
+       libraryHaskellDepends = [
+         base base-unicode-symbols data-default lens text text-metrics
+         unordered-containers vector
+       ];
+       testHaskellDepends = [
+         base base-unicode-symbols hspec ieee754 lens text
+         unordered-containers
+       ];
+       homepage = "https://github.com/laserpants/fuzzyset-haskell";
+       description = "Fuzzy set for approximate string matching";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "fuzzytime" = callPackage
     ({ mkDerivation, base, cmdargs, directory, old-time, process }:
      mkDerivation {
@@ -80123,10 +80258,11 @@ self: {
     ({ mkDerivation, aeson, aeson-compat, base, base-compat
      , base16-bytestring, binary, binary-orphans, byteable, bytestring
      , containers, cryptohash, deepseq, deepseq-generics, exceptions
-     , file-embed, hashable, hspec, http-client, http-client-tls
-     , http-link-header, http-types, iso8601-time, mtl, network-uri
-     , semigroups, text, time, tls, transformers, transformers-compat
-     , unordered-containers, vector, vector-instances
+     , file-embed, hashable, hspec, hspec-discover, http-client
+     , http-client-tls, http-link-header, http-types, iso8601-time, mtl
+     , network-uri, semigroups, text, time, tls, transformers
+     , transformers-compat, unordered-containers, vector
+     , vector-instances
      }:
      mkDerivation {
        pname = "github";
@@ -80146,6 +80282,7 @@ self: {
          aeson-compat base base-compat bytestring file-embed hspec
          unordered-containers vector
        ];
+       testToolDepends = [ hspec-discover ];
        homepage = "https://github.com/phadej/github";
        description = "Access to the GitHub API, v3";
        license = stdenv.lib.licenses.bsd3;
@@ -87415,6 +87552,31 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "hackernews_1_4_0_0" = callPackage
+    ({ mkDerivation, aeson, base, hspec, http-client, http-client-tls
+     , http-types, QuickCheck, quickcheck-instances, servant
+     , servant-client, string-conversions, text
+     }:
+     mkDerivation {
+       pname = "hackernews";
+       version = "1.4.0.0";
+       sha256 = "0ilj91vjnsfdlzhjh35nqrr3c1z7p6qfabvk3xdz6iqzmpcq3ys8";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         aeson base http-client http-types QuickCheck quickcheck-instances
+         servant servant-client string-conversions text
+       ];
+       executableHaskellDepends = [ base http-client http-client-tls ];
+       testHaskellDepends = [
+         aeson base hspec http-client http-client-tls QuickCheck
+         quickcheck-instances
+       ];
+       description = "API for Hacker News";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "hackertyper" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
@@ -87598,7 +87760,8 @@ self: {
   "haddock-api" = callPackage
     ({ mkDerivation, array, base, bytestring, Cabal, containers
      , deepseq, directory, filepath, ghc, ghc-boot, ghc-paths
-     , haddock-library, hspec, QuickCheck, transformers, xhtml
+     , haddock-library, hspec, hspec-discover, QuickCheck, transformers
+     , xhtml
      }:
      mkDerivation {
        pname = "haddock-api";
@@ -87612,6 +87775,7 @@ self: {
          ghc ghc-boot ghc-paths haddock-library transformers xhtml
        ];
        testHaskellDepends = [ base containers ghc hspec QuickCheck ];
+       testToolDepends = [ hspec-discover ];
        homepage = "http://www.haskell.org/haddock/";
        description = "A documentation-generation tool for Haskell libraries";
        license = stdenv.lib.licenses.bsd3;
@@ -87674,20 +87838,18 @@ self: {
      }) {};
 
   "haddock-library_1_4_4" = callPackage
-    ({ mkDerivation, attoparsec, base, base-compat, bytestring, deepseq
-     , hspec, QuickCheck, transformers
+    ({ mkDerivation, base, base-compat, bytestring, deepseq, hspec
+     , hspec-discover, QuickCheck, transformers
      }:
      mkDerivation {
        pname = "haddock-library";
        version = "1.4.4";
        sha256 = "0dx5hawfanglhkj5nqq1dwr2j1v35p0syz30xvdk8gld8rif06p9";
-       libraryHaskellDepends = [
-         attoparsec base bytestring transformers
-       ];
+       libraryHaskellDepends = [ base bytestring deepseq transformers ];
        testHaskellDepends = [
-         attoparsec base base-compat bytestring deepseq hspec QuickCheck
-         transformers
+         base base-compat bytestring deepseq hspec QuickCheck transformers
        ];
+       testToolDepends = [ hspec-discover ];
        homepage = "http://www.haskell.org/haddock/";
        description = "Library exposing some functionality of Haddock";
        license = stdenv.lib.licenses.bsd3;
@@ -87695,20 +87857,18 @@ self: {
      }) {};
 
   "haddock-library_1_4_5" = callPackage
-    ({ mkDerivation, attoparsec, base, base-compat, bytestring, deepseq
-     , hspec, QuickCheck, transformers
+    ({ mkDerivation, base, base-compat, bytestring, deepseq, hspec
+     , hspec-discover, QuickCheck, transformers
      }:
      mkDerivation {
        pname = "haddock-library";
        version = "1.4.5";
        sha256 = "0dmpxj6fgv9js90cxlf4yhrclh8kwmn8dm4llwhiyzmiddanjjy9";
-       libraryHaskellDepends = [
-         attoparsec base bytestring transformers
-       ];
+       libraryHaskellDepends = [ base bytestring deepseq transformers ];
        testHaskellDepends = [
-         attoparsec base base-compat bytestring deepseq hspec QuickCheck
-         transformers
+         base base-compat bytestring deepseq hspec QuickCheck transformers
        ];
+       testToolDepends = [ hspec-discover ];
        homepage = "http://www.haskell.org/haddock/";
        description = "Library exposing some functionality of Haddock";
        license = stdenv.lib.licenses.bsd3;
@@ -89137,6 +89297,34 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "hapistrano_0_3_5_1" = callPackage
+    ({ mkDerivation, aeson, async, base, directory, filepath
+     , formatting, gitrev, hspec, mtl, optparse-applicative, path
+     , path-io, process, stm, temporary, time, transformers, yaml
+     }:
+     mkDerivation {
+       pname = "hapistrano";
+       version = "0.3.5.1";
+       sha256 = "1zpvwdq9dzfkq9jh1bpc5x8vh41508x0wph5a020q31rknc8llad";
+       isLibrary = true;
+       isExecutable = true;
+       enableSeparateDataOutput = true;
+       libraryHaskellDepends = [
+         base filepath formatting gitrev mtl path process time transformers
+       ];
+       executableHaskellDepends = [
+         aeson async base formatting gitrev optparse-applicative path
+         path-io stm 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
@@ -91553,6 +91741,38 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "haskell-lsp_0_2_0_1" = callPackage
+    ({ mkDerivation, aeson, base, bytestring, containers, data-default
+     , directory, filepath, hashable, hslogger, hspec, lens, mtl, parsec
+     , sorted-list, stm, text, time, transformers, unordered-containers
+     , vector, yi-rope
+     }:
+     mkDerivation {
+       pname = "haskell-lsp";
+       version = "0.2.0.1";
+       sha256 = "0xvgm1kkfz5yf1949f07phg5lic1zhwy5pdbgfnqdpaxrwscxm8y";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         aeson base bytestring containers data-default directory filepath
+         hashable hslogger lens mtl parsec sorted-list stm text time
+         unordered-containers yi-rope
+       ];
+       executableHaskellDepends = [
+         aeson base bytestring containers data-default directory filepath
+         hslogger lens mtl parsec stm text time transformers
+         unordered-containers vector yi-rope
+       ];
+       testHaskellDepends = [
+         aeson base containers directory hashable hspec lens sorted-list
+         text yi-rope
+       ];
+       homepage = "https://github.com/alanz/haskell-lsp";
+       description = "Haskell library for the Microsoft Language Server Protocol";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "haskell-lsp-client" = callPackage
     ({ mkDerivation, aeson, base, bytestring, containers, directory
      , haskell-lsp, lens, process, text, unix
@@ -93942,8 +94162,8 @@ self: {
      }:
      mkDerivation {
        pname = "hasql-generic";
-       version = "0.1.0.4";
-       sha256 = "10ps2kf0q4lxcmrvyqsw7gkamcyqlyjlj3ljgs68fniri0pbw3fn";
+       version = "0.1.0.5";
+       sha256 = "0prf7ikjccp4bvlxxv78xg34mz0m3gn2y3c2z1lq14jzarya4pcf";
        libraryHaskellDepends = [
          aeson base binary-parser bytestring containers contravariant
          generics-sop hasql postgresql-binary scientific text time uuid
@@ -97279,8 +97499,8 @@ self: {
      }:
      mkDerivation {
        pname = "heyefi";
-       version = "2.0.0.1";
-       sha256 = "08lry3bxppnxr1mqpsbplq041nf2c5aaaim4iqhrapvqwwca7n5v";
+       version = "2.0.0.2";
+       sha256 = "1dhjvg5hhqj7apbsz5sq5p05rp3g07igc00r8qa7dmgixrp0a77b";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -116589,6 +116809,26 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {inherit (pkgs) jdk;};
 
+  "jni_0_5_1" = callPackage
+    ({ mkDerivation, base, bytestring, choice, constraints, containers
+     , cpphs, deepseq, inline-c, jdk, singletons
+     }:
+     mkDerivation {
+       pname = "jni";
+       version = "0.5.1";
+       sha256 = "0lrgj5dxhn7amzjw7gsqxg0gh91nxh1j4vmb4j2f5r8y3m8nwq4a";
+       libraryHaskellDepends = [
+         base bytestring choice constraints containers deepseq inline-c
+         singletons
+       ];
+       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
@@ -117471,6 +117711,28 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "json-rpc-generic_0_2_1_3" = callPackage
+    ({ mkDerivation, aeson, aeson-generic-compat, base, bytestring
+     , containers, dlist, QuickCheck, quickcheck-simple, scientific
+     , text, transformers, unordered-containers, vector
+     }:
+     mkDerivation {
+       pname = "json-rpc-generic";
+       version = "0.2.1.3";
+       sha256 = "105v0x610hb8vnbbmfm7myn15vblxkcvcryhgx363wgg0qqyakna";
+       libraryHaskellDepends = [
+         aeson aeson-generic-compat base bytestring containers dlist
+         scientific text transformers unordered-containers vector
+       ];
+       testHaskellDepends = [
+         aeson base QuickCheck quickcheck-simple text
+       ];
+       homepage = "http://github.com/khibino/haskell-json-rpc-generic";
+       description = "Generic encoder and decode for JSON-RPC";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "json-rpc-server" = callPackage
     ({ mkDerivation, aeson, base, bytestring, deepseq, HUnit, mtl
      , test-framework, test-framework-hunit, text, unordered-containers
@@ -118077,6 +118339,29 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "jvm_0_4_1" = callPackage
+    ({ mkDerivation, base, bytestring, choice, constraints, criterion
+     , deepseq, distributed-closure, exceptions, hspec, jni, singletons
+     , text, vector
+     }:
+     mkDerivation {
+       pname = "jvm";
+       version = "0.4.1";
+       sha256 = "1mwhp5a4ykwcwr7h3j6803fy558q93cdkazqhck9dg67cgx7iyjr";
+       libraryHaskellDepends = [
+         base bytestring choice constraints distributed-closure exceptions
+         jni singletons text vector
+       ];
+       testHaskellDepends = [ base bytestring hspec jni text ];
+       benchmarkHaskellDepends = [
+         base criterion deepseq jni singletons
+       ];
+       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-binary" = callPackage
     ({ mkDerivation, base, binary, bytestring, containers, criterion
      , directory, filepath, tasty, tasty-discover, tasty-hspec
@@ -127514,8 +127799,8 @@ self: {
     ({ mkDerivation, base, logict, mtl, transformers }:
      mkDerivation {
        pname = "logict-state";
-       version = "0.1.0.2";
-       sha256 = "1b2iqz1andmgibb30s1x32ak0vac7zy4gw7jihm2hhlpyycah5bp";
+       version = "0.1.0.4";
+       sha256 = "0mkwggh97c3x96v7a4y7i4scdvr38d49an3617i9zgj328xkr6w9";
        libraryHaskellDepends = [ base logict mtl transformers ];
        homepage = "https://github.com/atzedijkstra/logict-state";
        description = "Library for logic programming based on haskell package logict";
@@ -135976,6 +136261,38 @@ self: {
        license = stdenv.lib.licenses.asl20;
      }) {};
 
+  "mongoDB_2_3_0_1" = callPackage
+    ({ mkDerivation, array, base, base16-bytestring, base64-bytestring
+     , binary, bson, bytestring, conduit, conduit-extra, containers
+     , criterion, cryptohash, data-default-class, hashtables, hspec
+     , lifted-base, monad-control, mtl, network, nonce, old-locale
+     , parsec, pureMD5, random, random-shuffle, resourcet, tagged, text
+     , time, tls, transformers, transformers-base
+     }:
+     mkDerivation {
+       pname = "mongoDB";
+       version = "2.3.0.1";
+       sha256 = "1snr144yk05p5l9ck5gfs4zawg2l8fd8slmzxsrd29w2x6pk7iqv";
+       libraryHaskellDepends = [
+         array base base16-bytestring base64-bytestring binary bson
+         bytestring conduit conduit-extra containers cryptohash
+         data-default-class hashtables lifted-base monad-control mtl network
+         nonce parsec pureMD5 random random-shuffle resourcet tagged text
+         time tls transformers 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;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "mongodb-queue" = callPackage
     ({ mkDerivation, base, data-default, hspec, lifted-base
      , monad-control, mongoDB, network, text, transformers
@@ -136417,8 +136734,8 @@ self: {
     ({ mkDerivation, base, containers, hspec }:
      mkDerivation {
        pname = "more-containers";
-       version = "0.1.0.4";
-       sha256 = "1p6nv3i576gyq7rh2aq67bal64swy5sza0320mcl2rd1k0j19l39";
+       version = "0.1.0.5";
+       sha256 = "1q1fs56a61ryild0zp43ash5mm83162v5v61x29vmc3hv1h79bnm";
        libraryHaskellDepends = [ base containers ];
        testHaskellDepends = [ base containers hspec ];
        homepage = "https://github.com/mtth/more-containers#readme";
@@ -141394,8 +141711,8 @@ self: {
      }) {};
 
   "network-uri-json" = callPackage
-    ({ mkDerivation, aeson, base, hspec, network-uri, QuickCheck
-     , test-invariant, text
+    ({ mkDerivation, aeson, base, hspec, hspec-discover, network-uri
+     , QuickCheck, test-invariant, text
      }:
      mkDerivation {
        pname = "network-uri-json";
@@ -141405,6 +141722,7 @@ self: {
        testHaskellDepends = [
          aeson base hspec network-uri QuickCheck test-invariant text
        ];
+       testToolDepends = [ hspec-discover ];
        homepage = "https://github.com/alunduil/network-uri-json";
        description = "FromJSON and ToJSON Instances for Network.URI";
        license = stdenv.lib.licenses.mit;
@@ -141664,13 +141982,15 @@ self: {
      }) {};
 
   "newtype-generics" = callPackage
-    ({ mkDerivation, base, hspec, HUnit, transformers }:
+    ({ mkDerivation, base, hspec, hspec-discover, HUnit, transformers
+     }:
      mkDerivation {
        pname = "newtype-generics";
        version = "0.5.1";
        sha256 = "1cm9v5agz6dmqd2ijwl1llgabihk49zjvx0wxrvhlmdfj6b44gr7";
        libraryHaskellDepends = [ base transformers ];
        testHaskellDepends = [ base hspec HUnit ];
+       testToolDepends = [ hspec-discover ];
        description = "A typeclass and set of functions for working with newtypes, with generics support";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -142036,8 +142356,8 @@ self: {
      }:
      mkDerivation {
        pname = "nix-diff";
-       version = "1.0.0";
-       sha256 = "1dds8r7ld64zl6hba8z3dij1kiacg6xqxlv85nhm2lf6lm9257i8";
+       version = "1.0.1";
+       sha256 = "0xk8ggng32czhy4wxgzw7g28xj18jcbncmfshviqlw17rccrm2fx";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -143395,6 +143715,25 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "numhask-range_0_1_3_0" = callPackage
+    ({ mkDerivation, adjunctions, base, distributive, doctest, numhask
+     , protolude, QuickCheck, semigroupoids, tasty
+     }:
+     mkDerivation {
+       pname = "numhask-range";
+       version = "0.1.3.0";
+       sha256 = "1h42p48ridvvaxzjjh17pfjmfw9sjlzlmippi952m7jf1rfjxjpi";
+       libraryHaskellDepends = [
+         adjunctions base distributive numhask protolude QuickCheck
+         semigroupoids
+       ];
+       testHaskellDepends = [ base doctest numhask tasty ];
+       homepage = "https://github.com/tonyday567/numhask-range#readme";
+       description = "Numbers that are range representations";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "nums" = callPackage
     ({ mkDerivation }:
      mkDerivation {
@@ -146862,6 +147201,56 @@ self: {
        maintainers = with stdenv.lib.maintainers; [ peti ];
      }) {};
 
+  "pandoc_2_0_6" = callPackage
+    ({ mkDerivation, aeson, aeson-pretty, base, base64-bytestring
+     , binary, blaze-html, blaze-markup, bytestring, Cabal
+     , case-insensitive, cmark-gfm, containers, criterion, data-default
+     , deepseq, Diff, directory, doctemplates, executable-path, filepath
+     , Glob, haddock-library, hslua, hslua-module-text, HTTP
+     , http-client, http-client-tls, http-types, JuicyPixels, mtl
+     , network, network-uri, pandoc-types, parsec, process, QuickCheck
+     , random, safe, scientific, SHA, skylighting, split, syb, tagsoup
+     , tasty, tasty-golden, tasty-hunit, tasty-quickcheck, temporary
+     , texmath, text, time, unix, unordered-containers, vector, xml
+     , yaml, zip-archive, zlib
+     }:
+     mkDerivation {
+       pname = "pandoc";
+       version = "2.0.6";
+       sha256 = "1vhj6splykksb1mkxv5cs0361nj12qn23a3y1i8j5dc637lkdwpj";
+       configureFlags = [ "-fhttps" "-f-trypandoc" ];
+       isLibrary = true;
+       isExecutable = true;
+       enableSeparateDataOutput = true;
+       setupHaskellDepends = [ base Cabal ];
+       libraryHaskellDepends = [
+         aeson aeson-pretty base base64-bytestring binary blaze-html
+         blaze-markup bytestring case-insensitive cmark-gfm containers
+         data-default deepseq directory doctemplates filepath Glob
+         haddock-library hslua hslua-module-text HTTP http-client
+         http-client-tls http-types JuicyPixels mtl network network-uri
+         pandoc-types parsec process random safe scientific SHA skylighting
+         split syb tagsoup temporary texmath text time unix
+         unordered-containers vector xml yaml zip-archive zlib
+       ];
+       executableHaskellDepends = [ base ];
+       testHaskellDepends = [
+         base base64-bytestring bytestring containers Diff directory
+         executable-path filepath hslua pandoc-types process QuickCheck
+         tasty tasty-golden tasty-hunit tasty-quickcheck temporary text time
+         zip-archive
+       ];
+       benchmarkHaskellDepends = [
+         base bytestring containers criterion text time
+       ];
+       doCheck = false;
+       homepage = "http://pandoc.org";
+       description = "Conversion between markup formats";
+       license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       maintainers = with stdenv.lib.maintainers; [ peti ];
+     }) {};
+
   "pandoc-citeproc" = callPackage
     ({ mkDerivation, aeson, aeson-pretty, attoparsec, base, bytestring
      , Cabal, containers, data-default, directory, filepath, hs-bibutils
@@ -148483,6 +148872,29 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "parsers_0_12_8" = callPackage
+    ({ mkDerivation, attoparsec, base, base-orphans, bytestring
+     , charset, containers, mtl, parsec, QuickCheck
+     , quickcheck-instances, scientific, semigroups, text, transformers
+     , unordered-containers
+     }:
+     mkDerivation {
+       pname = "parsers";
+       version = "0.12.8";
+       sha256 = "1j3bh008klx5nqpp9566k783c2msjsv5ia2w2jdx6frzspyhmfjs";
+       libraryHaskellDepends = [
+         attoparsec base base-orphans charset containers mtl parsec
+         scientific semigroups text transformers unordered-containers
+       ];
+       testHaskellDepends = [
+         attoparsec base bytestring parsec QuickCheck quickcheck-instances
+       ];
+       homepage = "http://github.com/ekmett/parsers/";
+       description = "Parsing combinators";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "parsestar" = callPackage
     ({ mkDerivation, array, base, binary, bytestring, bytestring-mmap
      , bytestring-nums, bytestring-show, containers, deepseq, derive
@@ -148725,9 +149137,9 @@ self: {
   "passman-core" = callPackage
     ({ mkDerivation, aeson, async, base, bcrypt, bytestring, conduit
      , conduit-extra, containers, cryptohash-md5, csv-conduit
-     , data-ordlist, directory, filepath, int-cast, memory
-     , passman-core-internal, QuickCheck, quickcheck-unicode, resourcet
-     , template-haskell, temporary, text, unix-compat, yaml
+     , data-ordlist, directory, filepath, int-cast, memory, QuickCheck
+     , quickcheck-unicode, resourcet, template-haskell, temporary, text
+     , unix-compat, yaml
      }:
      mkDerivation {
        pname = "passman-core";
@@ -148736,17 +149148,17 @@ self: {
        libraryHaskellDepends = [
          aeson base bcrypt bytestring conduit conduit-extra containers
          cryptohash-md5 csv-conduit data-ordlist directory filepath int-cast
-         memory passman-core-internal resourcet text unix-compat yaml
+         memory resourcet text unix-compat yaml
        ];
        testHaskellDepends = [
-         async base conduit filepath passman-core-internal QuickCheck
-         quickcheck-unicode template-haskell temporary text yaml
+         async base conduit filepath QuickCheck quickcheck-unicode
+         template-haskell temporary text yaml
        ];
        homepage = "https://github.com/PasswordManager/passman-core#readme";
        description = "Deterministic password generator core";
        license = stdenv.lib.licenses.gpl3;
        broken = true;
-     }) {passman-core-internal = null;};
+     }) {};
 
   "passwords" = callPackage
     ({ mkDerivation, base, containers, MonadRandom, random }:
@@ -150076,6 +150488,31 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "perf_0_3_1_0" = callPackage
+    ({ mkDerivation, base, containers, doctest, foldl, formatting
+     , numhask, optparse-generic, protolude, rdtsc, scientific, tdigest
+     , text, time, vector
+     }:
+     mkDerivation {
+       pname = "perf";
+       version = "0.3.1.0";
+       sha256 = "1pr735gflp91ljfrlpba6il1l4zm260whdp4hc205jff0r0gv44c";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base containers foldl numhask protolude rdtsc tdigest time
+       ];
+       executableHaskellDepends = [
+         base formatting numhask optparse-generic protolude scientific text
+         vector
+       ];
+       testHaskellDepends = [ base doctest protolude ];
+       homepage = "https://github.com/tonyday567/perf#readme";
+       description = "low-level performance statistics";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "perfect-hash-generator" = callPackage
     ({ mkDerivation, base, containers, data-ordlist, directory
      , filepath, hashable, HUnit, optparse-applicative, random
@@ -151337,8 +151774,8 @@ self: {
      }:
      mkDerivation {
        pname = "photoname";
-       version = "3.2";
-       sha256 = "1ygwhs79jrv5h1l407w41vfs96nd3kn2bl248j8bc1fh67kf6kka";
+       version = "3.3";
+       sha256 = "1fcl0m5hm6xvnzvn8v0l69vr7yh2q58six62147mwf4nlzny61gd";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -151350,7 +151787,7 @@ self: {
        ];
        homepage = "http://hub.darcs.net/dino/photoname";
        description = "Rename photo image files based on EXIF shoot date";
-       license = stdenv.lib.licenses.bsd3;
+       license = stdenv.lib.licenses.isc;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
@@ -161417,8 +161854,8 @@ self: {
      }:
      mkDerivation {
        pname = "radius";
-       version = "0.5.0.0";
-       sha256 = "0jj4g6m70i6dw1r0a821vn4fpx35n0mgsg820wpwmrk7xd2v6xhz";
+       version = "0.5.0.1";
+       sha256 = "0mrgcrhi99imclc400lp666gimxv4gkg4svjr49p9aip5dx03bjh";
        libraryHaskellDepends = [
          base binary bytestring cryptonite iproute memory
        ];
@@ -164645,6 +165082,18 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "reformat" = callPackage
+    ({ mkDerivation, base, parsec }:
+     mkDerivation {
+       pname = "reformat";
+       version = "0.1.0.1";
+       sha256 = "1cvffbx2vhv18k4p95p0ddcxzyn8f10hg2bxa2da60fy9zkjg3am";
+       libraryHaskellDepends = [ base parsec ];
+       homepage = "https://github.com/Qinka/reformat";
+       description = "The parser and render to parsec and render the string";
+       license = stdenv.lib.licenses.gpl3;
+     }) {};
+
   "refresht" = callPackage
     ({ mkDerivation, base, data-default, exceptions, lens, mtl }:
      mkDerivation {
@@ -173462,10 +173911,11 @@ self: {
   "servant_0_12_1" = callPackage
     ({ mkDerivation, aeson, aeson-compat, attoparsec, base, base-compat
      , bytestring, Cabal, cabal-doctest, case-insensitive, directory
-     , doctest, filemanip, filepath, hspec, http-api-data, http-media
-     , http-types, mmorph, mtl, natural-transformation, network-uri
-     , QuickCheck, quickcheck-instances, string-conversions, tagged
-     , text, url, vault
+     , doctest, filemanip, filepath, hspec, hspec-discover
+     , http-api-data, http-media, http-types, mmorph, mtl
+     , natural-transformation, network-uri, QuickCheck
+     , quickcheck-instances, string-conversions, tagged, text, url
+     , vault
      }:
      mkDerivation {
        pname = "servant";
@@ -173483,6 +173933,7 @@ self: {
          doctest filemanip filepath hspec QuickCheck quickcheck-instances
          string-conversions text url
        ];
+       testToolDepends = [ hspec-discover ];
        homepage = "http://haskell-servant.readthedocs.org/";
        description = "A family of combinators for defining webservices APIs";
        license = stdenv.lib.licenses.bsd3;
@@ -173551,9 +174002,10 @@ self: {
 
   "servant-auth-client" = callPackage
     ({ mkDerivation, aeson, base, bytestring, containers, hspec
-     , http-client, http-types, jose, QuickCheck, servant, servant-auth
-     , servant-auth-server, servant-client, servant-client-core
-     , servant-server, text, time, transformers, wai, warp
+     , hspec-discover, http-client, http-types, jose, QuickCheck
+     , servant, servant-auth, servant-auth-server, servant-client
+     , servant-client-core, servant-server, text, time, transformers
+     , wai, warp
      }:
      mkDerivation {
        pname = "servant-auth-client";
@@ -173568,6 +174020,7 @@ self: {
          servant servant-auth servant-auth-server servant-client
          servant-server time transformers wai warp
        ];
+       testToolDepends = [ hspec-discover ];
        homepage = "http://github.com/plow-technologies/servant-auth#readme";
        description = "servant-client/servant-auth compatibility";
        license = stdenv.lib.licenses.bsd3;
@@ -173635,9 +174088,9 @@ self: {
      }) {};
 
   "servant-auth-docs" = callPackage
-    ({ mkDerivation, base, Cabal, cabal-doctest, doctest, hspec, lens
-     , QuickCheck, servant, servant-auth, servant-docs, template-haskell
-     , text
+    ({ mkDerivation, base, Cabal, cabal-doctest, doctest, hspec
+     , hspec-discover, lens, QuickCheck, servant, servant-auth
+     , servant-docs, template-haskell, text
      }:
      mkDerivation {
        pname = "servant-auth-docs";
@@ -173651,6 +174104,7 @@ self: {
          base doctest hspec lens QuickCheck servant servant-auth
          servant-docs template-haskell text
        ];
+       testToolDepends = [ hspec-discover ];
        homepage = "http://github.com/plow-technologies/servant-auth#readme";
        description = "servant-docs/servant-auth compatibility";
        license = stdenv.lib.licenses.bsd3;
@@ -173695,10 +174149,11 @@ self: {
   "servant-auth-server" = callPackage
     ({ mkDerivation, aeson, base, base64-bytestring, blaze-builder
      , bytestring, bytestring-conversion, case-insensitive, cookie
-     , crypto-api, data-default-class, entropy, hspec, http-api-data
-     , http-client, http-types, jose, lens, lens-aeson, markdown-unlit
-     , monad-time, mtl, QuickCheck, servant-auth, servant-server, tagged
-     , text, time, transformers, unordered-containers, wai, warp, wreq
+     , crypto-api, data-default-class, entropy, hspec, hspec-discover
+     , http-api-data, http-client, http-types, jose, lens, lens-aeson
+     , markdown-unlit, monad-time, mtl, QuickCheck, servant-auth
+     , servant-server, tagged, text, time, transformers
+     , unordered-containers, wai, warp, wreq
      }:
      mkDerivation {
        pname = "servant-auth-server";
@@ -173722,14 +174177,15 @@ self: {
          jose lens lens-aeson mtl QuickCheck servant-server time wai warp
          wreq
        ];
+       testToolDepends = [ hspec-discover ];
        homepage = "http://github.com/plow-technologies/servant-auth#readme";
        description = "servant-server/servant-auth compatibility";
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
   "servant-auth-swagger" = callPackage
-    ({ mkDerivation, base, hspec, lens, QuickCheck, servant
-     , servant-auth, servant-swagger, swagger2, text
+    ({ mkDerivation, base, hspec, hspec-discover, lens, QuickCheck
+     , servant, servant-auth, servant-swagger, swagger2, text
      }:
      mkDerivation {
        pname = "servant-auth-swagger";
@@ -173742,6 +174198,7 @@ self: {
          base hspec lens QuickCheck servant servant-auth servant-swagger
          swagger2 text
        ];
+       testToolDepends = [ hspec-discover ];
        homepage = "http://github.com/plow-technologies/servant-auth#readme";
        description = "servant-swagger/servant-auth compatibility";
        license = stdenv.lib.licenses.bsd3;
@@ -173981,10 +174438,11 @@ self: {
   "servant-client_0_12_0_1" = callPackage
     ({ mkDerivation, aeson, attoparsec, base, base-compat, bytestring
      , containers, deepseq, exceptions, generics-sop, hspec
-     , http-api-data, http-client, http-client-tls, http-media
-     , http-types, HUnit, monad-control, mtl, network, QuickCheck
-     , semigroupoids, servant, servant-client-core, servant-server, text
-     , transformers, transformers-base, transformers-compat, wai, warp
+     , hspec-discover, http-api-data, http-client, http-client-tls
+     , http-media, http-types, HUnit, monad-control, mtl, network
+     , QuickCheck, semigroupoids, servant, servant-client-core
+     , servant-server, text, transformers, transformers-base
+     , transformers-compat, wai, warp
      }:
      mkDerivation {
        pname = "servant-client";
@@ -174004,6 +174462,7 @@ self: {
          network QuickCheck servant servant-client-core servant-server text
          transformers transformers-compat wai warp
        ];
+       testToolDepends = [ hspec-discover ];
        homepage = "http://haskell-servant.readthedocs.org/";
        description = "automatical derivation of querying functions for servant webservices";
        license = stdenv.lib.licenses.bsd3;
@@ -174013,8 +174472,8 @@ self: {
   "servant-client-core" = callPackage
     ({ mkDerivation, base, base-compat, base64-bytestring, bytestring
      , containers, deepseq, exceptions, generics-sop, hspec
-     , http-api-data, http-media, http-types, mtl, network-uri
-     , QuickCheck, safe, servant, text
+     , hspec-discover, http-api-data, http-media, http-types, mtl
+     , network-uri, QuickCheck, safe, servant, text
      }:
      mkDerivation {
        pname = "servant-client-core";
@@ -174028,6 +174487,7 @@ self: {
          safe servant text
        ];
        testHaskellDepends = [ base base-compat deepseq hspec QuickCheck ];
+       testToolDepends = [ hspec-discover ];
        homepage = "http://haskell-servant.readthedocs.org/";
        description = "Core functionality and class for client function generation for servant APIs";
        license = stdenv.lib.licenses.bsd3;
@@ -174129,8 +174589,8 @@ self: {
   "servant-docs_0_11_1" = callPackage
     ({ mkDerivation, aeson, aeson-pretty, base, base-compat, bytestring
      , case-insensitive, control-monad-omega, hashable, hspec
-     , http-media, http-types, lens, servant, string-conversions, text
-     , unordered-containers
+     , hspec-discover, http-media, http-types, lens, servant
+     , string-conversions, text, unordered-containers
      }:
      mkDerivation {
        pname = "servant-docs";
@@ -174149,6 +174609,7 @@ self: {
        testHaskellDepends = [
          aeson base hspec lens servant string-conversions
        ];
+       testToolDepends = [ hspec-discover ];
        homepage = "http://haskell-servant.readthedocs.org/";
        description = "generate API docs for your servant webservice";
        license = stdenv.lib.licenses.bsd3;
@@ -174288,13 +174749,16 @@ self: {
      }) {};
 
   "servant-foreign_0_10_2" = callPackage
-    ({ mkDerivation, base, hspec, http-types, lens, servant, text }:
+    ({ mkDerivation, base, hspec, hspec-discover, http-types, lens
+     , servant, text
+     }:
      mkDerivation {
        pname = "servant-foreign";
        version = "0.10.2";
        sha256 = "16r42df628jsw9khv5kjwb702ajwmxg4kya19acm10660c0gxygs";
        libraryHaskellDepends = [ base http-types lens servant text ];
        testHaskellDepends = [ base hspec servant ];
+       testToolDepends = [ hspec-discover ];
        description = "Helpers for generating clients for servant APIs in any programming language";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -174347,8 +174811,8 @@ self: {
      }:
      mkDerivation {
        pname = "servant-github-webhook";
-       version = "0.3.2.0";
-       sha256 = "15n6nn03m2gxhd4rhavcxny13q962db3c4fi9gjzix6w56vwqwm7";
+       version = "0.3.2.1";
+       sha256 = "1yy5hnnj64wgafn60cj4ywwkwpzl506g0fsm9fcsyz4dr7irhpyf";
        libraryHaskellDepends = [
          aeson base base16-bytestring bytestring cryptonite github
          http-types memory servant servant-server string-conversions text
@@ -174435,9 +174899,9 @@ self: {
 
   "servant-js" = callPackage
     ({ mkDerivation, aeson, base, base-compat, charset, filepath, hspec
-     , hspec-expectations, language-ecmascript, lens, QuickCheck
-     , servant, servant-foreign, servant-server, stm, text, transformers
-     , warp
+     , hspec-discover, hspec-expectations, language-ecmascript, lens
+     , QuickCheck, servant, servant-foreign, servant-server, stm, text
+     , transformers, warp
      }:
      mkDerivation {
        pname = "servant-js";
@@ -174456,6 +174920,7 @@ self: {
          base base-compat hspec hspec-expectations language-ecmascript lens
          QuickCheck servant text
        ];
+       testToolDepends = [ hspec-discover ];
        homepage = "http://haskell-servant.readthedocs.org/";
        description = "Automatically derive javascript functions to query servant webservices";
        license = stdenv.lib.licenses.bsd3;
@@ -174542,8 +175007,8 @@ self: {
 
   "servant-mock" = callPackage
     ({ mkDerivation, aeson, base, bytestring, bytestring-conversion
-     , hspec, hspec-wai, http-types, QuickCheck, servant, servant-server
-     , transformers, wai, warp
+     , hspec, hspec-discover, hspec-wai, http-types, QuickCheck, servant
+     , servant-server, transformers, wai, warp
      }:
      mkDerivation {
        pname = "servant-mock";
@@ -174564,6 +175029,7 @@ self: {
          aeson base bytestring-conversion hspec hspec-wai QuickCheck servant
          servant-server wai
        ];
+       testToolDepends = [ hspec-discover ];
        homepage = "http://haskell-servant.readthedocs.org/";
        description = "Derive a mock server for free from your servant API types";
        license = stdenv.lib.licenses.bsd3;
@@ -174778,10 +175244,10 @@ self: {
   "servant-quickcheck" = callPackage
     ({ mkDerivation, aeson, base, base-compat, blaze-html, bytestring
      , case-insensitive, clock, data-default-class, hspec, hspec-core
-     , http-client, http-media, http-types, mtl, pretty, process
-     , QuickCheck, quickcheck-io, servant, servant-blaze, servant-client
-     , servant-server, split, string-conversions, temporary, text, time
-     , transformers, warp
+     , hspec-discover, http-client, http-media, http-types, mtl, pretty
+     , process, QuickCheck, quickcheck-io, servant, servant-blaze
+     , servant-client, servant-server, split, string-conversions
+     , temporary, text, time, transformers, warp
      }:
      mkDerivation {
        pname = "servant-quickcheck";
@@ -174798,6 +175264,7 @@ self: {
          http-client QuickCheck quickcheck-io servant servant-blaze
          servant-client servant-server transformers warp
        ];
+       testToolDepends = [ hspec-discover ];
        description = "QuickCheck entire APIs";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -174909,11 +175376,12 @@ self: {
     ({ mkDerivation, aeson, attoparsec, base, base-compat
      , base64-bytestring, bytestring, Cabal, cabal-doctest, containers
      , directory, doctest, exceptions, filemanip, filepath, hspec
-     , hspec-wai, http-api-data, http-types, monad-control, mtl, network
-     , network-uri, parsec, QuickCheck, resourcet, safe, servant
-     , should-not-typecheck, split, string-conversions, system-filepath
-     , tagged, temporary, text, transformers, transformers-base
-     , transformers-compat, wai, wai-app-static, wai-extra, warp, word8
+     , hspec-discover, hspec-wai, http-api-data, http-types
+     , monad-control, mtl, network, network-uri, parsec, QuickCheck
+     , resourcet, safe, servant, should-not-typecheck, split
+     , string-conversions, system-filepath, tagged, temporary, text
+     , transformers, transformers-base, transformers-compat, wai
+     , wai-app-static, wai-extra, warp, word8
      }:
      mkDerivation {
        pname = "servant-server";
@@ -174937,6 +175405,7 @@ self: {
          should-not-typecheck string-conversions temporary text transformers
          transformers-compat wai wai-extra warp
        ];
+       testToolDepends = [ hspec-discover ];
        homepage = "http://haskell-servant.readthedocs.org/";
        description = "A family of combinators for defining webservices APIs and serving them";
        license = stdenv.lib.licenses.bsd3;
@@ -174946,11 +175415,12 @@ self: {
     ({ mkDerivation, aeson, attoparsec, base, base-compat
      , base64-bytestring, bytestring, Cabal, cabal-doctest, containers
      , directory, doctest, exceptions, filemanip, filepath, hspec
-     , hspec-wai, http-api-data, http-types, monad-control, mtl, network
-     , network-uri, parsec, QuickCheck, resourcet, safe, servant
-     , should-not-typecheck, split, string-conversions, system-filepath
-     , tagged, temporary, text, transformers, transformers-base
-     , transformers-compat, wai, wai-app-static, wai-extra, warp, word8
+     , hspec-discover, hspec-wai, http-api-data, http-types
+     , monad-control, mtl, network, network-uri, parsec, QuickCheck
+     , resourcet, safe, servant, should-not-typecheck, split
+     , string-conversions, system-filepath, tagged, temporary, text
+     , transformers, transformers-base, transformers-compat, wai
+     , wai-app-static, wai-extra, warp, word8
      }:
      mkDerivation {
        pname = "servant-server";
@@ -174976,6 +175446,7 @@ self: {
          should-not-typecheck string-conversions temporary text transformers
          transformers-compat wai wai-extra warp
        ];
+       testToolDepends = [ hspec-discover ];
        homepage = "http://haskell-servant.readthedocs.org/";
        description = "A family of combinators for defining webservices APIs and serving them";
        license = stdenv.lib.licenses.bsd3;
@@ -178543,8 +179014,8 @@ self: {
 
   "siren-json" = callPackage
     ({ mkDerivation, aeson, base, bytestring, case-insensitive
-     , containers, hspec, http-media, http-types, network-uri
-     , network-uri-json, QuickCheck, quickcheck-instances
+     , containers, hspec, hspec-discover, http-media, http-types
+     , network-uri, network-uri-json, QuickCheck, quickcheck-instances
      , test-invariant, text, unordered-containers
      }:
      mkDerivation {
@@ -178560,6 +179031,7 @@ self: {
          http-types network-uri network-uri-json QuickCheck
          quickcheck-instances test-invariant text unordered-containers
        ];
+       testToolDepends = [ hspec-discover ];
        homepage = "https://github.com/alunduil/siren-json.hs";
        description = "Siren Tools for Haskell";
        license = stdenv.lib.licenses.mit;
@@ -188349,10 +188821,10 @@ self: {
   "swagger2" = callPackage
     ({ mkDerivation, aeson, aeson-qq, base, base-compat, bytestring
      , Cabal, cabal-doctest, containers, doctest, generics-sop, Glob
-     , hashable, hspec, http-media, HUnit, insert-ordered-containers
-     , lens, mtl, network, QuickCheck, scientific, template-haskell
-     , text, time, transformers, transformers-compat
-     , unordered-containers, uuid-types, vector
+     , hashable, hspec, hspec-discover, http-media, HUnit
+     , insert-ordered-containers, lens, mtl, network, QuickCheck
+     , scientific, template-haskell, text, time, transformers
+     , transformers-compat, unordered-containers, uuid-types, vector
      }:
      mkDerivation {
        pname = "swagger2";
@@ -188370,6 +188842,7 @@ self: {
          hashable hspec HUnit insert-ordered-containers lens mtl QuickCheck
          text time unordered-containers vector
        ];
+       testToolDepends = [ hspec-discover ];
        homepage = "https://github.com/GetShopTV/swagger2";
        description = "Swagger 2.0 data model";
        license = stdenv.lib.licenses.bsd3;
@@ -193327,6 +193800,31 @@ self: {
        license = stdenv.lib.licenses.bsd2;
      }) {};
 
+  "text_1_2_3_0" = callPackage
+    ({ mkDerivation, array, base, binary, bytestring, deepseq
+     , directory, ghc-prim, HUnit, integer-gmp, QuickCheck
+     , quickcheck-unicode, random, test-framework, test-framework-hunit
+     , test-framework-quickcheck2
+     }:
+     mkDerivation {
+       pname = "text";
+       version = "1.2.3.0";
+       sha256 = "06iir7q99rnffzxi8gagn8w1k9m49368sbidgz634fv1gxib3q10";
+       libraryHaskellDepends = [
+         array base binary bytestring deepseq ghc-prim integer-gmp
+       ];
+       testHaskellDepends = [
+         array base binary bytestring deepseq directory ghc-prim HUnit
+         integer-gmp QuickCheck quickcheck-unicode random test-framework
+         test-framework-hunit test-framework-quickcheck2
+       ];
+       doCheck = false;
+       homepage = "https://github.com/haskell/text";
+       description = "An efficient packed Unicode text type";
+       license = stdenv.lib.licenses.bsd2;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "text-all" = callPackage
     ({ mkDerivation, base, bytestring, text, text-format, utf8-string
      }:
@@ -198659,8 +199157,8 @@ self: {
        pname = "trifecta";
        version = "1.7.1.1";
        sha256 = "13n6a3fdxngnzsjnhfrzigv1c2g0xm6lqkjcnirpc37sd0rpby31";
-       revision = "1";
-       editedCabalFile = "17i9137mqcm74s8zwdnkcg5kj583zzwqjyyz1z0af4anxfs1hvng";
+       revision = "2";
+       editedCabalFile = "1pbywxk2aw0bkhkhhcdqhxnkvyxxnrj13qahlzf2ivd5awmynmqp";
        setupHaskellDepends = [ base Cabal cabal-doctest ];
        libraryHaskellDepends = [
          ansi-terminal ansi-wl-pprint array base blaze-builder blaze-html
@@ -199912,10 +200410,10 @@ self: {
     ({ mkDerivation, aeson, attoparsec, authenticate-oauth, base
      , bytestring, Cabal, cabal-doctest, case-insensitive, conduit
      , conduit-extra, containers, data-default, doctest, exceptions
-     , hlint, hspec, http-client, http-conduit, http-types, lens
-     , lens-aeson, network-uri, resourcet, template-haskell, text, time
-     , transformers, transformers-base, twitter-types
-     , twitter-types-lens
+     , hlint, hspec, hspec-discover, http-client, http-conduit
+     , http-types, lens, lens-aeson, network-uri, resourcet
+     , template-haskell, text, time, transformers, transformers-base
+     , twitter-types, twitter-types-lens
      }:
      mkDerivation {
        pname = "twitter-conduit";
@@ -199936,6 +200434,7 @@ self: {
          lens-aeson network-uri resourcet template-haskell text time
          twitter-types twitter-types-lens
        ];
+       testToolDepends = [ hspec-discover ];
        homepage = "https://github.com/himura/twitter-conduit";
        description = "Twitter API package with conduit interface and Streaming API support";
        license = stdenv.lib.licenses.bsd3;
@@ -200578,6 +201077,27 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "type-of-html_1_3_1_1" = callPackage
+    ({ mkDerivation, base, blaze-html, bytestring, criterion
+     , double-conversion, ghc-prim, hspec, QuickCheck, text
+     }:
+     mkDerivation {
+       pname = "type-of-html";
+       version = "1.3.1.1";
+       sha256 = "0idnj14bsqlz1ww2bvfa07yqi53gh72diaacnlfdrvgil8n11wvb";
+       libraryHaskellDepends = [
+         base bytestring double-conversion ghc-prim text
+       ];
+       testHaskellDepends = [ base hspec QuickCheck ];
+       benchmarkHaskellDepends = [
+         base blaze-html bytestring criterion QuickCheck text
+       ];
+       homepage = "https://github.com/knupfer/type-of-html";
+       description = "High performance type driven html generation";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "type-operators" = callPackage
     ({ mkDerivation, base, ghc-prim }:
      mkDerivation {
@@ -201421,20 +201941,19 @@ self: {
      }) {};
 
   "uhc-util" = callPackage
-    ({ mkDerivation, array, base, binary, bytestring, containers
-     , directory, fclabels, fgl, hashable, logict-state, mtl, pqueue
-     , process, time, time-compat, transformers, uulib
+    ({ mkDerivation, array, base, binary, bytestring, chr-core
+     , chr-data, chr-parse, chr-pretty, containers, directory, fclabels
+     , fgl, hashable, logict-state, mtl, pqueue, process, time
+     , time-compat, transformers, uulib, vector
      }:
      mkDerivation {
        pname = "uhc-util";
-       version = "0.1.6.7";
-       sha256 = "0xaa9xp7yaj6mjq392x2jyi6rdplfabmhbwwq4ammr4wbqbjfjyl";
-       revision = "1";
-       editedCabalFile = "0ngrfb87vq5r114nlkbkkrzpa6hy6cyws3z1zf339aaixb8g1763";
+       version = "0.1.7.0";
+       sha256 = "1xz7r5sk18aqqzxmblihk6y271qr7dsv89xxxrz5n8ds9fmj4y3k";
        libraryHaskellDepends = [
-         array base binary bytestring containers directory fclabels fgl
-         hashable logict-state mtl pqueue process time time-compat
-         transformers uulib
+         array base binary bytestring chr-core chr-data chr-parse chr-pretty
+         containers directory fclabels fgl hashable logict-state mtl pqueue
+         process time time-compat transformers uulib vector
        ];
        homepage = "https://github.com/UU-ComputerScience/uhc-util";
        description = "UHC utilities";
@@ -206110,8 +206629,8 @@ self: {
     ({ mkDerivation, base, contravariant, transformers, vinyl }:
      mkDerivation {
        pname = "vinyl-utils";
-       version = "0.3.0.0";
-       sha256 = "0gqlqh0apymn3zydxklqjfp4sr9h170n2r9rai5z2phxv666dmz6";
+       version = "0.3.0.1";
+       sha256 = "0lcpg2mxmr41lqpn5ksc35c0w16s45z6qq9wjbm0cv8r047k9bq5";
        libraryHaskellDepends = [ base contravariant transformers vinyl ];
        homepage = "https://github.com/marcinmrotek/vinyl-utils";
        description = "Utilities for vinyl";
@@ -207189,6 +207708,25 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "wai-logger_2_3_1" = callPackage
+    ({ mkDerivation, base, blaze-builder, byteorder, bytestring
+     , case-insensitive, doctest, fast-logger, http-types, network, unix
+     , unix-time, wai
+     }:
+     mkDerivation {
+       pname = "wai-logger";
+       version = "2.3.1";
+       sha256 = "0ldx9jiq70ga2clsrg1sw5jsy76n4s6kzs3785qs87gbj5dqfdip";
+       libraryHaskellDepends = [
+         base blaze-builder byteorder bytestring case-insensitive
+         fast-logger http-types network unix unix-time wai
+       ];
+       testHaskellDepends = [ base doctest ];
+       description = "A logging system for WAI";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "wai-logger-prefork" = callPackage
     ({ mkDerivation, base, bytestring, date-cache, fast-logger
      , http-types, unix, wai, wai-logger
@@ -209659,6 +210197,27 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "weeder_0_1_10" = callPackage
+    ({ mkDerivation, aeson, base, bytestring, cmdargs, deepseq
+     , directory, extra, filepath, foundation, hashable, process, text
+     , unordered-containers, vector, yaml
+     }:
+     mkDerivation {
+       pname = "weeder";
+       version = "0.1.10";
+       sha256 = "0mcxp8jrhyd98fz29i6rzwi8h4vd8w32nqw1qarbw2qbyrq03a72";
+       isLibrary = false;
+       isExecutable = true;
+       executableHaskellDepends = [
+         aeson base bytestring cmdargs deepseq directory extra filepath
+         foundation hashable process text unordered-containers vector yaml
+       ];
+       homepage = "https://github.com/ndmitchell/weeder#readme";
+       description = "Detect dead code";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "weigh" = callPackage
     ({ mkDerivation, base, bytestring-trie, containers, deepseq, mtl
      , process, random, split, template-haskell, temporary