diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index 587fab177056..8cf9836fc45f 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -14772,8 +14772,8 @@ self: {
      }:
      mkDerivation {
        pname = "SFML";
-       version = "2.3.2.2";
-       sha256 = "b61578cc1bc95554aca715ed0ae15eadf89dbf3fe49866541903d384387fdf2d";
+       version = "2.3.2.3";
+       sha256 = "a8d38a6be04c8eb31c6dbf889e383afb25f7a8bb29b398ab948d6c3d773391b4";
        libraryHaskellDepends = [ base ];
        librarySystemDepends = [
          csfml-audio csfml-graphics csfml-network csfml-system csfml-window
@@ -25703,11 +25703,11 @@ self: {
     ({ mkDerivation, base }:
      mkDerivation {
        pname = "atl";
-       version = "15409.2";
-       sha256 = "0273021bd03c2210b6dab28a24ccc6c16a14c365d7fd0403ccc00d3d7207c2af";
+       version = "17072";
+       sha256 = "3aee6a8ddfe9d9b0db710889fb49b8a08662ee3026153e15ca83100e2a34a07a";
        libraryHaskellDepends = [ base ];
        description = "Arrow Transformer Library";
-       license = "LGPL";
+       license = stdenv.lib.licenses.bsd3;
      }) {};
 
   "atlassian-connect-core" = callPackage
@@ -51005,6 +51005,23 @@ self: {
        license = stdenv.lib.licenses.gpl3;
      }) {};
 
+  "dictionaries" = callPackage
+    ({ mkDerivation, attoparsec, base, binary, bytestring, containers
+     , data-default, directory, exceptions, filepath, text, time, zlib
+     }:
+     mkDerivation {
+       pname = "dictionaries";
+       version = "0.1.0.0";
+       sha256 = "28b3ba1e9ad52ccf4f333861e22830da77ad915622fa1ffca87cff6e9716c0ab";
+       libraryHaskellDepends = [
+         attoparsec base binary bytestring containers data-default directory
+         exceptions filepath text time zlib
+       ];
+       jailbreak = true;
+       description = "Tools to handle StarDict dictionaries";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "dictionary-sharing" = callPackage
     ({ mkDerivation, base, containers }:
      mkDerivation {
@@ -52753,6 +52770,30 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "dns_2_0_6" = callPackage
+    ({ mkDerivation, attoparsec, base, binary, bytestring
+     , bytestring-builder, conduit, conduit-extra, containers, doctest
+     , hspec, iproute, mtl, network, random, resourcet, safe, word8
+     }:
+     mkDerivation {
+       pname = "dns";
+       version = "2.0.6";
+       sha256 = "148342aaca67c4c6f4a7c15bc50eb13d7f145943277e6f55c1a455208531c0f2";
+       libraryHaskellDepends = [
+         attoparsec base binary bytestring bytestring-builder conduit
+         conduit-extra containers iproute mtl network random resourcet safe
+       ];
+       testHaskellDepends = [
+         attoparsec base binary bytestring bytestring-builder conduit
+         conduit-extra containers doctest hspec iproute mtl network random
+         resourcet safe word8
+       ];
+       testTarget = "spec";
+       description = "DNS library in Haskell";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "dnscache" = callPackage
     ({ mkDerivation, base, bytestring, containers, contstuff, dns
      , iproute, time
@@ -54432,22 +54473,23 @@ self: {
      }) {};
 
   "dynamic-plot" = callPackage
-    ({ mkDerivation, async, base, colour, constrained-categories
+    ({ mkDerivation, base, colour, colour-space, constrained-categories
      , containers, data-default, deepseq, diagrams-cairo, diagrams-core
      , diagrams-gtk, diagrams-lib, free-vector-spaces, glib, gtk, lens
-     , manifolds, MemoTrie, MonadRandom, mtl, process, random
-     , semigroups, tagged, time, transformers, vector, vector-space
+     , linearmap-category, manifolds, MemoTrie, MonadRandom, mtl
+     , process, random, semigroups, tagged, time, transformers, vector
+     , vector-space
      }:
      mkDerivation {
        pname = "dynamic-plot";
-       version = "0.1.4.0";
-       sha256 = "7b67a4433324a76e2a6892cbcb9ce2250db09dd32583d6d29b63161ca954b18d";
+       version = "0.2.0.0";
+       sha256 = "4a5e2d6105139bd8756d3b1d1d2fbffcf36cb435e02973efa9066123cbd3e528";
        libraryHaskellDepends = [
-         async base colour constrained-categories containers data-default
-         deepseq diagrams-cairo diagrams-core diagrams-gtk diagrams-lib
-         free-vector-spaces glib gtk lens manifolds MemoTrie MonadRandom mtl
-         process random semigroups tagged time transformers vector
-         vector-space
+         base colour colour-space constrained-categories containers
+         data-default deepseq diagrams-cairo diagrams-core diagrams-gtk
+         diagrams-lib free-vector-spaces glib gtk lens linearmap-category
+         manifolds MemoTrie MonadRandom mtl process random semigroups tagged
+         time transformers vector vector-space
        ];
        homepage = "https://github.com/leftaroundabout/dynamic-plot";
        description = "Interactive diagram windows";
@@ -55115,16 +55157,13 @@ self: {
      }) {};
 
   "effect-monad" = callPackage
-    ({ mkDerivation, base, ghc-prim, type-level-sets }:
+    ({ mkDerivation, base, type-level-sets }:
      mkDerivation {
        pname = "effect-monad";
-       version = "0.6.1";
-       sha256 = "884b7f1b26767329051ca846ad20cef871decd992f63c2d7d50475b163d3724d";
-       revision = "2";
-       editedCabalFile = "5cb34f683ee8c60c89647fd5a283cbe4b640a596cf2608a937a0819503e3b3ea";
-       libraryHaskellDepends = [ base ghc-prim type-level-sets ];
-       jailbreak = true;
-       description = "Embeds effect systems into Haskell using parameteric effect monads";
+       version = "0.7.0.0";
+       sha256 = "de9dbb8ee23595510e3674f090a1e066308f64174ef03dd99a5c75070d825416";
+       libraryHaskellDepends = [ base type-level-sets ];
+       description = "Embeds effect systems into Haskell using graded monads";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
@@ -58251,6 +58290,29 @@ self: {
        license = stdenv.lib.licenses.gpl3;
      }) {};
 
+  "exp-pairs_0_1_5_2" = callPackage
+    ({ mkDerivation, base, containers, deepseq, ghc-prim, matrix
+     , QuickCheck, random, smallcheck, tasty, tasty-hunit
+     , tasty-quickcheck, tasty-smallcheck, wl-pprint
+     }:
+     mkDerivation {
+       pname = "exp-pairs";
+       version = "0.1.5.2";
+       sha256 = "8dadc2dc4b4f666c9fe70068634a1eb07598943d6ace86560878ed8ec0aeac9d";
+       libraryHaskellDepends = [
+         base containers deepseq ghc-prim wl-pprint
+       ];
+       testHaskellDepends = [
+         base matrix QuickCheck random smallcheck tasty tasty-hunit
+         tasty-quickcheck tasty-smallcheck
+       ];
+       jailbreak = true;
+       homepage = "https://github.com/Bodigrim/exp-pairs";
+       description = "Linear programming over exponent pairs";
+       license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "expand" = callPackage
     ({ mkDerivation, AspectAG, base, HList, murder, uu-parsinglib }:
      mkDerivation {
@@ -59023,6 +59085,26 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "fast-logger_2_4_7" = callPackage
+    ({ mkDerivation, array, auto-update, base, bytestring
+     , bytestring-builder, directory, easy-file, filepath, hspec, text
+     , unix, unix-time
+     }:
+     mkDerivation {
+       pname = "fast-logger";
+       version = "2.4.7";
+       sha256 = "201b07d898da91472aa86662399feb093a7379bc04315f8e84db52fbf3464a38";
+       libraryHaskellDepends = [
+         array auto-update base bytestring bytestring-builder directory
+         easy-file filepath text unix unix-time
+       ];
+       testHaskellDepends = [ base bytestring directory hspec ];
+       homepage = "https://github.com/kazu-yamamoto/logger";
+       description = "A fast logging system";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "fast-math" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
@@ -59235,7 +59317,7 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "fay_0_23_1_15" = callPackage
+  "fay_0_23_1_16" = callPackage
     ({ mkDerivation, aeson, base, base-compat, bytestring, containers
      , data-default, data-lens-light, directory, filepath, ghc-paths
      , haskell-src-exts, language-ecmascript, mtl, mtl-compat
@@ -59246,8 +59328,8 @@ self: {
      }:
      mkDerivation {
        pname = "fay";
-       version = "0.23.1.15";
-       sha256 = "d8a1912c8359877e8d9cfec4c07275d21167cb03e607f7dd8190d201d967af59";
+       version = "0.23.1.16";
+       sha256 = "c46ef8cb7980bcf62ef7ccc9897e9c4246e6bec8cafc06d49ebe1d5bcd618a64";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -63394,6 +63476,19 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "from-sum" = callPackage
+    ({ mkDerivation, base, doctest, Glob }:
+     mkDerivation {
+       pname = "from-sum";
+       version = "0.1.0.0";
+       sha256 = "cfc80660a6986b2a2dc07605a26a6bc3b010b9aecfbeb4a852e671106b37475c";
+       libraryHaskellDepends = [ base ];
+       testHaskellDepends = [ base doctest Glob ];
+       homepage = "https://github.com/cdepillabout/from-sum";
+       description = "Canonical fromMaybeM and fromEitherM functions";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "frontmatter" = callPackage
     ({ mkDerivation, attoparsec, base, bytestring, hspec, QuickCheck
      , text, yaml
@@ -65319,8 +65414,8 @@ self: {
     ({ mkDerivation, base, hspec, QuickCheck, validity }:
      mkDerivation {
        pname = "genvalidity";
-       version = "0.2.0.2";
-       sha256 = "039cb76d733452b664c701a068e65ac86a3731a8dd33bc9192623d1e88bdf288";
+       version = "0.2.0.4";
+       sha256 = "dca8c978f6bedb08199042fa7001dc94143cc69bb3bfc0d4dc90346a19ca8e57";
        libraryHaskellDepends = [ base QuickCheck validity ];
        testHaskellDepends = [ base hspec QuickCheck ];
        homepage = "https://github.com/NorfairKing/validity#readme";
@@ -65330,14 +65425,14 @@ self: {
 
   "genvalidity-containers" = callPackage
     ({ mkDerivation, base, containers, genvalidity, QuickCheck
-     , validity
+     , validity, validity-containers
      }:
      mkDerivation {
        pname = "genvalidity-containers";
-       version = "0.1.0.1";
-       sha256 = "1193630423059f558d99e20f14e60daabb664539e25ca7c92ebca3f776dd94c2";
+       version = "0.1.0.2";
+       sha256 = "f26522673e67c3780662bbce48734a4e955d6fbc5dd7e8c701866180cbf7b8bb";
        libraryHaskellDepends = [
-         base containers genvalidity QuickCheck validity
+         base containers genvalidity QuickCheck validity validity-containers
        ];
        homepage = "https://github.com/NorfairKing/validity#readme";
        description = "GenValidity support for containers";
@@ -65346,29 +65441,32 @@ self: {
      }) {};
 
   "genvalidity-hspec" = callPackage
-    ({ mkDerivation, base, genvalidity, hspec, QuickCheck, validity }:
+    ({ mkDerivation, base, doctest, genvalidity, hspec, QuickCheck
+     , validity
+     }:
      mkDerivation {
        pname = "genvalidity-hspec";
-       version = "0.2.0.4";
-       sha256 = "848014573766b08edbb3a5ab043a60ed0fdbe8370b4cfac6a48ef8102cc4d2d2";
+       version = "0.2.0.5";
+       sha256 = "af4b3a7db29bc9cfe9f10de84256350de91a67d6d3676c8fb269dddf32bce62b";
        libraryHaskellDepends = [
          base genvalidity hspec QuickCheck validity
        ];
+       testHaskellDepends = [ base doctest ];
        homepage = "https://github.com/NorfairKing/validity#readme";
        description = "Standard spec's for GenValidity instances";
        license = stdenv.lib.licenses.mit;
      }) {};
 
   "genvalidity-text" = callPackage
-    ({ mkDerivation, base, genvalidity, hspec, QuickCheck, text
-     , validity
+    ({ mkDerivation, array, base, genvalidity, hspec, QuickCheck, text
+     , validity, validity-text
      }:
      mkDerivation {
        pname = "genvalidity-text";
-       version = "0.1.0.0";
-       sha256 = "faca82b1d58fb2cd40575f0743c2579def715e697eebbaba7fc75c6b73b28c4e";
+       version = "0.1.0.1";
+       sha256 = "1906c0df7b65355f38ce1c13b1e1094a5f9d6da2c4c432ceee74523154814b54";
        libraryHaskellDepends = [
-         base genvalidity QuickCheck text validity
+         array base genvalidity QuickCheck text validity validity-text
        ];
        testHaskellDepends = [ base genvalidity hspec QuickCheck text ];
        homepage = "https://github.com/NorfairKing/validity#readme";
@@ -66379,6 +66477,29 @@ self: {
        license = stdenv.lib.licenses.bsd2;
      }) {};
 
+  "ghc-typelits-extra_0_2_1" = callPackage
+    ({ mkDerivation, base, ghc, ghc-tcplugins-extra
+     , ghc-typelits-knownnat, ghc-typelits-natnormalise, integer-gmp
+     , singletons, tasty, tasty-hunit, template-haskell, transformers
+     }:
+     mkDerivation {
+       pname = "ghc-typelits-extra";
+       version = "0.2.1";
+       sha256 = "bc76eccd4686d12e77ada1b08c8bb087d46d102acedf37c502391a5da01d55f8";
+       libraryHaskellDepends = [
+         base ghc ghc-tcplugins-extra ghc-typelits-knownnat
+         ghc-typelits-natnormalise integer-gmp singletons transformers
+       ];
+       testHaskellDepends = [
+         base ghc-typelits-knownnat ghc-typelits-natnormalise tasty
+         tasty-hunit template-haskell
+       ];
+       homepage = "http://www.clash-lang.org/";
+       description = "Additional type-level operations on GHC.TypeLits.Nat";
+       license = stdenv.lib.licenses.bsd2;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "ghc-typelits-knownnat" = callPackage
     ({ mkDerivation, base, ghc, ghc-tcplugins-extra
      , ghc-typelits-natnormalise, singletons, tasty, tasty-hunit
@@ -66400,6 +66521,28 @@ self: {
        license = stdenv.lib.licenses.bsd2;
      }) {};
 
+  "ghc-typelits-knownnat_0_2_2" = callPackage
+    ({ mkDerivation, base, ghc, ghc-tcplugins-extra
+     , ghc-typelits-natnormalise, singletons, tasty, tasty-hunit
+     , template-haskell, transformers
+     }:
+     mkDerivation {
+       pname = "ghc-typelits-knownnat";
+       version = "0.2.2";
+       sha256 = "5236eda806fd52ec51a9a10666129d1c66e20c45e4167008f1b7442a25353f12";
+       libraryHaskellDepends = [
+         base ghc ghc-tcplugins-extra ghc-typelits-natnormalise singletons
+         template-haskell transformers
+       ];
+       testHaskellDepends = [
+         base ghc-typelits-natnormalise singletons tasty tasty-hunit
+       ];
+       homepage = "http://clash-lang.org/";
+       description = "Derive KnownNat constraints from other KnownNat constraints";
+       license = stdenv.lib.licenses.bsd2;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "ghc-typelits-natnormalise" = callPackage
     ({ mkDerivation, base, ghc, ghc-tcplugins-extra, integer-gmp, tasty
      , tasty-hunit
@@ -66417,6 +66560,24 @@ self: {
        license = stdenv.lib.licenses.bsd2;
      }) {};
 
+  "ghc-typelits-natnormalise_0_5_1" = callPackage
+    ({ mkDerivation, base, ghc, ghc-tcplugins-extra, integer-gmp, tasty
+     , tasty-hunit, template-haskell
+     }:
+     mkDerivation {
+       pname = "ghc-typelits-natnormalise";
+       version = "0.5.1";
+       sha256 = "999459e94b1b577d5ad591390f56b2b29ccf6c1244d1c2d09ffae11524629b4c";
+       libraryHaskellDepends = [
+         base ghc ghc-tcplugins-extra integer-gmp
+       ];
+       testHaskellDepends = [ base tasty tasty-hunit template-haskell ];
+       homepage = "http://www.clash-lang.org/";
+       description = "GHC typechecker plugin for types of kind GHC.TypeLits.Nat";
+       license = stdenv.lib.licenses.bsd2;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "ghc-typelits-presburger" = callPackage
     ({ mkDerivation, base, equational-reasoning, ghc
      , ghc-tcplugins-extra, presburger, reflection
@@ -67712,8 +67873,8 @@ self: {
      }:
      mkDerivation {
        pname = "ginger";
-       version = "0.3.2.0";
-       sha256 = "23485cfcab2af0bc010991183ac57fe1a922010581aa51dd70261241b241f87a";
+       version = "0.3.5.0";
+       sha256 = "8a410a6b65ad7753cc6fc4dba17258a0e818451aa42130b29e335bb6989495fe";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -75015,6 +75176,25 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "hailgun_0_4_1_1" = callPackage
+    ({ mkDerivation, aeson, base, bytestring, email-validate
+     , exceptions, filepath, http-client, http-client-tls, http-types
+     , tagsoup, text, time, transformers
+     }:
+     mkDerivation {
+       pname = "hailgun";
+       version = "0.4.1.1";
+       sha256 = "d584d2bfec3eb94088452bb0611a4f8aea255bba4b3bf861ff3aeb888b5d4d03";
+       libraryHaskellDepends = [
+         aeson base bytestring email-validate exceptions filepath
+         http-client http-client-tls http-types tagsoup text time
+         transformers
+       ];
+       description = "Mailgun REST api interface for Haskell";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "hailgun-send" = callPackage
     ({ mkDerivation, base, bytestring, configurator, hailgun, text }:
      mkDerivation {
@@ -75671,6 +75851,31 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "hamsql" = callPackage
+    ({ mkDerivation, aeson, base, bytestring, directory, file-embed
+     , filepath, frontmatter, groom, network-uri, optparse-applicative
+     , pandoc, postgresql-simple, semigroups, text, transformers
+     , unordered-containers, yaml
+     }:
+     mkDerivation {
+       pname = "hamsql";
+       version = "0.7.0.0";
+       sha256 = "bde760cd857cd601b8f9cd737752cd172f7cdf360b5cbed13c0acba18c80433d";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         aeson base bytestring directory file-embed filepath frontmatter
+         groom network-uri optparse-applicative pandoc postgresql-simple
+         semigroups text transformers unordered-containers yaml
+       ];
+       executableHaskellDepends = [ base ];
+       testHaskellDepends = [ base ];
+       jailbreak = true;
+       homepage = "https://git.hemio.de/hemio/hamsql";
+       description = "HamSql";
+       license = stdenv.lib.licenses.gpl3;
+     }) {};
+
   "hamtmap" = callPackage
     ({ mkDerivation, array, base, deepseq, hashable }:
      mkDerivation {
@@ -80448,29 +80653,27 @@ self: {
      }) {};
 
   "haxl" = callPackage
-    ({ mkDerivation, aeson, base, bytestring, containers, deepseq
-     , directory, exceptions, filepath, hashable, HUnit, pretty, text
-     , time, unordered-containers, vector
+    ({ mkDerivation, aeson, base, binary, bytestring, containers
+     , deepseq, directory, exceptions, filepath, ghc-prim, hashable
+     , HUnit, pretty, test-framework, test-framework-hunit, text, time
+     , transformers, unordered-containers, vector
      }:
      mkDerivation {
        pname = "haxl";
-       version = "0.3.1.0";
-       sha256 = "fba961b0f3a9a9b6f7cf6ac24689d48fb8404d79ec86a36c2784f3f45d06669a";
-       revision = "2";
-       editedCabalFile = "f3a1523824d97b8e261e17491fb91230fc77c903444211f8303d89eacb2065d1";
+       version = "0.4.0.0";
+       sha256 = "fb63805d17f920efc59f16452f4b4a6e501880123505d73fa5d17c1b1554d7b6";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
-         aeson base bytestring containers deepseq directory exceptions
-         filepath hashable HUnit pretty text time unordered-containers
-         vector
+         aeson base binary bytestring containers deepseq directory
+         exceptions filepath ghc-prim hashable HUnit pretty text time
+         transformers unordered-containers vector
        ];
        executableHaskellDepends = [ base hashable time ];
        testHaskellDepends = [
-         aeson base bytestring containers hashable HUnit text
-         unordered-containers
+         aeson base binary bytestring containers deepseq filepath hashable
+         HUnit test-framework test-framework-hunit text unordered-containers
        ];
-       jailbreak = true;
        homepage = "https://github.com/facebook/Haxl";
        description = "A Haskell library for efficient, concurrent, and concise data access";
        license = stdenv.lib.licenses.bsd3;
@@ -90089,8 +90292,8 @@ self: {
      }:
      mkDerivation {
        pname = "hsparql";
-       version = "0.2.8";
-       sha256 = "fa843d3ed104a61c2750d333e851048e6677e0f0713c74117c2fb8def8eaa3fe";
+       version = "0.2.9";
+       sha256 = "283e50db41018e115147f533024d874cb878f42b466f59e1f97ce3735bfd13f0";
        libraryHaskellDepends = [
          base bytestring HTTP MissingH mtl network network-uri rdf4h text
          xml
@@ -93613,6 +93816,23 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "hw-diagnostics_0_0_0_4" = callPackage
+    ({ mkDerivation, base, hspec, QuickCheck }:
+     mkDerivation {
+       pname = "hw-diagnostics";
+       version = "0.0.0.4";
+       sha256 = "63c07c2c6b5e8d6bda8b50070594b0f31549ed7758384c122ae74016ca984c17";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [ base ];
+       executableHaskellDepends = [ base ];
+       testHaskellDepends = [ base hspec QuickCheck ];
+       homepage = "http://github.com/haskell-works/hw-diagnostics#readme";
+       description = "Conduits for tokenizing streams";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "hw-json" = callPackage
     ({ mkDerivation, ansi-wl-pprint, array, attoparsec, base
      , bytestring, conduit, containers, criterion, errors, hspec
@@ -93650,8 +93870,8 @@ self: {
     ({ mkDerivation, ansi-wl-pprint, base, dlist, hspec, QuickCheck }:
      mkDerivation {
        pname = "hw-mquery";
-       version = "0.1.0.0";
-       sha256 = "7353d749e489c8cff4d5a9a923f3901453979642fcaa76e13617c67177149c83";
+       version = "0.1.0.1";
+       sha256 = "724aa5b0490b57a89fb71b7042a3770f7978a4c975aa3d1b671576b0e83e113d";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ ansi-wl-pprint base dlist ];
@@ -93659,7 +93879,7 @@ self: {
        testHaskellDepends = [ base hspec QuickCheck ];
        homepage = "http://github.com/haskell-works/hw-mquery#readme";
        description = "Conduits for tokenizing streams";
-       license = stdenv.lib.licenses.bsd3;
+       license = stdenv.lib.licenses.mit;
      }) {};
 
   "hw-parser" = callPackage
@@ -93698,14 +93918,14 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "hw-prim_0_3_0_1" = callPackage
+  "hw-prim_0_3_0_3" = callPackage
     ({ mkDerivation, base, bytestring, deepseq, hspec, QuickCheck
      , random, vector
      }:
      mkDerivation {
        pname = "hw-prim";
-       version = "0.3.0.1";
-       sha256 = "ce87b75687e5b03e4a115ec577a3f03f905767644c7a3cf5b9b39f69f03c7107";
+       version = "0.3.0.3";
+       sha256 = "7abc9b3a3125dce061c89f9948302ed13c6c0eab3b64236157ae81d33ed09372";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base bytestring deepseq random vector ];
@@ -93716,7 +93936,7 @@ self: {
        jailbreak = true;
        homepage = "http://github.com/haskell-works/hw-prim#readme";
        description = "Primitive functions and data types";
-       license = stdenv.lib.licenses.bsd3;
+       license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
@@ -93740,6 +93960,19 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "hw-string-parse" = callPackage
+    ({ mkDerivation, base, bytestring, hspec, QuickCheck, vector }:
+     mkDerivation {
+       pname = "hw-string-parse";
+       version = "0.0.0.2";
+       sha256 = "2b915afcc3ef29a61b17e7a37c047059bf87eb0d22d0f970892292b959ed562e";
+       libraryHaskellDepends = [ base ];
+       testHaskellDepends = [ base bytestring hspec QuickCheck vector ];
+       homepage = "http://github.com/haskell-works/hw-string-parse#readme";
+       description = "Conduits for tokenizing streams";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "hw-succinct" = callPackage
     ({ mkDerivation, attoparsec, base, bytestring, conduit, containers
      , hw-bits, hw-conduit, hw-parser, hw-prim, hw-rankselect
@@ -96391,6 +96624,24 @@ self: {
        license = "GPL";
      }) {};
 
+  "incremental-parser_0_2_5" = callPackage
+    ({ mkDerivation, base, checkers, monoid-subclasses, QuickCheck
+     , tasty, tasty-quickcheck
+     }:
+     mkDerivation {
+       pname = "incremental-parser";
+       version = "0.2.5";
+       sha256 = "7d0fd208e86d383ec00ceabc6c229d66ae35726862b003820df06e855ea87ac1";
+       libraryHaskellDepends = [ base monoid-subclasses ];
+       testHaskellDepends = [
+         base checkers monoid-subclasses QuickCheck tasty tasty-quickcheck
+       ];
+       homepage = "https://github.com/blamario/incremental-parser";
+       description = "Generic parser library capable of providing partial results from partial input";
+       license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "incremental-sat-solver" = callPackage
     ({ mkDerivation, base, containers, mtl }:
      mkDerivation {
@@ -97648,6 +97899,47 @@ self: {
        license = stdenv.lib.licenses.gpl3;
      }) {};
 
+  "introduction" = callPackage
+    ({ mkDerivation, async, base, bytestring, containers, deepseq
+     , exceptions, filepath, ghc-prim, lifted-base, monad-control, mtl
+     , path, path-io, safe, stm, string-conv, text, transformers
+     , transformers-base, validity, validity-containers
+     }:
+     mkDerivation {
+       pname = "introduction";
+       version = "0.0.1.0";
+       sha256 = "4a061e4d863526c583d95907b9be1e11e6fd1ccb757d360c4bd3c3fe0214cd3c";
+       libraryHaskellDepends = [
+         async base bytestring containers deepseq exceptions filepath
+         ghc-prim lifted-base monad-control mtl path path-io safe stm
+         string-conv text transformers transformers-base validity
+         validity-containers
+       ];
+       homepage = "https://github.com/NorfairKing/introduction";
+       description = "A prelude for safe new projects";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
+  "introduction-test" = callPackage
+    ({ mkDerivation, base, bytestring, containers, filepath
+     , genvalidity, genvalidity-containers, genvalidity-hspec
+     , genvalidity-text, hspec, introduction, path, path-io, QuickCheck
+     , time
+     }:
+     mkDerivation {
+       pname = "introduction-test";
+       version = "0.0.1.0";
+       sha256 = "398191ff93488b86d4f58fb675403ccfe84c5eb50a06a16d8eec8033eb3f31bb";
+       libraryHaskellDepends = [
+         base bytestring containers filepath genvalidity
+         genvalidity-containers genvalidity-hspec genvalidity-text hspec
+         introduction path path-io QuickCheck time
+       ];
+       homepage = "https://github.com/NorfairKing/introduction";
+       description = "A prelude for the tests of safe new projects";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "intset" = callPackage
     ({ mkDerivation, base, bits-extras, bytestring, deepseq }:
      mkDerivation {
@@ -106916,15 +107208,17 @@ self: {
      }:
      mkDerivation {
        pname = "linearmap-category";
-       version = "0.1.0.0";
-       sha256 = "965294deb7e4e15d11126e84ee7a5f158312f15d07c8e3adc0514b9143e3173f";
+       version = "0.1.0.1";
+       sha256 = "ff237dba6477c1ef1328c36785563422fbf3aae1acd31cf5aca139d8a0b4adbd";
+       revision = "1";
+       editedCabalFile = "c917ace1221a02587e65c9224c1b39fd6999b9c6f712138312def89981bcd3d4";
        libraryHaskellDepends = [
          base constrained-categories containers free-vector-spaces ieee754
          lens linear semigroups vector vector-space
        ];
        jailbreak = true;
        homepage = "https://github.com/leftaroundabout/linearmap-family";
-       description = "Native, complete, matrix-free linear algebra";
+       description = "Native, matrix-free linear algebra";
        license = stdenv.lib.licenses.gpl3;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
@@ -107043,8 +107337,8 @@ self: {
     ({ mkDerivation, base, containers }:
      mkDerivation {
        pname = "linked-list-with-iterator";
-       version = "0.1.0.0";
-       sha256 = "fc61ca669aaacf7401db5261e956f922db210cf02bbb540a6efd753060153853";
+       version = "0.1.1.0";
+       sha256 = "c6ae37cc9d123afcb92f28fef9c5dae6d3713489bdf7f73ac9af420bb3f11b89";
        libraryHaskellDepends = [ base containers ];
        testHaskellDepends = [ base ];
        homepage = "https://github.com/CindyLinz/Haskell-linked-list-with-iterator#readme";
@@ -111038,20 +111332,20 @@ self: {
 
   "manifolds" = callPackage
     ({ mkDerivation, base, comonad, constrained-categories, containers
-     , deepseq, hmatrix, MemoTrie, microlens, microlens-th, semigroups
-     , tagged, transformers, trivial-constraint, vector, vector-space
-     , void
+     , deepseq, free-vector-spaces, linear, linearmap-category, MemoTrie
+     , microlens, microlens-th, semigroups, tagged, transformers
+     , trivial-constraint, vector, vector-space, void
      }:
      mkDerivation {
        pname = "manifolds";
-       version = "0.2.3.0";
-       sha256 = "ae9bcf5eb972acee8eaec5f4180fb634466e6bc76849edd83d3c28cf20fdfa3e";
+       version = "0.3.0.0";
+       sha256 = "011ee59126ab31c49ec4fab8cfe1a77ca76b170f74ecae75f4458e25593616ab";
        libraryHaskellDepends = [
-         base comonad constrained-categories containers deepseq hmatrix
-         MemoTrie microlens microlens-th semigroups tagged transformers
-         trivial-constraint vector vector-space void
+         base comonad constrained-categories containers deepseq
+         free-vector-spaces linear linearmap-category MemoTrie microlens
+         microlens-th semigroups tagged transformers trivial-constraint
+         vector vector-space void
        ];
-       jailbreak = true;
        homepage = "https://github.com/leftaroundabout/manifolds";
        description = "Coordinate-free hypersurfaces";
        license = stdenv.lib.licenses.gpl3;
@@ -113328,8 +113622,8 @@ self: {
      }:
      mkDerivation {
        pname = "mikrokosmos";
-       version = "0.1.0";
-       sha256 = "49547246b9a22a9d2037424d99017d09823a2f321a9d0f6cec3309b85c5880a4";
+       version = "0.2.0";
+       sha256 = "853b4e3c3f2299f550f18bb0692bc194a2720b57fbcb5bf2aba70713586375b2";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -114058,15 +114352,13 @@ self: {
      }) {};
 
   "modbus-tcp" = callPackage
-    ({ mkDerivation, base, base-unicode-symbols, bytestring, cereal
-     , network
-     }:
+    ({ mkDerivation, base, bytestring, cereal, network, transformers }:
      mkDerivation {
        pname = "modbus-tcp";
-       version = "0.1";
-       sha256 = "996aa62fc7d5ac0112d128fc3209c4bf1c9a55bc0bd5c636f8cdefbc0d9b0fc8";
+       version = "0.2";
+       sha256 = "85bc2678704b0e573a4c4bc1672f76cdca1c9febd50dc9a40ffa6aa097361aeb";
        libraryHaskellDepends = [
-         base base-unicode-symbols bytestring cereal network
+         base bytestring cereal network transformers
        ];
        jailbreak = true;
        homepage = "https://github.com/roelvandijk/modbus-tcp";
@@ -119785,16 +120077,16 @@ self: {
   "network-msgpack-rpc" = callPackage
     ({ mkDerivation, async, base, binary, binary-conduit, bytestring
      , conduit, conduit-extra, data-default-class, data-msgpack
-     , exceptions, hspec, monad-control, mtl, network, tagged
+     , exceptions, hspec, MissingH, monad-control, mtl, network, tagged
      }:
      mkDerivation {
        pname = "network-msgpack-rpc";
-       version = "0.0.2";
-       sha256 = "6938c9952006b7cd2796d493c295f96324523308cc5c2c9748d4707f58012f7c";
+       version = "0.0.3";
+       sha256 = "74bf9cd029126e26a0ebf0b02cbc12bc5410e85404ba36f3d8ba001523c3200b";
        libraryHaskellDepends = [
          base binary binary-conduit bytestring conduit conduit-extra
-         data-default-class data-msgpack exceptions monad-control mtl
-         network tagged
+         data-default-class data-msgpack exceptions MissingH monad-control
+         mtl network tagged
        ];
        testHaskellDepends = [ async base bytestring hspec mtl network ];
        homepage = "http://msgpack.org/";
@@ -124843,8 +125135,8 @@ self: {
      }:
      mkDerivation {
        pname = "pandoc-vimhl";
-       version = "0.1.0.0";
-       sha256 = "b6241c77d659f8c4d75025e6a89c9c22d594a52eee5a36380aa056b3e53ff633";
+       version = "0.1.1.0";
+       sha256 = "ceab0f2df428c0e15bcbf3cf24cdead4cc0907252dbc0f705ce9edb2c6ef6775";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -125298,22 +125590,23 @@ self: {
     ({ mkDerivation, abstract-par, accelerate, array, async, base
      , binary, bytestring, containers, deepseq, directory
      , distributed-process, distributed-process-simplelocalnet
-     , distributed-static, filepath, HTTP, monad-par, network
+     , distributed-static, filepath, http-conduit, monad-par, network
      , network-uri, normaldistribution, parallel, random, repa, stm
      , template-haskell, time, transformers, utf8-string, vector, xml
      }:
      mkDerivation {
        pname = "parconc-examples";
-       version = "0.4.3";
-       sha256 = "22770bec32f6dcfcd68a55c49473932ba09eb21e5f72631fec17e0be40599f8e";
+       version = "0.4.4";
+       sha256 = "bc05ccd125a23c4698904186b9ce9082f93ce689b533c1dc1627013a348393c8";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
          abstract-par accelerate array async base binary bytestring
          containers deepseq directory distributed-process
-         distributed-process-simplelocalnet distributed-static filepath HTTP
-         monad-par network network-uri normaldistribution parallel random
-         repa stm template-haskell time transformers utf8-string vector xml
+         distributed-process-simplelocalnet distributed-static filepath
+         http-conduit monad-par network network-uri normaldistribution
+         parallel random repa stm template-haskell time transformers
+         utf8-string vector xml
        ];
        jailbreak = true;
        homepage = "http://github.com/simonmar/parconc-examples";
@@ -131565,8 +131858,8 @@ self: {
     ({ mkDerivation, base, deepseq }:
      mkDerivation {
        pname = "pqueue";
-       version = "1.3.1.1";
-       sha256 = "a40a5eaa1b74b34f774c09613ac92955ae381000a5007a67b500a794516063a2";
+       version = "1.3.2";
+       sha256 = "58d6c91432d91c1e9908495f5bfeb231239a53b5c59bda724fe8d7bd3873adf1";
        libraryHaskellDepends = [ base deepseq ];
        description = "Reliable, persistent, fast priority queues";
        license = stdenv.lib.licenses.bsd3;
@@ -134566,26 +134859,28 @@ self: {
      }) {};
 
   "pushme" = callPackage
-    ({ mkDerivation, aeson, base, bytestring, containers, deepseq
-     , hslogger, io-storage, lens, old-locale, optparse-applicative
-     , parallel-io, pointless-fun, regex-posix, shelly, system-fileio
-     , system-filepath, text, text-format, time, unix
-     , unordered-containers, yaml
+    ({ mkDerivation, aeson, base, bytestring, containers, foldl
+     , io-storage, lens, logging, monad-logger, old-locale
+     , optparse-applicative, parallel-io, pipes, pipes-group, pipes-safe
+     , pipes-text, regex-posix, safe, shelly, system-fileio
+     , system-filepath, temporary, text, text-format, time, transformers
+     , unix, unordered-containers, yaml
      }:
      mkDerivation {
        pname = "pushme";
-       version = "1.5.0";
-       sha256 = "8d44eb63f4bee35e9474851816085317316008152ca16203338b9b0d2e28c332";
+       version = "2.0.2";
+       sha256 = "fc9b7ab521dee1ccc66912b08ab6d54715cc3fe9334ece6a6f6a54bd5c18ed89";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
-         aeson base bytestring containers deepseq hslogger io-storage lens
-         old-locale optparse-applicative parallel-io pointless-fun
-         regex-posix shelly system-fileio system-filepath text text-format
-         time unix unordered-containers yaml
+         aeson base bytestring containers foldl io-storage lens logging
+         monad-logger old-locale optparse-applicative parallel-io pipes
+         pipes-group pipes-safe pipes-text regex-posix safe shelly
+         system-fileio system-filepath temporary text text-format time
+         transformers unix unordered-containers yaml
        ];
        homepage = "https://github.com/jwiegley/pushme";
-       description = "Tool to synchronize multiple directories with rsync, zfs or git-annex";
+       description = "Tool to synchronize directories with rsync, zfs or git-annex";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
@@ -140619,6 +140914,27 @@ self: {
        license = stdenv.lib.licenses.asl20;
      }) {};
 
+  "rethinkdb_2_2_0_7" = callPackage
+    ({ mkDerivation, aeson, base, base64-bytestring, binary, bytestring
+     , containers, data-default, doctest, mtl, network, scientific, text
+     , time, unordered-containers, utf8-string, vector
+     }:
+     mkDerivation {
+       pname = "rethinkdb";
+       version = "2.2.0.7";
+       sha256 = "ed74dd74333e5cd5fd99dfd84af8c6331fca04d1d04e241b533e2c2936078873";
+       libraryHaskellDepends = [
+         aeson base base64-bytestring binary bytestring containers
+         data-default mtl network scientific text time unordered-containers
+         utf8-string vector
+       ];
+       testHaskellDepends = [ base doctest ];
+       homepage = "http://github.com/atnnn/haskell-rethinkdb";
+       description = "A driver for RethinkDB 2.2";
+       license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "rethinkdb-client-driver" = callPackage
     ({ mkDerivation, aeson, base, binary, bytestring, containers
      , hashable, hspec, hspec-smallcheck, mtl, network, old-locale
@@ -154081,74 +154397,6 @@ self: {
      }) {};
 
   "stack" = callPackage
-    ({ mkDerivation, aeson, ansi-terminal, async, attoparsec, base
-     , base-compat, base16-bytestring, base64-bytestring, binary
-     , binary-tagged, blaze-builder, byteable, bytestring, Cabal
-     , conduit, conduit-extra, containers, cryptohash
-     , cryptohash-conduit, deepseq, directory, edit-distance, either
-     , enclosed-exceptions, errors, exceptions, extra, fast-logger
-     , filelock, filepath, fsnotify, generic-deriving, gitrev, hashable
-     , hastache, hit, hpack, hpc, hspec, http-client, http-client-tls
-     , http-conduit, http-types, lifted-base, microlens, monad-control
-     , monad-logger, monad-unlift, mtl, open-browser
-     , optparse-applicative, optparse-simple, path, path-io, persistent
-     , persistent-sqlite, persistent-template, pretty, process
-     , project-template, QuickCheck, regex-applicative-text, resourcet
-     , retry, safe, semigroups, split, stm, streaming-commons, tar
-     , template-haskell, temporary, text, text-binary, time, tls
-     , transformers, transformers-base, unix, unix-compat
-     , unordered-containers, vector, vector-binary-instances, yaml
-     , zip-archive, zlib
-     }:
-     mkDerivation {
-       pname = "stack";
-       version = "1.1.2";
-       sha256 = "fc836b24fdeac54244fc79b6775d5edee146b7e552ad8e69596c7cc2f2b10625";
-       revision = "8";
-       editedCabalFile = "0eb7cd69c79c481cd463ccd8e33cc8e03bc79169f084c8f9bf3ef006da7c3a12";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         aeson ansi-terminal async attoparsec base base-compat
-         base16-bytestring base64-bytestring binary binary-tagged
-         blaze-builder byteable bytestring Cabal conduit conduit-extra
-         containers cryptohash cryptohash-conduit deepseq directory
-         edit-distance either enclosed-exceptions errors exceptions extra
-         fast-logger filelock filepath fsnotify generic-deriving hashable
-         hastache hit hpack hpc http-client http-client-tls http-conduit
-         http-types lifted-base microlens monad-control monad-logger
-         monad-unlift mtl open-browser optparse-applicative path path-io
-         persistent persistent-sqlite persistent-template pretty process
-         project-template regex-applicative-text resourcet retry safe
-         semigroups split stm streaming-commons tar template-haskell
-         temporary text text-binary time tls transformers transformers-base
-         unix unix-compat unordered-containers vector
-         vector-binary-instances yaml zip-archive zlib
-       ];
-       executableHaskellDepends = [
-         base bytestring Cabal containers directory filelock filepath gitrev
-         http-client lifted-base microlens monad-control monad-logger mtl
-         optparse-applicative optparse-simple path path-io text transformers
-       ];
-       testHaskellDepends = [
-         attoparsec base Cabal conduit conduit-extra containers cryptohash
-         directory exceptions hspec http-conduit monad-logger path path-io
-         QuickCheck resourcet retry temporary text transformers
-       ];
-       doCheck = false;
-       preCheck = "export HOME=$TMPDIR";
-       postInstall = ''
-         exe=$out/bin/stack
-         mkdir -p $out/share/bash-completion/completions
-         $exe --bash-completion-script $exe >$out/share/bash-completion/completions/stack
-       '';
-       homepage = "http://haskellstack.org";
-       description = "The Haskell Tool Stack";
-       license = stdenv.lib.licenses.bsd3;
-       maintainers = with stdenv.lib.maintainers; [ peti ];
-     }) {};
-
-  "stack_1_2_0" = callPackage
     ({ mkDerivation, aeson, annotated-wl-pprint, ansi-terminal, async
      , attoparsec, base, base-compat, base16-bytestring
      , base64-bytestring, binary, binary-tagged, blaze-builder, byteable
@@ -154218,7 +154466,6 @@ self: {
        homepage = "http://haskellstack.org";
        description = "The Haskell Tool Stack";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
        maintainers = with stdenv.lib.maintainers; [ peti ];
      }) {};
 
@@ -160218,6 +160465,30 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) openssl;};
 
+  "tcp-streams_0_5_0_0" = callPackage
+    ({ mkDerivation, base, bytestring, data-default-class, directory
+     , HsOpenSSL, HsOpenSSL-x509-system, HUnit, io-streams, network
+     , openssl, pem, QuickCheck, test-framework, test-framework-hunit
+     , test-framework-quickcheck2, tls, x509, x509-store, x509-system
+     }:
+     mkDerivation {
+       pname = "tcp-streams";
+       version = "0.5.0.0";
+       sha256 = "a963c6ad88b4feb4012c39bb6ebe1237b3e6263a3b1b0b14fb3b10f729df3be0";
+       libraryHaskellDepends = [
+         base bytestring data-default-class HsOpenSSL HsOpenSSL-x509-system
+         io-streams network pem tls x509 x509-store x509-system
+       ];
+       librarySystemDepends = [ openssl ];
+       testHaskellDepends = [
+         base bytestring directory HUnit io-streams network QuickCheck
+         test-framework test-framework-hunit test-framework-quickcheck2
+       ];
+       description = "One stop solution for tcp client and server with tls support";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {inherit (pkgs) openssl;};
+
   "tdd-util" = callPackage
     ({ mkDerivation, base, bytestring, HUnit, lens
      , MonadCatchIO-transformers, parallel-io, process, QuickCheck
@@ -161584,6 +161855,19 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "text-binary_0_2_1_1" = callPackage
+    ({ mkDerivation, base, binary, text }:
+     mkDerivation {
+       pname = "text-binary";
+       version = "0.2.1.1";
+       sha256 = "b697b2bd09080643d4686705c779122129638904870df5c1d41c8fc72f08f4a1";
+       libraryHaskellDepends = [ base binary text ];
+       homepage = "https://github.com/kawu/text-binary";
+       description = "Binary instances for text types";
+       license = stdenv.lib.licenses.bsd2;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "text-conversions" = callPackage
     ({ mkDerivation, base, base16-bytestring, base64-bytestring
      , bytestring, errors, hspec, hspec-discover, text
@@ -170562,8 +170846,8 @@ self: {
     ({ mkDerivation, base }:
      mkDerivation {
        pname = "validity";
-       version = "0.3.0.2";
-       sha256 = "c1d7a91bbcb4c06ebad9149e11f02a1e10bc3617f3835b441d0340230d4d1fef";
+       version = "0.3.0.4";
+       sha256 = "9ae590d34aeb41f096bd7432ff8c8cb07a4da010825c0190d4ef630ef6370f7f";
        libraryHaskellDepends = [ base ];
        homepage = "https://github.com/NorfairKing/validity#readme";
        description = "Validity typeclass";
@@ -170574,14 +170858,26 @@ self: {
     ({ mkDerivation, base, containers, validity }:
      mkDerivation {
        pname = "validity-containers";
-       version = "0.1.0.0";
-       sha256 = "58d5a5b068ec6f53718d73a6fdc7e76f15cad27fe6f1deff2132bb577e25e6f5";
+       version = "0.1.0.1";
+       sha256 = "ae626d963b2caca9f385cf65eb793fb41441ec93a4d8e937c24dc44a64a88829";
        libraryHaskellDepends = [ base containers validity ];
        homepage = "https://github.com/NorfairKing/validity#readme";
        description = "Validity instances for containers";
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "validity-text" = callPackage
+    ({ mkDerivation, base, text, validity }:
+     mkDerivation {
+       pname = "validity-text";
+       version = "0.1.0.1";
+       sha256 = "ab92980b7e900db8cf8e11cf986a5a952d2306cbb4735e8bc810acf8ca5e2189";
+       libraryHaskellDepends = [ base text validity ];
+       homepage = "https://github.com/NorfairKing/validity#readme";
+       description = "Validity instances for text";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "value-supply" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
@@ -176515,8 +176811,8 @@ self: {
      }:
      mkDerivation {
        pname = "x86-64bit";
-       version = "0.4";
-       sha256 = "af347a79288e5bdca0cab284ec82eae6efddd18881c7aa077ddd5765437df660";
+       version = "0.4.1";
+       sha256 = "c980fccd28989467703dee57477d0b4c8916cc52a81e8aa8d3aa5c206726bbaf";
        libraryHaskellDepends = [
          base deepseq monads-tf QuickCheck tardis vector
        ];
@@ -179617,8 +179913,8 @@ self: {
      }:
      mkDerivation {
        pname = "yesod-csp";
-       version = "0.2.0.0";
-       sha256 = "3804bdbc7b2f40a707c0af2bd6c2586abdc49c0f2eada5b24c488ed126e37280";
+       version = "0.2.1.0";
+       sha256 = "068357f7a3f6f6e6593730a556d84a5c1643e37b492d5486f4387dd111494e95";
        libraryHaskellDepends = [
          attoparsec base mono-traversable network-uri semigroups syb
          template-haskell text uniplate yesod yesod-core
@@ -180834,6 +181130,22 @@ self: {
        license = stdenv.lib.licenses.gpl2;
      }) {};
 
+  "yi_0_13_0_1" = callPackage
+    ({ mkDerivation, base, yi-core }:
+     mkDerivation {
+       pname = "yi";
+       version = "0.13.0.1";
+       sha256 = "c689370d1121626e0d2d17dce9aeaad65c6191b3215a26c37014b1900dd23a15";
+       configureFlags = [ "-fpango" "-fvty" ];
+       isLibrary = false;
+       isExecutable = true;
+       executableHaskellDepends = [ base yi-core ];
+       homepage = "https://github.com/yi-editor/yi#readme";
+       description = "Yi editor";
+       license = stdenv.lib.licenses.gpl2;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "yi-contrib" = callPackage
     ({ mkDerivation, base, containers, directory, filepath, lens, mtl
      , old-locale, oo-prototypes, split, text, time, transformers-base
@@ -180855,6 +181167,42 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "yi-core" = callPackage
+    ({ mkDerivation, array, attoparsec, base, binary, bytestring
+     , containers, data-default, directory, dlist, dynamic-state, dyre
+     , exceptions, filepath, hashable, Hclip, ListLike
+     , microlens-platform, mtl, old-locale, oo-prototypes, parsec
+     , pointedlist, process, process-extras, safe, semigroups, split
+     , tasty, tasty-hunit, tasty-quickcheck, text, text-icu, time
+     , transformers-base, unix, unix-compat, unordered-containers
+     , word-trie, xdg-basedir, yi-language, yi-rope
+     }:
+     mkDerivation {
+       pname = "yi-core";
+       version = "0.13.0.1";
+       sha256 = "59d1032027339aed25d8ba0e294d83d5f12416becf8d36ab22e03f30085fc3f3";
+       libraryHaskellDepends = [
+         array attoparsec base binary bytestring containers data-default
+         directory dlist dynamic-state dyre exceptions filepath hashable
+         Hclip ListLike microlens-platform mtl old-locale oo-prototypes
+         parsec pointedlist process process-extras safe semigroups split
+         text text-icu time transformers-base unix unix-compat
+         unordered-containers word-trie xdg-basedir yi-language yi-rope
+       ];
+       testHaskellDepends = [
+         array attoparsec base binary bytestring containers data-default
+         directory dlist dynamic-state dyre exceptions filepath hashable
+         Hclip ListLike microlens-platform mtl old-locale oo-prototypes
+         parsec pointedlist process process-extras safe semigroups split
+         tasty tasty-hunit tasty-quickcheck text text-icu time
+         transformers-base unix unix-compat unordered-containers word-trie
+         xdg-basedir yi-language yi-rope
+       ];
+       homepage = "https://github.com/yi-editor/yi#readme";
+       description = "Yi editor core library";
+       license = stdenv.lib.licenses.gpl2;
+     }) {};
+
   "yi-emacs-colours" = callPackage
     ({ mkDerivation, base, containers, split, yi-language }:
      mkDerivation {
@@ -180867,6 +181215,43 @@ self: {
        license = stdenv.lib.licenses.gpl2;
      }) {};
 
+  "yi-frontend-pango" = callPackage
+    ({ mkDerivation, base, containers, filepath, glib, gtk
+     , microlens-platform, mtl, oo-prototypes, pango, pointedlist, text
+     , transformers-base, yi-core, yi-language, yi-rope
+     }:
+     mkDerivation {
+       pname = "yi-frontend-pango";
+       version = "0.13.0.1";
+       sha256 = "f0526c0014fc888ab0d1d9b6240b88fd6eae7554053818d8fff9725c0a8cd8be";
+       libraryHaskellDepends = [
+         base containers filepath glib gtk microlens-platform mtl
+         oo-prototypes pango pointedlist text transformers-base yi-core
+         yi-language yi-rope
+       ];
+       homepage = "https://github.com/yi-editor/yi#readme";
+       description = "Pango frontend for Yi editor";
+       license = stdenv.lib.licenses.gpl2;
+     }) {};
+
+  "yi-frontend-vty" = callPackage
+    ({ mkDerivation, base, containers, data-default, dlist
+     , microlens-platform, pointedlist, stm, text, vty, yi-core
+     , yi-language
+     }:
+     mkDerivation {
+       pname = "yi-frontend-vty";
+       version = "0.13.0.1";
+       sha256 = "68f94ba76109463a7c544c529635c8fc5652cdd424cdab9e55da1077e569477b";
+       libraryHaskellDepends = [
+         base containers data-default dlist microlens-platform pointedlist
+         stm text vty yi-core yi-language
+       ];
+       homepage = "https://github.com/yi-editor/yi#readme";
+       description = "Vty frontend for Yi editor";
+       license = stdenv.lib.licenses.gpl2;
+     }) {};
+
   "yi-fuzzy-open" = callPackage
     ({ mkDerivation, base, binary, containers, data-default, directory
      , filepath, mtl, text, transformers-base, vector, yi, yi-language
@@ -180897,6 +181282,86 @@ self: {
        license = "GPL";
      }) {};
 
+  "yi-ireader" = callPackage
+    ({ mkDerivation, base, binary, bytestring, containers, data-default
+     , microlens-platform, text, yi-core, yi-language, yi-rope
+     }:
+     mkDerivation {
+       pname = "yi-ireader";
+       version = "0.13.0.1";
+       sha256 = "abd842857424d10e13643ea9dd118cb8b9a77452fca17e6e1c274ed7c3203d70";
+       libraryHaskellDepends = [
+         base binary bytestring containers data-default microlens-platform
+         text yi-core yi-language yi-rope
+       ];
+       homepage = "https://github.com/yi-editor/yi#readme";
+       description = "Yi editor incremental reader";
+       license = stdenv.lib.licenses.gpl2;
+     }) {};
+
+  "yi-keymap-cua" = callPackage
+    ({ mkDerivation, base, microlens-platform, text, yi-core
+     , yi-keymap-emacs, yi-rope
+     }:
+     mkDerivation {
+       pname = "yi-keymap-cua";
+       version = "0.13.0.1";
+       sha256 = "130b7a1583ce80edbbc7227463dbaf5e1330b9927b6f512ed1b066ea1b8c6692";
+       libraryHaskellDepends = [
+         base microlens-platform text yi-core yi-keymap-emacs yi-rope
+       ];
+       homepage = "https://github.com/yi-editor/yi#readme";
+       description = "Cua keymap for Yi editor";
+       license = stdenv.lib.licenses.gpl2;
+     }) {};
+
+  "yi-keymap-emacs" = callPackage
+    ({ mkDerivation, base, containers, filepath, Hclip
+     , microlens-platform, mtl, oo-prototypes, semigroups, text
+     , transformers-base, yi-core, yi-language, yi-misc-modes, yi-rope
+     }:
+     mkDerivation {
+       pname = "yi-keymap-emacs";
+       version = "0.13.0.1";
+       sha256 = "495db9fa6efe1d628b078d384547deb2fd537f36db0daa5ebc9c149ed9fd7a9f";
+       libraryHaskellDepends = [
+         base containers filepath Hclip microlens-platform mtl oo-prototypes
+         semigroups text transformers-base yi-core yi-language yi-misc-modes
+         yi-rope
+       ];
+       homepage = "https://github.com/yi-editor/yi#readme";
+       description = "Emacs keymap for Yi editor";
+       license = stdenv.lib.licenses.gpl2;
+     }) {};
+
+  "yi-keymap-vim" = callPackage
+    ({ mkDerivation, attoparsec, base, binary, containers, data-default
+     , directory, filepath, Hclip, microlens-platform, mtl
+     , oo-prototypes, pointedlist, QuickCheck, safe, semigroups, tasty
+     , tasty-hunit, tasty-quickcheck, text, transformers-base
+     , unordered-containers, yi-core, yi-language, yi-rope
+     }:
+     mkDerivation {
+       pname = "yi-keymap-vim";
+       version = "0.13.0.1";
+       sha256 = "a3f2360e2a5f17a71448cc2ab7d669f9d17553a97fb97bddcc731528b441a3b1";
+       libraryHaskellDepends = [
+         attoparsec base binary containers data-default directory filepath
+         Hclip microlens-platform mtl oo-prototypes pointedlist safe
+         semigroups text transformers-base unordered-containers yi-core
+         yi-language yi-rope
+       ];
+       testHaskellDepends = [
+         attoparsec base binary containers data-default directory filepath
+         Hclip microlens-platform mtl oo-prototypes pointedlist QuickCheck
+         safe semigroups tasty tasty-hunit tasty-quickcheck text
+         transformers-base unordered-containers yi-core yi-language yi-rope
+       ];
+       homepage = "https://github.com/yi-editor/yi#readme";
+       description = "Vim keymap for Yi editor";
+       license = stdenv.lib.licenses.gpl2;
+     }) {};
+
   "yi-language" = callPackage
     ({ mkDerivation, alex, array, base, binary, containers
      , data-default, filepath, hashable, hspec, microlens-platform
@@ -180923,6 +181388,96 @@ self: {
        license = stdenv.lib.licenses.gpl2;
      }) {};
 
+  "yi-language_0_13_0_1" = callPackage
+    ({ mkDerivation, alex, array, base, binary, containers
+     , data-default, hashable, microlens-platform, oo-prototypes
+     , pointedlist, regex-base, regex-tdfa, tasty, tasty-hspec
+     , tasty-quickcheck, template-haskell, transformers-base
+     , unordered-containers
+     }:
+     mkDerivation {
+       pname = "yi-language";
+       version = "0.13.0.1";
+       sha256 = "1fee232d0e3cd9565d6d504b1c70b465aacfe2b3460f86560c8d19ba9ae81c9c";
+       libraryHaskellDepends = [
+         array base binary containers data-default hashable
+         microlens-platform oo-prototypes pointedlist regex-base regex-tdfa
+         template-haskell transformers-base unordered-containers
+       ];
+       libraryToolDepends = [ alex ];
+       testHaskellDepends = [
+         array base binary containers data-default hashable
+         microlens-platform oo-prototypes pointedlist regex-base regex-tdfa
+         tasty tasty-hspec tasty-quickcheck template-haskell
+         transformers-base unordered-containers
+       ];
+       homepage = "https://github.com/yi-editor/yi#readme";
+       description = "Collection of language-related Yi libraries";
+       license = stdenv.lib.licenses.gpl2;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "yi-misc-modes" = callPackage
+    ({ mkDerivation, array, base, binary, data-default, filepath
+     , microlens-platform, semigroups, text, yi-core, yi-language
+     , yi-rope
+     }:
+     mkDerivation {
+       pname = "yi-misc-modes";
+       version = "0.13.0.1";
+       sha256 = "fea111c983d93f6bdd66bede3846e17d4e9d88eecf21118cb60827454ba4c323";
+       libraryHaskellDepends = [
+         array base binary data-default filepath microlens-platform
+         semigroups text yi-core yi-language yi-rope
+       ];
+       homepage = "https://github.com/yi-editor/yi#readme";
+       description = "Yi editor miscellaneous modes";
+       license = stdenv.lib.licenses.gpl2;
+     }) {};
+
+  "yi-mode-haskell" = callPackage
+    ({ mkDerivation, array, base, binary, containers, data-default
+     , filepath, hashable, hspec, microlens-platform, pointedlist
+     , QuickCheck, regex-base, regex-tdfa, template-haskell, text
+     , transformers-base, unordered-containers, yi-core, yi-language
+     , yi-rope
+     }:
+     mkDerivation {
+       pname = "yi-mode-haskell";
+       version = "0.13.0.1";
+       sha256 = "4727944e57b89a988ab7af57dff0ed2bbd926105b5035ceb9343c8dd2be84f8e";
+       libraryHaskellDepends = [
+         array base binary data-default microlens-platform text yi-core
+         yi-language yi-rope
+       ];
+       testHaskellDepends = [
+         array base binary containers data-default filepath hashable hspec
+         microlens-platform pointedlist QuickCheck regex-base regex-tdfa
+         template-haskell text transformers-base unordered-containers
+         yi-core yi-language yi-rope
+       ];
+       homepage = "https://github.com/yi-editor/yi#readme";
+       description = "Yi editor haskell mode";
+       license = stdenv.lib.licenses.gpl2;
+     }) {};
+
+  "yi-mode-javascript" = callPackage
+    ({ mkDerivation, array, base, binary, data-default, dlist, filepath
+     , microlens-platform, mtl, text, yi-core, yi-language, yi-rope
+     }:
+     mkDerivation {
+       pname = "yi-mode-javascript";
+       version = "0.13.0.1";
+       sha256 = "b952219ba83d27b4fe292fe6bcbc8b0a14b95c849f35fd1b74ff1c81a464ae8c";
+       libraryHaskellDepends = [
+         array base binary data-default dlist filepath microlens-platform
+         mtl text yi-core yi-language yi-rope
+       ];
+       homepage = "https://github.com/yi-editor/yi#readme";
+       description = "Yi editor javascript mode";
+       license = stdenv.lib.licenses.gpl2;
+     }) {};
+
   "yi-monokai" = callPackage
     ({ mkDerivation, base, yi }:
      mkDerivation {