about summary refs log tree commit diff
path: root/pkgs/development/haskell-modules
diff options
context:
space:
mode:
authorobadz <obadz-git@obadz.com>2016-08-27 23:54:54 +0100
committerobadz <obadz-git@obadz.com>2016-08-27 23:54:54 +0100
commit3de6e5be50124834f9d0adfc299295e9e6e30c08 (patch)
tree31c4c7003ca554e75fa7ead8242f00922a92b25f /pkgs/development/haskell-modules
parent132571454c8162cdefe9e94613137d6a13b950b7 (diff)
parentdf27c35e9a0515146eb7db07e11af59e520214a6 (diff)
downloadnixlib-3de6e5be50124834f9d0adfc299295e9e6e30c08.tar
nixlib-3de6e5be50124834f9d0adfc299295e9e6e30c08.tar.gz
nixlib-3de6e5be50124834f9d0adfc299295e9e6e30c08.tar.bz2
nixlib-3de6e5be50124834f9d0adfc299295e9e6e30c08.tar.lz
nixlib-3de6e5be50124834f9d0adfc299295e9e6e30c08.tar.xz
nixlib-3de6e5be50124834f9d0adfc299295e9e6e30c08.tar.zst
nixlib-3de6e5be50124834f9d0adfc299295e9e6e30c08.zip
Merge branch 'master' into staging
Conflicts:
      pkgs/applications/misc/navit/default.nix
      pkgs/applications/networking/mailreaders/alpine/default.nix
      pkgs/applications/networking/mailreaders/realpine/default.nix
      pkgs/development/compilers/ghc/head.nix
      pkgs/development/libraries/openssl/default.nix
      pkgs/games/liquidwar/default.nix
      pkgs/games/spring/springlobby.nix
      pkgs/os-specific/linux/kernel/perf.nix
      pkgs/servers/sip/freeswitch/default.nix
      pkgs/tools/archivers/cromfs/default.nix
      pkgs/tools/graphics/plotutils/default.nix
Diffstat (limited to 'pkgs/development/haskell-modules')
-rw-r--r--pkgs/development/haskell-modules/configuration-hackage2nix.yaml1
-rw-r--r--pkgs/development/haskell-modules/configuration-lts.nix44
-rw-r--r--pkgs/development/haskell-modules/hackage-packages.nix1889
3 files changed, 1498 insertions, 436 deletions
diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
index 860ed1fec0cf..003fef4f096b 100644
--- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
@@ -2825,7 +2825,6 @@ dont-distribute-packages:
   language-lua-qq:                              [ i686-linux, x86_64-darwin, x86_64-linux ]
   language-mixal:                               [ i686-linux, x86_64-linux ]
   language-objc:                                [ i686-linux, x86_64-linux ]
-  language-puppet:                              [ i686-linux, x86_64-darwin, x86_64-linux ]
   language-python-colour:                       [ i686-linux, x86_64-darwin, x86_64-linux ]
   language-qux:                                 [ i686-linux, x86_64-darwin, x86_64-linux ]
   language-sh:                                  [ i686-linux, x86_64-linux ]
diff --git a/pkgs/development/haskell-modules/configuration-lts.nix b/pkgs/development/haskell-modules/configuration-lts.nix
index bcebd87d40ab..59f791e93bdc 100644
--- a/pkgs/development/haskell-modules/configuration-lts.nix
+++ b/pkgs/development/haskell-modules/configuration-lts.nix
@@ -321,6 +321,7 @@ self: super: {
   "FpMLv53" = dontDistribute super."FpMLv53";
   "FractalArt" = dontDistribute super."FractalArt";
   "Fractaler" = dontDistribute super."Fractaler";
+  "Frames" = doDistribute super."Frames_0_1_4";
   "Frank" = dontDistribute super."Frank";
   "FreeTypeGL" = dontDistribute super."FreeTypeGL";
   "FunGEn" = dontDistribute super."FunGEn";
@@ -1038,6 +1039,7 @@ self: super: {
   "accentuateus" = dontDistribute super."accentuateus";
   "access-time" = dontDistribute super."access-time";
   "accuerr" = dontDistribute super."accuerr";
+  "acid-state" = doDistribute super."acid-state_0_14_1";
   "acid-state-dist" = dontDistribute super."acid-state-dist";
   "acid-state-tls" = dontDistribute super."acid-state-tls";
   "acl2" = dontDistribute super."acl2";
@@ -1191,6 +1193,7 @@ self: super: {
   "anatomy" = dontDistribute super."anatomy";
   "android" = dontDistribute super."android";
   "android-lint-summary" = dontDistribute super."android-lint-summary";
+  "angle" = dontDistribute super."angle";
   "animalcase" = dontDistribute super."animalcase";
   "annah" = dontDistribute super."annah";
   "annihilator" = dontDistribute super."annihilator";
@@ -1611,6 +1614,7 @@ self: super: {
   "bounded-tchan" = dontDistribute super."bounded-tchan";
   "boundingboxes" = dontDistribute super."boundingboxes";
   "bowntz" = dontDistribute super."bowntz";
+  "box-tuples" = dontDistribute super."box-tuples";
   "bpann" = dontDistribute super."bpann";
   "braid" = dontDistribute super."braid";
   "brainfuck" = dontDistribute super."brainfuck";
@@ -1660,6 +1664,7 @@ self: super: {
   "bytestring-rematch" = dontDistribute super."bytestring-rematch";
   "bytestring-short" = dontDistribute super."bytestring-short";
   "bytestring-show" = dontDistribute super."bytestring-show";
+  "bytestring-tree-builder" = doDistribute super."bytestring-tree-builder_0_2_7";
   "bytestringparser" = dontDistribute super."bytestringparser";
   "bytestringparser-temporary" = dontDistribute super."bytestringparser-temporary";
   "bytestringreadp" = dontDistribute super."bytestringreadp";
@@ -1774,6 +1779,8 @@ self: super: {
   "cash" = dontDistribute super."cash";
   "casing" = dontDistribute super."casing";
   "casr-logbook" = dontDistribute super."casr-logbook";
+  "casr-logbook-html" = dontDistribute super."casr-logbook-html";
+  "casr-logbook-meta" = dontDistribute super."casr-logbook-meta";
   "cassandra-cql" = dontDistribute super."cassandra-cql";
   "cassandra-thrift" = dontDistribute super."cassandra-thrift";
   "cassava-conduit" = dontDistribute super."cassava-conduit";
@@ -1890,6 +1897,7 @@ self: super: {
   "clckwrks-dot-com" = dontDistribute super."clckwrks-dot-com";
   "clckwrks-plugin-bugs" = dontDistribute super."clckwrks-plugin-bugs";
   "clckwrks-plugin-ircbot" = dontDistribute super."clckwrks-plugin-ircbot";
+  "clckwrks-plugin-page" = doDistribute super."clckwrks-plugin-page_0_4_3_3";
   "clckwrks-theme-clckwrks" = dontDistribute super."clckwrks-theme-clckwrks";
   "clckwrks-theme-geo-bootstrap" = dontDistribute super."clckwrks-theme-geo-bootstrap";
   "cld2" = dontDistribute super."cld2";
@@ -2030,6 +2038,7 @@ self: super: {
   "conduit-find" = dontDistribute super."conduit-find";
   "conduit-merge" = dontDistribute super."conduit-merge";
   "conduit-network-stream" = dontDistribute super."conduit-network-stream";
+  "conduit-parse" = doDistribute super."conduit-parse_0_1_1_1";
   "conduit-resumablesink" = dontDistribute super."conduit-resumablesink";
   "conduit-tokenize-attoparsec" = dontDistribute super."conduit-tokenize-attoparsec";
   "conf" = dontDistribute super."conf";
@@ -2523,6 +2532,7 @@ self: super: {
   "djinn" = dontDistribute super."djinn";
   "djinn-th" = dontDistribute super."djinn-th";
   "dlist" = doDistribute super."dlist_0_7_1_2";
+  "dns" = doDistribute super."dns_2_0_4";
   "dnscache" = dontDistribute super."dnscache";
   "dnsrbl" = dontDistribute super."dnsrbl";
   "dnssd" = dontDistribute super."dnssd";
@@ -3079,6 +3089,7 @@ self: super: {
   "gang-of-threads" = dontDistribute super."gang-of-threads";
   "garepinoh" = dontDistribute super."garepinoh";
   "garsia-wachs" = dontDistribute super."garsia-wachs";
+  "gasp" = dontDistribute super."gasp";
   "gbu" = dontDistribute super."gbu";
   "gc" = dontDistribute super."gc";
   "gc-monitoring-wai" = dontDistribute super."gc-monitoring-wai";
@@ -3167,6 +3178,7 @@ self: super: {
   "ghc-srcspan-plugin" = dontDistribute super."ghc-srcspan-plugin";
   "ghc-syb" = dontDistribute super."ghc-syb";
   "ghc-time-alloc-prof" = dontDistribute super."ghc-time-alloc-prof";
+  "ghc-typelits-extra" = doDistribute super."ghc-typelits-extra_0_1_3";
   "ghc-typelits-knownnat" = dontDistribute super."ghc-typelits-knownnat";
   "ghc-typelits-natnormalise" = doDistribute super."ghc-typelits-natnormalise_0_4_6";
   "ghc-typelits-presburger" = dontDistribute super."ghc-typelits-presburger";
@@ -3231,6 +3243,7 @@ self: super: {
   "gitHUD" = dontDistribute super."gitHUD";
   "gitcache" = dontDistribute super."gitcache";
   "gitdo" = dontDistribute super."gitdo";
+  "github-backup" = doDistribute super."github-backup_1_20160522";
   "github-post-receive" = dontDistribute super."github-post-receive";
   "github-utils" = dontDistribute super."github-utils";
   "gitignore" = dontDistribute super."gitignore";
@@ -3641,6 +3654,7 @@ self: super: {
   "happs-tutorial" = dontDistribute super."happs-tutorial";
   "happstack" = dontDistribute super."happstack";
   "happstack-auth" = dontDistribute super."happstack-auth";
+  "happstack-authenticate" = doDistribute super."happstack-authenticate_2_3_4_3";
   "happstack-contrib" = dontDistribute super."happstack-contrib";
   "happstack-data" = dontDistribute super."happstack-data";
   "happstack-dlg" = dontDistribute super."happstack-dlg";
@@ -3729,6 +3743,7 @@ self: super: {
   "haskell-import-graph" = dontDistribute super."haskell-import-graph";
   "haskell-in-space" = dontDistribute super."haskell-in-space";
   "haskell-kubernetes" = dontDistribute super."haskell-kubernetes";
+  "haskell-lexer" = doDistribute super."haskell-lexer_1_0";
   "haskell-modbus" = dontDistribute super."haskell-modbus";
   "haskell-mpfr" = dontDistribute super."haskell-mpfr";
   "haskell-mpi" = dontDistribute super."haskell-mpi";
@@ -4029,6 +4044,7 @@ self: super: {
   "hit-graph" = dontDistribute super."hit-graph";
   "hjcase" = dontDistribute super."hjcase";
   "hjs" = dontDistribute super."hjs";
+  "hjsmin" = doDistribute super."hjsmin_0_2_0_1";
   "hjson-query" = dontDistribute super."hjson-query";
   "hjsonpointer" = dontDistribute super."hjsonpointer";
   "hjsonschema" = dontDistribute super."hjsonschema";
@@ -4087,6 +4103,7 @@ self: super: {
   "hob" = dontDistribute super."hob";
   "hobbes" = dontDistribute super."hobbes";
   "hobbits" = dontDistribute super."hobbits";
+  "hocilib" = dontDistribute super."hocilib";
   "hoe" = dontDistribute super."hoe";
   "hofix-mtl" = dontDistribute super."hofix-mtl";
   "hog" = dontDistribute super."hog";
@@ -4155,6 +4172,7 @@ self: super: {
   "hpaste" = dontDistribute super."hpaste";
   "hpasteit" = dontDistribute super."hpasteit";
   "hpath" = dontDistribute super."hpath";
+  "hpc-coveralls" = doDistribute super."hpc-coveralls_1_0_4";
   "hpc-strobe" = dontDistribute super."hpc-strobe";
   "hpc-tracer" = dontDistribute super."hpc-tracer";
   "hpdft" = dontDistribute super."hpdft";
@@ -4241,6 +4259,7 @@ self: super: {
   "hsc3-sf-hsndfile" = dontDistribute super."hsc3-sf-hsndfile";
   "hsc3-unsafe" = dontDistribute super."hsc3-unsafe";
   "hsc3-utils" = dontDistribute super."hsc3-utils";
+  "hscaffold" = dontDistribute super."hscaffold";
   "hscamwire" = dontDistribute super."hscamwire";
   "hscassandra" = dontDistribute super."hscassandra";
   "hscd" = dontDistribute super."hscd";
@@ -4395,6 +4414,7 @@ self: super: {
   "http-reverse-proxy" = doDistribute super."http-reverse-proxy_0_4_3";
   "http-server" = dontDistribute super."http-server";
   "http-shed" = dontDistribute super."http-shed";
+  "http-streams" = doDistribute super."http-streams_0_8_3_3";
   "http-test" = dontDistribute super."http-test";
   "http-trace" = dontDistribute super."http-trace";
   "http-wget" = dontDistribute super."http-wget";
@@ -4443,6 +4463,7 @@ self: super: {
   "hxournal" = dontDistribute super."hxournal";
   "hxt-binary" = dontDistribute super."hxt-binary";
   "hxt-cache" = dontDistribute super."hxt-cache";
+  "hxt-css" = doDistribute super."hxt-css_0_1_0_2";
   "hxt-extras" = dontDistribute super."hxt-extras";
   "hxt-filter" = dontDistribute super."hxt-filter";
   "hxt-xpath" = dontDistribute super."hxt-xpath";
@@ -4600,6 +4621,7 @@ self: super: {
   "interpolation" = dontDistribute super."interpolation";
   "interruptible" = dontDistribute super."interruptible";
   "interspersed" = dontDistribute super."interspersed";
+  "interval" = dontDistribute super."interval";
   "intricacy" = dontDistribute super."intricacy";
   "intset" = dontDistribute super."intset";
   "invariant" = doDistribute super."invariant_0_3_1";
@@ -4628,6 +4650,7 @@ self: super: {
   "irc-colors" = dontDistribute super."irc-colors";
   "irc-conduit" = doDistribute super."irc-conduit_0_1_2_0";
   "irc-core" = dontDistribute super."irc-core";
+  "irc-dcc" = doDistribute super."irc-dcc_1_2_1";
   "irc-fun-bot" = dontDistribute super."irc-fun-bot";
   "irc-fun-client" = dontDistribute super."irc-fun-client";
   "irc-fun-color" = dontDistribute super."irc-fun-color";
@@ -4798,6 +4821,7 @@ self: super: {
   "keycode" = doDistribute super."keycode_0_2";
   "keyed" = dontDistribute super."keyed";
   "keyring" = dontDistribute super."keyring";
+  "keysafe" = dontDistribute super."keysafe";
   "keystore" = dontDistribute super."keystore";
   "keyvaluehash" = dontDistribute super."keyvaluehash";
   "keyword-args" = dontDistribute super."keyword-args";
@@ -5087,6 +5111,7 @@ self: super: {
   "llvm-data-interop" = dontDistribute super."llvm-data-interop";
   "llvm-extra" = dontDistribute super."llvm-extra";
   "llvm-ffi" = dontDistribute super."llvm-ffi";
+  "llvm-ffi-tools" = dontDistribute super."llvm-ffi-tools";
   "llvm-general" = dontDistribute super."llvm-general";
   "llvm-general-pure" = dontDistribute super."llvm-general-pure";
   "llvm-general-quote" = dontDistribute super."llvm-general-quote";
@@ -5130,6 +5155,8 @@ self: super: {
   "lojysamban" = dontDistribute super."lojysamban";
   "lol" = dontDistribute super."lol";
   "lol-apps" = dontDistribute super."lol-apps";
+  "lol-calculus" = dontDistribute super."lol-calculus";
+  "lol-typing" = dontDistribute super."lol-typing";
   "loli" = dontDistribute super."loli";
   "lookup-tables" = dontDistribute super."lookup-tables";
   "loop-effin" = dontDistribute super."loop-effin";
@@ -5294,6 +5321,7 @@ self: super: {
   "memscript" = dontDistribute super."memscript";
   "merge-bash-history" = dontDistribute super."merge-bash-history";
   "mersenne-random" = dontDistribute super."mersenne-random";
+  "mersenne-random-pure64" = doDistribute super."mersenne-random-pure64_0_2_0_5";
   "messente" = dontDistribute super."messente";
   "meta-misc" = dontDistribute super."meta-misc";
   "meta-par" = dontDistribute super."meta-par";
@@ -5377,6 +5405,7 @@ self: super: {
   "modulo" = dontDistribute super."modulo";
   "moe" = dontDistribute super."moe";
   "mohws" = dontDistribute super."mohws";
+  "mollie-api-haskell" = dontDistribute super."mollie-api-haskell";
   "monad-abort-fd" = dontDistribute super."monad-abort-fd";
   "monad-atom" = dontDistribute super."monad-atom";
   "monad-atom-simple" = dontDistribute super."monad-atom-simple";
@@ -5456,6 +5485,7 @@ self: super: {
   "morfette" = dontDistribute super."morfette";
   "morfeusz" = dontDistribute super."morfeusz";
   "morph" = dontDistribute super."morph";
+  "morte" = doDistribute super."morte_1_6_1";
   "mosaico-lib" = dontDistribute super."mosaico-lib";
   "mount" = dontDistribute super."mount";
   "mp" = dontDistribute super."mp";
@@ -5748,6 +5778,7 @@ self: super: {
   "old-version" = dontDistribute super."old-version";
   "olwrapper" = dontDistribute super."olwrapper";
   "omaketex" = dontDistribute super."omaketex";
+  "ombra" = dontDistribute super."ombra";
   "omega" = dontDistribute super."omega";
   "omnicodec" = dontDistribute super."omnicodec";
   "on-a-horse" = dontDistribute super."on-a-horse";
@@ -5861,6 +5892,7 @@ self: super: {
   "pandoc-lens" = dontDistribute super."pandoc-lens";
   "pandoc-placetable" = dontDistribute super."pandoc-placetable";
   "pandoc-plantuml-diagrams" = dontDistribute super."pandoc-plantuml-diagrams";
+  "pandoc-types" = doDistribute super."pandoc-types_1_16_1";
   "pandoc-unlit" = dontDistribute super."pandoc-unlit";
   "pango" = doDistribute super."pango_0_13_1_1";
   "papillon" = dontDistribute super."papillon";
@@ -6005,6 +6037,7 @@ self: super: {
   "phraskell" = dontDistribute super."phraskell";
   "phybin" = dontDistribute super."phybin";
   "pi-calculus" = dontDistribute super."pi-calculus";
+  "pi-forall" = dontDistribute super."pi-forall";
   "pia-forward" = dontDistribute super."pia-forward";
   "pianola" = dontDistribute super."pianola";
   "picologic" = dontDistribute super."picologic";
@@ -6031,6 +6064,7 @@ self: super: {
   "pipes-errors" = dontDistribute super."pipes-errors";
   "pipes-extra" = dontDistribute super."pipes-extra";
   "pipes-files" = dontDistribute super."pipes-files";
+  "pipes-http" = doDistribute super."pipes-http_1_0_3";
   "pipes-interleave" = dontDistribute super."pipes-interleave";
   "pipes-key-value-csv" = dontDistribute super."pipes-key-value-csv";
   "pipes-lzma" = dontDistribute super."pipes-lzma";
@@ -6160,6 +6194,7 @@ self: super: {
   "practice-room" = dontDistribute super."practice-room";
   "precis" = dontDistribute super."precis";
   "predicates" = dontDistribute super."predicates";
+  "predictive" = dontDistribute super."predictive";
   "prednote-test" = dontDistribute super."prednote-test";
   "prefork" = dontDistribute super."prefork";
   "pregame" = dontDistribute super."pregame";
@@ -6310,6 +6345,7 @@ self: super: {
   "qtah-examples" = dontDistribute super."qtah-examples";
   "qtah-generator" = dontDistribute super."qtah-generator";
   "qtah-qt5" = dontDistribute super."qtah-qt5";
+  "quack" = dontDistribute super."quack";
   "quadratic-irrational" = dontDistribute super."quadratic-irrational";
   "quantfin" = dontDistribute super."quantfin";
   "quantities" = dontDistribute super."quantities";
@@ -6401,6 +6437,7 @@ self: super: {
   "rbr" = dontDistribute super."rbr";
   "rclient" = dontDistribute super."rclient";
   "rcu" = dontDistribute super."rcu";
+  "rdf" = dontDistribute super."rdf";
   "rdf4h" = dontDistribute super."rdf4h";
   "rdioh" = dontDistribute super."rdioh";
   "rdtsc" = dontDistribute super."rdtsc";
@@ -6567,6 +6604,7 @@ self: super: {
   "restful-snap" = dontDistribute super."restful-snap";
   "restricted-workers" = dontDistribute super."restricted-workers";
   "restyle" = dontDistribute super."restyle";
+  "result" = dontDistribute super."result";
   "resumable-exceptions" = dontDistribute super."resumable-exceptions";
   "rethinkdb-client-driver" = doDistribute super."rethinkdb-client-driver_0_0_22";
   "rethinkdb-model" = dontDistribute super."rethinkdb-model";
@@ -7416,6 +7454,7 @@ self: super: {
   "tak-ai" = dontDistribute super."tak-ai";
   "takahashi" = dontDistribute super."takahashi";
   "takusen-oracle" = dontDistribute super."takusen-oracle";
+  "tal" = dontDistribute super."tal";
   "tamarin-prover" = dontDistribute super."tamarin-prover";
   "tamarin-prover-term" = dontDistribute super."tamarin-prover-term";
   "tamarin-prover-theory" = dontDistribute super."tamarin-prover-theory";
@@ -7425,6 +7464,7 @@ self: super: {
   "task" = dontDistribute super."task";
   "task-distribution" = dontDistribute super."task-distribution";
   "taskpool" = dontDistribute super."taskpool";
+  "tasty" = doDistribute super."tasty_0_11_0_3";
   "tasty-groundhog-converters" = dontDistribute super."tasty-groundhog-converters";
   "tasty-hunit-adapter" = dontDistribute super."tasty-hunit-adapter";
   "tasty-integrate" = dontDistribute super."tasty-integrate";
@@ -7688,6 +7728,7 @@ self: super: {
   "trawl" = dontDistribute super."trawl";
   "traypoweroff" = dontDistribute super."traypoweroff";
   "tree-monad" = dontDistribute super."tree-monad";
+  "treemap" = dontDistribute super."treemap";
   "treemap-html" = dontDistribute super."treemap-html";
   "treemap-html-tools" = dontDistribute super."treemap-html-tools";
   "treersec" = dontDistribute super."treersec";
@@ -7821,6 +7862,7 @@ self: super: {
   "ui-command" = dontDistribute super."ui-command";
   "uid" = dontDistribute super."uid";
   "una" = dontDistribute super."una";
+  "unagi-bloomfilter" = dontDistribute super."unagi-bloomfilter";
   "unagi-chan" = dontDistribute super."unagi-chan";
   "unagi-streams" = dontDistribute super."unagi-streams";
   "unamb" = dontDistribute super."unamb";
@@ -7914,6 +7956,7 @@ self: super: {
   "usb-id-database" = dontDistribute super."usb-id-database";
   "usb-iteratee" = dontDistribute super."usb-iteratee";
   "usb-safe" = dontDistribute super."usb-safe";
+  "userid" = doDistribute super."userid_0_1_2_6";
   "utc" = dontDistribute super."utc";
   "utf8-env" = dontDistribute super."utf8-env";
   "utf8-prelude" = dontDistribute super."utf8-prelude";
@@ -8049,6 +8092,7 @@ self: super: {
   "wai-middleware-cache" = dontDistribute super."wai-middleware-cache";
   "wai-middleware-cache-redis" = dontDistribute super."wai-middleware-cache-redis";
   "wai-middleware-catch" = dontDistribute super."wai-middleware-catch";
+  "wai-middleware-content-type" = doDistribute super."wai-middleware-content-type_0_4_0";
   "wai-middleware-crowd" = doDistribute super."wai-middleware-crowd_0_1_4_1";
   "wai-middleware-etag" = dontDistribute super."wai-middleware-etag";
   "wai-middleware-gunzip" = dontDistribute super."wai-middleware-gunzip";
diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index 6c3eb98d853c..606add41f046 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -5575,7 +5575,7 @@ self: {
        hydraPlatforms = [ "x86_64-darwin" ];
      }) {};
 
-  "Frames" = callPackage
+  "Frames_0_1_4" = callPackage
     ({ mkDerivation, base, ghc-prim, pipes, primitive, readable
      , template-haskell, text, transformers, vector, vinyl
      }:
@@ -5589,6 +5589,23 @@ self: {
        ];
        description = "Data frames For working with tabular data files";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "Frames" = callPackage
+    ({ mkDerivation, base, ghc-prim, pipes, primitive, readable
+     , template-haskell, text, transformers, vector, vinyl
+     }:
+     mkDerivation {
+       pname = "Frames";
+       version = "0.1.6";
+       sha256 = "7a7a6639b04e9650d5dde93bb67bc0f26b053fd3456a34808f39640a0f780a50";
+       libraryHaskellDepends = [
+         base ghc-prim pipes primitive readable template-haskell text
+         transformers vector vinyl
+       ];
+       description = "Data frames For working with tabular data files";
+       license = stdenv.lib.licenses.bsd3;
      }) {};
 
   "Frank" = callPackage
@@ -5730,6 +5747,8 @@ self: {
        pname = "GLFW-b";
        version = "1.4.8.0";
        sha256 = "4e88c518d527e28606c9f150c74ace2e350bbb5630d51e4f365a13b2c14ef4ef";
+       revision = "1";
+       editedCabalFile = "f686b01337a2a511c3c6819d07dda3cb604ee44647a4b3dbde3bff24470a2836";
        libraryHaskellDepends = [ base bindings-GLFW ];
        testHaskellDepends = [
          base bindings-GLFW HUnit test-framework test-framework-hunit
@@ -9605,8 +9624,8 @@ self: {
     ({ mkDerivation, base, bytestring, HsOpenSSL, unix }:
      mkDerivation {
        pname = "HsOpenSSL-x509-system";
-       version = "0.1.0.2";
-       sha256 = "ecc942c69f4c25fa52dec70f34d3e324de62596826b0bdc1ba8196594d13289b";
+       version = "0.1.0.3";
+       sha256 = "5bdcb7ae2faba07a374109fea0a1431ae09d080f8574e60ab7a351b46f931f92";
        libraryHaskellDepends = [ base bytestring HsOpenSSL unix ];
        homepage = "https://github.com/redneb/HsOpenSSL-x509-system";
        description = "Use the system's native CA certificate store with HsOpenSSL";
@@ -14856,12 +14875,11 @@ self: {
      }:
      mkDerivation {
        pname = "RepLib";
-       version = "0.5.3.5";
-       sha256 = "05c21fdaf2d09a44ffdb4d4f02a3b9a282dd5b5542ecc3e71222d31228644550";
+       version = "0.5.4";
+       sha256 = "986447e27a4eb12408b9571f51c766612f31f99c40e94d031c796387ce24838d";
        libraryHaskellDepends = [
          base containers mtl template-haskell transformers
        ];
-       jailbreak = true;
        homepage = "https://github.com/sweirich/replib";
        description = "Generic programming library with representation types";
        license = stdenv.lib.licenses.bsd3;
@@ -17386,8 +17404,8 @@ self: {
      }:
      mkDerivation {
        pname = "VKHS";
-       version = "1.7.1";
-       sha256 = "1b6075e1cae298b47d0d71e8a2f42c5bdc1e7428f82e81d9d55f993a3b0247a2";
+       version = "1.7.2";
+       sha256 = "5fa26bab55d5566cf512412256b06072e286707718532cd4132ce330ad9f437e";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -19239,7 +19257,7 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "acid-state" = callPackage
+  "acid-state_0_14_1" = callPackage
     ({ mkDerivation, array, base, bytestring, cereal, containers
      , directory, extensible-exceptions, filepath, mtl, network
      , safecopy, stm, template-haskell, unix
@@ -19259,6 +19277,26 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "acid-state" = callPackage
+    ({ mkDerivation, array, base, bytestring, cereal, containers
+     , directory, extensible-exceptions, filepath, mtl, network
+     , safecopy, stm, template-haskell, unix
+     }:
+     mkDerivation {
+       pname = "acid-state";
+       version = "0.14.2";
+       sha256 = "86dc1ebbcb4870e1c233764c3e038f38c8c8802694440baf83c3f7dc05ebe5c0";
+       libraryHaskellDepends = [
+         array base bytestring cereal containers directory
+         extensible-exceptions filepath mtl network safecopy stm
+         template-haskell unix
+       ];
+       homepage = "http://acid-state.seize.it/";
+       description = "Add ACID guarantees to any serializable Haskell data structure";
+       license = stdenv.lib.licenses.publicDomain;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "acid-state-dist" = callPackage
     ({ mkDerivation, acid-state, base, bytestring, cereal
      , concurrent-extra, containers, directory, filepath, mtl, random
@@ -20264,6 +20302,7 @@ self: {
          test-framework test-framework-hunit test-framework-quickcheck2 text
          time time-locale-compat unordered-containers vector
        ];
+       jailbreak = true;
        homepage = "https://github.com/bos/aeson";
        description = "Fast JSON parsing and encoding";
        license = stdenv.lib.licenses.bsd3;
@@ -20477,28 +20516,6 @@ self: {
      }:
      mkDerivation {
        pname = "aeson-injector";
-       version = "1.0.4.0";
-       sha256 = "1f3e4e2d32a919b9ac2f297b3d7ab3fe337aa729aa08eb2c18490c8bd962a30f";
-       libraryHaskellDepends = [
-         aeson base bifunctors deepseq lens servant-docs swagger2 text
-         unordered-containers
-       ];
-       testHaskellDepends = [
-         aeson base HUnit lens QuickCheck quickcheck-text scientific
-         swagger2 tasty tasty-hunit tasty-quickcheck text vector
-       ];
-       description = "Injecting fields into aeson values";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "aeson-injector_1_0_5_1" = callPackage
-    ({ mkDerivation, aeson, base, bifunctors, deepseq, HUnit, lens
-     , QuickCheck, quickcheck-text, scientific, servant-docs, swagger2
-     , tasty, tasty-hunit, tasty-quickcheck, text, unordered-containers
-     , vector
-     }:
-     mkDerivation {
-       pname = "aeson-injector";
        version = "1.0.5.1";
        sha256 = "61cd48cf2f6fa2ace98841918b092727e478099bf1f9b159eed0966ae3c6a8d9";
        libraryHaskellDepends = [
@@ -20509,10 +20526,8 @@ self: {
          aeson base HUnit lens QuickCheck quickcheck-text scientific
          swagger2 tasty tasty-hunit tasty-quickcheck text vector
        ];
-       jailbreak = true;
        description = "Injecting fields into aeson values";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "aeson-iproute" = callPackage
@@ -23715,6 +23730,34 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "angle" = callPackage
+    ({ mkDerivation, base, containers, directory, filepath, haskeline
+     , mtl, process, QuickCheck, split, tasty, tasty-quickcheck
+     , transformers, transformers-compat
+     }:
+     mkDerivation {
+       pname = "angle";
+       version = "0.8.1.0";
+       sha256 = "2439f9267cd299c73e418354e97f884777107078590d1bbf5ccd825ff27e8ba1";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base containers directory filepath mtl process transformers
+         transformers-compat
+       ];
+       executableHaskellDepends = [
+         base containers directory haskeline mtl split transformers
+         transformers-compat
+       ];
+       testHaskellDepends = [
+         base containers mtl QuickCheck tasty tasty-quickcheck transformers
+         transformers-compat
+       ];
+       jailbreak = true;
+       description = "A small, general-purpose programming language";
+       license = stdenv.lib.licenses.gpl3;
+     }) {};
+
   "animalcase" = callPackage
     ({ mkDerivation, base, bytestring, text }:
      mkDerivation {
@@ -30245,6 +30288,8 @@ self: {
        pname = "bindings-GLFW";
        version = "3.1.2.1";
        sha256 = "083cea7d2262aecd8a80f74d80c82c2aaa84cf80e960d456e8e34fc38398decb";
+       revision = "1";
+       editedCabalFile = "d215ed7ea8c1d6879f877e446ce3e3ab78d7721ab9e6fbb4d8e91cf004b4cda3";
        libraryHaskellDepends = [ base bindings-DSL template-haskell ];
        librarySystemDepends = [
          libX11 libXcursor libXext libXfixes libXi libXinerama libXrandr
@@ -31149,8 +31194,8 @@ self: {
      }:
      mkDerivation {
        pname = "bioinformatics-toolkit";
-       version = "0.2.1";
-       sha256 = "3085dd865c075555a8d67049840d0cd9ce66d5565d55aee48f54950354b9c72f";
+       version = "0.2.2";
+       sha256 = "df424767fad8d8df0cf70581fc2b478fcbba30bbde71545d9bdce44ec8c2989e";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -31165,8 +31210,9 @@ self: {
          shelly split text
        ];
        testHaskellDepends = [
-         base bytestring conduit conduit-combinators data-default-class mtl
-         random tasty tasty-golden tasty-hunit unordered-containers vector
+         base bytestring conduit conduit-combinators data-default-class
+         matrices mtl random tasty tasty-golden tasty-hunit
+         unordered-containers vector
        ];
        description = "A collection of bioinformatics tools";
        license = stdenv.lib.licenses.mit;
@@ -33249,6 +33295,17 @@ self: {
        license = stdenv.lib.licenses.gpl3;
      }) {};
 
+  "box-tuples" = callPackage
+    ({ mkDerivation, base, ghc-prim }:
+     mkDerivation {
+       pname = "box-tuples";
+       version = "0.1.0.0";
+       sha256 = "713ef3146ce16ab075f3e4a4b3e28a5c7252b0eebf10775fe43b4415a7f07ad6";
+       libraryHaskellDepends = [ base ghc-prim ];
+       description = "A hack to use GHC.Prim primitives in GHCi";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "boxes" = callPackage
     ({ mkDerivation, base, QuickCheck, split }:
      mkDerivation {
@@ -33773,8 +33830,8 @@ self: {
      }:
      mkDerivation {
        pname = "buildbox";
-       version = "2.1.9.1";
-       sha256 = "4143193ed3a190a1f9559de05d1070df7df0f2e6cfa905d531aee3acde0c32e7";
+       version = "2.1.9.2";
+       sha256 = "7f9a3d82643b2d300cee11da526359cb4480388a9c7b9e7be6d8a0abce1053ce";
        libraryHaskellDepends = [
          base bytestring containers directory exceptions mtl old-locale
          pretty process stm temporary text time
@@ -34409,7 +34466,7 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "bytestring-tree-builder" = callPackage
+  "bytestring-tree-builder_0_2_7" = callPackage
     ({ mkDerivation, base, base-prelude, bytestring, QuickCheck
      , quickcheck-instances, semigroups, tasty, tasty-hunit
      , tasty-quickcheck, tasty-smallcheck, text
@@ -34428,6 +34485,28 @@ self: {
        homepage = "https://github.com/nikita-volkov/bytestring-tree-builder";
        description = "A very efficient ByteString builder implementation based on the binary tree";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "bytestring-tree-builder" = callPackage
+    ({ mkDerivation, base, base-prelude, bytestring
+     , quickcheck-instances, semigroups, tasty, tasty-hunit
+     , tasty-quickcheck, tasty-smallcheck, text
+     }:
+     mkDerivation {
+       pname = "bytestring-tree-builder";
+       version = "0.2.7.1";
+       sha256 = "ae03a5b2e24068870dfcff6c6dc8d6d243aaebdb7c66746d499e7cf6cfd16bd5";
+       libraryHaskellDepends = [
+         base base-prelude bytestring semigroups text
+       ];
+       testHaskellDepends = [
+         base-prelude bytestring quickcheck-instances tasty tasty-hunit
+         tasty-quickcheck tasty-smallcheck
+       ];
+       homepage = "https://github.com/nikita-volkov/bytestring-tree-builder";
+       description = "A very efficient ByteString builder implementation based on the binary tree";
+       license = stdenv.lib.licenses.mit;
      }) {};
 
   "bytestring-trie" = callPackage
@@ -36873,8 +36952,8 @@ self: {
      }:
      mkDerivation {
        pname = "casr-logbook";
-       version = "0.1.2";
-       sha256 = "e74f15d65d80cae1c5858c7ed769d74519212a6e9362b7c97d844bec4d9ca34d";
+       version = "0.1.3";
+       sha256 = "5cf395400ffe15ad83522d98f3c6626d3755fef5ef538cda1ce00cb3e7cb342f";
        libraryHaskellDepends = [ base containers digit lens time ];
        testHaskellDepends = [
          base directory doctest filepath QuickCheck template-haskell
@@ -36884,6 +36963,43 @@ self: {
        license = "unknown";
      }) {};
 
+  "casr-logbook-html" = callPackage
+    ({ mkDerivation, base, casr-logbook, digit, directory, doctest
+     , filepath, lens, lucid, QuickCheck, template-haskell, text, time
+     }:
+     mkDerivation {
+       pname = "casr-logbook-html";
+       version = "0.0.1";
+       sha256 = "9ab0cd9a42379fb4f892f00558802de86556727b6d898c8034291b27b6909079";
+       libraryHaskellDepends = [
+         base casr-logbook digit lens lucid text time
+       ];
+       testHaskellDepends = [
+         base directory doctest filepath QuickCheck template-haskell
+       ];
+       jailbreak = true;
+       homepage = "https://github.com/tonymorris/casr-logbook-html";
+       description = "CASR 61.345 Pilot Personal Logbook HTML output";
+       license = "unknown";
+     }) {};
+
+  "casr-logbook-meta" = callPackage
+    ({ mkDerivation, base, casr-logbook, directory, doctest, filepath
+     , lens, QuickCheck, template-haskell
+     }:
+     mkDerivation {
+       pname = "casr-logbook-meta";
+       version = "0.0.2";
+       sha256 = "68460e46a3f7367efbd46a72daa802ee249321ffddb3ad5b4630115e2be692de";
+       libraryHaskellDepends = [ base casr-logbook lens ];
+       testHaskellDepends = [
+         base directory doctest filepath QuickCheck template-haskell
+       ];
+       homepage = "https://github.com/tonymorris/casr-logbook-meta";
+       description = "Meta-information about entries in a CASR 61.345 logbook (casr-logbook)";
+       license = "unknown";
+     }) {};
+
   "cassandra-cql" = callPackage
     ({ mkDerivation, base, bytestring, cereal, containers, cryptohash
      , Decimal, hslogger, MonadCatchIO-transformers, mtl, network
@@ -36961,6 +37077,26 @@ self: {
        hydraPlatforms = [ "x86_64-darwin" ];
      }) {};
 
+  "cassava-conduit_0_3_3" = callPackage
+    ({ mkDerivation, array, base, bifunctors, bytestring, cassava
+     , conduit, conduit-extra, containers, mtl, QuickCheck, text
+     }:
+     mkDerivation {
+       pname = "cassava-conduit";
+       version = "0.3.3";
+       sha256 = "04286953d887cb1ba2c12aa7f3ba3697789920e39b93abd2de2e3081e2272759";
+       libraryHaskellDepends = [
+         array base bifunctors bytestring cassava conduit conduit-extra
+         containers mtl text
+       ];
+       testHaskellDepends = [ base QuickCheck ];
+       jailbreak = true;
+       homepage = "https://github.com/domdere/cassava-conduit";
+       description = "Conduit interface for cassava package";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "cassava-megaparsec" = callPackage
     ({ mkDerivation, base, bytestring, cassava, containers, hspec
      , hspec-megaparsec, megaparsec, unordered-containers, vector
@@ -39097,6 +39233,8 @@ self: {
        pname = "clash-ghc";
        version = "0.6.23";
        sha256 = "ec13dd8c85c452751860d761f44744c9a1d70ad81c053fc8a5747c6359a3378c";
+       revision = "2";
+       editedCabalFile = "8755a6b93d6722500034289e29e12fed3c0845fcc33179a9c51b1a0059b375e4";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -39190,8 +39328,8 @@ self: {
      }:
      mkDerivation {
        pname = "clash-prelude";
-       version = "0.10.13";
-       sha256 = "e0c9704a5ebf42acffa66a22d9282710d40650301b38538080a3d0c56073f203";
+       version = "0.10.14";
+       sha256 = "bf99eabf5a0ac6a86523c95a122242d3f5631d1b1870ba83d8e7319f245ef7f2";
        libraryHaskellDepends = [
          array base data-default deepseq ghc-prim ghc-typelits-extra
          ghc-typelits-natnormalise integer-gmp lens QuickCheck reflection
@@ -39680,7 +39818,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "clckwrks-plugin-page" = callPackage
+  "clckwrks-plugin-page_0_4_3_3" = callPackage
     ({ mkDerivation, acid-state, aeson, attoparsec, base, clckwrks
      , containers, directory, filepath, happstack-hsp, happstack-server
      , hsp, hsx2hs, ixset, mtl, old-locale, random, reform
@@ -39705,6 +39843,32 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "clckwrks-plugin-page" = callPackage
+    ({ mkDerivation, acid-state, aeson, attoparsec, base, clckwrks
+     , containers, directory, filepath, happstack-hsp, happstack-server
+     , hsp, hsx2hs, ixset, mtl, old-locale, random, reform
+     , reform-happstack, reform-hsp, safecopy, tagsoup, template-haskell
+     , text, time, time-locale-compat, uuid, uuid-orphans, web-plugins
+     , web-routes, web-routes-happstack, web-routes-th
+     }:
+     mkDerivation {
+       pname = "clckwrks-plugin-page";
+       version = "0.4.3.4";
+       sha256 = "8c2667447c59c57d02a911ea858d9b9ea73dfc87a9aba3a11389c67a423b60e7";
+       libraryHaskellDepends = [
+         acid-state aeson attoparsec base clckwrks containers directory
+         filepath happstack-hsp happstack-server hsp hsx2hs ixset mtl
+         old-locale random reform reform-happstack reform-hsp safecopy
+         tagsoup template-haskell text time time-locale-compat uuid
+         uuid-orphans web-plugins web-routes web-routes-happstack
+         web-routes-th
+       ];
+       homepage = "http://www.clckwrks.com/";
+       description = "support for CMS/Blogging in clckwrks";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "clckwrks-theme-bootstrap" = callPackage
     ({ mkDerivation, base, clckwrks, happstack-authenticate, hsp
      , hsx-jmacro, hsx2hs, jmacro, mtl, text, web-plugins
@@ -42648,7 +42812,7 @@ self: {
        hydraPlatforms = [ "x86_64-darwin" ];
      }) {};
 
-  "conduit-parse" = callPackage
+  "conduit-parse_0_1_1_1" = callPackage
     ({ mkDerivation, base, conduit, dlist, exceptions, hlint, mtl
      , parsers, resourcet, tasty, tasty-hunit, text, transformers
      }:
@@ -42666,6 +42830,29 @@ self: {
        homepage = "https://github.com/k0ral/conduit-parse";
        description = "Parsing framework based on conduit";
        license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "conduit-parse" = callPackage
+    ({ mkDerivation, base, conduit, dlist, hlint, mtl, parsers
+     , resourcet, safe, safe-exceptions, tasty, tasty-hunit, text
+     , transformers
+     }:
+     mkDerivation {
+       pname = "conduit-parse";
+       version = "0.1.2.0";
+       sha256 = "15621f6b0e452d30fbd7738d98a6dfcdcb078f4d51044ed6e32ea227f07bce17";
+       libraryHaskellDepends = [
+         base conduit dlist mtl parsers safe safe-exceptions text
+         transformers
+       ];
+       testHaskellDepends = [
+         base conduit hlint mtl parsers resourcet safe-exceptions tasty
+         tasty-hunit
+       ];
+       homepage = "https://github.com/k0ral/conduit-parse";
+       description = "Parsing framework based on conduit";
+       license = "unknown";
      }) {};
 
   "conduit-resumablesink" = callPackage
@@ -47557,8 +47744,8 @@ self: {
     ({ mkDerivation }:
      mkDerivation {
        pname = "data-category";
-       version = "0.6.1";
-       sha256 = "0ccb310d6b0b94df9e148c7f7d1ac792340b6767dc8d542e249c12f6e2e77de6";
+       version = "0.6.2";
+       sha256 = "8e82d0b076c9330ad99b39d6f934401ddb71400b51c259a3fd974cfa99bdec4e";
        homepage = "http://github.com/sjoerdvisscher/data-category";
        description = "Category theory";
        license = stdenv.lib.licenses.bsd3;
@@ -48321,8 +48508,8 @@ self: {
      }:
      mkDerivation {
        pname = "data-lens";
-       version = "2.11.0.1";
-       sha256 = "690a282338dbd94ecf05fce07ea90724f1bd3349defd2f6619fcf635fb7b881b";
+       version = "2.11.1";
+       sha256 = "fbbe0bb7d754fa9bced7c89a0629146618ab204cbe7a7ea26b1fa9746ac73c32";
        libraryHaskellDepends = [
          base comonad containers semigroupoids transformers
        ];
@@ -51289,6 +51476,29 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "diagrams-cairo_1_3_1_2" = callPackage
+    ({ mkDerivation, array, base, bytestring, cairo, colour, containers
+     , data-default-class, diagrams-core, diagrams-lib, filepath
+     , hashable, JuicyPixels, lens, mtl, optparse-applicative, pango
+     , split, statestack, transformers, unix, vector
+     }:
+     mkDerivation {
+       pname = "diagrams-cairo";
+       version = "1.3.1.2";
+       sha256 = "099ffe00c3fa0b6522ac2b5c4ed8beb0ff82884b164c147f3ec900dc773126f4";
+       libraryHaskellDepends = [
+         array base bytestring cairo colour containers data-default-class
+         diagrams-core diagrams-lib filepath hashable JuicyPixels lens mtl
+         optparse-applicative pango split statestack transformers unix
+         vector
+       ];
+       jailbreak = true;
+       homepage = "http://projects.haskell.org/diagrams";
+       description = "Cairo backend for diagrams drawing EDSL";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "diagrams-canvas_1_3_0_5" = callPackage
     ({ mkDerivation, base, blank-canvas, cmdargs, containers
      , data-default-class, diagrams-core, diagrams-lib, lens, mtl
@@ -51329,6 +51539,27 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "diagrams-canvas_1_3_0_7" = callPackage
+    ({ mkDerivation, base, blank-canvas, cmdargs, containers
+     , data-default-class, diagrams-core, diagrams-lib, lens, mtl
+     , NumInstances, optparse-applicative, statestack, text
+     }:
+     mkDerivation {
+       pname = "diagrams-canvas";
+       version = "1.3.0.7";
+       sha256 = "dd8477ed65f58d3137b5541e3c42994144af6ffc7e7f4b72b41754a86f1600da";
+       libraryHaskellDepends = [
+         base blank-canvas cmdargs containers data-default-class
+         diagrams-core diagrams-lib lens mtl NumInstances
+         optparse-applicative statestack text
+       ];
+       jailbreak = true;
+       homepage = "http://projects.haskell.org/diagrams/";
+       description = "HTML5 canvas backend for diagrams drawing EDSL";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "diagrams-contrib" = callPackage
     ({ mkDerivation, base, circle-packing, colour, containers
      , data-default, data-default-class, diagrams-core, diagrams-lib
@@ -51611,13 +51842,14 @@ self: {
      }:
      mkDerivation {
        pname = "diagrams-pgf";
-       version = "0.1.0.4";
-       sha256 = "106f0401b97fe6d14572fd964bf97d400277bf44e9af19f3711e4fa14a4fb85a";
+       version = "0.1.0.5";
+       sha256 = "6f5a4274b447614599603b5cc819f723e262ba0794c3ed2bbe842079a48f6898";
        libraryHaskellDepends = [
          base bytestring bytestring-builder colour containers diagrams-core
          diagrams-lib directory filepath hashable JuicyPixels mtl
          optparse-applicative process split texrunner time vector zlib
        ];
+       jailbreak = true;
        homepage = "http://github.com/cchalmers/diagrams-pgf";
        description = "PGF backend for diagrams drawing EDSL";
        license = stdenv.lib.licenses.bsd3;
@@ -51692,6 +51924,8 @@ self: {
        pname = "diagrams-rasterific";
        version = "1.3.1.8";
        sha256 = "b76001105055563e2a51f6dbff2e1c12547644014f748e7564f1ded42b75cb99";
+       revision = "1";
+       editedCabalFile = "9a5004b0563415202937cd437518f75c9910ff25c605630eed77456ce2238041";
        libraryHaskellDepends = [
          base bytestring containers data-default-class diagrams-core
          diagrams-lib filepath FontyFruity hashable JuicyPixels lens mtl
@@ -51703,6 +51937,28 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "diagrams-rasterific_1_3_1_9" = callPackage
+    ({ mkDerivation, base, bytestring, containers, data-default-class
+     , diagrams-core, diagrams-lib, filepath, FontyFruity, hashable
+     , JuicyPixels, lens, mtl, optparse-applicative, Rasterific, split
+     , unix
+     }:
+     mkDerivation {
+       pname = "diagrams-rasterific";
+       version = "1.3.1.9";
+       sha256 = "b3305657391f75b9f69c3a30905724c1151ea7cab78561c800657f7a81166ab8";
+       libraryHaskellDepends = [
+         base bytestring containers data-default-class diagrams-core
+         diagrams-lib filepath FontyFruity hashable JuicyPixels lens mtl
+         optparse-applicative Rasterific split unix
+       ];
+       jailbreak = true;
+       homepage = "http://projects.haskell.org/diagrams/";
+       description = "Rasterific backend for diagrams";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "diagrams-reflex" = callPackage
     ({ mkDerivation, base, colour, containers, diagrams-core
      , diagrams-lib, lens, monoid-extras, mtl, reflex, reflex-dom
@@ -51798,6 +52054,30 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "diagrams-svg_1_4_0_4" = callPackage
+    ({ mkDerivation, base, base64-bytestring, bytestring, colour
+     , containers, diagrams-core, diagrams-lib, directory, filepath
+     , hashable, JuicyPixels, lens, monoid-extras, mtl, old-time
+     , optparse-applicative, process, semigroups, split, svg-builder
+     , text, time
+     }:
+     mkDerivation {
+       pname = "diagrams-svg";
+       version = "1.4.0.4";
+       sha256 = "b9843885cd30a70b3acf97a0ce41934776d535777584b670f5b3ec4a39b6668c";
+       libraryHaskellDepends = [
+         base base64-bytestring bytestring colour containers diagrams-core
+         diagrams-lib directory filepath hashable JuicyPixels lens
+         monoid-extras mtl old-time optparse-applicative process semigroups
+         split svg-builder text time
+       ];
+       jailbreak = true;
+       homepage = "http://projects.haskell.org/diagrams/";
+       description = "SVG backend for diagrams drawing EDSL";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "diagrams-tikz" = callPackage
     ({ mkDerivation, base, diagrams-core, diagrams-lib, dlist, mtl }:
      mkDerivation {
@@ -52750,8 +53030,8 @@ self: {
      }:
      mkDerivation {
        pname = "dirstream";
-       version = "1.0.0";
-       sha256 = "7c1f944d519b8b56ccb855486482be8fed83492335d5b78ad73f08280c63b5c3";
+       version = "1.0.1";
+       sha256 = "76136a076311a19e4e3242ef15bd21e39b8eade315d03b92f9b8750daffdbe59";
        libraryHaskellDepends = [
          base directory pipes pipes-safe system-fileio system-filepath unix
        ];
@@ -53687,7 +53967,7 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "dns" = callPackage
+  "dns_2_0_4" = callPackage
     ({ mkDerivation, attoparsec, base, binary, blaze-builder
      , bytestring, conduit, conduit-extra, containers, doctest, hspec
      , iproute, mtl, network, random, resourcet, safe, word8
@@ -53709,9 +53989,10 @@ self: {
        testTarget = "spec";
        description = "DNS library in Haskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "dns_2_0_5" = callPackage
+  "dns" = callPackage
     ({ mkDerivation, attoparsec, base, binary, bytestring
      , bytestring-builder, conduit, conduit-extra, containers, doctest
      , hspec, iproute, mtl, network, random, resourcet, safe, word8
@@ -53729,10 +54010,10 @@ self: {
          conduit-extra containers doctest hspec iproute mtl network random
          resourcet safe word8
        ];
+       doCheck = false;
        testTarget = "spec";
        description = "DNS library in Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "dnscache" = callPackage
@@ -57198,16 +57479,18 @@ self: {
      }) {};
 
   "emailaddress" = callPackage
-    ({ mkDerivation, aeson, base, bytestring, doctest, email-validate
-     , Glob, opaleye, postgresql-simple, product-profunctors
-     , profunctors, text
+    ({ mkDerivation, aeson, base, bifunctors, bytestring, doctest
+     , email-validate, Glob, http-api-data, opaleye, path-pieces
+     , persistent, postgresql-simple, product-profunctors, profunctors
+     , text
      }:
      mkDerivation {
        pname = "emailaddress";
-       version = "0.1.0.0";
-       sha256 = "97d8dbe96ee77f341cbf1e1f382a3944adc434376bde1a82ea9df3c66be2cdba";
+       version = "0.1.6.0";
+       sha256 = "5b81ba46a7228bad005cf0370a4762fac06729277355dc02085c4d81697c689d";
        libraryHaskellDepends = [
-         aeson base bytestring email-validate opaleye postgresql-simple
+         aeson base bifunctors bytestring email-validate http-api-data
+         opaleye path-pieces persistent postgresql-simple
          product-profunctors profunctors text
        ];
        testHaskellDepends = [ base doctest Glob ];
@@ -58733,10 +59016,8 @@ self: {
      }:
      mkDerivation {
        pname = "eventloop";
-       version = "0.8.1.2";
-       sha256 = "1e4a62abcfb50f949cffe61a53d37c6b7a5ad157cdaecba31f528046f36fe42e";
-       revision = "3";
-       editedCabalFile = "c2eeaa631bc97d0a2214829ded0eaf1411852515fe1a9d2ed5aa5a25e8e6302d";
+       version = "0.8.2.0";
+       sha256 = "2d3e90201da379a76f68aed93b0058d76f766ae07e4078c797e5f91c0e315f1b";
        libraryHaskellDepends = [
          aeson base bytestring concurrent-utilities deepseq network stm
          suspend text timers websockets
@@ -60332,7 +60613,7 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "fay_0_23_1_14" = callPackage
+  "fay_0_23_1_15" = 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
@@ -60343,8 +60624,8 @@ self: {
      }:
      mkDerivation {
        pname = "fay";
-       version = "0.23.1.14";
-       sha256 = "d5f3c6bb8373e35333075c438ba0c48faa0963c6162649780ab55ee5f61a4280";
+       version = "0.23.1.15";
+       sha256 = "d8a1912c8359877e8d9cfec4c07275d21167cb03e607f7dd8190d201d967af59";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -65467,6 +65748,17 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "gasp" = callPackage
+    ({ mkDerivation, base, binary, containers }:
+     mkDerivation {
+       pname = "gasp";
+       version = "1.0.1.0";
+       sha256 = "7f9dcc98599814557179e428e281a82ceebc8208a698d87e726c3f8307b033f9";
+       libraryHaskellDepends = [ base binary containers ];
+       description = "A framework of algebraic classes";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "gbu" = callPackage
     ({ mkDerivation, base, containers, fgl, Graphalyze, haskell98, mtl
      , regex-posix
@@ -65874,8 +66166,8 @@ self: {
        pname = "generic-aeson";
        version = "0.2.0.8";
        sha256 = "de29fa648b9eb6c9e678b0715a530efaf70aac8f1ad8becc22d7ef1411ded5cb";
-       revision = "1";
-       editedCabalFile = "7d8da0973a605807887ae7309ff75483ccdaf1735adb2117a67c2721f6452c43";
+       revision = "2";
+       editedCabalFile = "1796cd85bd71d6f83a9dfd2f56cbb90c0059591e4e3bbf6e38864435f726c971";
        libraryHaskellDepends = [
          aeson attoparsec base generic-deriving mtl tagged text
          unordered-containers vector
@@ -65944,8 +66236,8 @@ self: {
     ({ mkDerivation, base, containers, ghc-prim, template-haskell }:
      mkDerivation {
        pname = "generic-deriving";
-       version = "1.10.7";
-       sha256 = "c0d8bc935951beafb13aec33e25e2896eb0e39aba60b1eba17dbd990adae07fa";
+       version = "1.11";
+       sha256 = "16d40544e4dad85af78d93158e9b6a39b35c88ca10a455cfc861a4282556240d";
        libraryHaskellDepends = [
          base containers ghc-prim template-haskell
        ];
@@ -66016,10 +66308,8 @@ self: {
      }:
      mkDerivation {
        pname = "generic-random";
-       version = "0.2.0.0";
-       sha256 = "f191ee3303d3437dd3f9cc7ebe37e8872f5bcfc4aeb77c9c838d5cd6e594538c";
-       revision = "1";
-       editedCabalFile = "0232fea4599edb18571d3a167f83978acd12ee1b1bdb1c9a1c3013e5df786b1d";
+       version = "0.3.0.0";
+       sha256 = "80a8484be904a8ac7a536c454bffe8e912897e184bfb8574ff317461eb228546";
        libraryHaskellDepends = [
          ad base containers hashable hmatrix ieee754 MonadRandom mtl
          QuickCheck transformers unordered-containers vector
@@ -66102,6 +66392,8 @@ self: {
        pname = "generic-xmlpickler";
        version = "0.1.0.5";
        sha256 = "d51760f5650051eebe561f2b18670657e8398014fa2a623c0e0169bfeca336af";
+       revision = "1";
+       editedCabalFile = "eb0855e93042f13a9becd93e75ebc42edf67546ce5bb157152fdf32b6b4c380f";
        libraryHaskellDepends = [ base generic-deriving hxt text ];
        testHaskellDepends = [
          base hxt hxt-pickle-utils tasty tasty-hunit tasty-th
@@ -66341,8 +66633,8 @@ self: {
     ({ mkDerivation, base, hspec, QuickCheck, validity }:
      mkDerivation {
        pname = "genvalidity";
-       version = "0.2.0.1";
-       sha256 = "b5f071c161a5720728f03998a50aac86bf298b21cd07723ef151943dac3ac447";
+       version = "0.2.0.2";
+       sha256 = "039cb76d733452b664c701a068e65ac86a3731a8dd33bc9192623d1e88bdf288";
        libraryHaskellDepends = [ base QuickCheck validity ];
        testHaskellDepends = [ base hspec QuickCheck ];
        homepage = "https://github.com/NorfairKing/validity#readme";
@@ -67384,18 +67676,24 @@ self: {
      }) {};
 
   "ghc-time-alloc-prof" = callPackage
-    ({ mkDerivation, attoparsec, base, containers, text, time }:
+    ({ mkDerivation, attoparsec, base, containers, directory, filepath
+     , process, tasty, tasty-hunit, temporary, text, time
+     }:
      mkDerivation {
        pname = "ghc-time-alloc-prof";
-       version = "0.0.0.1";
-       sha256 = "9a3fabe71006ce604945d3195f4d3057bdf24693e483633b688f447819381b98";
+       version = "0.1.0";
+       sha256 = "61a877a8f7a7dbfc8ceeac0e7b20f63a52183b7d1690d0557b4300c0bbfe30d5";
        libraryHaskellDepends = [ attoparsec base containers text time ];
+       testHaskellDepends = [
+         attoparsec base directory filepath process tasty tasty-hunit
+         temporary text
+       ];
        homepage = "https://github.com/maoe/ghc-time-alloc-prof";
        description = "Library for parsing GHC time and allocation profiling reports";
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "ghc-typelits-extra" = callPackage
+  "ghc-typelits-extra_0_1_3" = callPackage
     ({ mkDerivation, base, ghc, ghc-tcplugins-extra
      , ghc-typelits-natnormalise, integer-gmp, tasty, tasty-hunit
      , transformers
@@ -67413,6 +67711,31 @@ self: {
        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-extra" = callPackage
+    ({ mkDerivation, base, ghc, ghc-tcplugins-extra
+     , ghc-typelits-knownnat, ghc-typelits-natnormalise, integer-gmp
+     , singletons, tasty, tasty-hunit, transformers
+     }:
+     mkDerivation {
+       pname = "ghc-typelits-extra";
+       version = "0.2";
+       sha256 = "7ea3126b4dcf8de6dacd4654bbed1eb019cd088a70f79434d34193d93fac2c17";
+       revision = "1";
+       editedCabalFile = "52861a8d689da7f12990a870c6f3c0a219e9b2946570733710e21841947afdbc";
+       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
+       ];
+       homepage = "http://www.clash-lang.org/";
+       description = "Additional type-level operations on GHC.TypeLits.Nat";
+       license = stdenv.lib.licenses.bsd2;
      }) {};
 
   "ghc-typelits-knownnat" = callPackage
@@ -67422,8 +67745,8 @@ self: {
      }:
      mkDerivation {
        pname = "ghc-typelits-knownnat";
-       version = "0.2";
-       sha256 = "ea8363b81b55219ceb037afe349d81c77952969370bf2a9451208679fb0abf8c";
+       version = "0.2.1";
+       sha256 = "5c4e3f8be0fe29e523c1129cea98a18d46950ea53178b57fd06ae3b0057271ee";
        libraryHaskellDepends = [
          base ghc ghc-tcplugins-extra ghc-typelits-natnormalise singletons
          template-haskell transformers
@@ -67960,7 +68283,7 @@ self: {
        doHaddock = false;
        preConfigure = ''export HASKELL_GI_GIR_SEARCH_PATH=${gobjectIntrospection.dev}/share/gir-1.0'';
        preCompileBuildDriver = ''
-         PKG_CONFIG_PATH+=":${cairo.dev}/lib/pkgconfig"
+         PKG_CONFIG_PATH+=":${cairo}/lib/pkgconfig"
          setupCompileFlags+=" $(pkg-config --libs cairo-gobject)"
        '';
        homepage = "https://github.com/haskell-gi/haskell-gi";
@@ -67986,7 +68309,7 @@ self: {
        doHaddock = false;
        preConfigure = ''export HASKELL_GI_GIR_SEARCH_PATH=${gobjectIntrospection.dev}/share/gir-1.0'';
        preCompileBuildDriver = ''
-         PKG_CONFIG_PATH+=":${cairo.dev}/lib/pkgconfig"
+         PKG_CONFIG_PATH+=":${cairo}/lib/pkgconfig"
          setupCompileFlags+=" $(pkg-config --libs cairo-gobject)"
        '';
        homepage = "https://github.com/haskell-gi/haskell-gi";
@@ -68807,8 +69130,8 @@ self: {
      }:
      mkDerivation {
        pname = "ginger";
-       version = "0.2.7.0";
-       sha256 = "809944fc799e3238911595ba45a54437a9c206528a37cf60dd4aa98d142bd1ef";
+       version = "0.2.8.0";
+       sha256 = "17f7ee8a2f0cb1ee40b20043a1d39e6fd6dc100e7cb6548f590cc82030af9856";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -69512,7 +69835,7 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "github-backup" = callPackage
+  "github-backup_1_20160522" = callPackage
     ({ mkDerivation, base, bytestring, containers, directory
      , exceptions, filepath, git, github, hslogger, IfElse, MissingH
      , mtl, network, network-uri, optparse-applicative, pretty-show
@@ -69536,6 +69859,33 @@ self: {
        homepage = "https://github.com/joeyh/github-backup";
        description = "backs up everything github knows about a repository, to the repository";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {inherit (pkgs) git;};
+
+  "github-backup" = callPackage
+    ({ mkDerivation, base, bytestring, containers, directory
+     , exceptions, filepath, git, github, hslogger, IfElse, MissingH
+     , mtl, network, network-uri, optparse-applicative, pretty-show
+     , process, text, transformers, unix, unix-compat, utf8-string
+     , vector
+     }:
+     mkDerivation {
+       pname = "github-backup";
+       version = "1.20160922";
+       sha256 = "ea8036c3d9e40057bcf6c26fe925606bce8769277f0d2cfa394fd23a73df4242";
+       isLibrary = false;
+       isExecutable = true;
+       setupHaskellDepends = [ base hslogger MissingH ];
+       executableHaskellDepends = [
+         base bytestring containers directory exceptions filepath github
+         hslogger IfElse MissingH mtl network network-uri
+         optparse-applicative pretty-show process text transformers unix
+         unix-compat utf8-string vector
+       ];
+       executableToolDepends = [ git ];
+       homepage = "https://github.com/joeyh/github-backup";
+       description = "backs up everything github knows about a repository, to the repository";
+       license = stdenv.lib.licenses.gpl3;
        hydraPlatforms = [ "x86_64-darwin" ];
      }) {inherit (pkgs) git;};
 
@@ -70203,8 +70553,8 @@ self: {
      }:
      mkDerivation {
        pname = "glirc";
-       version = "2.9";
-       sha256 = "7328b69803806ebdc80c938efc70fc687d64ecc6343b99562afe95c9d60ae2ab";
+       version = "2.10";
+       sha256 = "9ecb9d1e0fd365d2bf51706e2df09ce8e6e17a648ad9f603d2888ae15129f368";
        isLibrary = false;
        isExecutable = true;
        setupHaskellDepends = [ base Cabal ];
@@ -73332,8 +73682,8 @@ self: {
      }:
      mkDerivation {
        pname = "graphmod";
-       version = "1.2.9";
-       sha256 = "2e9af4e92a2cad0fc4132060bcf61bdbed28bde50b3ca5d1cadb9db37d1493d9";
+       version = "1.3";
+       sha256 = "8f9197bd25aa79974e31fe81498cca7920d33979fe9b49084023ca9965e71910";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -76504,14 +76854,13 @@ self: {
      }:
      mkDerivation {
        pname = "hailgun";
-       version = "0.4.0.5";
-       sha256 = "b314252ae3c7346e67b1e17b719fc9eefc743eb14f6be5ea095ba3f4fd773e16";
+       version = "0.4.1.0";
+       sha256 = "9700d1718e92ffb55b457ed21bc21731fefe71990d21bc36b92bb6a5e08c869b";
        libraryHaskellDepends = [
          aeson base bytestring email-validate exceptions filepath
          http-client http-client-tls http-types tagsoup text time
          transformers
        ];
-       jailbreak = true;
        description = "Mailgun REST api interface for Haskell";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -77601,7 +77950,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "happstack-authenticate" = callPackage
+  "happstack-authenticate_2_3_4_3" = callPackage
     ({ mkDerivation, acid-state, aeson, authenticate, base
      , base64-bytestring, boomerang, bytestring, containers
      , data-default, email-validate, filepath, happstack-hsp
@@ -77631,6 +77980,36 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "happstack-authenticate" = callPackage
+    ({ mkDerivation, acid-state, aeson, authenticate, base
+     , base64-bytestring, boomerang, bytestring, containers
+     , data-default, email-validate, filepath, happstack-hsp
+     , happstack-jmacro, happstack-server, hsp, hsx-jmacro, hsx2hs
+     , http-conduit, http-types, ixset-typed, jmacro, jwt, lens
+     , mime-mail, mtl, pwstore-purehaskell, random, safecopy
+     , shakespeare, text, time, unordered-containers, userid, web-routes
+     , web-routes-boomerang, web-routes-happstack, web-routes-hsp
+     , web-routes-th
+     }:
+     mkDerivation {
+       pname = "happstack-authenticate";
+       version = "2.3.4.4";
+       sha256 = "7c48c45dd4e67101fa098b9cdd5b2e11853da0253cfefe2e9f1a773e13094a59";
+       libraryHaskellDepends = [
+         acid-state aeson authenticate base base64-bytestring boomerang
+         bytestring containers data-default email-validate filepath
+         happstack-hsp happstack-jmacro happstack-server hsp hsx-jmacro
+         hsx2hs http-conduit http-types ixset-typed jmacro jwt lens
+         mime-mail mtl pwstore-purehaskell random safecopy shakespeare text
+         time unordered-containers userid web-routes web-routes-boomerang
+         web-routes-happstack web-routes-hsp web-routes-th
+       ];
+       homepage = "http://www.happstack.com/";
+       description = "Happstack Authentication Library";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "happstack-clientsession" = callPackage
     ({ mkDerivation, base, bytestring, cereal, clientsession
      , happstack-server, monad-control, mtl, safecopy, transformers-base
@@ -78711,8 +79090,8 @@ self: {
      }:
      mkDerivation {
        pname = "hashabler";
-       version = "1.2.1";
-       sha256 = "dbe4b8698748642afe6441b533fcde55d2c467557a86fe47700544841c4f13f5";
+       version = "1.3.0";
+       sha256 = "6bbd711b75f9c8fe72a1471ed99709e382ce7a58595a0088228aa39e74bf74ab";
        libraryHaskellDepends = [
          array base bytestring ghc-prim integer-gmp primitive
          template-haskell text
@@ -79573,7 +79952,7 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
-  "haskell-lexer" = callPackage
+  "haskell-lexer_1_0" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
        pname = "haskell-lexer";
@@ -79582,6 +79961,18 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "A fully compliant Haskell 98 lexer";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "haskell-lexer" = callPackage
+    ({ mkDerivation, base }:
+     mkDerivation {
+       pname = "haskell-lexer";
+       version = "1.0.1";
+       sha256 = "d7d42ab3c4bc2f0232ede8b005fb9de57f862ee4c1c83aa61e1022346fc84366";
+       libraryHaskellDepends = [ base ];
+       description = "A fully compliant Haskell 98 lexer";
+       license = stdenv.lib.licenses.bsd3;
      }) {};
 
   "haskell-modbus" = callPackage
@@ -81822,6 +82213,8 @@ self: {
        pname = "hat";
        version = "2.9.0.0";
        sha256 = "2e557847aca6531307d0fd9d5f453ea6663a0f7fd41d89896d50455a037e4b17";
+       revision = "1";
+       editedCabalFile = "b02535be9ba2feeb0fb04f6f88cdec934286b740eec1472ee9e3de0eb56857f3";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -81831,6 +82224,7 @@ self: {
          base bytestring containers directory filepath haskeline
          haskell-src-exts polyparse process
        ];
+       jailbreak = true;
        homepage = "http://projects.haskell.org/hat/";
        description = "The Haskell tracer, generating and viewing Haskell execution traces";
        license = "unknown";
@@ -85392,8 +85786,8 @@ self: {
        pname = "hindent";
        version = "4.6.4";
        sha256 = "26fc1498705b8a64b03eb5b699ba6229955273d91a49a01c3c2b58436c8e4dcf";
-       revision = "1";
-       editedCabalFile = "f0a60118bc1676b194de34b26a83a11f62ff91b557c8ef0e1da737a7923e0642";
+       revision = "2";
+       editedCabalFile = "d06cf7934ba7a7bc938bf9c378955ee5d4925ee3f45cfa1e417a2adbe5db5955";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -85411,24 +85805,28 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "hindent_5_0_0" = callPackage
-    ({ mkDerivation, base, containers, descriptive, directory, ghc-prim
-     , haskell-src-exts, hspec, monad-loops, mtl, text, transformers
+  "hindent_5_0_1" = callPackage
+    ({ mkDerivation, base, bytestring, containers, deepseq, descriptive
+     , directory, exceptions, ghc-prim, haskell-src-exts, hspec
+     , monad-loops, mtl, text, transformers, utf8-string
      }:
      mkDerivation {
        pname = "hindent";
-       version = "5.0.0";
-       sha256 = "ad2f652d086e7bd8dd933b3aed682fd811bcb081b367279097f9d384dd738d77";
+       version = "5.0.1";
+       sha256 = "429f2603479b7a972332aaa91bbc69ac204d5b7a218f83fc071f8565120cc6b9";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
-         base containers haskell-src-exts monad-loops mtl text transformers
+         base bytestring containers exceptions haskell-src-exts monad-loops
+         mtl text transformers utf8-string
        ];
        executableHaskellDepends = [
-         base descriptive directory ghc-prim haskell-src-exts text
+         base bytestring descriptive directory ghc-prim haskell-src-exts
+         text utf8-string
        ];
        testHaskellDepends = [
-         base directory haskell-src-exts hspec monad-loops mtl text
+         base bytestring deepseq directory exceptions haskell-src-exts hspec
+         monad-loops mtl utf8-string
        ];
        jailbreak = true;
        homepage = "http://www.github.com/chrisdone/hindent";
@@ -86108,7 +86506,7 @@ self: {
        hydraPlatforms = [ "x86_64-darwin" ];
      }) {};
 
-  "hjsmin" = callPackage
+  "hjsmin_0_2_0_1" = callPackage
     ({ mkDerivation, base, blaze-builder, bytestring, containers
      , language-javascript, optparse-applicative, text
      }:
@@ -86128,6 +86526,29 @@ self: {
        homepage = "http://github.com/erikd/hjsmin";
        description = "Haskell implementation of a javascript minifier";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "hjsmin" = callPackage
+    ({ mkDerivation, base, blaze-builder, bytestring, containers
+     , language-javascript, optparse-applicative, text
+     }:
+     mkDerivation {
+       pname = "hjsmin";
+       version = "0.2.0.2";
+       sha256 = "bec153d2396962c63998eb12d0a2c7c9f7df6f774cb00e41b6cdb1f5a4905484";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base blaze-builder bytestring containers language-javascript text
+       ];
+       executableHaskellDepends = [
+         base blaze-builder bytestring containers language-javascript
+         optparse-applicative text
+       ];
+       homepage = "http://github.com/erikd/hjsmin";
+       description = "Haskell implementation of a javascript minifier";
+       license = stdenv.lib.licenses.bsd3;
      }) {};
 
   "hjson" = callPackage
@@ -87525,6 +87946,25 @@ self: {
        hydraPlatforms = [ "x86_64-darwin" ];
      }) {};
 
+  "hocilib" = callPackage
+    ({ mkDerivation, base, bytestring, c2hs, containers, inline-c
+     , ocilib, tasty, tasty-hunit, template-haskell
+     }:
+     mkDerivation {
+       pname = "hocilib";
+       version = "0.0.0";
+       sha256 = "a8bd06eec5224d8fa0c72a4a1d0f2639ef9f3ba84e52cad42c633435a8bf8ee0";
+       libraryHaskellDepends = [
+         base containers inline-c template-haskell
+       ];
+       librarySystemDepends = [ ocilib ];
+       libraryToolDepends = [ c2hs ];
+       testHaskellDepends = [ base bytestring tasty tasty-hunit ];
+       homepage = "https://github.com/fpinsight/hocilib";
+       description = "FFI binding to OCILIB";
+       license = stdenv.lib.licenses.bsd3;
+     }) {ocilib = null;};
+
   "hoe" = callPackage
     ({ mkDerivation, base, exceptions, hint, mtl, optparse-declarative
      , regex-posix, split, text, time
@@ -88940,38 +89380,6 @@ self: {
      }:
      mkDerivation {
        pname = "hpack-convert";
-       version = "0.14.4";
-       sha256 = "dff7716b20bbe03e9b96d4051becb0ece42315c926e8b5999782a2566ed879d1";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         aeson base base-compat bytestring Cabal containers deepseq
-         directory filepath Glob pretty text unordered-containers vector
-         yaml
-       ];
-       executableHaskellDepends = [
-         aeson base base-compat bytestring Cabal containers deepseq
-         directory filepath Glob pretty text unordered-containers vector
-         yaml
-       ];
-       testHaskellDepends = [
-         aeson aeson-qq base base-compat bytestring Cabal containers deepseq
-         directory filepath Glob hspec interpolate mockery pretty QuickCheck
-         temporary text unordered-containers vector yaml
-       ];
-       homepage = "https://github.com/yamadapc/hpack-convert#readme";
-       description = "Convert Cabal manifests into hpack's package.yamls";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "hpack-convert_0_14_5" = callPackage
-    ({ mkDerivation, aeson, aeson-qq, base, base-compat, bytestring
-     , Cabal, containers, deepseq, directory, filepath, Glob, hspec
-     , interpolate, mockery, pretty, QuickCheck, temporary, text
-     , unordered-containers, vector, yaml
-     }:
-     mkDerivation {
-       pname = "hpack-convert";
        version = "0.14.5";
        sha256 = "fddb0bbb0a0aeb7362ee4333fb15f5d90191a6163698d596aead89577b4656ae";
        isLibrary = true;
@@ -88994,7 +89402,6 @@ self: {
        homepage = "https://github.com/yamadapc/hpack-convert#readme";
        description = "Convert Cabal manifests into hpack's package.yamls";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hpaco" = callPackage
@@ -89160,7 +89567,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "hpc-coveralls" = callPackage
+  "hpc-coveralls_1_0_4" = callPackage
     ({ mkDerivation, aeson, async, base, bytestring, Cabal, cmdargs
      , containers, curl, directory, directory-tree, hpc, HUnit, process
      , pureMD5, regex-posix, retry, safe, split, transformers
@@ -89184,6 +89591,33 @@ self: {
        homepage = "https://github.com/guillaume-nargeot/hpc-coveralls";
        description = "Coveralls.io support for Haskell.";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "hpc-coveralls" = callPackage
+    ({ mkDerivation, aeson, async, base, bytestring, Cabal, cmdargs
+     , containers, curl, directory, directory-tree, hpc, HUnit, process
+     , pureMD5, regex-posix, retry, safe, split, transformers
+     }:
+     mkDerivation {
+       pname = "hpc-coveralls";
+       version = "1.0.6";
+       sha256 = "e58739ab2c0db02770911927aa534e04c808b38f11b39b646c14b0cab802cf84";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         aeson base bytestring Cabal cmdargs containers curl directory
+         directory-tree hpc process pureMD5 retry safe split transformers
+       ];
+       executableHaskellDepends = [
+         aeson async base bytestring Cabal cmdargs containers curl directory
+         directory-tree hpc process pureMD5 regex-posix retry safe split
+         transformers
+       ];
+       testHaskellDepends = [ base HUnit ];
+       homepage = "https://github.com/guillaume-nargeot/hpc-coveralls";
+       description = "Coveralls.io support for Haskell.";
+       license = stdenv.lib.licenses.bsd3;
      }) {};
 
   "hpc-strobe" = callPackage
@@ -89595,6 +90029,35 @@ self: {
        hydraPlatforms = [ "x86_64-darwin" ];
      }) {};
 
+  "hquantlib_0_0_3_1" = callPackage
+    ({ mkDerivation, base, containers, HerbiePlugin, hmatrix
+     , hmatrix-gsl, hmatrix-special, HUnit, mersenne-random, parallel
+     , QuickCheck, statistics, test-framework, test-framework-hunit
+     , test-framework-quickcheck2, time, vector, vector-algorithms
+     }:
+     mkDerivation {
+       pname = "hquantlib";
+       version = "0.0.3.1";
+       sha256 = "1da4a612d63aceca1ac946d204ee8048732fb82a74ece9df7b8c15f0b17ee0e4";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base containers HerbiePlugin hmatrix hmatrix-gsl hmatrix-special
+         mersenne-random parallel statistics time vector vector-algorithms
+       ];
+       executableHaskellDepends = [
+         base containers mersenne-random parallel
+       ];
+       testHaskellDepends = [
+         base HUnit QuickCheck test-framework test-framework-hunit
+         test-framework-quickcheck2
+       ];
+       homepage = "http://github.com/paulrzcz/hquantlib.git";
+       description = "HQuantLib is a port of essencial parts of QuantLib to Haskell";
+       license = "LGPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "hquery" = callPackage
     ({ mkDerivation, base, bytestring, containers, filepath, HUnit
      , parsec, test-framework, test-framework-hunit, text, xmlhtml
@@ -90806,6 +91269,34 @@ self: {
        license = "GPL";
      }) {};
 
+  "hscaffold" = callPackage
+    ({ mkDerivation, base, directory, exceptions, filepath, hspec, mtl
+     , QuickCheck, regex-compat, temporary, text, transformers, unix
+     }:
+     mkDerivation {
+       pname = "hscaffold";
+       version = "0.4.4.0";
+       sha256 = "f56776610c0a64fe5bf396a3d0d1fff5e2e22ad8996f1f95fa1336d7d25285df";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base directory exceptions filepath mtl regex-compat temporary text
+         transformers unix
+       ];
+       executableHaskellDepends = [
+         base directory exceptions filepath mtl regex-compat temporary text
+         transformers unix
+       ];
+       testHaskellDepends = [
+         base directory exceptions filepath hspec mtl QuickCheck
+         regex-compat temporary text transformers unix
+       ];
+       jailbreak = true;
+       homepage = "https://github.com/yamadapc/hscaffold#readme";
+       description = "Very simple file/directory structure scaffolding writer monad EDSL";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "hscamwire" = callPackage
     ({ mkDerivation, array, base, camwire_1394, dc1394_control, raw1394
      , time, unix
@@ -92223,6 +92714,38 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "hspec-setup_0_2_1_0" = callPackage
+    ({ mkDerivation, ansi-wl-pprint, base, bytestring, cryptohash
+     , directory, directory-tree, filepath, haskell-src-exts, hspec
+     , language-dockerfile, pretty, process, projectroot, QuickCheck
+     , split, strict
+     }:
+     mkDerivation {
+       pname = "hspec-setup";
+       version = "0.2.1.0";
+       sha256 = "abd91c97ca341f3111b318e7a203daf083424b180ba3bd00fc7e5d9ba2c177d0";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         ansi-wl-pprint base directory directory-tree filepath
+         haskell-src-exts pretty process projectroot split strict
+       ];
+       executableHaskellDepends = [
+         ansi-wl-pprint base directory directory-tree filepath
+         haskell-src-exts pretty process projectroot split strict
+       ];
+       testHaskellDepends = [
+         ansi-wl-pprint base bytestring cryptohash directory directory-tree
+         filepath haskell-src-exts hspec language-dockerfile pretty process
+         projectroot QuickCheck split strict
+       ];
+       jailbreak = true;
+       homepage = "https://github.com/yamadapc/haskell-hspec-setup";
+       description = "Add an hspec test-suite in one command";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "hspec-shouldbe" = callPackage
     ({ mkDerivation, hspec, test-shouldbe }:
      mkDerivation {
@@ -94386,7 +94909,7 @@ self: {
        hydraPlatforms = [ "x86_64-darwin" ];
      }) {};
 
-  "http-streams" = callPackage
+  "http-streams_0_8_3_3" = callPackage
     ({ mkDerivation, aeson, aeson-pretty, attoparsec, base
      , base64-bytestring, blaze-builder, bytestring, case-insensitive
      , directory, ghc-prim, HsOpenSSL, hspec, hspec-expectations
@@ -94414,6 +94937,39 @@ self: {
          transformers unordered-containers
        ];
        jailbreak = true;
+       homepage = "http://research.operationaldynamics.com/projects/http-streams/";
+       description = "An HTTP client using io-streams";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "http-streams" = callPackage
+    ({ mkDerivation, aeson, aeson-pretty, attoparsec, base
+     , base64-bytestring, blaze-builder, bytestring, case-insensitive
+     , directory, ghc-prim, HsOpenSSL, hspec, hspec-expectations
+     , http-common, HUnit, io-streams, lifted-base, mtl, network
+     , network-uri, openssl-streams, snap-core, snap-server
+     , system-fileio, system-filepath, text, transformers
+     , unordered-containers
+     }:
+     mkDerivation {
+       pname = "http-streams";
+       version = "0.8.4.0";
+       sha256 = "d8778352ca3d87b7ea6839d9c26e20d89792e723a6b63e399d19e7811aaf4793";
+       libraryHaskellDepends = [
+         aeson attoparsec base base64-bytestring blaze-builder bytestring
+         case-insensitive directory HsOpenSSL http-common io-streams mtl
+         network network-uri openssl-streams text transformers
+         unordered-containers
+       ];
+       testHaskellDepends = [
+         aeson aeson-pretty attoparsec base base64-bytestring blaze-builder
+         bytestring case-insensitive directory ghc-prim HsOpenSSL hspec
+         hspec-expectations http-common HUnit io-streams lifted-base mtl
+         network network-uri openssl-streams snap-core snap-server
+         system-fileio system-filepath text transformers
+         unordered-containers
+       ];
        doCheck = false;
        homepage = "http://research.operationaldynamics.com/projects/http-streams/";
        description = "An HTTP client using io-streams";
@@ -94701,14 +95257,14 @@ self: {
      }) {inherit (pkgs) ruby;};
 
   "huckleberry" = callPackage
-    ({ mkDerivation, base, bytestring, HUnit, mtl, serialport }:
+    ({ mkDerivation, base }:
      mkDerivation {
        pname = "huckleberry";
-       version = "0.9.0.2";
-       sha256 = "70fd7cbe9e41d28f2d8882364646007745ce6b2a64d6369b25fd5a3222eda32d";
-       libraryHaskellDepends = [ base bytestring mtl serialport ];
-       testHaskellDepends = [ base HUnit ];
-       description = "IchigoJam BASIC expressed in Haskell";
+       version = "0.9.1.1";
+       sha256 = "cbb6e78b098a466fdc8b6f90e64f510bd362920c4979d42aeb2bb47f6a258778";
+       libraryHaskellDepends = [ base ];
+       homepage = "https://github.com/mitsuji/huckleberry#readme";
+       description = "Haskell IOT on Intel Edison and other Linux computers";
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
@@ -95702,7 +96258,7 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
-  "hxt-css" = callPackage
+  "hxt-css_0_1_0_2" = callPackage
     ({ mkDerivation, base, hxt, parsec, split }:
      mkDerivation {
        pname = "hxt-css";
@@ -95712,6 +96268,19 @@ self: {
        homepage = "https://github.com/redneb/hxt-css";
        description = "CSS selectors for HXT";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "hxt-css" = callPackage
+    ({ mkDerivation, base, hxt, parsec, split }:
+     mkDerivation {
+       pname = "hxt-css";
+       version = "0.1.0.3";
+       sha256 = "0244fc145d5923df0522ad80949e9b221b01a028c755ebfc4740339881ef65b7";
+       libraryHaskellDepends = [ base hxt parsec split ];
+       homepage = "https://github.com/redneb/hxt-css";
+       description = "CSS selectors for HXT";
+       license = stdenv.lib.licenses.bsd3;
      }) {};
 
   "hxt-curl" = callPackage
@@ -96549,19 +97118,20 @@ self: {
      }) {};
 
   "i18n" = callPackage
-    ({ mkDerivation, array, base, containers, directory, filepath, mtl
-     , old-locale, old-time, parsec, utf8-string
+    ({ mkDerivation, base, containers, directory, filepath, hspec, mtl
+     , parsec, tasty, tasty-hspec, text, transformers
      }:
      mkDerivation {
        pname = "i18n";
-       version = "0.3";
-       sha256 = "37e012104ab07255ae4f45490af8795d743e24857e83c38dd1dddaf0984a3f50";
-       revision = "1";
-       editedCabalFile = "d439935bdde42851690657019ef6fe3a9869299d918ed04db2e6752614608d36";
+       version = "0.4.0.0";
+       sha256 = "7e0df375883fb3428b0cd20aac1163ea38de80fd3499ec3007979b36fe2f93fa";
        libraryHaskellDepends = [
-         array base containers directory filepath mtl old-locale old-time
-         parsec utf8-string
+         base containers directory filepath mtl parsec text transformers
        ];
+       testHaskellDepends = [
+         base containers hspec tasty tasty-hspec text
+       ];
+       homepage = "https://github.com/filib/i18n";
        description = "Internationalization for Haskell";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = [ "x86_64-darwin" ];
@@ -98059,8 +98629,8 @@ self: {
     ({ mkDerivation, base }:
      mkDerivation {
        pname = "inchworm";
-       version = "1.0.0.1";
-       sha256 = "40449b0515ab4ae191879cb951947ab5f44aed5d9c067beee5fb825f07318645";
+       version = "1.0.2.1";
+       sha256 = "ec3b3d9035dffb6fa9f062a54273b1eb68556b6d5ac23c3e262acad0b34ddda5";
        libraryHaskellDepends = [ base ];
        homepage = "https://github.com/DDCSF/inchworm";
        description = "Inchworm Lexer Framework";
@@ -99364,6 +99934,20 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "interval" = callPackage
+    ({ mkDerivation, base, deepseq, fingertree, tasty, tasty-hunit }:
+     mkDerivation {
+       pname = "interval";
+       version = "1.20160821";
+       sha256 = "773ef5d0296c8639d4aa47dad4bdbdec7a28dd476765f133fc8dd629293acadd";
+       revision = "1";
+       editedCabalFile = "fa0c92596237e63a8804b9a208bc185945100d0932e8481348990f1c16d586a8";
+       libraryHaskellDepends = [ base deepseq fingertree ];
+       testHaskellDepends = [ base tasty tasty-hunit ];
+       description = "Intervals with adherences";
+       license = stdenv.lib.licenses.gpl3;
+     }) {};
+
   "intervals" = callPackage
     ({ mkDerivation, array, base, distributive, ghc-prim }:
      mkDerivation {
@@ -100005,8 +100589,8 @@ self: {
      }:
      mkDerivation {
        pname = "irc-client";
-       version = "0.4.2.2";
-       sha256 = "adde49f71e32f9c89c7b4ec307efc1b70556ab8c04864a091ce2d05ad105ab27";
+       version = "0.4.3.0";
+       sha256 = "e40fb8d41b6230a01820deed60e43fea525554cd900e9be3582a6371d69c2676";
        libraryHaskellDepends = [
          base bytestring conduit irc-conduit irc-ctcp old-locale stm
          stm-conduit text time transformers
@@ -100073,6 +100657,8 @@ self: {
        pname = "irc-core";
        version = "2.1.0.0";
        sha256 = "e1dcd6a967bd866d56df30b29fcdeb97b11d9608419e1886288e45a29a2e799d";
+       revision = "1";
+       editedCabalFile = "81dda1142ca0a847629278e19cb1535c3073e9f4755aac347f088d4eb2c6dc60";
        libraryHaskellDepends = [
          attoparsec base bytestring hashable lens memory primitive text time
          vector
@@ -100094,7 +100680,7 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
-  "irc-dcc" = callPackage
+  "irc-dcc_1_2_1" = callPackage
     ({ mkDerivation, attoparsec, base, binary, bytestring, errors
      , hspec-attoparsec, io-streams, iproute, irc-ctcp, network, path
      , tasty, tasty-hspec, transformers, utf8-string
@@ -100116,6 +100702,30 @@ self: {
        homepage = "https://github.com/JanGe/irc-dcc";
        description = "A DCC message parsing and helper library for IRC clients";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "irc-dcc" = callPackage
+    ({ mkDerivation, attoparsec, base, binary, bytestring, errors
+     , hspec-attoparsec, io-streams, iproute, irc-ctcp, mtl, network
+     , path, safe-exceptions, tasty, tasty-hspec, tasty-quickcheck
+     , transformers, utf8-string
+     }:
+     mkDerivation {
+       pname = "irc-dcc";
+       version = "2.0.0";
+       sha256 = "af21bb0929ead7439e0d45ce4db1c35799949d91c8dd8f25f048826498483115";
+       libraryHaskellDepends = [
+         attoparsec base binary bytestring errors io-streams iproute
+         irc-ctcp mtl network path safe-exceptions transformers utf8-string
+       ];
+       testHaskellDepends = [
+         base bytestring hspec-attoparsec iproute network path tasty
+         tasty-hspec tasty-quickcheck utf8-string
+       ];
+       homepage = "https://github.com/JanGe/irc-dcc";
+       description = "A DCC message parsing and helper library for IRC clients";
+       license = stdenv.lib.licenses.mit;
      }) {};
 
   "irc-fun-bot" = callPackage
@@ -102333,8 +102943,8 @@ self: {
        pname = "json-schema";
        version = "0.7.4.1";
        sha256 = "560d6a17d6eab734f43d329e51967e3ed62f8df2a6fea4a92d06359fe77d7c96";
-       revision = "4";
-       editedCabalFile = "686610295b3967be97f3b6e433b76b331c203f9058cc05b6bcd907ddecdb8d00";
+       revision = "5";
+       editedCabalFile = "ec1615227a46ff11cc6dca76df0564ace2a8ff8069e9c84cea0064cd908d0eb3";
        libraryHaskellDepends = [
          aeson base containers generic-aeson generic-deriving mtl scientific
          text time unordered-containers vector
@@ -103137,32 +103747,29 @@ self: {
 
   "kawaii" = callPackage
     ({ mkDerivation, base, bytestring, containers, data-default, hakyll
-     , hakyll-serve, hspec, lens, lifted-base, monad-control
-     , monad-logger, mtl, optparse-applicative, QuickCheck, safe
-     , streaming-commons, text, wai, wai-app-static, wai-extra, warp
-     , warp-tls
+     , hspec, lens, lifted-base, monad-control, monad-logger, mtl
+     , optparse-applicative, QuickCheck, safe, streaming-commons, text
+     , wai, wai-app-static, wai-extra, warp, warp-tls
      }:
      mkDerivation {
        pname = "kawaii";
-       version = "0.0.1.0";
-       sha256 = "93901fdb028401d96461ff75fad794933bedc090f7cab7947d878ec36fe90228";
+       version = "0.0.1.1";
+       sha256 = "9b7e66ffbb281d4cf4cab30a9b4aed4c7593875bb637f192a629fce3595f42c0";
        libraryHaskellDepends = [
          base bytestring containers data-default hakyll lens lifted-base
          monad-control monad-logger mtl optparse-applicative safe
          streaming-commons text wai wai-app-static wai-extra warp warp-tls
        ];
        testHaskellDepends = [
-         base bytestring containers data-default hakyll hakyll-serve hspec
-         lens lifted-base monad-control monad-logger mtl
-         optparse-applicative QuickCheck safe streaming-commons text wai
-         wai-app-static wai-extra warp warp-tls
+         base bytestring containers data-default hakyll hspec lens
+         lifted-base monad-control monad-logger mtl optparse-applicative
+         QuickCheck safe streaming-commons text wai wai-app-static wai-extra
+         warp warp-tls
        ];
-       jailbreak = true;
        homepage = "https://phabricator.chromabits.com/diffusion/KWAI/";
        description = "Utilities for serving static sites and blogs with Wai/Warp";
        license = stdenv.lib.licenses.asl20;
-       broken = true;
-     }) {hakyll-serve = null;};
+     }) {};
 
   "kawhi" = callPackage
     ({ mkDerivation, aeson, base, bytestring, exceptions, http-client
@@ -103838,6 +104445,31 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "keysafe" = callPackage
+    ({ mkDerivation, argon2, base, binary, bytestring, containers
+     , deepseq, dice-entropy-conduit, directory, filepath, finite-field
+     , optparse-applicative, polynomial, process, raaz, random, readline
+     , split, text, time, unix, utf8-string, vector, zxcvbn-c
+     }:
+     mkDerivation {
+       pname = "keysafe";
+       version = "0.20160819";
+       sha256 = "cd6909e3cbbcd8e144ebc8fb75b2fa4068ad6d4330d4ba6d5cf7e81529020704";
+       isLibrary = false;
+       isExecutable = true;
+       executableHaskellDepends = [
+         base binary bytestring containers deepseq dice-entropy-conduit
+         directory filepath finite-field optparse-applicative polynomial
+         process raaz random readline split text time unix utf8-string
+         vector zxcvbn-c
+       ];
+       executableSystemDepends = [ argon2 ];
+       jailbreak = true;
+       homepage = "https://joeyh.name/code/keysafe/";
+       description = "back up a secret key securely to the cloud";
+       license = stdenv.lib.licenses.agpl3;
+     }) {argon2 = null;};
+
   "keystore" = callPackage
     ({ mkDerivation, aeson, aeson-pretty, ansi-wl-pprint, api-tools
      , asn1-encoding, asn1-types, base, base64-bytestring, byteable
@@ -104509,6 +105141,23 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "lackey_0_4_0" = callPackage
+    ({ mkDerivation, base, servant, servant-foreign, tasty, tasty-hspec
+     , text
+     }:
+     mkDerivation {
+       pname = "lackey";
+       version = "0.4.0";
+       sha256 = "34fa0c06eac9c6039aa704e7f64bfd0ed058e36088bef338459b4118e21a7fbb";
+       libraryHaskellDepends = [ base servant servant-foreign text ];
+       testHaskellDepends = [ base servant tasty tasty-hspec text ];
+       jailbreak = true;
+       homepage = "https://github.com/tfausak/lackey#readme";
+       description = "Generate Ruby clients from Servant APIs";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "lagrangian" = callPackage
     ({ mkDerivation, ad, base, hmatrix, HUnit, nonlinear-optimization
      , test-framework, test-framework-hunit, test-framework-quickcheck2
@@ -105471,32 +106120,6 @@ self: {
      }:
      mkDerivation {
        pname = "language-dockerfile";
-       version = "0.3.3.0";
-       sha256 = "70850bdf6d00a40160a3203de2d94fd45e4b51edd2b8284952286a26adf49afc";
-       libraryHaskellDepends = [
-         base bytestring free mtl parsec pretty ShellCheck split
-         template-haskell th-lift th-lift-instances transformers
-       ];
-       testHaskellDepends = [
-         base bytestring directory filepath free Glob hspec HUnit mtl parsec
-         pretty process QuickCheck ShellCheck split template-haskell
-         test-framework test-framework-hunit th-lift th-lift-instances
-         transformers
-       ];
-       doCheck = false;
-       homepage = "https://github.com/beijaflor-io/language-dockerfile#readme";
-       description = "Dockerfile linter, parser, pretty-printer and embedded DSL";
-       license = stdenv.lib.licenses.gpl3;
-     }) {};
-
-  "language-dockerfile_0_3_4_0" = callPackage
-    ({ mkDerivation, base, bytestring, directory, filepath, free, Glob
-     , hspec, HUnit, mtl, parsec, pretty, process, QuickCheck
-     , ShellCheck, split, template-haskell, test-framework
-     , test-framework-hunit, th-lift, th-lift-instances, transformers
-     }:
-     mkDerivation {
-       pname = "language-dockerfile";
        version = "0.3.4.0";
        sha256 = "94e6996d5e56b6fb73f967e09d47d1aa2dc5a8e31ce991f27b49f28a3d8953d0";
        libraryHaskellDepends = [
@@ -105509,10 +106132,10 @@ self: {
          test-framework test-framework-hunit th-lift th-lift-instances
          transformers
        ];
+       doCheck = false;
        homepage = "https://github.com/beijaflor-io/language-dockerfile#readme";
        description = "Dockerfile linter, parser, pretty-printer and embedded DSL";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "language-dot" = callPackage
@@ -105977,7 +106600,6 @@ self: {
        homepage = "http://lpuppet.banquise.net/";
        description = "Tools to parse and evaluate the Puppet DSL";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "language-puppet_1_3" = callPackage
@@ -109965,15 +110587,33 @@ self: {
     ({ mkDerivation, base, enumset, llvm }:
      mkDerivation {
        pname = "llvm-ffi";
-       version = "3.5.1";
-       sha256 = "17f5ede28961ab5dddff7643a3c4bc82b5f68fc47f4671f758a85840c606d7a4";
+       version = "3.7.0";
+       sha256 = "1d9f2ef4df9d031422b0ad887bcb3bbea041f61e8b105a583e6496168cea83f7";
        libraryHaskellDepends = [ base enumset ];
        libraryPkgconfigDepends = [ llvm ];
        homepage = "http://haskell.org/haskellwiki/LLVM";
        description = "FFI bindings to the LLVM compiler toolkit";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) {inherit (self.llvmPackages) llvm;};
+     }) {"llvm" = null;};
+
+  "llvm-ffi-tools" = callPackage
+    ({ mkDerivation, base, bytestring, containers, regex-posix
+     , utility-ht
+     }:
+     mkDerivation {
+       pname = "llvm-ffi-tools";
+       version = "0.0";
+       sha256 = "fd8042f38772b64f0a0b6df48c92e5ff46546a57252e5e9234b7b3fb9d518ea2";
+       isLibrary = false;
+       isExecutable = true;
+       executableHaskellDepends = [
+         base bytestring containers regex-posix utility-ht
+       ];
+       homepage = "http://haskell.org/haskellwiki/LLVM";
+       description = "Tools for maintaining the llvm-ffi package";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
 
   "llvm-general" = callPackage
     ({ mkDerivation, array, base, bytestring, containers, HUnit
@@ -110075,14 +110715,13 @@ self: {
      }:
      mkDerivation {
        pname = "llvm-pkg-config";
-       version = "0.0.0.1";
-       sha256 = "557be5a87569fe41ce009e4ed8ad49d4ab3f0c5cdf3239ce9dc8313790892f0a";
+       version = "0.0.1";
+       sha256 = "3913c3214ee56bf5bdd6b0a721eed7fd49f335374f32f7f4ed7670ab549bddfa";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
          base Cabal explicit-exception process transformers utility-ht
        ];
-       jailbreak = true;
        description = "Generate Pkg-Config configuration file for LLVM";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -110125,18 +110764,19 @@ self: {
      }) {};
 
   "llvm-tf" = callPackage
-    ({ mkDerivation, base, containers, fixed-length, llvm-ffi
+    ({ mkDerivation, base, containers, enumset, fixed-length, llvm-ffi
      , non-empty, process, storable-record, tfp, transformers
      , utility-ht
      }:
      mkDerivation {
        pname = "llvm-tf";
-       version = "3.0.3.2";
-       sha256 = "d2ddc2b15e48a241f43ff220d453839750c9c462f523b941c22fcff35ba3a02f";
+       version = "3.0.3.3";
+       sha256 = "865822db0079228ac904fd5bf7074ad2433f353c3c87eb0fff3b38f42b812e30";
        libraryHaskellDepends = [
-         base containers fixed-length llvm-ffi non-empty process
+         base containers enumset fixed-length llvm-ffi non-empty process
          storable-record tfp transformers utility-ht
        ];
+       jailbreak = true;
        description = "Bindings to the LLVM compiler toolkit using type families";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -110872,6 +111512,51 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "lol-calculus" = callPackage
+    ({ mkDerivation, base, containers, directory, filepath, haskeline
+     , mtl, parsec, text, text-format, transformers
+     }:
+     mkDerivation {
+       pname = "lol-calculus";
+       version = "1.20160822";
+       sha256 = "06bda58d895274d2786d1b20fe5903d2788d5735903c6c0db4ab8f447ddf60af";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base containers parsec text text-format transformers
+       ];
+       executableHaskellDepends = [
+         base containers directory filepath haskeline mtl parsec text
+         text-format transformers
+       ];
+       description = "Calculus for LOL (λω language)";
+       license = stdenv.lib.licenses.gpl3;
+     }) {};
+
+  "lol-typing" = callPackage
+    ({ mkDerivation, base, Cabal, containers, directory, filepath
+     , ghc-prim, lol-calculus, monad-classes, parsec, tasty, tasty-hunit
+     , text, text-format, transformers, uuagc, uuagc-cabal
+     }:
+     mkDerivation {
+       pname = "lol-typing";
+       version = "1.20160822";
+       sha256 = "23dc43a7cc9a742da3c335b4b68118b46e9d9afc868ac929f077cdbb35e1538b";
+       setupHaskellDepends = [ base Cabal uuagc uuagc-cabal ];
+       libraryHaskellDepends = [
+         base containers ghc-prim lol-calculus monad-classes parsec text
+         text-format transformers uuagc uuagc-cabal
+       ];
+       testHaskellDepends = [
+         base containers directory filepath ghc-prim lol-calculus
+         monad-classes tasty tasty-hunit text text-format transformers
+       ];
+       jailbreak = true;
+       homepage = "http://pad.autogeree.net/informatique/lol/";
+       description = "Type inferencer for LOL (λω language)";
+       license = stdenv.lib.licenses.gpl3;
+     }) {};
+
   "loli" = callPackage
     ({ mkDerivation, base, bytestring, containers, data-default, hack
      , hack-contrib, mps, mtl, template, utf8-string
@@ -111121,11 +111806,9 @@ self: {
          polynomials-bernstein process reflection text typography-geometry
          vector
        ];
-       jailbreak = true;
        description = "An EDSL for diagrams based based on linear constraints";
        license = stdenv.lib.licenses.agpl3;
-       broken = true;
-     }) {gasp = null;};
+     }) {};
 
   "lp-diagrams-svg" = callPackage
     ({ mkDerivation, base, containers, FontyFruity, gasp, JuicyPixels
@@ -111140,11 +111823,9 @@ self: {
          base containers FontyFruity gasp JuicyPixels lens linear
          lp-diagrams lucid-svg mtl optparse-applicative svg-tree text vector
        ];
-       jailbreak = true;
        description = "SVG Backend for lp-diagrams";
        license = "GPL";
-       broken = true;
-     }) {gasp = null;};
+     }) {};
 
   "lrucache" = callPackage
     ({ mkDerivation, base, containers, contravariant }:
@@ -111321,8 +112002,8 @@ self: {
      }:
      mkDerivation {
        pname = "ltiv1p1";
-       version = "1.0.0.1";
-       sha256 = "76a0bb0a2206225007a9cbf9524518e5a64b15f17d8ca0c9552a5a4908926e7d";
+       version = "1.0.0.2";
+       sha256 = "d51a7723a205b344b15a153de8baf463d31c23275891691613b13fe2dc9de24c";
        libraryHaskellDepends = [
          authenticate-oauth base blaze-builder bytestring containers
          data-default http-client http-types random text time transformers
@@ -113347,8 +114028,8 @@ self: {
      }:
      mkDerivation {
        pname = "mars";
-       version = "0.1.0.0";
-       sha256 = "3154d125ab96dcb6fc23685ca35483d622e8e6ff02e5564df570eb3cfed80ae9";
+       version = "0.2.0.0";
+       sha256 = "070993003d162fa6e76cf38a0976fa821a3072cf792a0415759f89003209fa96";
        libraryHaskellDepends = [
          array base bytestring colour gloss MonadRandom mtl random
        ];
@@ -114530,7 +115211,7 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "mersenne-random-pure64" = callPackage
+  "mersenne-random-pure64_0_2_0_5" = callPackage
     ({ mkDerivation, base, old-time, random }:
      mkDerivation {
        pname = "mersenne-random-pure64";
@@ -114540,6 +115221,19 @@ self: {
        homepage = "http://code.haskell.org/~dons/code/mersenne-random-pure64/";
        description = "Generate high quality pseudorandom numbers purely using a Mersenne Twister";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "mersenne-random-pure64" = callPackage
+    ({ mkDerivation, base, random, time }:
+     mkDerivation {
+       pname = "mersenne-random-pure64";
+       version = "0.2.1.0";
+       sha256 = "0f2b3eb57e53e3057598bb0c026f16143dbc73b1237bc45d69a9a9ec64f6904f";
+       libraryHaskellDepends = [ base random time ];
+       homepage = "http://code.haskell.org/~dons/code/mersenne-random-pure64/";
+       description = "Generate high quality pseudorandom numbers purely using a Mersenne Twister";
+       license = stdenv.lib.licenses.bsd3;
      }) {};
 
   "messagepack" = callPackage
@@ -116407,6 +117101,24 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "mollie-api-haskell" = callPackage
+    ({ mkDerivation, aeson, base, bytestring, HsOpenSSL, http-client
+     , http-client-openssl, http-types, mtl, text, time
+     }:
+     mkDerivation {
+       pname = "mollie-api-haskell";
+       version = "0.1.0.1";
+       sha256 = "a23421f8c7a8c3ed21f8742a8ec5072c7381e4d3e65c3c4ebf30e5fa7e2f5a20";
+       libraryHaskellDepends = [
+         aeson base bytestring HsOpenSSL http-client http-client-openssl
+         http-types mtl text time
+       ];
+       testHaskellDepends = [ base ];
+       homepage = "https://github.com/paramanders/mollie-api-haskell";
+       description = "Mollie API client for Haskell http://www.mollie.com";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "monad-abort-fd" = callPackage
     ({ mkDerivation, base, monad-control, mtl, transformers
      , transformers-abort, transformers-base
@@ -118160,7 +118872,7 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "morte" = callPackage
+  "morte_1_6_1" = callPackage
     ({ mkDerivation, alex, array, base, binary, containers, deepseq
      , Earley, http-client, http-client-tls, microlens, microlens-mtl
      , mtl, optparse-applicative, pipes, QuickCheck, system-fileio
@@ -118186,6 +118898,65 @@ self: {
        ];
        description = "A bare-bones calculus of constructions";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "morte" = callPackage
+    ({ mkDerivation, alex, array, base, binary, containers, deepseq
+     , Earley, http-client, http-client-tls, microlens, microlens-mtl
+     , mtl, optparse-applicative, pipes, QuickCheck, system-fileio
+     , system-filepath, tasty, tasty-hunit, tasty-quickcheck, text
+     , text-format, transformers
+     }:
+     mkDerivation {
+       pname = "morte";
+       version = "1.6.2";
+       sha256 = "277ba41cc40236a8a02dd154d29108ddc9d8ca7706daa5fe3177189487363b5a";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         array base binary containers deepseq Earley http-client
+         http-client-tls microlens microlens-mtl pipes system-fileio
+         system-filepath text text-format transformers
+       ];
+       libraryToolDepends = [ alex ];
+       executableHaskellDepends = [ base optparse-applicative text ];
+       testHaskellDepends = [
+         base mtl QuickCheck system-filepath tasty tasty-hunit
+         tasty-quickcheck text transformers
+       ];
+       description = "A bare-bones calculus of constructions";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
+  "morte_1_6_4" = callPackage
+    ({ mkDerivation, alex, array, base, binary, containers, deepseq
+     , Earley, http-client, http-client-tls, microlens, microlens-mtl
+     , mtl, optparse-applicative, pipes, QuickCheck, system-fileio
+     , system-filepath, tasty, tasty-hunit, tasty-quickcheck, text
+     , text-format, transformers
+     }:
+     mkDerivation {
+       pname = "morte";
+       version = "1.6.4";
+       sha256 = "8066f8a4092d3fee6fc67bb361bee0a71dc59f9bb38bb81e4d85d9f799076598";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         array base binary containers deepseq Earley http-client
+         http-client-tls microlens microlens-mtl pipes system-fileio
+         system-filepath text text-format transformers
+       ];
+       libraryToolDepends = [ alex ];
+       executableHaskellDepends = [ base optparse-applicative text ];
+       testHaskellDepends = [
+         base mtl QuickCheck system-filepath tasty tasty-hunit
+         tasty-quickcheck text transformers
+       ];
+       jailbreak = true;
+       description = "A bare-bones calculus of constructions";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "mosaico-lib" = callPackage
@@ -120031,27 +120802,30 @@ self: {
 
   "mysql-haskell" = callPackage
     ({ mkDerivation, base, binary, blaze-textual, bytestring
-     , bytestring-lexing, cryptonite, io-streams, memory, monad-loops
-     , network, scientific, tasty, tasty-hunit, tcp-streams, text, time
-     , tls, transformers, wire-streams, word24
+     , bytestring-lexing, cryptonite, HsOpenSSL, io-streams, memory
+     , monad-loops, network, openssl, optparse-applicative, scientific
+     , tasty, tasty-hunit, tcp-streams, text, time, tls, wire-streams
+     , word24
      }:
      mkDerivation {
        pname = "mysql-haskell";
-       version = "0.1.0.0";
-       sha256 = "3367dd2735ee81268d6c02da7a9588374258f8ec9eb860f71d74ead2ccd2b735";
+       version = "0.4.0.0";
+       sha256 = "44cdd2fa3e897cd90667a60d63e408beca0acfcf83be134a49236db6ee809914";
        libraryHaskellDepends = [
          base binary blaze-textual bytestring bytestring-lexing cryptonite
-         io-streams memory monad-loops network scientific tcp-streams text
-         time tls transformers wire-streams word24
+         HsOpenSSL io-streams memory monad-loops network scientific
+         tcp-streams text time tls wire-streams word24
        ];
+       librarySystemDepends = [ openssl ];
        testHaskellDepends = [
-         base bytestring io-streams tasty tasty-hunit text time
+         base bytestring io-streams optparse-applicative tasty tasty-hunit
+         text time
        ];
        jailbreak = true;
        homepage = "https://github.com/winterland1989/mysql-haskell";
        description = "pure haskell MySQL driver";
        license = stdenv.lib.licenses.bsd3;
-     }) {};
+     }) {inherit (pkgs) openssl;};
 
   "mysql-simple" = callPackage
     ({ mkDerivation, attoparsec, base, base16-bytestring, blaze-builder
@@ -121052,8 +121826,8 @@ self: {
      }:
      mkDerivation {
        pname = "nested-routes";
-       version = "7.2.0";
-       sha256 = "a9d15f4f1c98add0f91ec50102d088bf24e27b7a58a3d9984feb71ed58bea037";
+       version = "7.2.1";
+       sha256 = "f2a813bccfb40ea242c2787ee85ab02fed43a2a7d2644509066c66fc939472ed";
        libraryHaskellDepends = [
          attoparsec base bytestring composition-extra errors exceptions
          hashable hashtables mtl poly-arity pred-set pred-trie regex-compat
@@ -124003,20 +124777,22 @@ self: {
 
   "octane" = callPackage
     ({ mkDerivation, aeson, base, bimap, binary, binary-bits
-     , bytestring, containers, data-binary-ieee754, deepseq, doctest
-     , file-embed, http-client, http-client-tls, regex-compat, tasty
-     , tasty-hspec, text, unordered-containers, vector
+     , bytestring, containers, data-binary-ieee754, data-default-class
+     , deepseq, doctest, file-embed, http-client, http-client-tls
+     , overloaded-records, regex-compat, tasty, tasty-hspec, text
+     , unordered-containers, vector
      }:
      mkDerivation {
        pname = "octane";
-       version = "0.13.4";
-       sha256 = "ac1e3afab893ae0cf5c134640b6b825a833a6fc6226e8f607be1ff53203a2005";
+       version = "0.14.0";
+       sha256 = "4e51bd02cfe07791d0fc413c26ace571b945ba8d49c14f4ad4355ca791162d3c";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
          aeson base bimap binary binary-bits bytestring containers
-         data-binary-ieee754 deepseq file-embed http-client http-client-tls
-         regex-compat text unordered-containers vector
+         data-binary-ieee754 data-default-class deepseq file-embed
+         http-client http-client-tls overloaded-records regex-compat text
+         unordered-containers vector
        ];
        executableHaskellDepends = [ base ];
        testHaskellDepends = [ base doctest tasty tasty-hspec ];
@@ -124347,6 +125123,25 @@ self: {
        hydraPlatforms = [ "x86_64-darwin" ];
      }) {};
 
+  "ombra" = callPackage
+    ({ mkDerivation, base, gl, hashable, hashtables, transformers
+     , unordered-containers, vect, vector
+     }:
+     mkDerivation {
+       pname = "ombra";
+       version = "0.1.0.0";
+       sha256 = "2d89e1b8630c71973aa69c2aa8ea7c52367705f4661d37b8f68528c9377def93";
+       revision = "1";
+       editedCabalFile = "ce10c9b1257110bbfec5edbd403abe27e43dfa7a7cdf7d62890530a5ace21376";
+       libraryHaskellDepends = [
+         base gl hashable hashtables transformers unordered-containers vect
+         vector
+       ];
+       homepage = "https://github.com/ziocroc/Ombra";
+       description = "Render engine";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "omega" = callPackage
     ({ mkDerivation, array, base, containers, directory, filepath
      , pretty, time
@@ -125721,6 +126516,23 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "optparse-generic_1_1_3" = callPackage
+    ({ mkDerivation, base, bytestring, optparse-applicative
+     , system-filepath, text, time, transformers, void
+     }:
+     mkDerivation {
+       pname = "optparse-generic";
+       version = "1.1.3";
+       sha256 = "aa999234f55296f2c82a05f2ba9e7e418065ae60c826569e6590f021be7321a0";
+       libraryHaskellDepends = [
+         base bytestring optparse-applicative system-filepath text time
+         transformers void
+       ];
+       description = "Auto-generate a command-line parser for your datatype";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "optparse-helper" = callPackage
     ({ mkDerivation, base, optparse-applicative }:
      mkDerivation {
@@ -126803,13 +127615,13 @@ self: {
   "pandoc-crossref" = callPackage
     ({ mkDerivation, base, bytestring, containers, data-accessor
      , data-accessor-template, data-accessor-transformers, data-default
-     , hspec, mtl, pandoc, pandoc-types, process, roman-numerals, syb
-     , template-haskell, yaml
+     , directory, filepath, hspec, mtl, pandoc, pandoc-types, process
+     , roman-numerals, syb, template-haskell, yaml
      }:
      mkDerivation {
        pname = "pandoc-crossref";
-       version = "0.2.2.1";
-       sha256 = "85da5dff663b578367ed75dcd71d8273a9cd92e8ae4a907ff0b83694d8417abd";
+       version = "0.2.3.0";
+       sha256 = "b6b4200023da4835cf50a2c9a247a837282ccf16e1684336b5a15d17b9ad085e";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -126823,8 +127635,9 @@ self: {
        ];
        testHaskellDepends = [
          base bytestring containers data-accessor data-accessor-template
-         data-accessor-transformers data-default hspec mtl pandoc
-         pandoc-types process roman-numerals syb template-haskell yaml
+         data-accessor-transformers data-default directory filepath hspec
+         mtl pandoc pandoc-types process roman-numerals syb template-haskell
+         yaml
        ];
        description = "Pandoc filter for cross-references";
        license = stdenv.lib.licenses.gpl2;
@@ -126942,7 +127755,7 @@ self: {
        hydraPlatforms = [ "x86_64-darwin" ];
      }) {};
 
-  "pandoc-types" = callPackage
+  "pandoc-types_1_16_1" = callPackage
     ({ mkDerivation, aeson, base, bytestring, containers, deepseq
      , ghc-prim, syb
      }:
@@ -126956,6 +127769,23 @@ self: {
        homepage = "http://johnmacfarlane.net/pandoc";
        description = "Types for representing a structured document";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "pandoc-types" = callPackage
+    ({ mkDerivation, aeson, base, bytestring, containers, deepseq
+     , ghc-prim, syb
+     }:
+     mkDerivation {
+       pname = "pandoc-types";
+       version = "1.16.1.1";
+       sha256 = "f8feb3aef9adc16e7a81d4fd4548e5a142366c59a826272f9b04a9dddbfb9524";
+       libraryHaskellDepends = [
+         aeson base bytestring containers deepseq ghc-prim syb
+       ];
+       homepage = "http://johnmacfarlane.net/pandoc";
+       description = "Types for representing a structured document";
+       license = stdenv.lib.licenses.bsd3;
      }) {};
 
   "pandoc-unlit" = callPackage
@@ -130223,6 +131053,30 @@ self: {
        hydraPlatforms = [ "x86_64-darwin" ];
      }) {};
 
+  "pi-forall" = callPackage
+    ({ mkDerivation, array, base, containers, directory, filepath
+     , HUnit, mtl, parsec, pretty, QuickCheck, transformers
+     , unbound-generics
+     }:
+     mkDerivation {
+       pname = "pi-forall";
+       version = "0.1.1";
+       sha256 = "c3b736d069854ad0d3126fae42cb398dd6c23c4659ffbbd929dd5cc03e76a540";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         array base containers directory filepath HUnit mtl parsec pretty
+         QuickCheck transformers unbound-generics
+       ];
+       executableHaskellDepends = [
+         array base containers directory filepath HUnit mtl parsec pretty
+         QuickCheck transformers unbound-generics
+       ];
+       homepage = "https://github.com/sweirich/pi-forall";
+       description = "Demo implementation of typechecker for dependently-typed language";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "pia-forward" = callPackage
     ({ mkDerivation, aeson, base, bytestring, data-default, directory
      , filepath, http-client, http-client-tls, network-info, process
@@ -130476,8 +131330,8 @@ self: {
      }:
      mkDerivation {
        pname = "pinchot";
-       version = "0.20.0.0";
-       sha256 = "704dcc99baf5cb62836696cdf66d785b7e9d103511a616734329844c1b0e669e";
+       version = "0.22.0.0";
+       sha256 = "248a9e9108d5e12afd4da1aa5bc6bc8d2e732257da318c60bb225844edb88617";
        libraryHaskellDepends = [
          base containers Earley lens ListLike non-empty-sequence pretty-show
          semigroups template-haskell transformers
@@ -131023,7 +131877,7 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "pipes-http" = callPackage
+  "pipes-http_1_0_3" = callPackage
     ({ mkDerivation, base, bytestring, http-client, http-client-tls
      , pipes
      }:
@@ -131036,6 +131890,22 @@ self: {
        ];
        description = "HTTP client with pipes interface";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "pipes-http" = callPackage
+    ({ mkDerivation, base, bytestring, http-client, http-client-tls
+     , pipes
+     }:
+     mkDerivation {
+       pname = "pipes-http";
+       version = "1.0.4";
+       sha256 = "f5cff84b9f415f1a65dbe04837884793fa10b1b52e96b29d52987b820c5a0216";
+       libraryHaskellDepends = [
+         base bytestring http-client http-client-tls pipes
+       ];
+       description = "HTTP client with pipes interface";
+       license = stdenv.lib.licenses.bsd3;
      }) {};
 
   "pipes-illumina" = callPackage
@@ -132376,8 +133246,8 @@ self: {
     ({ mkDerivation, base, containers, hspec, lens, mtl }:
      mkDerivation {
        pname = "polar-shader";
-       version = "0.1.0.4";
-       sha256 = "7f19c299d8e8c1672f6d98a475bfe969feefc8f862c47c39c2088de6ebfe12d4";
+       version = "0.2.0.0";
+       sha256 = "a251680f9d717394cb91e758d51ab8a69889be619325aff378d80b21742867f5";
        libraryHaskellDepends = [ base containers lens mtl ];
        testHaskellDepends = [ base containers hspec ];
        description = "High-level shader compiler for Polar Game Engine";
@@ -133299,6 +134169,7 @@ self: {
          quickcheck-assertions quickcheck-instances tasty tasty-hunit
          tasty-quickcheck tasty-th text time
        ];
+       doCheck = false;
        homepage = "https://bitbucket.org/s9gf4ult/postgresql-query";
        description = "Sql interpolating quasiquote plus some kind of primitive ORM using it";
        license = stdenv.lib.licenses.bsd3;
@@ -133354,23 +134225,23 @@ self: {
 
   "postgresql-simple-bind" = callPackage
     ({ mkDerivation, attoparsec, base, bytestring, case-conversion
-     , heredoc, HUnit, postgresql-simple, template-haskell, text, time
+     , data-default, exceptions, heredoc, hspec, postgresql-simple
+     , template-haskell, text, time
      }:
      mkDerivation {
        pname = "postgresql-simple-bind";
-       version = "0.1.0.0";
-       sha256 = "179b91ff7bc98ba3c818a8b8d181c20d607c198344afc3916abd7cf8fb598371";
+       version = "0.2.0.0";
+       sha256 = "9e9f91c1b8b41ad19ebd01416435007e847560e840f62e4d5187185d051936fb";
        libraryHaskellDepends = [
-         attoparsec base bytestring heredoc postgresql-simple
-         template-haskell text time
+         attoparsec base bytestring data-default exceptions heredoc
+         postgresql-simple template-haskell text time
        ];
        testHaskellDepends = [
-         attoparsec base bytestring case-conversion HUnit postgresql-simple
-         text
+         attoparsec base bytestring case-conversion data-default hspec
+         postgresql-simple text
        ];
-       jailbreak = true;
        description = "A FFI-like bindings for PostgreSQL stored functions";
-       license = stdenv.lib.licenses.gpl3;
+       license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
@@ -133380,8 +134251,8 @@ self: {
      }:
      mkDerivation {
        pname = "postgresql-simple-migration";
-       version = "0.1.5.0";
-       sha256 = "c45e5467c384498dc07ca9e96578ea69781a899f92c53f19fb7024d6d98aa06e";
+       version = "0.1.6.0";
+       sha256 = "f67d4d14970ca4310939238cd1b483a6cd427766384e1b6b4fdf69abd9117e15";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -133393,7 +134264,6 @@ self: {
          postgresql-simple text time
        ];
        testHaskellDepends = [ base bytestring hspec postgresql-simple ];
-       jailbreak = true;
        homepage = "https://github.com/ameingast/postgresql-simple-migration";
        description = "PostgreSQL Schema Migrations";
        license = stdenv.lib.licenses.bsd3;
@@ -133833,6 +134703,18 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "predictive" = callPackage
+    ({ mkDerivation, base, containers }:
+     mkDerivation {
+       pname = "predictive";
+       version = "0.1.0";
+       sha256 = "20aeaca3fde85e13d9421d85377c1560725b968ac5f633a2540fe93ff2a23158";
+       libraryHaskellDepends = [ base containers ];
+       homepage = "https://github.com/esoeylemez/predictive";
+       description = "Predict the future, backtrack on failure";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "prednote" = callPackage
     ({ mkDerivation, base, bytestring, containers, contravariant
      , QuickCheck, rainbow, split, tasty, tasty-quickcheck, tasty-th
@@ -136502,51 +137384,6 @@ self: {
   "purescript" = callPackage
     ({ mkDerivation, aeson, aeson-better-errors, ansi-terminal
      , ansi-wl-pprint, base, base-compat, bower-json, boxes, bytestring
-     , containers, directory, dlist, edit-distance, filepath, fsnotify
-     , Glob, haskeline, hspec, hspec-discover, http-types, HUnit
-     , language-javascript, lifted-base, monad-control, monad-logger
-     , mtl, network, optparse-applicative, parallel, parsec
-     , pattern-arrows, pipes, pipes-http, process, regex-tdfa, safe
-     , semigroups, silently, sourcemap, spdx, split, stm, syb, text
-     , time, transformers, transformers-base, transformers-compat
-     , unordered-containers, utf8-string, vector
-     }:
-     mkDerivation {
-       pname = "purescript";
-       version = "0.9.1";
-       sha256 = "72a4c9148a5d6b6ec2650185be7b8aa6a43a089d73037f870babd0ded9a5d0e7";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         aeson aeson-better-errors ansi-terminal base base-compat bower-json
-         boxes bytestring containers directory dlist edit-distance filepath
-         fsnotify Glob haskeline http-types language-javascript lifted-base
-         monad-control monad-logger mtl parallel parsec pattern-arrows pipes
-         pipes-http process regex-tdfa safe semigroups sourcemap spdx split
-         stm syb text time transformers transformers-base
-         transformers-compat unordered-containers utf8-string vector
-       ];
-       executableHaskellDepends = [
-         aeson ansi-terminal ansi-wl-pprint base base-compat boxes
-         bytestring containers directory filepath Glob haskeline
-         monad-logger mtl network optparse-applicative parsec process split
-         stm text time transformers transformers-compat utf8-string
-       ];
-       testHaskellDepends = [
-         aeson aeson-better-errors base base-compat boxes bytestring
-         containers directory filepath Glob haskeline hspec hspec-discover
-         HUnit mtl optparse-applicative parsec process silently stm text
-         time transformers transformers-compat utf8-string vector
-       ];
-       doCheck = false;
-       homepage = "http://www.purescript.org/";
-       description = "PureScript Programming Language Compiler";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "purescript_0_9_3" = callPackage
-    ({ mkDerivation, aeson, aeson-better-errors, ansi-terminal
-     , ansi-wl-pprint, base, base-compat, bower-json, boxes, bytestring
      , clock, containers, directory, dlist, edit-distance, file-embed
      , filepath, fsnotify, Glob, haskeline, hspec, hspec-discover
      , http-client, http-types, HUnit, language-javascript, lifted-base
@@ -136586,10 +137423,10 @@ self: {
          HUnit mtl optparse-applicative parsec process protolude silently
          stm text time transformers transformers-compat utf8-string vector
        ];
+       doCheck = false;
        homepage = "http://www.purescript.org/";
        description = "PureScript Programming Language Compiler";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "purescript-bridge" = callPackage
@@ -136598,8 +137435,8 @@ self: {
      }:
      mkDerivation {
        pname = "purescript-bridge";
-       version = "0.6.0.2";
-       sha256 = "821c1376f642e7721ce2076726013e18e01cec8dafbe916dad8baaede9f80ed5";
+       version = "0.7.0.0";
+       sha256 = "f80ddb4a613614b775e7636cbb92755a938ffa7b0b6093cfded3d5487bf79e7b";
        libraryHaskellDepends = [
          base containers directory filepath generic-deriving lens mtl text
          transformers
@@ -137226,6 +138063,19 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {qtah = null; inherit (pkgs.qt5) qtbase;};
 
+  "quack" = callPackage
+    ({ mkDerivation, aeson, attoparsec, base, http-types, mtl, text }:
+     mkDerivation {
+       pname = "quack";
+       version = "0.0.0.1";
+       sha256 = "86a7aae649a3c81bea6ccf368a13d75deddf11efd850580e28c92ede55cee8a3";
+       libraryHaskellDepends = [
+         aeson attoparsec base http-types mtl text
+       ];
+       description = "Convenience parser combinators for URI query strings";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "quadratic-irrational" = callPackage
     ({ mkDerivation, arithmoi, base, containers, directory, doctest
      , filepath, mtl, numbers, QuickCheck, tasty, tasty-quickcheck
@@ -137503,8 +138353,8 @@ self: {
      }:
      mkDerivation {
        pname = "quickcheck-arbitrary-adt";
-       version = "0.1.0.0";
-       sha256 = "d28cafb8aadeb8931076e3ba2565e9bcc1bbb51f57d54f301e3b524f83931e80";
+       version = "0.2.0.0";
+       sha256 = "d9998dbfa2785f29164c0bdc345b2ffaed630dd5bfb1bdbaa3b0e13e0724c0db";
        libraryHaskellDepends = [ base QuickCheck ];
        testHaskellDepends = [
          base hspec lens QuickCheck template-haskell transformers
@@ -139087,6 +139937,22 @@ self: {
        hydraPlatforms = [ "x86_64-darwin" ];
      }) {};
 
+  "rdf" = callPackage
+    ({ mkDerivation, attoparsec, base, bytestring, deepseq, dlist, fgl
+     , text, transformers
+     }:
+     mkDerivation {
+       pname = "rdf";
+       version = "0.1.0.0";
+       sha256 = "b18dac5e3a4465a0f24eafb03deb2cdbf9de8deaf7713e565408c52e9fe5b37a";
+       libraryHaskellDepends = [
+         attoparsec base bytestring deepseq dlist fgl text transformers
+       ];
+       homepage = "https://github.com/traviswhitaker/rdf";
+       description = "Representation and Incremental Processing of RDF Data";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "rdf4h" = callPackage
     ({ mkDerivation, base, binary, bytestring, containers, deepseq
      , directory, fgl, hashable, hgal, HTTP, HUnit, hxt, network
@@ -142647,6 +143513,34 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "rest-gen_0_20_0_0" = callPackage
+    ({ mkDerivation, aeson, base, base-compat, blaze-html, Cabal
+     , code-builder, directory, fclabels, filepath, hashable
+     , haskell-src-exts, HStringTemplate, HUnit, hxt, json-schema
+     , pretty, process, rest-core, safe, scientific, semigroups, split
+     , test-framework, test-framework-hunit, text, uniplate
+     , unordered-containers, vector
+     }:
+     mkDerivation {
+       pname = "rest-gen";
+       version = "0.20.0.0";
+       sha256 = "81a9486136f91773371858f9d3e248b80458e7d55aab11f17cc158c3ce68d542";
+       libraryHaskellDepends = [
+         aeson base base-compat blaze-html Cabal code-builder directory
+         fclabels filepath hashable haskell-src-exts HStringTemplate hxt
+         json-schema pretty process rest-core safe scientific semigroups
+         split text uniplate unordered-containers vector
+       ];
+       testHaskellDepends = [
+         base fclabels haskell-src-exts HUnit rest-core test-framework
+         test-framework-hunit
+       ];
+       jailbreak = true;
+       description = "Documentation and client generation from rest definition";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "rest-happstack" = callPackage
     ({ mkDerivation, base, containers, happstack-server, mtl, rest-core
      , rest-gen, utf8-string
@@ -142655,6 +143549,8 @@ self: {
        pname = "rest-happstack";
        version = "0.3.1.1";
        sha256 = "794f06eb2c96b995397e21f4578bd7094a20334f43883e97af81dbe60b394ff6";
+       revision = "1";
+       editedCabalFile = "a8e6fd0f4e8090876b1770ceb55397d9a33f1d7706d52a9781e577fd913f4eac";
        libraryHaskellDepends = [
          base containers happstack-server mtl rest-core rest-gen utf8-string
        ];
@@ -142793,6 +143689,19 @@ self: {
        hydraPlatforms = [ "x86_64-darwin" ];
      }) {};
 
+  "result" = callPackage
+    ({ mkDerivation, base, bifunctors, keys, semigroups }:
+     mkDerivation {
+       pname = "result";
+       version = "0.2.2.0";
+       sha256 = "9807a72c07467c617a27bf5a7c4ebae6e1732cba6a767d934edb9b7435e26e51";
+       libraryHaskellDepends = [ base bifunctors keys semigroups ];
+       testHaskellDepends = [ base ];
+       homepage = "https://github.com/srijs/haskell-result";
+       description = "Encode success or at least one error";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "resumable-exceptions" = callPackage
     ({ mkDerivation, base, mtl }:
      mkDerivation {
@@ -146634,8 +147543,8 @@ self: {
      }:
      mkDerivation {
        pname = "scrape-changes";
-       version = "0.1.0.2";
-       sha256 = "5a5d38ee976fd528167c84bce3bcbbf842a8ac4142a587872f1ac7e60a9e5e5d";
+       version = "0.1.0.3";
+       sha256 = "adc2e84e97cdc4c4cca7012be5be61683e55c4ba2bb539dd2dfe75cda1a3f4e7";
        libraryHaskellDepends = [
          async attoparsec base bytestring cron directory email-validate
          filepath hashable hslogger http-client lens mime-mail network-uri
@@ -146646,7 +147555,6 @@ self: {
          shakespeare test-framework test-framework-hunit
          test-framework-quickcheck2 text validation
        ];
-       jailbreak = true;
        description = "Scrape websites for changes";
        license = stdenv.lib.licenses.gpl3;
      }) {};
@@ -148078,8 +148986,8 @@ self: {
      }:
      mkDerivation {
        pname = "servant-aeson-specs";
-       version = "0.4";
-       sha256 = "7a409bb60daedd077575f5c8f8d300660131c2d5dfed2c4c7b0808d1bf9cb56a";
+       version = "0.4.1";
+       sha256 = "659294fbc3e56202ff886b96f72ea6d3aeb8e6b083e17e9d48e57485ef5eb058";
        libraryHaskellDepends = [
          aeson aeson-pretty base bytestring directory filepath hspec
          QuickCheck random servant
@@ -148089,7 +148997,6 @@ self: {
          hspec-core mockery QuickCheck quickcheck-instances random servant
          silently string-conversions temporary text
        ];
-       jailbreak = true;
        homepage = "https://github.com/plow-technologies/servant-aeson-specs#readme";
        description = "generic tests for aeson serialization in servant";
        license = stdenv.lib.licenses.mit;
@@ -148105,8 +149012,8 @@ self: {
      }:
      mkDerivation {
        pname = "servant-auth-cookie";
-       version = "0.3.0.3";
-       sha256 = "50b7a4e28ccd95169f1eb0159c302ea517c68cf35f57507ea59a2dea8ddc4474";
+       version = "0.3.1";
+       sha256 = "fe4b1fe4948d1368ece446695b406170e5e049f8b7818e8d35c7bd7ffc5c4f1d";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -148565,15 +149472,18 @@ self: {
      }) {};
 
   "servant-matrix-param" = callPackage
-    ({ mkDerivation, base, doctest, hspec, servant, servant-aeson-specs
+    ({ mkDerivation, aeson, base, bytestring, containers, doctest
+     , hspec, http-types, servant, servant-aeson-specs, servant-server
+     , text, transformers, wai, wai-extra
      }:
      mkDerivation {
        pname = "servant-matrix-param";
-       version = "0.1.0.1";
-       sha256 = "eedf69940d621282b42eb3f06474851a4903fdaa29c399f3747426c8474ebeb9";
+       version = "0.2";
+       sha256 = "22e8bc5a2109066c26ec2bca18bd349509cfe8cd35ff7507bd6f2536f9544bd0";
        libraryHaskellDepends = [ base servant ];
        testHaskellDepends = [
-         base doctest hspec servant servant-aeson-specs
+         aeson base bytestring containers doctest hspec http-types servant
+         servant-aeson-specs servant-server text transformers wai wai-extra
        ];
        jailbreak = true;
        description = "Matrix parameter combinator for servant";
@@ -148707,6 +149617,7 @@ self: {
          aeson base containers lens mainland-pretty purescript-bridge
          servant servant-foreign servant-subscriber text
        ];
+       jailbreak = true;
        homepage = "https://github.com/eskimor/servant-purescript#readme";
        description = "Generate PureScript accessor functions for you servant API";
        license = stdenv.lib.licenses.bsd3;
@@ -148912,6 +149823,7 @@ self: {
          wai-websockets warp websockets
        ];
        executableHaskellDepends = [ base purescript-bridge ];
+       jailbreak = true;
        homepage = "http://github.com/eskimor/servant-subscriber#readme";
        description = "When REST is not enough ...";
        license = stdenv.lib.licenses.bsd3;
@@ -148973,23 +149885,26 @@ self: {
     ({ mkDerivation, aeson, base, base-compat, blaze-markup, bytestring
      , directory, file-embed, filepath, http-media, lens, servant
      , servant-blaze, servant-server, servant-swagger, swagger2
-     , template-haskell, text, wai, wai-app-static, warp
+     , template-haskell, text, transformers, transformers-compat, wai
+     , wai-app-static, warp
      }:
      mkDerivation {
        pname = "servant-swagger-ui";
-       version = "0.1.1.2.1.4";
-       sha256 = "45d27f6e92207422937cfc865c9e0a5aa32596282a134a9196f1248fe15496e4";
+       version = "0.2.0.2.1.5";
+       sha256 = "57fa0b9d8a46482051f3e2bcab7c513adec07450b3fb6bb00281758f99922d57";
        libraryHaskellDepends = [
          base blaze-markup bytestring directory file-embed filepath
          http-media servant servant-blaze servant-server servant-swagger
-         swagger2 template-haskell text wai-app-static
+         swagger2 template-haskell text transformers transformers-compat
+         wai-app-static
        ];
        testHaskellDepends = [
          aeson base base-compat blaze-markup bytestring directory file-embed
          filepath http-media lens servant servant-blaze servant-server
-         servant-swagger swagger2 template-haskell text wai wai-app-static
-         warp
+         servant-swagger swagger2 template-haskell text transformers
+         transformers-compat wai wai-app-static warp
        ];
+       doCheck = false;
        homepage = "https://github.com/phadej/servant-swagger-ui#readme";
        description = "Servant swagger ui";
        license = stdenv.lib.licenses.bsd3;
@@ -153203,8 +154118,8 @@ self: {
      }:
      mkDerivation {
        pname = "snap-server";
-       version = "1.0.0.0";
-       sha256 = "dd92414cf5005f548d54ed246c1de92ce47f7f75e1a160ff31a590f9fa50aa61";
+       version = "1.0.1.0";
+       sha256 = "a398b15e90d2d6bc77af3edf6f5926df7863073a4774c71a46c0adb43c837488";
        configureFlags = [ "-fopenssl" ];
        libraryHaskellDepends = [
          attoparsec base blaze-builder bytestring bytestring-builder
@@ -153455,8 +154370,8 @@ self: {
        pname = "snaplet-fay";
        version = "0.3.3.13";
        sha256 = "39810748b7177b45a0fab785e48ac497d81587e48dde9dc8ad75e8d704bdda3f";
-       revision = "2";
-       editedCabalFile = "43c3a484e0e34f13bf2f372850d33b98de9d8057fd33e9d79be0fcc0a5013559";
+       revision = "3";
+       editedCabalFile = "9c0c70fba7d28449f5e2d2aa6612466aac98b4416a63f829adc3012fec9199a2";
        libraryHaskellDepends = [
          aeson base bytestring configurator directory fay filepath mtl snap
          snap-core transformers
@@ -156414,8 +157329,8 @@ self: {
        pname = "stack";
        version = "1.1.2";
        sha256 = "fc836b24fdeac54244fc79b6775d5edee146b7e552ad8e69596c7cc2f2b10625";
-       revision = "7";
-       editedCabalFile = "af269ebe5ac7a096cd4b44af570643c1e48444a4b9eb01dc8f97c8fb53eea55f";
+       revision = "8";
+       editedCabalFile = "0eb7cd69c79c481cd463ccd8e33cc8e03bc79169f084c8f9bf3ef006da7c3a12";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -158613,12 +159528,12 @@ self: {
      }) {};
 
   "strict-data" = callPackage
-    ({ mkDerivation, aeson, base, deepseq, store }:
+    ({ mkDerivation, aeson, base, deepseq }:
      mkDerivation {
        pname = "strict-data";
-       version = "0.1.0.0";
-       sha256 = "b3af392c5efc321a78960624a1f8c32511c5d8ae58822a3b9781ddf20481a6bb";
-       libraryHaskellDepends = [ aeson base deepseq store ];
+       version = "0.1.1.0";
+       sha256 = "d97632137b191064bd377dd0474cf99cf3782065aae6839ea8112c701d8bc3af";
+       libraryHaskellDepends = [ aeson base deepseq ];
        homepage = "https://github.com/agrafix/strict-data#readme";
        description = "Verious useful strict data structures";
        license = stdenv.lib.licenses.bsd3;
@@ -159330,15 +160245,15 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "stylish-haskell_0_6_2_0" = callPackage
+  "stylish-haskell_0_6_3_0" = callPackage
     ({ mkDerivation, aeson, base, bytestring, containers, directory
      , filepath, haskell-src-exts, HUnit, mtl, optparse-applicative
      , strict, syb, test-framework, test-framework-hunit, yaml
      }:
      mkDerivation {
        pname = "stylish-haskell";
-       version = "0.6.2.0";
-       sha256 = "2f4fcef31803e5f671fc65c20c480ebc664d7efb28e757ba4ca27f58811b18ec";
+       version = "0.6.3.0";
+       sha256 = "a285bf678220fa365eec2624192ab36c2f35dd0893d811b7118eff887701bfa2";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -160037,34 +160952,6 @@ self: {
      }:
      mkDerivation {
        pname = "swagger2";
-       version = "2.1.1";
-       sha256 = "f492429ea0f3f48b9bc1c164de17e47509b9192e10b4a53d8c1316e97b366918";
-       libraryHaskellDepends = [
-         aeson base base-compat containers generics-sop hashable http-media
-         insert-ordered-containers lens mtl network scientific
-         template-haskell text time transformers unordered-containers vector
-       ];
-       testHaskellDepends = [
-         aeson aeson-qq base base-compat bytestring containers doctest Glob
-         hashable hspec HUnit insert-ordered-containers lens mtl QuickCheck
-         text time unordered-containers vector
-       ];
-       doHaddock = false;
-       homepage = "https://github.com/GetShopTV/swagger2";
-       description = "Swagger 2.0 data model";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ];
-     }) {};
-
-  "swagger2_2_1_2_1" = callPackage
-    ({ mkDerivation, aeson, aeson-qq, base, base-compat, bytestring
-     , containers, doctest, generics-sop, Glob, hashable, hspec
-     , http-media, HUnit, insert-ordered-containers, lens, mtl, network
-     , QuickCheck, scientific, template-haskell, text, time
-     , transformers, unordered-containers, vector
-     }:
-     mkDerivation {
-       pname = "swagger2";
        version = "2.1.2.1";
        sha256 = "112b053db3cbeeeea9c7b43cb0f07a6ea9f73715ac5883b2eee9c2855c444930";
        libraryHaskellDepends = [
@@ -160077,10 +160964,11 @@ self: {
          hashable hspec HUnit insert-ordered-containers lens mtl QuickCheck
          text time unordered-containers vector
        ];
+       doHaddock = false;
        homepage = "https://github.com/GetShopTV/swagger2";
        description = "Swagger 2.0 data model";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ];
      }) {};
 
   "swapper" = callPackage
@@ -161939,6 +162827,22 @@ self: {
        hydraPlatforms = [ "x86_64-darwin" ];
      }) {clntsh = null; sqlplus = null;};
 
+  "tal" = callPackage
+    ({ mkDerivation, base, containers, mtl, pretty, transformers
+     , unbound
+     }:
+     mkDerivation {
+       pname = "tal";
+       version = "0.1.0.0";
+       sha256 = "365c63031df56be1f876d7ac7ccb9205008dbbefe62df0660b24494737dd5f11";
+       libraryHaskellDepends = [
+         base containers mtl pretty transformers unbound
+       ];
+       homepage = "https://github.com/sweirich/tal";
+       description = "An implementation of Typed Assembly Language (Morrisett, Walker, Crary, Glew)";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "tamarin-prover" = callPackage
     ({ mkDerivation, aeson, array, base, binary, blaze-builder
      , blaze-html, bytestring, cmdargs, conduit, containers, deepseq
@@ -162205,7 +163109,7 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
-  "tasty" = callPackage
+  "tasty_0_11_0_3" = callPackage
     ({ mkDerivation, ansi-terminal, async, base, clock, containers
      , deepseq, mtl, optparse-applicative, regex-tdfa, stm, tagged
      , unbounded-delays
@@ -162223,6 +163127,25 @@ self: {
        homepage = "http://documentup.com/feuerbach/tasty";
        description = "Modern and extensible testing framework";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "tasty" = callPackage
+    ({ mkDerivation, ansi-terminal, async, base, clock, containers
+     , deepseq, mtl, optparse-applicative, regex-tdfa, stm, tagged
+     , unbounded-delays
+     }:
+     mkDerivation {
+       pname = "tasty";
+       version = "0.11.0.4";
+       sha256 = "e0e248d50aaa098b2633d51a1c71f3da569ba5d6c0e77e0e39b6c9b7de97fd16";
+       libraryHaskellDepends = [
+         ansi-terminal async base clock containers deepseq mtl
+         optparse-applicative regex-tdfa stm tagged unbounded-delays
+       ];
+       homepage = "http://documentup.com/feuerbach/tasty";
+       description = "Modern and extensible testing framework";
+       license = stdenv.lib.licenses.mit;
      }) {};
 
   "tasty-ant-xml" = callPackage
@@ -162700,25 +163623,26 @@ self: {
 
   "tcp-streams" = callPackage
     ({ mkDerivation, base, bytestring, data-default-class, HsOpenSSL
-     , HsOpenSSL-x509-system, HUnit, io-streams, network, pem
+     , 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.3.0.0";
-       sha256 = "850582af5b8020aa30b4593b31be2710fbb28624fa440d01d01dda70058d596a";
+       version = "0.4.0.0";
+       sha256 = "e6ada5a4c34cb8653bd03c5db43229f8f954bc0eda60e8169b4fd1c4156a0824";
        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 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;
-     }) {};
+     }) {inherit (pkgs) openssl;};
 
   "tdd-util" = callPackage
     ({ mkDerivation, base, bytestring, HUnit, lens
@@ -164076,8 +165000,8 @@ self: {
     ({ mkDerivation, base, text, text-format, text-show }:
      mkDerivation {
        pname = "text-all";
-       version = "0.3.0.1";
-       sha256 = "2ffe6420dc2793b2e0ff8b108b4fc04fc76ab3cc562b0007c6c134515247004c";
+       version = "0.3.0.2";
+       sha256 = "1874b6d56a4e31e3754be6d7dadcb3f64dbc86fe473063631a4794f27fa13f85";
        libraryHaskellDepends = [ base text text-format text-show ];
        homepage = "http://github.com/aelve/text-all";
        description = "Everything Data.Text related in one package";
@@ -164495,8 +165419,8 @@ self: {
      }:
      mkDerivation {
        pname = "text-show";
-       version = "3.3";
-       sha256 = "a581f42ee24690fd96dd81179b86135e95502b22f2ab41d28f81acfd882d92e6";
+       version = "3.4";
+       sha256 = "ce8a7adcca87617766a4c988808ff41fee20a2c84ac5442d6f3d8c5cec55d7c7";
        libraryHaskellDepends = [
          array base base-compat bifunctors bytestring bytestring-builder
          containers contravariant generic-deriving ghc-boot-th ghc-prim
@@ -164526,8 +165450,8 @@ self: {
      }:
      mkDerivation {
        pname = "text-show-instances";
-       version = "3.3";
-       sha256 = "795d7e22f4ade987293a8b0376ef976822fb7f3383b4e1629566d27c1c4f991c";
+       version = "3.4";
+       sha256 = "bf2e9e4a8ed01481024cce33a611daf52d733527e2ceb2ef2a576cf79ace6322";
        libraryHaskellDepends = [
          base base-compat bifunctors binary bytestring containers directory
          ghc-boot haskeline hoopl hpc old-locale old-time pretty random
@@ -168065,6 +168989,26 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "treemap" = callPackage
+    ({ mkDerivation, base, containers, deepseq, semigroups, strict
+     , tasty, tasty-hunit, text, transformers
+     }:
+     mkDerivation {
+       pname = "treemap";
+       version = "1.20160814";
+       sha256 = "95aa1f68710aaff75bbd71317f61fe6e47c4f20bdaabfb4be05514f6f841f97f";
+       libraryHaskellDepends = [
+         base containers deepseq semigroups strict transformers
+       ];
+       testHaskellDepends = [
+         base containers semigroups strict tasty tasty-hunit text
+         transformers
+       ];
+       jailbreak = true;
+       description = "A tree of Data.Map.";
+       license = stdenv.lib.licenses.gpl3;
+     }) {};
+
   "treemap-html" = callPackage
     ({ mkDerivation, base, Cabal, containers, filepath, ghc, html
      , parsec, regex-posix
@@ -169364,8 +170308,8 @@ self: {
      }:
      mkDerivation {
        pname = "twitter-feed";
-       version = "0.2.0.8";
-       sha256 = "e75182594dbd68219902c9ed7bb2a36addf9a8cdb1f456ec4eafef70b57915c4";
+       version = "0.2.0.9";
+       sha256 = "570e20335adce61cddbdefa8f3f01131e44f266fb1970ccbe65d3716fbe72960";
        libraryHaskellDepends = [
          aeson authenticate-oauth base bytestring http-conduit
        ];
@@ -169864,8 +170808,8 @@ self: {
     ({ mkDerivation, base, ghc-prim }:
      mkDerivation {
        pname = "type-operators";
-       version = "0.1.0.0";
-       sha256 = "1ed1669c0185a6411eeea83034b6b46f366d57341813006992273b3724c5c2a4";
+       version = "0.1.0.3";
+       sha256 = "ea0b994df588b84679171878ebdc420d20dbfef975d263ff48622ab161057dc2";
        libraryHaskellDepends = [ base ghc-prim ];
        homepage = "https://github.com/Shou/type-operators#readme";
        description = "Various type-level operators";
@@ -170664,6 +171608,22 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "unagi-bloomfilter" = callPackage
+    ({ mkDerivation, atomic-primops, base, bytestring, hashabler
+     , primitive
+     }:
+     mkDerivation {
+       pname = "unagi-bloomfilter";
+       version = "0.1.0.0";
+       sha256 = "19b0a1b8c03cc407177c55ec2b00b83c9ed69e043011aa0c0785509cb828cc6b";
+       libraryHaskellDepends = [
+         atomic-primops base bytestring hashabler primitive
+       ];
+       homepage = "http://github.com/jberryman/unagi-bloomfilter";
+       description = "A fast, cache-efficient, concurrent bloom filter";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "unagi-chan" = callPackage
     ({ mkDerivation, atomic-primops, base, containers, ghc-prim
      , primitive
@@ -170718,17 +171678,20 @@ self: {
      }) {};
 
   "unbound" = callPackage
-    ({ mkDerivation, base, binary, containers, mtl, RepLib
-     , transformers
+    ({ mkDerivation, base, binary, containers, mtl, parsec, pretty
+     , QuickCheck, RepLib, template-haskell, transformers
      }:
      mkDerivation {
        pname = "unbound";
-       version = "0.4.4";
-       sha256 = "c6454dd5725bf2a02cc99f74b18fc5b3b1ab9d44dd99d6322e42d8399409eb7e";
+       version = "0.5.0";
+       sha256 = "1290827b7a67d87eaa4dfa8d753e01d98ef0d501ee42da0f9635fdd73b64220e";
        libraryHaskellDepends = [
          base binary containers mtl RepLib transformers
        ];
-       jailbreak = true;
+       testHaskellDepends = [
+         base binary containers mtl parsec pretty QuickCheck RepLib
+         template-haskell transformers
+       ];
        homepage = "https://github.com/sweirich/replib";
        description = "Generic support for programming with names and binders";
        license = stdenv.lib.licenses.bsd3;
@@ -170852,8 +171815,8 @@ self: {
      }:
      mkDerivation {
        pname = "unfoldable";
-       version = "0.8.3";
-       sha256 = "62926d1f12db96468ca2c9c7e55cb63201c62d97c7486ef30a62a910893e2ddd";
+       version = "0.8.4";
+       sha256 = "af86e863625d4ae45820d1942a49de00559e4d4ee25db20610859d0a19cc1683";
        libraryHaskellDepends = [
          base ghc-prim QuickCheck random transformers
        ];
@@ -171938,22 +172901,22 @@ self: {
 
   "unused" = callPackage
     ({ mkDerivation, ansi-terminal, base, bytestring, cassava
-     , containers, directory, filepath, hspec, inflections, megaparsec
-     , mtl, optparse-applicative, parallel-io, process, regex-tdfa
-     , terminal-progress-bar, text, transformers, unix
+     , containers, directory, file-embed, filepath, hspec, inflections
+     , megaparsec, mtl, optparse-applicative, parallel-io, process
+     , regex-tdfa, terminal-progress-bar, text, transformers, unix
      , unordered-containers, vector, yaml
      }:
      mkDerivation {
        pname = "unused";
-       version = "0.6.0.0";
-       sha256 = "ff84730dc03f01e73769abf1a2c0d11b46421a08b13608a4b542b2f9bbdc7f8a";
+       version = "0.6.1.0";
+       sha256 = "763cd92955d6ec154037e10e1332507272d8557abc1b2a2262a354a3c226375f";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
-         ansi-terminal base bytestring cassava containers directory filepath
-         inflections megaparsec mtl parallel-io process regex-tdfa
-         terminal-progress-bar text transformers unix unordered-containers
-         vector yaml
+         ansi-terminal base bytestring cassava containers directory
+         file-embed filepath inflections megaparsec mtl parallel-io process
+         regex-tdfa terminal-progress-bar text transformers unix
+         unordered-containers vector yaml
        ];
        executableHaskellDepends = [
          base mtl optparse-applicative transformers
@@ -172505,7 +173468,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "userid" = callPackage
+  "userid_0_1_2_6" = callPackage
     ({ mkDerivation, aeson, base, boomerang, safecopy, web-routes
      , web-routes-th
      }:
@@ -172522,6 +173485,23 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "userid" = callPackage
+    ({ mkDerivation, aeson, base, boomerang, safecopy, web-routes
+     , web-routes-th
+     }:
+     mkDerivation {
+       pname = "userid";
+       version = "0.1.2.7";
+       sha256 = "9d8a614cf760556f40ab79f7f733161defd5240219bcd23399756c0589f2dc8c";
+       libraryHaskellDepends = [
+         aeson base boomerang safecopy web-routes web-routes-th
+       ];
+       homepage = "http://www.github.com/Happstack/userid";
+       description = "The UserId type and useful instances for web development";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "users" = callPackage
     ({ mkDerivation, aeson, base, bcrypt, path-pieces, text, time }:
      mkDerivation {
@@ -173276,8 +174256,8 @@ self: {
     ({ mkDerivation, base }:
      mkDerivation {
        pname = "validity";
-       version = "0.3.0.1";
-       sha256 = "a70eada6f9a91361cfc13a14c896b272978df57daabbc34b767c18e07d6dcbaa";
+       version = "0.3.0.2";
+       sha256 = "c1d7a91bbcb4c06ebad9149e11f02a1e10bc3617f3835b441d0340230d4d1fef";
        libraryHaskellDepends = [ base ];
        homepage = "https://github.com/NorfairKing/validity#readme";
        description = "Validity typeclass";
@@ -175663,7 +176643,7 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
-  "wai-middleware-content-type" = callPackage
+  "wai-middleware-content-type_0_4_0" = callPackage
     ({ mkDerivation, aeson, base, blaze-builder, blaze-html, bytestring
      , clay, exceptions, hashable, hspec, hspec-wai, http-media
      , http-types, lucid, mmorph, monad-control, monad-logger, mtl
@@ -175693,6 +176673,37 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "wai-middleware-content-type" = callPackage
+    ({ mkDerivation, aeson, base, blaze-builder, blaze-html, bytestring
+     , clay, exceptions, hashable, hspec, hspec-wai, http-media
+     , http-types, lucid, mmorph, monad-control, monad-logger, mtl
+     , pandoc, pandoc-types, resourcet, shakespeare, tasty, tasty-hspec
+     , text, transformers, transformers-base, unordered-containers
+     , urlpath, wai, wai-transformers, warp
+     }:
+     mkDerivation {
+       pname = "wai-middleware-content-type";
+       version = "0.4.1";
+       sha256 = "99dcd8ae5da77650d31a1cd91d43d93c1a18687cd8947a3ea32cb1424229743e";
+       libraryHaskellDepends = [
+         aeson base blaze-builder blaze-html bytestring clay exceptions
+         hashable http-media http-types lucid mmorph monad-control
+         monad-logger mtl pandoc resourcet shakespeare text transformers
+         transformers-base unordered-containers urlpath wai wai-transformers
+       ];
+       testHaskellDepends = [
+         aeson base blaze-builder blaze-html bytestring clay exceptions
+         hashable hspec hspec-wai http-media http-types lucid mmorph
+         monad-control monad-logger mtl pandoc pandoc-types resourcet
+         shakespeare tasty tasty-hspec text transformers transformers-base
+         unordered-containers urlpath wai wai-transformers warp
+       ];
+       doCheck = false;
+       description = "Route to different middlewares based on the incoming Accept header";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "wai-middleware-crowd_0_1_4_1" = callPackage
     ({ mkDerivation, authenticate, base, base64-bytestring, binary
      , blaze-builder, bytestring, case-insensitive, clientsession
@@ -176013,8 +177024,8 @@ self: {
      }:
      mkDerivation {
        pname = "wai-middleware-verbs";
-       version = "0.3.0";
-       sha256 = "cfc8b80412a6fe3e4ee4e4828be478d28cdb8aadc063c7c229a44a74a4aa9806";
+       version = "0.3.2";
+       sha256 = "691fa97fda7204d84e1fa8f953334ca51cb1055577a5ec1d56cc5f07491aaa66";
        libraryHaskellDepends = [
          base errors exceptions hashable http-types mmorph monad-logger mtl
          resourcet transformers transformers-base unordered-containers wai
@@ -178488,8 +179499,8 @@ self: {
      }:
      mkDerivation {
        pname = "wolf";
-       version = "0.2.7";
-       sha256 = "4e3f8e4e39336d9ef685ade61864e0baab422d5e3f2f8f59e909a6cddf5ca643";
+       version = "0.2.8";
+       sha256 = "a76f54f9274e021787c59f2739a55a74f803576eaa624c506648839dd3b52a8c";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -179503,6 +180514,7 @@ self: {
          network optparse-applicative path random simpleirc transformers
          unix-compat
        ];
+       jailbreak = true;
        homepage = "https://github.com/JanGe/xdcc";
        description = "A wget-like utility for retrieving files from XDCC bots on IRC";
        license = stdenv.lib.licenses.mit;
@@ -179510,22 +180522,24 @@ self: {
      }) {};
 
   "xdcc" = callPackage
-    ({ mkDerivation, ascii-progress, base, bytestring, case-insensitive
-     , concurrent-extra, concurrent-output, errors, iproute, irc-ctcp
-     , irc-dcc, lifted-base, network, optparse-applicative, path, random
-     , simpleirc, transformers, unix-compat
+    ({ mkDerivation, ascii-progress, async, base, bytestring
+     , case-insensitive, concurrent-extra, concurrent-output, errors
+     , iproute, irc-client, irc-conduit, irc-ctcp, irc-dcc, lifted-base
+     , network, optparse-applicative, path, random, safe-exceptions, stm
+     , text, text-format, transformers, unix-compat
      }:
      mkDerivation {
        pname = "xdcc";
-       version = "1.0.6";
-       sha256 = "2a28d2c3bd13647b605adb845bb2f377c9be502218d979a52f6ed653050fb1b8";
+       version = "1.1.2";
+       sha256 = "d3268b0e1ffc28dabd33ffdc8c5f2e632b114002b5b3cc1d6836faa2d640b35d";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
-         ascii-progress base bytestring case-insensitive concurrent-extra
-         concurrent-output errors iproute irc-ctcp irc-dcc lifted-base
-         network optparse-applicative path random simpleirc transformers
-         unix-compat
+         ascii-progress async base bytestring case-insensitive
+         concurrent-extra concurrent-output errors iproute irc-client
+         irc-conduit irc-ctcp irc-dcc lifted-base network
+         optparse-applicative path random safe-exceptions stm text
+         text-format transformers unix-compat
        ];
        homepage = "https://github.com/JanGe/xdcc";
        description = "A wget-like utility for retrieving files from XDCC bots on IRC";
@@ -179592,11 +180606,16 @@ self: {
      }) {};
 
   "xfconf" = callPackage
-    ({ mkDerivation, base, glib, gtk2hs-buildtools, libxfconf-0 }:
+    ({ mkDerivation, base, Cabal, containers, directory, filepath, glib
+     , gtk2hs-buildtools, libxfconf-0
+     }:
      mkDerivation {
        pname = "xfconf";
        version = "4.8.0.0";
        sha256 = "9febbf8349f27fa184c56959a01db2f78176bd534f103f6b1be0bb01b7fac360";
+       revision = "1";
+       editedCabalFile = "ce4bb3ab326d8e4c0a4fc2576045b589305b12f7ca28b79a69fcc367c429d33c";
+       setupHaskellDepends = [ base Cabal containers directory filepath ];
        libraryHaskellDepends = [ base glib ];
        libraryPkgconfigDepends = [ libxfconf-0 ];
        libraryToolDepends = [ gtk2hs-buildtools ];