hackage-packages.nix: update Haskell package set

This update was generated by hackage2nix v20151217-9-geddefc2 using the following inputs:

  - Nixpkgs: https://github.com/NixOS/nixpkgs/commit/34e1e2890fe8124c7b262c0f514e160f14676684
  - Hackage: https://github.com/commercialhaskell/all-cabal-hashes/commit/152c587fd11879bf3e53adc3d8d0e1463f71f7ba
  - LTS Haskell: https://github.com/fpco/lts-haskell/commit/9b9c0dc0e337ee769438a8da43f3a7af0279b809
  - Stackage Nightly: https://github.com/fpco/stackage-nightly/commit/486fdffc718b1599b6007f40530e31ea44c39f5d

73 files changed, 888 insertions, 149 deletions

diff --git a/pkgs/development/haskell-modules/configuration-lts-0.0.nix b/pkgs/development/haskell-modules/configuration-lts-0.0.nix
index 9cda25a90573..e9ab7886bf2c 100644
--- a/pkgs/development/haskell-modules/configuration-lts-0.0.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-0.0.nix
@@ -172,6 +172,7 @@ self: super: {
   "Cartesian" = dontDistribute super."Cartesian";
   "Cascade" = dontDistribute super."Cascade";
   "Catana" = dontDistribute super."Catana";
+  "ChannelT" = dontDistribute super."ChannelT";
   "Chart" = doDistribute super."Chart_1_3_2";
   "Chart-cairo" = dontDistribute super."Chart-cairo";
   "Chart-diagrams" = doDistribute super."Chart-diagrams_1_3_2";
@@ -4976,6 +4977,7 @@ self: super: {
   "irc-fun-client" = dontDistribute super."irc-fun-client";
   "irc-fun-color" = dontDistribute super."irc-fun-color";
   "irc-fun-messages" = dontDistribute super."irc-fun-messages";
+  "irc-fun-types" = dontDistribute super."irc-fun-types";
   "ircbot" = dontDistribute super."ircbot";
   "ircbouncer" = dontDistribute super."ircbouncer";
   "ireal" = dontDistribute super."ireal";
@@ -5060,6 +5062,7 @@ self: super: {
   "jsmw" = dontDistribute super."jsmw";
   "json" = dontDistribute super."json";
   "json-assertions" = dontDistribute super."json-assertions";
+  "json-ast" = dontDistribute super."json-ast";
   "json-autotype" = dontDistribute super."json-autotype";
   "json-b" = dontDistribute super."json-b";
   "json-builder" = dontDistribute super."json-builder";
@@ -7776,6 +7779,7 @@ self: super: {
   "string-qq" = dontDistribute super."string-qq";
   "string-quote" = dontDistribute super."string-quote";
   "string-similarity" = dontDistribute super."string-similarity";
+  "string-typelits" = dontDistribute super."string-typelits";
   "stringlike" = dontDistribute super."stringlike";
   "strings" = dontDistribute super."strings";
   "stringsearch" = doDistribute super."stringsearch_0_3_6_5";
diff --git a/pkgs/development/haskell-modules/configuration-lts-0.1.nix b/pkgs/development/haskell-modules/configuration-lts-0.1.nix
index 300a95e2c17c..f5ffa31c0b90 100644
--- a/pkgs/development/haskell-modules/configuration-lts-0.1.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-0.1.nix
@@ -172,6 +172,7 @@ self: super: {
   "Cartesian" = dontDistribute super."Cartesian";
   "Cascade" = dontDistribute super."Cascade";
   "Catana" = dontDistribute super."Catana";
+  "ChannelT" = dontDistribute super."ChannelT";
   "Chart" = doDistribute super."Chart_1_3_2";
   "Chart-cairo" = dontDistribute super."Chart-cairo";
   "Chart-diagrams" = doDistribute super."Chart-diagrams_1_3_2";
@@ -4976,6 +4977,7 @@ self: super: {
   "irc-fun-client" = dontDistribute super."irc-fun-client";
   "irc-fun-color" = dontDistribute super."irc-fun-color";
   "irc-fun-messages" = dontDistribute super."irc-fun-messages";
+  "irc-fun-types" = dontDistribute super."irc-fun-types";
   "ircbot" = dontDistribute super."ircbot";
   "ircbouncer" = dontDistribute super."ircbouncer";
   "ireal" = dontDistribute super."ireal";
@@ -5060,6 +5062,7 @@ self: super: {
   "jsmw" = dontDistribute super."jsmw";
   "json" = dontDistribute super."json";
   "json-assertions" = dontDistribute super."json-assertions";
+  "json-ast" = dontDistribute super."json-ast";
   "json-autotype" = dontDistribute super."json-autotype";
   "json-b" = dontDistribute super."json-b";
   "json-builder" = dontDistribute super."json-builder";
@@ -7776,6 +7779,7 @@ self: super: {
   "string-qq" = dontDistribute super."string-qq";
   "string-quote" = dontDistribute super."string-quote";
   "string-similarity" = dontDistribute super."string-similarity";
+  "string-typelits" = dontDistribute super."string-typelits";
   "stringlike" = dontDistribute super."stringlike";
   "strings" = dontDistribute super."strings";
   "stringsearch" = doDistribute super."stringsearch_0_3_6_5";
diff --git a/pkgs/development/haskell-modules/configuration-lts-0.2.nix b/pkgs/development/haskell-modules/configuration-lts-0.2.nix
index 12c95ce49f95..7bfff6317298 100644
--- a/pkgs/development/haskell-modules/configuration-lts-0.2.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-0.2.nix
@@ -172,6 +172,7 @@ self: super: {
   "Cartesian" = dontDistribute super."Cartesian";
   "Cascade" = dontDistribute super."Cascade";
   "Catana" = dontDistribute super."Catana";
+  "ChannelT" = dontDistribute super."ChannelT";
   "Chart" = doDistribute super."Chart_1_3_2";
   "Chart-cairo" = dontDistribute super."Chart-cairo";
   "Chart-diagrams" = doDistribute super."Chart-diagrams_1_3_2";
@@ -4976,6 +4977,7 @@ self: super: {
   "irc-fun-client" = dontDistribute super."irc-fun-client";
   "irc-fun-color" = dontDistribute super."irc-fun-color";
   "irc-fun-messages" = dontDistribute super."irc-fun-messages";
+  "irc-fun-types" = dontDistribute super."irc-fun-types";
   "ircbot" = dontDistribute super."ircbot";
   "ircbouncer" = dontDistribute super."ircbouncer";
   "ireal" = dontDistribute super."ireal";
@@ -5060,6 +5062,7 @@ self: super: {
   "jsmw" = dontDistribute super."jsmw";
   "json" = dontDistribute super."json";
   "json-assertions" = dontDistribute super."json-assertions";
+  "json-ast" = dontDistribute super."json-ast";
   "json-autotype" = dontDistribute super."json-autotype";
   "json-b" = dontDistribute super."json-b";
   "json-builder" = dontDistribute super."json-builder";
@@ -7776,6 +7779,7 @@ self: super: {
   "string-qq" = dontDistribute super."string-qq";
   "string-quote" = dontDistribute super."string-quote";
   "string-similarity" = dontDistribute super."string-similarity";
+  "string-typelits" = dontDistribute super."string-typelits";
   "stringlike" = dontDistribute super."stringlike";
   "strings" = dontDistribute super."strings";
   "stringsearch" = doDistribute super."stringsearch_0_3_6_5";
diff --git a/pkgs/development/haskell-modules/configuration-lts-0.3.nix b/pkgs/development/haskell-modules/configuration-lts-0.3.nix
index 6e5603e3a840..0041c132ac49 100644
--- a/pkgs/development/haskell-modules/configuration-lts-0.3.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-0.3.nix
@@ -172,6 +172,7 @@ self: super: {
   "Cartesian" = dontDistribute super."Cartesian";
   "Cascade" = dontDistribute super."Cascade";
   "Catana" = dontDistribute super."Catana";
+  "ChannelT" = dontDistribute super."ChannelT";
   "Chart" = doDistribute super."Chart_1_3_2";
   "Chart-cairo" = dontDistribute super."Chart-cairo";
   "Chart-diagrams" = doDistribute super."Chart-diagrams_1_3_2";
@@ -4976,6 +4977,7 @@ self: super: {
   "irc-fun-client" = dontDistribute super."irc-fun-client";
   "irc-fun-color" = dontDistribute super."irc-fun-color";
   "irc-fun-messages" = dontDistribute super."irc-fun-messages";
+  "irc-fun-types" = dontDistribute super."irc-fun-types";
   "ircbot" = dontDistribute super."ircbot";
   "ircbouncer" = dontDistribute super."ircbouncer";
   "ireal" = dontDistribute super."ireal";
@@ -5060,6 +5062,7 @@ self: super: {
   "jsmw" = dontDistribute super."jsmw";
   "json" = dontDistribute super."json";
   "json-assertions" = dontDistribute super."json-assertions";
+  "json-ast" = dontDistribute super."json-ast";
   "json-autotype" = dontDistribute super."json-autotype";
   "json-b" = dontDistribute super."json-b";
   "json-builder" = dontDistribute super."json-builder";
@@ -7776,6 +7779,7 @@ self: super: {
   "string-qq" = dontDistribute super."string-qq";
   "string-quote" = dontDistribute super."string-quote";
   "string-similarity" = dontDistribute super."string-similarity";
+  "string-typelits" = dontDistribute super."string-typelits";
   "stringlike" = dontDistribute super."stringlike";
   "strings" = dontDistribute super."strings";
   "stringsearch" = doDistribute super."stringsearch_0_3_6_5";
diff --git a/pkgs/development/haskell-modules/configuration-lts-0.4.nix b/pkgs/development/haskell-modules/configuration-lts-0.4.nix
index a69e82064c4e..f4c19fe75705 100644
--- a/pkgs/development/haskell-modules/configuration-lts-0.4.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-0.4.nix
@@ -172,6 +172,7 @@ self: super: {
   "Cartesian" = dontDistribute super."Cartesian";
   "Cascade" = dontDistribute super."Cascade";
   "Catana" = dontDistribute super."Catana";
+  "ChannelT" = dontDistribute super."ChannelT";
   "Chart" = doDistribute super."Chart_1_3_2";
   "Chart-cairo" = dontDistribute super."Chart-cairo";
   "Chart-diagrams" = doDistribute super."Chart-diagrams_1_3_2";
@@ -4973,6 +4974,7 @@ self: super: {
   "irc-fun-client" = dontDistribute super."irc-fun-client";
   "irc-fun-color" = dontDistribute super."irc-fun-color";
   "irc-fun-messages" = dontDistribute super."irc-fun-messages";
+  "irc-fun-types" = dontDistribute super."irc-fun-types";
   "ircbot" = dontDistribute super."ircbot";
   "ircbouncer" = dontDistribute super."ircbouncer";
   "ireal" = dontDistribute super."ireal";
@@ -5057,6 +5059,7 @@ self: super: {
   "jsmw" = dontDistribute super."jsmw";
   "json" = dontDistribute super."json";
   "json-assertions" = dontDistribute super."json-assertions";
+  "json-ast" = dontDistribute super."json-ast";
   "json-autotype" = dontDistribute super."json-autotype";
   "json-b" = dontDistribute super."json-b";
   "json-builder" = dontDistribute super."json-builder";
@@ -7772,6 +7775,7 @@ self: super: {
   "string-qq" = dontDistribute super."string-qq";
   "string-quote" = dontDistribute super."string-quote";
   "string-similarity" = dontDistribute super."string-similarity";
+  "string-typelits" = dontDistribute super."string-typelits";
   "stringlike" = dontDistribute super."stringlike";
   "strings" = dontDistribute super."strings";
   "stringsearch" = doDistribute super."stringsearch_0_3_6_5";
diff --git a/pkgs/development/haskell-modules/configuration-lts-0.5.nix b/pkgs/development/haskell-modules/configuration-lts-0.5.nix
index be91dee6bc66..fdcd0e2bab6f 100644
--- a/pkgs/development/haskell-modules/configuration-lts-0.5.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-0.5.nix
@@ -172,6 +172,7 @@ self: super: {
   "Cartesian" = dontDistribute super."Cartesian";
   "Cascade" = dontDistribute super."Cascade";
   "Catana" = dontDistribute super."Catana";
+  "ChannelT" = dontDistribute super."ChannelT";
   "Chart" = doDistribute super."Chart_1_3_2";
   "Chart-cairo" = dontDistribute super."Chart-cairo";
   "Chart-diagrams" = doDistribute super."Chart-diagrams_1_3_2";
@@ -4973,6 +4974,7 @@ self: super: {
   "irc-fun-client" = dontDistribute super."irc-fun-client";
   "irc-fun-color" = dontDistribute super."irc-fun-color";
   "irc-fun-messages" = dontDistribute super."irc-fun-messages";
+  "irc-fun-types" = dontDistribute super."irc-fun-types";
   "ircbot" = dontDistribute super."ircbot";
   "ircbouncer" = dontDistribute super."ircbouncer";
   "ireal" = dontDistribute super."ireal";
@@ -5057,6 +5059,7 @@ self: super: {
   "jsmw" = dontDistribute super."jsmw";
   "json" = dontDistribute super."json";
   "json-assertions" = dontDistribute super."json-assertions";
+  "json-ast" = dontDistribute super."json-ast";
   "json-autotype" = dontDistribute super."json-autotype";
   "json-b" = dontDistribute super."json-b";
   "json-builder" = dontDistribute super."json-builder";
@@ -7772,6 +7775,7 @@ self: super: {
   "string-qq" = dontDistribute super."string-qq";
   "string-quote" = dontDistribute super."string-quote";
   "string-similarity" = dontDistribute super."string-similarity";
+  "string-typelits" = dontDistribute super."string-typelits";
   "stringlike" = dontDistribute super."stringlike";
   "strings" = dontDistribute super."strings";
   "stringsearch" = doDistribute super."stringsearch_0_3_6_5";
diff --git a/pkgs/development/haskell-modules/configuration-lts-0.6.nix b/pkgs/development/haskell-modules/configuration-lts-0.6.nix
index d62988266a98..70339bd0bb73 100644
--- a/pkgs/development/haskell-modules/configuration-lts-0.6.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-0.6.nix
@@ -172,6 +172,7 @@ self: super: {
   "Cartesian" = dontDistribute super."Cartesian";
   "Cascade" = dontDistribute super."Cascade";
   "Catana" = dontDistribute super."Catana";
+  "ChannelT" = dontDistribute super."ChannelT";
   "Chart" = doDistribute super."Chart_1_3_2";
   "Chart-cairo" = dontDistribute super."Chart-cairo";
   "Chart-diagrams" = doDistribute super."Chart-diagrams_1_3_2";
@@ -4971,6 +4972,7 @@ self: super: {
   "irc-fun-client" = dontDistribute super."irc-fun-client";
   "irc-fun-color" = dontDistribute super."irc-fun-color";
   "irc-fun-messages" = dontDistribute super."irc-fun-messages";
+  "irc-fun-types" = dontDistribute super."irc-fun-types";
   "ircbot" = dontDistribute super."ircbot";
   "ircbouncer" = dontDistribute super."ircbouncer";
   "ireal" = dontDistribute super."ireal";
@@ -5055,6 +5057,7 @@ self: super: {
   "jsmw" = dontDistribute super."jsmw";
   "json" = dontDistribute super."json";
   "json-assertions" = dontDistribute super."json-assertions";
+  "json-ast" = dontDistribute super."json-ast";
   "json-autotype" = dontDistribute super."json-autotype";
   "json-b" = dontDistribute super."json-b";
   "json-builder" = dontDistribute super."json-builder";
@@ -7768,6 +7771,7 @@ self: super: {
   "string-qq" = dontDistribute super."string-qq";
   "string-quote" = dontDistribute super."string-quote";
   "string-similarity" = dontDistribute super."string-similarity";
+  "string-typelits" = dontDistribute super."string-typelits";
   "stringlike" = dontDistribute super."stringlike";
   "strings" = dontDistribute super."strings";
   "stringsearch" = doDistribute super."stringsearch_0_3_6_5";
diff --git a/pkgs/development/haskell-modules/configuration-lts-0.7.nix b/pkgs/development/haskell-modules/configuration-lts-0.7.nix
index 5e546e41bc22..38156ce2ed5f 100644
--- a/pkgs/development/haskell-modules/configuration-lts-0.7.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-0.7.nix
@@ -172,6 +172,7 @@ self: super: {
   "Cartesian" = dontDistribute super."Cartesian";
   "Cascade" = dontDistribute super."Cascade";
   "Catana" = dontDistribute super."Catana";
+  "ChannelT" = dontDistribute super."ChannelT";
   "Chart" = doDistribute super."Chart_1_3_2";
   "Chart-cairo" = dontDistribute super."Chart-cairo";
   "Chart-diagrams" = doDistribute super."Chart-diagrams_1_3_2";
@@ -4971,6 +4972,7 @@ self: super: {
   "irc-fun-client" = dontDistribute super."irc-fun-client";
   "irc-fun-color" = dontDistribute super."irc-fun-color";
   "irc-fun-messages" = dontDistribute super."irc-fun-messages";
+  "irc-fun-types" = dontDistribute super."irc-fun-types";
   "ircbot" = dontDistribute super."ircbot";
   "ircbouncer" = dontDistribute super."ircbouncer";
   "ireal" = dontDistribute super."ireal";
@@ -5055,6 +5057,7 @@ self: super: {
   "jsmw" = dontDistribute super."jsmw";
   "json" = dontDistribute super."json";
   "json-assertions" = dontDistribute super."json-assertions";
+  "json-ast" = dontDistribute super."json-ast";
   "json-autotype" = dontDistribute super."json-autotype";
   "json-b" = dontDistribute super."json-b";
   "json-builder" = dontDistribute super."json-builder";
@@ -7768,6 +7771,7 @@ self: super: {
   "string-qq" = dontDistribute super."string-qq";
   "string-quote" = dontDistribute super."string-quote";
   "string-similarity" = dontDistribute super."string-similarity";
+  "string-typelits" = dontDistribute super."string-typelits";
   "stringlike" = dontDistribute super."stringlike";
   "strings" = dontDistribute super."strings";
   "stringsearch" = doDistribute super."stringsearch_0_3_6_5";
diff --git a/pkgs/development/haskell-modules/configuration-lts-1.0.nix b/pkgs/development/haskell-modules/configuration-lts-1.0.nix
index 977351aaf2a0..f6622404e5f8 100644
--- a/pkgs/development/haskell-modules/configuration-lts-1.0.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.0.nix
@@ -172,6 +172,7 @@ self: super: {
   "Cartesian" = dontDistribute super."Cartesian";
   "Cascade" = dontDistribute super."Cascade";
   "Catana" = dontDistribute super."Catana";
+  "ChannelT" = dontDistribute super."ChannelT";
   "Chart" = doDistribute super."Chart_1_3_2";
   "Chart-cairo" = dontDistribute super."Chart-cairo";
   "Chart-diagrams" = doDistribute super."Chart-diagrams_1_3_2";
@@ -4959,6 +4960,7 @@ self: super: {
   "irc-fun-client" = dontDistribute super."irc-fun-client";
   "irc-fun-color" = dontDistribute super."irc-fun-color";
   "irc-fun-messages" = dontDistribute super."irc-fun-messages";
+  "irc-fun-types" = dontDistribute super."irc-fun-types";
   "ircbot" = dontDistribute super."ircbot";
   "ircbouncer" = dontDistribute super."ircbouncer";
   "ireal" = dontDistribute super."ireal";
@@ -5043,6 +5045,7 @@ self: super: {
   "jsmw" = dontDistribute super."jsmw";
   "json" = dontDistribute super."json";
   "json-assertions" = dontDistribute super."json-assertions";
+  "json-ast" = dontDistribute super."json-ast";
   "json-autotype" = doDistribute super."json-autotype_0_2_5_4";
   "json-b" = dontDistribute super."json-b";
   "json-builder" = dontDistribute super."json-builder";
@@ -7754,6 +7757,7 @@ self: super: {
   "string-qq" = dontDistribute super."string-qq";
   "string-quote" = dontDistribute super."string-quote";
   "string-similarity" = dontDistribute super."string-similarity";
+  "string-typelits" = dontDistribute super."string-typelits";
   "stringlike" = dontDistribute super."stringlike";
   "strings" = dontDistribute super."strings";
   "stringsearch" = doDistribute super."stringsearch_0_3_6_5";
diff --git a/pkgs/development/haskell-modules/configuration-lts-1.1.nix b/pkgs/development/haskell-modules/configuration-lts-1.1.nix
index 865b55aa960a..dcab2aa28320 100644
--- a/pkgs/development/haskell-modules/configuration-lts-1.1.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.1.nix
@@ -172,6 +172,7 @@ self: super: {
   "Cartesian" = dontDistribute super."Cartesian";
   "Cascade" = dontDistribute super."Cascade";
   "Catana" = dontDistribute super."Catana";
+  "ChannelT" = dontDistribute super."ChannelT";
   "Chart" = doDistribute super."Chart_1_3_2";
   "Chart-cairo" = dontDistribute super."Chart-cairo";
   "Chart-diagrams" = doDistribute super."Chart-diagrams_1_3_2";
@@ -4953,6 +4954,7 @@ self: super: {
   "irc-fun-client" = dontDistribute super."irc-fun-client";
   "irc-fun-color" = dontDistribute super."irc-fun-color";
   "irc-fun-messages" = dontDistribute super."irc-fun-messages";
+  "irc-fun-types" = dontDistribute super."irc-fun-types";
   "ircbot" = dontDistribute super."ircbot";
   "ircbouncer" = dontDistribute super."ircbouncer";
   "ireal" = dontDistribute super."ireal";
@@ -5037,6 +5039,7 @@ self: super: {
   "jsmw" = dontDistribute super."jsmw";
   "json" = dontDistribute super."json";
   "json-assertions" = dontDistribute super."json-assertions";
+  "json-ast" = dontDistribute super."json-ast";
   "json-autotype" = doDistribute super."json-autotype_0_2_5_4";
   "json-b" = dontDistribute super."json-b";
   "json-builder" = dontDistribute super."json-builder";
@@ -7745,6 +7748,7 @@ self: super: {
   "string-qq" = dontDistribute super."string-qq";
   "string-quote" = dontDistribute super."string-quote";
   "string-similarity" = dontDistribute super."string-similarity";
+  "string-typelits" = dontDistribute super."string-typelits";
   "stringlike" = dontDistribute super."stringlike";
   "strings" = dontDistribute super."strings";
   "stringsearch" = doDistribute super."stringsearch_0_3_6_5";
diff --git a/pkgs/development/haskell-modules/configuration-lts-1.10.nix b/pkgs/development/haskell-modules/configuration-lts-1.10.nix
index a420ff8f774f..6b041938ec1a 100644
--- a/pkgs/development/haskell-modules/configuration-lts-1.10.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.10.nix
@@ -172,6 +172,7 @@ self: super: {
   "Cartesian" = dontDistribute super."Cartesian";
   "Cascade" = dontDistribute super."Cascade";
   "Catana" = dontDistribute super."Catana";
+  "ChannelT" = dontDistribute super."ChannelT";
   "Chart" = doDistribute super."Chart_1_3_3";
   "Chart-cairo" = dontDistribute super."Chart-cairo";
   "Chart-diagrams" = doDistribute super."Chart-diagrams_1_3_3";
@@ -4937,6 +4938,7 @@ self: super: {
   "irc-fun-client" = dontDistribute super."irc-fun-client";
   "irc-fun-color" = dontDistribute super."irc-fun-color";
   "irc-fun-messages" = dontDistribute super."irc-fun-messages";
+  "irc-fun-types" = dontDistribute super."irc-fun-types";
   "ircbot" = dontDistribute super."ircbot";
   "ircbouncer" = dontDistribute super."ircbouncer";
   "ireal" = dontDistribute super."ireal";
@@ -5021,6 +5023,7 @@ self: super: {
   "jsmw" = dontDistribute super."jsmw";
   "json" = dontDistribute super."json";
   "json-assertions" = dontDistribute super."json-assertions";
+  "json-ast" = dontDistribute super."json-ast";
   "json-autotype" = doDistribute super."json-autotype_0_2_5_4";
   "json-b" = dontDistribute super."json-b";
   "json-builder" = dontDistribute super."json-builder";
@@ -7722,6 +7725,7 @@ self: super: {
   "string-qq" = dontDistribute super."string-qq";
   "string-quote" = dontDistribute super."string-quote";
   "string-similarity" = dontDistribute super."string-similarity";
+  "string-typelits" = dontDistribute super."string-typelits";
   "stringlike" = dontDistribute super."stringlike";
   "strings" = dontDistribute super."strings";
   "stringsearch" = doDistribute super."stringsearch_0_3_6_5";
diff --git a/pkgs/development/haskell-modules/configuration-lts-1.11.nix b/pkgs/development/haskell-modules/configuration-lts-1.11.nix
index 28c5d043681b..6851fcfd4cbf 100644
--- a/pkgs/development/haskell-modules/configuration-lts-1.11.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.11.nix
@@ -172,6 +172,7 @@ self: super: {
   "Cartesian" = dontDistribute super."Cartesian";
   "Cascade" = dontDistribute super."Cascade";
   "Catana" = dontDistribute super."Catana";
+  "ChannelT" = dontDistribute super."ChannelT";
   "Chart" = doDistribute super."Chart_1_3_3";
   "Chart-cairo" = dontDistribute super."Chart-cairo";
   "Chart-diagrams" = doDistribute super."Chart-diagrams_1_3_3";
@@ -4934,6 +4935,7 @@ self: super: {
   "irc-fun-client" = dontDistribute super."irc-fun-client";
   "irc-fun-color" = dontDistribute super."irc-fun-color";
   "irc-fun-messages" = dontDistribute super."irc-fun-messages";
+  "irc-fun-types" = dontDistribute super."irc-fun-types";
   "ircbot" = dontDistribute super."ircbot";
   "ircbouncer" = dontDistribute super."ircbouncer";
   "ireal" = dontDistribute super."ireal";
@@ -5018,6 +5020,7 @@ self: super: {
   "jsmw" = dontDistribute super."jsmw";
   "json" = dontDistribute super."json";
   "json-assertions" = dontDistribute super."json-assertions";
+  "json-ast" = dontDistribute super."json-ast";
   "json-autotype" = doDistribute super."json-autotype_0_2_5_4";
   "json-b" = dontDistribute super."json-b";
   "json-builder" = dontDistribute super."json-builder";
@@ -7718,6 +7721,7 @@ self: super: {
   "string-qq" = dontDistribute super."string-qq";
   "string-quote" = dontDistribute super."string-quote";
   "string-similarity" = dontDistribute super."string-similarity";
+  "string-typelits" = dontDistribute super."string-typelits";
   "stringlike" = dontDistribute super."stringlike";
   "strings" = dontDistribute super."strings";
   "stringsearch" = doDistribute super."stringsearch_0_3_6_5";
diff --git a/pkgs/development/haskell-modules/configuration-lts-1.12.nix b/pkgs/development/haskell-modules/configuration-lts-1.12.nix
index 2f285e680dd2..50ee12bb52dc 100644
--- a/pkgs/development/haskell-modules/configuration-lts-1.12.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.12.nix
@@ -172,6 +172,7 @@ self: super: {
   "Cartesian" = dontDistribute super."Cartesian";
   "Cascade" = dontDistribute super."Cascade";
   "Catana" = dontDistribute super."Catana";
+  "ChannelT" = dontDistribute super."ChannelT";
   "Chart" = doDistribute super."Chart_1_3_3";
   "Chart-cairo" = dontDistribute super."Chart-cairo";
   "Chart-diagrams" = doDistribute super."Chart-diagrams_1_3_3";
@@ -4933,6 +4934,7 @@ self: super: {
   "irc-fun-client" = dontDistribute super."irc-fun-client";
   "irc-fun-color" = dontDistribute super."irc-fun-color";
   "irc-fun-messages" = dontDistribute super."irc-fun-messages";
+  "irc-fun-types" = dontDistribute super."irc-fun-types";
   "ircbot" = dontDistribute super."ircbot";
   "ircbouncer" = dontDistribute super."ircbouncer";
   "ireal" = dontDistribute super."ireal";
@@ -5017,6 +5019,7 @@ self: super: {
   "jsmw" = dontDistribute super."jsmw";
   "json" = dontDistribute super."json";
   "json-assertions" = dontDistribute super."json-assertions";
+  "json-ast" = dontDistribute super."json-ast";
   "json-autotype" = doDistribute super."json-autotype_0_2_5_8";
   "json-b" = dontDistribute super."json-b";
   "json-builder" = dontDistribute super."json-builder";
@@ -7717,6 +7720,7 @@ self: super: {
   "string-qq" = dontDistribute super."string-qq";
   "string-quote" = dontDistribute super."string-quote";
   "string-similarity" = dontDistribute super."string-similarity";
+  "string-typelits" = dontDistribute super."string-typelits";
   "stringlike" = dontDistribute super."stringlike";
   "strings" = dontDistribute super."strings";
   "stringsearch" = doDistribute super."stringsearch_0_3_6_5";
diff --git a/pkgs/development/haskell-modules/configuration-lts-1.13.nix b/pkgs/development/haskell-modules/configuration-lts-1.13.nix
index 01a2bf5d0821..318f7595f64b 100644
--- a/pkgs/development/haskell-modules/configuration-lts-1.13.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.13.nix
@@ -172,6 +172,7 @@ self: super: {
   "Cartesian" = dontDistribute super."Cartesian";
   "Cascade" = dontDistribute super."Cascade";
   "Catana" = dontDistribute super."Catana";
+  "ChannelT" = dontDistribute super."ChannelT";
   "Chart" = doDistribute super."Chart_1_3_3";
   "Chart-cairo" = dontDistribute super."Chart-cairo";
   "Chart-diagrams" = doDistribute super."Chart-diagrams_1_3_3";
@@ -4932,6 +4933,7 @@ self: super: {
   "irc-fun-client" = dontDistribute super."irc-fun-client";
   "irc-fun-color" = dontDistribute super."irc-fun-color";
   "irc-fun-messages" = dontDistribute super."irc-fun-messages";
+  "irc-fun-types" = dontDistribute super."irc-fun-types";
   "ircbot" = dontDistribute super."ircbot";
   "ircbouncer" = dontDistribute super."ircbouncer";
   "ireal" = dontDistribute super."ireal";
@@ -5016,6 +5018,7 @@ self: super: {
   "jsmw" = dontDistribute super."jsmw";
   "json" = dontDistribute super."json";
   "json-assertions" = dontDistribute super."json-assertions";
+  "json-ast" = dontDistribute super."json-ast";
   "json-autotype" = doDistribute super."json-autotype_0_2_5_8";
   "json-b" = dontDistribute super."json-b";
   "json-builder" = dontDistribute super."json-builder";
@@ -7716,6 +7719,7 @@ self: super: {
   "string-qq" = dontDistribute super."string-qq";
   "string-quote" = dontDistribute super."string-quote";
   "string-similarity" = dontDistribute super."string-similarity";
+  "string-typelits" = dontDistribute super."string-typelits";
   "stringlike" = dontDistribute super."stringlike";
   "strings" = dontDistribute super."strings";
   "stringsearch" = doDistribute super."stringsearch_0_3_6_5";
diff --git a/pkgs/development/haskell-modules/configuration-lts-1.14.nix b/pkgs/development/haskell-modules/configuration-lts-1.14.nix
index 6a6e7ca80973..3a378f0f3c99 100644
--- a/pkgs/development/haskell-modules/configuration-lts-1.14.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.14.nix
@@ -172,6 +172,7 @@ self: super: {
   "Cartesian" = dontDistribute super."Cartesian";
   "Cascade" = dontDistribute super."Cascade";
   "Catana" = dontDistribute super."Catana";
+  "ChannelT" = dontDistribute super."ChannelT";
   "Chart" = doDistribute super."Chart_1_3_3";
   "Chart-cairo" = dontDistribute super."Chart-cairo";
   "Chart-diagrams" = doDistribute super."Chart-diagrams_1_3_3";
@@ -4928,6 +4929,7 @@ self: super: {
   "irc-fun-client" = dontDistribute super."irc-fun-client";
   "irc-fun-color" = dontDistribute super."irc-fun-color";
   "irc-fun-messages" = dontDistribute super."irc-fun-messages";
+  "irc-fun-types" = dontDistribute super."irc-fun-types";
   "ircbot" = dontDistribute super."ircbot";
   "ircbouncer" = dontDistribute super."ircbouncer";
   "ireal" = dontDistribute super."ireal";
@@ -5012,6 +5014,7 @@ self: super: {
   "jsmw" = dontDistribute super."jsmw";
   "json" = dontDistribute super."json";
   "json-assertions" = dontDistribute super."json-assertions";
+  "json-ast" = dontDistribute super."json-ast";
   "json-autotype" = doDistribute super."json-autotype_0_2_5_9";
   "json-b" = dontDistribute super."json-b";
   "json-builder" = dontDistribute super."json-builder";
@@ -7709,6 +7712,7 @@ self: super: {
   "string-qq" = dontDistribute super."string-qq";
   "string-quote" = dontDistribute super."string-quote";
   "string-similarity" = dontDistribute super."string-similarity";
+  "string-typelits" = dontDistribute super."string-typelits";
   "stringlike" = dontDistribute super."stringlike";
   "strings" = dontDistribute super."strings";
   "stringsearch" = doDistribute super."stringsearch_0_3_6_5";
diff --git a/pkgs/development/haskell-modules/configuration-lts-1.15.nix b/pkgs/development/haskell-modules/configuration-lts-1.15.nix
index 76f95bd450e1..2fa448b07e10 100644
--- a/pkgs/development/haskell-modules/configuration-lts-1.15.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.15.nix
@@ -172,6 +172,7 @@ self: super: {
   "Cartesian" = dontDistribute super."Cartesian";
   "Cascade" = dontDistribute super."Cascade";
   "Catana" = dontDistribute super."Catana";
+  "ChannelT" = dontDistribute super."ChannelT";
   "Chart" = doDistribute super."Chart_1_3_3";
   "Chart-cairo" = dontDistribute super."Chart-cairo";
   "Chart-diagrams" = doDistribute super."Chart-diagrams_1_3_3";
@@ -4924,6 +4925,7 @@ self: super: {
   "irc-fun-client" = dontDistribute super."irc-fun-client";
   "irc-fun-color" = dontDistribute super."irc-fun-color";
   "irc-fun-messages" = dontDistribute super."irc-fun-messages";
+  "irc-fun-types" = dontDistribute super."irc-fun-types";
   "ircbot" = dontDistribute super."ircbot";
   "ircbouncer" = dontDistribute super."ircbouncer";
   "ireal" = dontDistribute super."ireal";
@@ -5008,6 +5010,7 @@ self: super: {
   "jsmw" = dontDistribute super."jsmw";
   "json" = dontDistribute super."json";
   "json-assertions" = dontDistribute super."json-assertions";
+  "json-ast" = dontDistribute super."json-ast";
   "json-autotype" = doDistribute super."json-autotype_0_2_5_9";
   "json-b" = dontDistribute super."json-b";
   "json-builder" = dontDistribute super."json-builder";
@@ -7700,6 +7703,7 @@ self: super: {
   "string-qq" = dontDistribute super."string-qq";
   "string-quote" = dontDistribute super."string-quote";
   "string-similarity" = dontDistribute super."string-similarity";
+  "string-typelits" = dontDistribute super."string-typelits";
   "stringlike" = dontDistribute super."stringlike";
   "strings" = dontDistribute super."strings";
   "stringtable-atom" = dontDistribute super."stringtable-atom";
diff --git a/pkgs/development/haskell-modules/configuration-lts-1.2.nix b/pkgs/development/haskell-modules/configuration-lts-1.2.nix
index 8ab51220e9a7..b84ea04fd9ac 100644
--- a/pkgs/development/haskell-modules/configuration-lts-1.2.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.2.nix
@@ -172,6 +172,7 @@ self: super: {
   "Cartesian" = dontDistribute super."Cartesian";
   "Cascade" = dontDistribute super."Cascade";
   "Catana" = dontDistribute super."Catana";
+  "ChannelT" = dontDistribute super."ChannelT";
   "Chart" = doDistribute super."Chart_1_3_2";
   "Chart-cairo" = dontDistribute super."Chart-cairo";
   "Chart-diagrams" = doDistribute super."Chart-diagrams_1_3_2";
@@ -4950,6 +4951,7 @@ self: super: {
   "irc-fun-client" = dontDistribute super."irc-fun-client";
   "irc-fun-color" = dontDistribute super."irc-fun-color";
   "irc-fun-messages" = dontDistribute super."irc-fun-messages";
+  "irc-fun-types" = dontDistribute super."irc-fun-types";
   "ircbot" = dontDistribute super."ircbot";
   "ircbouncer" = dontDistribute super."ircbouncer";
   "ireal" = dontDistribute super."ireal";
@@ -5034,6 +5036,7 @@ self: super: {
   "jsmw" = dontDistribute super."jsmw";
   "json" = dontDistribute super."json";
   "json-assertions" = dontDistribute super."json-assertions";
+  "json-ast" = dontDistribute super."json-ast";
   "json-autotype" = doDistribute super."json-autotype_0_2_5_4";
   "json-b" = dontDistribute super."json-b";
   "json-builder" = dontDistribute super."json-builder";
@@ -7739,6 +7742,7 @@ self: super: {
   "string-qq" = dontDistribute super."string-qq";
   "string-quote" = dontDistribute super."string-quote";
   "string-similarity" = dontDistribute super."string-similarity";
+  "string-typelits" = dontDistribute super."string-typelits";
   "stringlike" = dontDistribute super."stringlike";
   "strings" = dontDistribute super."strings";
   "stringsearch" = doDistribute super."stringsearch_0_3_6_5";
diff --git a/pkgs/development/haskell-modules/configuration-lts-1.4.nix b/pkgs/development/haskell-modules/configuration-lts-1.4.nix
index e4dbbab73874..2bbcedea2ebf 100644
--- a/pkgs/development/haskell-modules/configuration-lts-1.4.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.4.nix
@@ -172,6 +172,7 @@ self: super: {
   "Cartesian" = dontDistribute super."Cartesian";
   "Cascade" = dontDistribute super."Cascade";
   "Catana" = dontDistribute super."Catana";
+  "ChannelT" = dontDistribute super."ChannelT";
   "Chart" = doDistribute super."Chart_1_3_3";
   "Chart-cairo" = dontDistribute super."Chart-cairo";
   "Chart-diagrams" = doDistribute super."Chart-diagrams_1_3_3";
@@ -4947,6 +4948,7 @@ self: super: {
   "irc-fun-client" = dontDistribute super."irc-fun-client";
   "irc-fun-color" = dontDistribute super."irc-fun-color";
   "irc-fun-messages" = dontDistribute super."irc-fun-messages";
+  "irc-fun-types" = dontDistribute super."irc-fun-types";
   "ircbot" = dontDistribute super."ircbot";
   "ircbouncer" = dontDistribute super."ircbouncer";
   "ireal" = dontDistribute super."ireal";
@@ -5031,6 +5033,7 @@ self: super: {
   "jsmw" = dontDistribute super."jsmw";
   "json" = dontDistribute super."json";
   "json-assertions" = dontDistribute super."json-assertions";
+  "json-ast" = dontDistribute super."json-ast";
   "json-autotype" = doDistribute super."json-autotype_0_2_5_4";
   "json-b" = dontDistribute super."json-b";
   "json-builder" = dontDistribute super."json-builder";
@@ -7735,6 +7738,7 @@ self: super: {
   "string-qq" = dontDistribute super."string-qq";
   "string-quote" = dontDistribute super."string-quote";
   "string-similarity" = dontDistribute super."string-similarity";
+  "string-typelits" = dontDistribute super."string-typelits";
   "stringlike" = dontDistribute super."stringlike";
   "strings" = dontDistribute super."strings";
   "stringsearch" = doDistribute super."stringsearch_0_3_6_5";
diff --git a/pkgs/development/haskell-modules/configuration-lts-1.5.nix b/pkgs/development/haskell-modules/configuration-lts-1.5.nix
index be2d731b3f3a..952676714551 100644
--- a/pkgs/development/haskell-modules/configuration-lts-1.5.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.5.nix
@@ -172,6 +172,7 @@ self: super: {
   "Cartesian" = dontDistribute super."Cartesian";
   "Cascade" = dontDistribute super."Cascade";
   "Catana" = dontDistribute super."Catana";
+  "ChannelT" = dontDistribute super."ChannelT";
   "Chart" = doDistribute super."Chart_1_3_3";
   "Chart-cairo" = dontDistribute super."Chart-cairo";
   "Chart-diagrams" = doDistribute super."Chart-diagrams_1_3_3";
@@ -4946,6 +4947,7 @@ self: super: {
   "irc-fun-client" = dontDistribute super."irc-fun-client";
   "irc-fun-color" = dontDistribute super."irc-fun-color";
   "irc-fun-messages" = dontDistribute super."irc-fun-messages";
+  "irc-fun-types" = dontDistribute super."irc-fun-types";
   "ircbot" = dontDistribute super."ircbot";
   "ircbouncer" = dontDistribute super."ircbouncer";
   "ireal" = dontDistribute super."ireal";
@@ -5030,6 +5032,7 @@ self: super: {
   "jsmw" = dontDistribute super."jsmw";
   "json" = dontDistribute super."json";
   "json-assertions" = dontDistribute super."json-assertions";
+  "json-ast" = dontDistribute super."json-ast";
   "json-autotype" = doDistribute super."json-autotype_0_2_5_4";
   "json-b" = dontDistribute super."json-b";
   "json-builder" = dontDistribute super."json-builder";
@@ -7734,6 +7737,7 @@ self: super: {
   "string-qq" = dontDistribute super."string-qq";
   "string-quote" = dontDistribute super."string-quote";
   "string-similarity" = dontDistribute super."string-similarity";
+  "string-typelits" = dontDistribute super."string-typelits";
   "stringlike" = dontDistribute super."stringlike";
   "strings" = dontDistribute super."strings";
   "stringsearch" = doDistribute super."stringsearch_0_3_6_5";
diff --git a/pkgs/development/haskell-modules/configuration-lts-1.7.nix b/pkgs/development/haskell-modules/configuration-lts-1.7.nix
index 6617b79bd822..adcdd01ed261 100644
--- a/pkgs/development/haskell-modules/configuration-lts-1.7.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.7.nix
@@ -172,6 +172,7 @@ self: super: {
   "Cartesian" = dontDistribute super."Cartesian";
   "Cascade" = dontDistribute super."Cascade";
   "Catana" = dontDistribute super."Catana";
+  "ChannelT" = dontDistribute super."ChannelT";
   "Chart" = doDistribute super."Chart_1_3_3";
   "Chart-cairo" = dontDistribute super."Chart-cairo";
   "Chart-diagrams" = doDistribute super."Chart-diagrams_1_3_3";
@@ -4941,6 +4942,7 @@ self: super: {
   "irc-fun-client" = dontDistribute super."irc-fun-client";
   "irc-fun-color" = dontDistribute super."irc-fun-color";
   "irc-fun-messages" = dontDistribute super."irc-fun-messages";
+  "irc-fun-types" = dontDistribute super."irc-fun-types";
   "ircbot" = dontDistribute super."ircbot";
   "ircbouncer" = dontDistribute super."ircbouncer";
   "ireal" = dontDistribute super."ireal";
@@ -5025,6 +5027,7 @@ self: super: {
   "jsmw" = dontDistribute super."jsmw";
   "json" = dontDistribute super."json";
   "json-assertions" = dontDistribute super."json-assertions";
+  "json-ast" = dontDistribute super."json-ast";
   "json-autotype" = doDistribute super."json-autotype_0_2_5_4";
   "json-b" = dontDistribute super."json-b";
   "json-builder" = dontDistribute super."json-builder";
@@ -7729,6 +7732,7 @@ self: super: {
   "string-qq" = dontDistribute super."string-qq";
   "string-quote" = dontDistribute super."string-quote";
   "string-similarity" = dontDistribute super."string-similarity";
+  "string-typelits" = dontDistribute super."string-typelits";
   "stringlike" = dontDistribute super."stringlike";
   "strings" = dontDistribute super."strings";
   "stringsearch" = doDistribute super."stringsearch_0_3_6_5";
diff --git a/pkgs/development/haskell-modules/configuration-lts-1.8.nix b/pkgs/development/haskell-modules/configuration-lts-1.8.nix
index a9a8963aa99b..553dd0774d21 100644
--- a/pkgs/development/haskell-modules/configuration-lts-1.8.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.8.nix
@@ -172,6 +172,7 @@ self: super: {
   "Cartesian" = dontDistribute super."Cartesian";
   "Cascade" = dontDistribute super."Cascade";
   "Catana" = dontDistribute super."Catana";
+  "ChannelT" = dontDistribute super."ChannelT";
   "Chart" = doDistribute super."Chart_1_3_3";
   "Chart-cairo" = dontDistribute super."Chart-cairo";
   "Chart-diagrams" = doDistribute super."Chart-diagrams_1_3_3";
@@ -4938,6 +4939,7 @@ self: super: {
   "irc-fun-client" = dontDistribute super."irc-fun-client";
   "irc-fun-color" = dontDistribute super."irc-fun-color";
   "irc-fun-messages" = dontDistribute super."irc-fun-messages";
+  "irc-fun-types" = dontDistribute super."irc-fun-types";
   "ircbot" = dontDistribute super."ircbot";
   "ircbouncer" = dontDistribute super."ircbouncer";
   "ireal" = dontDistribute super."ireal";
@@ -5022,6 +5024,7 @@ self: super: {
   "jsmw" = dontDistribute super."jsmw";
   "json" = dontDistribute super."json";
   "json-assertions" = dontDistribute super."json-assertions";
+  "json-ast" = dontDistribute super."json-ast";
   "json-autotype" = doDistribute super."json-autotype_0_2_5_4";
   "json-b" = dontDistribute super."json-b";
   "json-builder" = dontDistribute super."json-builder";
@@ -7725,6 +7728,7 @@ self: super: {
   "string-qq" = dontDistribute super."string-qq";
   "string-quote" = dontDistribute super."string-quote";
   "string-similarity" = dontDistribute super."string-similarity";
+  "string-typelits" = dontDistribute super."string-typelits";
   "stringlike" = dontDistribute super."stringlike";
   "strings" = dontDistribute super."strings";
   "stringsearch" = doDistribute super."stringsearch_0_3_6_5";
diff --git a/pkgs/development/haskell-modules/configuration-lts-1.9.nix b/pkgs/development/haskell-modules/configuration-lts-1.9.nix
index f14ff6234093..eb92109fd38c 100644
--- a/pkgs/development/haskell-modules/configuration-lts-1.9.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.9.nix
@@ -172,6 +172,7 @@ self: super: {
   "Cartesian" = dontDistribute super."Cartesian";
   "Cascade" = dontDistribute super."Cascade";
   "Catana" = dontDistribute super."Catana";
+  "ChannelT" = dontDistribute super."ChannelT";
   "Chart" = doDistribute super."Chart_1_3_3";
   "Chart-cairo" = dontDistribute super."Chart-cairo";
   "Chart-diagrams" = doDistribute super."Chart-diagrams_1_3_3";
@@ -4937,6 +4938,7 @@ self: super: {
   "irc-fun-client" = dontDistribute super."irc-fun-client";
   "irc-fun-color" = dontDistribute super."irc-fun-color";
   "irc-fun-messages" = dontDistribute super."irc-fun-messages";
+  "irc-fun-types" = dontDistribute super."irc-fun-types";
   "ircbot" = dontDistribute super."ircbot";
   "ircbouncer" = dontDistribute super."ircbouncer";
   "ireal" = dontDistribute super."ireal";
@@ -5021,6 +5023,7 @@ self: super: {
   "jsmw" = dontDistribute super."jsmw";
   "json" = dontDistribute super."json";
   "json-assertions" = dontDistribute super."json-assertions";
+  "json-ast" = dontDistribute super."json-ast";
   "json-autotype" = doDistribute super."json-autotype_0_2_5_4";
   "json-b" = dontDistribute super."json-b";
   "json-builder" = dontDistribute super."json-builder";
@@ -7724,6 +7727,7 @@ self: super: {
   "string-qq" = dontDistribute super."string-qq";
   "string-quote" = dontDistribute super."string-quote";
   "string-similarity" = dontDistribute super."string-similarity";
+  "string-typelits" = dontDistribute super."string-typelits";
   "stringlike" = dontDistribute super."stringlike";
   "strings" = dontDistribute super."strings";
   "stringsearch" = doDistribute super."stringsearch_0_3_6_5";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.0.nix b/pkgs/development/haskell-modules/configuration-lts-2.0.nix
index 94b073c821dd..8e1c69f9d0a7 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.0.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.0.nix
@@ -171,6 +171,7 @@ self: super: {
   "Cartesian" = dontDistribute super."Cartesian";
   "Cascade" = dontDistribute super."Cascade";
   "Catana" = dontDistribute super."Catana";
+  "ChannelT" = dontDistribute super."ChannelT";
   "Chart" = doDistribute super."Chart_1_3_3";
   "Chart-cairo" = dontDistribute super."Chart-cairo";
   "Chart-diagrams" = doDistribute super."Chart-diagrams_1_3_3";
@@ -4894,6 +4895,7 @@ self: super: {
   "irc-fun-client" = dontDistribute super."irc-fun-client";
   "irc-fun-color" = dontDistribute super."irc-fun-color";
   "irc-fun-messages" = dontDistribute super."irc-fun-messages";
+  "irc-fun-types" = dontDistribute super."irc-fun-types";
   "ircbot" = dontDistribute super."ircbot";
   "ircbouncer" = dontDistribute super."ircbouncer";
   "ireal" = dontDistribute super."ireal";
@@ -4976,6 +4978,7 @@ self: super: {
   "jsc" = dontDistribute super."jsc";
   "jsmw" = dontDistribute super."jsmw";
   "json-assertions" = dontDistribute super."json-assertions";
+  "json-ast" = dontDistribute super."json-ast";
   "json-autotype" = doDistribute super."json-autotype_0_2_5_11";
   "json-b" = dontDistribute super."json-b";
   "json-builder" = dontDistribute super."json-builder";
@@ -7641,6 +7644,7 @@ self: super: {
   "string-qq" = dontDistribute super."string-qq";
   "string-quote" = dontDistribute super."string-quote";
   "string-similarity" = dontDistribute super."string-similarity";
+  "string-typelits" = dontDistribute super."string-typelits";
   "stringlike" = dontDistribute super."stringlike";
   "strings" = dontDistribute super."strings";
   "stringtable-atom" = dontDistribute super."stringtable-atom";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.1.nix b/pkgs/development/haskell-modules/configuration-lts-2.1.nix
index ddcf5efcae64..18261e8ccb9d 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.1.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.1.nix
@@ -171,6 +171,7 @@ self: super: {
   "Cartesian" = dontDistribute super."Cartesian";
   "Cascade" = dontDistribute super."Cascade";
   "Catana" = dontDistribute super."Catana";
+  "ChannelT" = dontDistribute super."ChannelT";
   "Chart" = doDistribute super."Chart_1_3_3";
   "Chart-cairo" = dontDistribute super."Chart-cairo";
   "Chart-diagrams" = doDistribute super."Chart-diagrams_1_3_3";
@@ -4893,6 +4894,7 @@ self: super: {
   "irc-fun-client" = dontDistribute super."irc-fun-client";
   "irc-fun-color" = dontDistribute super."irc-fun-color";
   "irc-fun-messages" = dontDistribute super."irc-fun-messages";
+  "irc-fun-types" = dontDistribute super."irc-fun-types";
   "ircbot" = dontDistribute super."ircbot";
   "ircbouncer" = dontDistribute super."ircbouncer";
   "ireal" = dontDistribute super."ireal";
@@ -4975,6 +4977,7 @@ self: super: {
   "jsc" = dontDistribute super."jsc";
   "jsmw" = dontDistribute super."jsmw";
   "json-assertions" = dontDistribute super."json-assertions";
+  "json-ast" = dontDistribute super."json-ast";
   "json-autotype" = doDistribute super."json-autotype_0_2_5_13";
   "json-b" = dontDistribute super."json-b";
   "json-builder" = dontDistribute super."json-builder";
@@ -7640,6 +7643,7 @@ self: super: {
   "string-qq" = dontDistribute super."string-qq";
   "string-quote" = dontDistribute super."string-quote";
   "string-similarity" = dontDistribute super."string-similarity";
+  "string-typelits" = dontDistribute super."string-typelits";
   "stringlike" = dontDistribute super."stringlike";
   "strings" = dontDistribute super."strings";
   "stringtable-atom" = dontDistribute super."stringtable-atom";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.10.nix b/pkgs/development/haskell-modules/configuration-lts-2.10.nix
index c98889fa2aa9..95b74fb6ccaa 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.10.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.10.nix
@@ -171,6 +171,7 @@ self: super: {
   "Cartesian" = dontDistribute super."Cartesian";
   "Cascade" = dontDistribute super."Cascade";
   "Catana" = dontDistribute super."Catana";
+  "ChannelT" = dontDistribute super."ChannelT";
   "Chart" = doDistribute super."Chart_1_3_3";
   "Chart-cairo" = dontDistribute super."Chart-cairo";
   "Chart-diagrams" = doDistribute super."Chart-diagrams_1_3_3";
@@ -4867,6 +4868,7 @@ self: super: {
   "irc-fun-client" = dontDistribute super."irc-fun-client";
   "irc-fun-color" = dontDistribute super."irc-fun-color";
   "irc-fun-messages" = dontDistribute super."irc-fun-messages";
+  "irc-fun-types" = dontDistribute super."irc-fun-types";
   "ircbot" = dontDistribute super."ircbot";
   "ircbouncer" = dontDistribute super."ircbouncer";
   "ireal" = dontDistribute super."ireal";
@@ -4947,6 +4949,7 @@ self: super: {
   "jsc" = dontDistribute super."jsc";
   "jsmw" = dontDistribute super."jsmw";
   "json-assertions" = dontDistribute super."json-assertions";
+  "json-ast" = dontDistribute super."json-ast";
   "json-autotype" = doDistribute super."json-autotype_0_2_5_13";
   "json-b" = dontDistribute super."json-b";
   "json-builder" = dontDistribute super."json-builder";
@@ -7592,6 +7595,7 @@ self: super: {
   "string-qq" = dontDistribute super."string-qq";
   "string-quote" = dontDistribute super."string-quote";
   "string-similarity" = dontDistribute super."string-similarity";
+  "string-typelits" = dontDistribute super."string-typelits";
   "stringlike" = dontDistribute super."stringlike";
   "strings" = dontDistribute super."strings";
   "stringtable-atom" = dontDistribute super."stringtable-atom";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.11.nix b/pkgs/development/haskell-modules/configuration-lts-2.11.nix
index 472a9215257d..9a47f9dda6f4 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.11.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.11.nix
@@ -171,6 +171,7 @@ self: super: {
   "Cartesian" = dontDistribute super."Cartesian";
   "Cascade" = dontDistribute super."Cascade";
   "Catana" = dontDistribute super."Catana";
+  "ChannelT" = dontDistribute super."ChannelT";
   "Chart" = doDistribute super."Chart_1_3_3";
   "Chart-cairo" = dontDistribute super."Chart-cairo";
   "Chart-diagrams" = doDistribute super."Chart-diagrams_1_3_3";
@@ -4864,6 +4865,7 @@ self: super: {
   "irc-fun-client" = dontDistribute super."irc-fun-client";
   "irc-fun-color" = dontDistribute super."irc-fun-color";
   "irc-fun-messages" = dontDistribute super."irc-fun-messages";
+  "irc-fun-types" = dontDistribute super."irc-fun-types";
   "ircbot" = dontDistribute super."ircbot";
   "ircbouncer" = dontDistribute super."ircbouncer";
   "ireal" = dontDistribute super."ireal";
@@ -4943,6 +4945,7 @@ self: super: {
   "jsc" = dontDistribute super."jsc";
   "jsmw" = dontDistribute super."jsmw";
   "json-assertions" = dontDistribute super."json-assertions";
+  "json-ast" = dontDistribute super."json-ast";
   "json-autotype" = doDistribute super."json-autotype_0_2_5_13";
   "json-b" = dontDistribute super."json-b";
   "json-builder" = dontDistribute super."json-builder";
@@ -7584,6 +7587,7 @@ self: super: {
   "string-qq" = dontDistribute super."string-qq";
   "string-quote" = dontDistribute super."string-quote";
   "string-similarity" = dontDistribute super."string-similarity";
+  "string-typelits" = dontDistribute super."string-typelits";
   "stringlike" = dontDistribute super."stringlike";
   "strings" = dontDistribute super."strings";
   "stringtable-atom" = dontDistribute super."stringtable-atom";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.12.nix b/pkgs/development/haskell-modules/configuration-lts-2.12.nix
index 0a81ae1cdf52..eddd47d1c874 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.12.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.12.nix
@@ -171,6 +171,7 @@ self: super: {
   "Cartesian" = dontDistribute super."Cartesian";
   "Cascade" = dontDistribute super."Cascade";
   "Catana" = dontDistribute super."Catana";
+  "ChannelT" = dontDistribute super."ChannelT";
   "Chart" = doDistribute super."Chart_1_3_3";
   "Chart-cairo" = dontDistribute super."Chart-cairo";
   "Chart-diagrams" = doDistribute super."Chart-diagrams_1_3_3";
@@ -4864,6 +4865,7 @@ self: super: {
   "irc-fun-client" = dontDistribute super."irc-fun-client";
   "irc-fun-color" = dontDistribute super."irc-fun-color";
   "irc-fun-messages" = dontDistribute super."irc-fun-messages";
+  "irc-fun-types" = dontDistribute super."irc-fun-types";
   "ircbot" = dontDistribute super."ircbot";
   "ircbouncer" = dontDistribute super."ircbouncer";
   "ireal" = dontDistribute super."ireal";
@@ -4943,6 +4945,7 @@ self: super: {
   "jsc" = dontDistribute super."jsc";
   "jsmw" = dontDistribute super."jsmw";
   "json-assertions" = dontDistribute super."json-assertions";
+  "json-ast" = dontDistribute super."json-ast";
   "json-autotype" = doDistribute super."json-autotype_0_2_5_13";
   "json-b" = dontDistribute super."json-b";
   "json-builder" = dontDistribute super."json-builder";
@@ -7583,6 +7586,7 @@ self: super: {
   "string-qq" = dontDistribute super."string-qq";
   "string-quote" = dontDistribute super."string-quote";
   "string-similarity" = dontDistribute super."string-similarity";
+  "string-typelits" = dontDistribute super."string-typelits";
   "stringlike" = dontDistribute super."stringlike";
   "strings" = dontDistribute super."strings";
   "stringtable-atom" = dontDistribute super."stringtable-atom";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.13.nix b/pkgs/development/haskell-modules/configuration-lts-2.13.nix
index 7c33ed9182ec..b4614ffe878d 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.13.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.13.nix
@@ -171,6 +171,7 @@ self: super: {
   "Cartesian" = dontDistribute super."Cartesian";
   "Cascade" = dontDistribute super."Cascade";
   "Catana" = dontDistribute super."Catana";
+  "ChannelT" = dontDistribute super."ChannelT";
   "Chart" = doDistribute super."Chart_1_3_3";
   "Chart-cairo" = dontDistribute super."Chart-cairo";
   "Chart-diagrams" = doDistribute super."Chart-diagrams_1_3_3";
@@ -4862,6 +4863,7 @@ self: super: {
   "irc-fun-client" = dontDistribute super."irc-fun-client";
   "irc-fun-color" = dontDistribute super."irc-fun-color";
   "irc-fun-messages" = dontDistribute super."irc-fun-messages";
+  "irc-fun-types" = dontDistribute super."irc-fun-types";
   "ircbot" = dontDistribute super."ircbot";
   "ircbouncer" = dontDistribute super."ircbouncer";
   "ireal" = dontDistribute super."ireal";
@@ -4941,6 +4943,7 @@ self: super: {
   "jsc" = dontDistribute super."jsc";
   "jsmw" = dontDistribute super."jsmw";
   "json-assertions" = dontDistribute super."json-assertions";
+  "json-ast" = dontDistribute super."json-ast";
   "json-autotype" = doDistribute super."json-autotype_0_2_5_13";
   "json-b" = dontDistribute super."json-b";
   "json-builder" = dontDistribute super."json-builder";
@@ -7581,6 +7584,7 @@ self: super: {
   "string-qq" = dontDistribute super."string-qq";
   "string-quote" = dontDistribute super."string-quote";
   "string-similarity" = dontDistribute super."string-similarity";
+  "string-typelits" = dontDistribute super."string-typelits";
   "stringlike" = dontDistribute super."stringlike";
   "strings" = dontDistribute super."strings";
   "stringtable-atom" = dontDistribute super."stringtable-atom";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.14.nix b/pkgs/development/haskell-modules/configuration-lts-2.14.nix
index 16a9b422305c..4d8ef2724d6f 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.14.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.14.nix
@@ -171,6 +171,7 @@ self: super: {
   "Cartesian" = dontDistribute super."Cartesian";
   "Cascade" = dontDistribute super."Cascade";
   "Catana" = dontDistribute super."Catana";
+  "ChannelT" = dontDistribute super."ChannelT";
   "Chart" = doDistribute super."Chart_1_3_3";
   "Chart-cairo" = dontDistribute super."Chart-cairo";
   "Chart-diagrams" = doDistribute super."Chart-diagrams_1_3_3";
@@ -4859,6 +4860,7 @@ self: super: {
   "irc-fun-client" = dontDistribute super."irc-fun-client";
   "irc-fun-color" = dontDistribute super."irc-fun-color";
   "irc-fun-messages" = dontDistribute super."irc-fun-messages";
+  "irc-fun-types" = dontDistribute super."irc-fun-types";
   "ircbot" = dontDistribute super."ircbot";
   "ircbouncer" = dontDistribute super."ircbouncer";
   "ireal" = dontDistribute super."ireal";
@@ -4938,6 +4940,7 @@ self: super: {
   "jsc" = dontDistribute super."jsc";
   "jsmw" = dontDistribute super."jsmw";
   "json-assertions" = dontDistribute super."json-assertions";
+  "json-ast" = dontDistribute super."json-ast";
   "json-autotype" = doDistribute super."json-autotype_0_2_5_13";
   "json-b" = dontDistribute super."json-b";
   "json-builder" = dontDistribute super."json-builder";
@@ -7577,6 +7580,7 @@ self: super: {
   "string-qq" = dontDistribute super."string-qq";
   "string-quote" = dontDistribute super."string-quote";
   "string-similarity" = dontDistribute super."string-similarity";
+  "string-typelits" = dontDistribute super."string-typelits";
   "stringlike" = dontDistribute super."stringlike";
   "strings" = dontDistribute super."strings";
   "stringtable-atom" = dontDistribute super."stringtable-atom";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.15.nix b/pkgs/development/haskell-modules/configuration-lts-2.15.nix
index 140483b7aded..94e9eb0184e4 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.15.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.15.nix
@@ -171,6 +171,7 @@ self: super: {
   "Cartesian" = dontDistribute super."Cartesian";
   "Cascade" = dontDistribute super."Cascade";
   "Catana" = dontDistribute super."Catana";
+  "ChannelT" = dontDistribute super."ChannelT";
   "Chart" = doDistribute super."Chart_1_3_3";
   "Chart-cairo" = dontDistribute super."Chart-cairo";
   "Chart-diagrams" = doDistribute super."Chart-diagrams_1_3_3";
@@ -4858,6 +4859,7 @@ self: super: {
   "irc-fun-client" = dontDistribute super."irc-fun-client";
   "irc-fun-color" = dontDistribute super."irc-fun-color";
   "irc-fun-messages" = dontDistribute super."irc-fun-messages";
+  "irc-fun-types" = dontDistribute super."irc-fun-types";
   "ircbot" = dontDistribute super."ircbot";
   "ircbouncer" = dontDistribute super."ircbouncer";
   "ireal" = dontDistribute super."ireal";
@@ -4937,6 +4939,7 @@ self: super: {
   "jsc" = dontDistribute super."jsc";
   "jsmw" = dontDistribute super."jsmw";
   "json-assertions" = dontDistribute super."json-assertions";
+  "json-ast" = dontDistribute super."json-ast";
   "json-autotype" = doDistribute super."json-autotype_0_2_5_13";
   "json-b" = dontDistribute super."json-b";
   "json-builder" = dontDistribute super."json-builder";
@@ -7572,6 +7575,7 @@ self: super: {
   "string-qq" = dontDistribute super."string-qq";
   "string-quote" = dontDistribute super."string-quote";
   "string-similarity" = dontDistribute super."string-similarity";
+  "string-typelits" = dontDistribute super."string-typelits";
   "stringlike" = dontDistribute super."stringlike";
   "strings" = dontDistribute super."strings";
   "stringtable-atom" = dontDistribute super."stringtable-atom";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.16.nix b/pkgs/development/haskell-modules/configuration-lts-2.16.nix
index 0fcd9376f8e5..8fc73ea3a05a 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.16.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.16.nix
@@ -171,6 +171,7 @@ self: super: {
   "Cartesian" = dontDistribute super."Cartesian";
   "Cascade" = dontDistribute super."Cascade";
   "Catana" = dontDistribute super."Catana";
+  "ChannelT" = dontDistribute super."ChannelT";
   "Chart" = doDistribute super."Chart_1_3_3";
   "Chart-cairo" = dontDistribute super."Chart-cairo";
   "Chart-diagrams" = doDistribute super."Chart-diagrams_1_3_3";
@@ -4853,6 +4854,7 @@ self: super: {
   "irc-fun-client" = dontDistribute super."irc-fun-client";
   "irc-fun-color" = dontDistribute super."irc-fun-color";
   "irc-fun-messages" = dontDistribute super."irc-fun-messages";
+  "irc-fun-types" = dontDistribute super."irc-fun-types";
   "ircbot" = dontDistribute super."ircbot";
   "ircbouncer" = dontDistribute super."ircbouncer";
   "ireal" = dontDistribute super."ireal";
@@ -4932,6 +4934,7 @@ self: super: {
   "jsc" = dontDistribute super."jsc";
   "jsmw" = dontDistribute super."jsmw";
   "json-assertions" = dontDistribute super."json-assertions";
+  "json-ast" = dontDistribute super."json-ast";
   "json-autotype" = doDistribute super."json-autotype_0_2_5_13";
   "json-b" = dontDistribute super."json-b";
   "json-builder" = dontDistribute super."json-builder";
@@ -7566,6 +7569,7 @@ self: super: {
   "string-qq" = dontDistribute super."string-qq";
   "string-quote" = dontDistribute super."string-quote";
   "string-similarity" = dontDistribute super."string-similarity";
+  "string-typelits" = dontDistribute super."string-typelits";
   "stringlike" = dontDistribute super."stringlike";
   "strings" = dontDistribute super."strings";
   "stringtable-atom" = dontDistribute super."stringtable-atom";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.17.nix b/pkgs/development/haskell-modules/configuration-lts-2.17.nix
index 94cf59753ec8..4b57e8e021f9 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.17.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.17.nix
@@ -171,6 +171,7 @@ self: super: {
   "Cartesian" = dontDistribute super."Cartesian";
   "Cascade" = dontDistribute super."Cascade";
   "Catana" = dontDistribute super."Catana";
+  "ChannelT" = dontDistribute super."ChannelT";
   "Chart" = doDistribute super."Chart_1_3_3";
   "Chart-cairo" = dontDistribute super."Chart-cairo";
   "Chart-diagrams" = doDistribute super."Chart-diagrams_1_3_3";
@@ -4848,6 +4849,7 @@ self: super: {
   "irc-fun-client" = dontDistribute super."irc-fun-client";
   "irc-fun-color" = dontDistribute super."irc-fun-color";
   "irc-fun-messages" = dontDistribute super."irc-fun-messages";
+  "irc-fun-types" = dontDistribute super."irc-fun-types";
   "ircbot" = dontDistribute super."ircbot";
   "ircbouncer" = dontDistribute super."ircbouncer";
   "ireal" = dontDistribute super."ireal";
@@ -4927,6 +4929,7 @@ self: super: {
   "jsc" = dontDistribute super."jsc";
   "jsmw" = dontDistribute super."jsmw";
   "json-assertions" = dontDistribute super."json-assertions";
+  "json-ast" = dontDistribute super."json-ast";
   "json-autotype" = doDistribute super."json-autotype_0_2_5_13";
   "json-b" = dontDistribute super."json-b";
   "json-builder" = dontDistribute super."json-builder";
@@ -7560,6 +7563,7 @@ self: super: {
   "string-qq" = dontDistribute super."string-qq";
   "string-quote" = dontDistribute super."string-quote";
   "string-similarity" = dontDistribute super."string-similarity";
+  "string-typelits" = dontDistribute super."string-typelits";
   "stringlike" = dontDistribute super."stringlike";
   "strings" = dontDistribute super."strings";
   "stringtable-atom" = dontDistribute super."stringtable-atom";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.18.nix b/pkgs/development/haskell-modules/configuration-lts-2.18.nix
index 1426832df281..c299d34ec022 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.18.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.18.nix
@@ -171,6 +171,7 @@ self: super: {
   "Cartesian" = dontDistribute super."Cartesian";
   "Cascade" = dontDistribute super."Cascade";
   "Catana" = dontDistribute super."Catana";
+  "ChannelT" = dontDistribute super."ChannelT";
   "Chart" = doDistribute super."Chart_1_3_3";
   "Chart-cairo" = dontDistribute super."Chart-cairo";
   "Chart-diagrams" = doDistribute super."Chart-diagrams_1_3_3";
@@ -4845,6 +4846,7 @@ self: super: {
   "irc-fun-client" = dontDistribute super."irc-fun-client";
   "irc-fun-color" = dontDistribute super."irc-fun-color";
   "irc-fun-messages" = dontDistribute super."irc-fun-messages";
+  "irc-fun-types" = dontDistribute super."irc-fun-types";
   "ircbot" = dontDistribute super."ircbot";
   "ircbouncer" = dontDistribute super."ircbouncer";
   "ireal" = dontDistribute super."ireal";
@@ -4924,6 +4926,7 @@ self: super: {
   "jsc" = dontDistribute super."jsc";
   "jsmw" = dontDistribute super."jsmw";
   "json-assertions" = dontDistribute super."json-assertions";
+  "json-ast" = dontDistribute super."json-ast";
   "json-autotype" = doDistribute super."json-autotype_0_2_5_13";
   "json-b" = dontDistribute super."json-b";
   "json-builder" = dontDistribute super."json-builder";
@@ -7554,6 +7557,7 @@ self: super: {
   "string-qq" = dontDistribute super."string-qq";
   "string-quote" = dontDistribute super."string-quote";
   "string-similarity" = dontDistribute super."string-similarity";
+  "string-typelits" = dontDistribute super."string-typelits";
   "stringlike" = dontDistribute super."stringlike";
   "strings" = dontDistribute super."strings";
   "stringtable-atom" = dontDistribute super."stringtable-atom";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.19.nix b/pkgs/development/haskell-modules/configuration-lts-2.19.nix
index 9a009d2ceeba..ad3e0bad7db5 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.19.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.19.nix
@@ -171,6 +171,7 @@ self: super: {
   "Cartesian" = dontDistribute super."Cartesian";
   "Cascade" = dontDistribute super."Cascade";
   "Catana" = dontDistribute super."Catana";
+  "ChannelT" = dontDistribute super."ChannelT";
   "Chart" = doDistribute super."Chart_1_3_3";
   "Chart-cairo" = dontDistribute super."Chart-cairo";
   "Chart-diagrams" = doDistribute super."Chart-diagrams_1_3_3";
@@ -4844,6 +4845,7 @@ self: super: {
   "irc-fun-client" = dontDistribute super."irc-fun-client";
   "irc-fun-color" = dontDistribute super."irc-fun-color";
   "irc-fun-messages" = dontDistribute super."irc-fun-messages";
+  "irc-fun-types" = dontDistribute super."irc-fun-types";
   "ircbot" = dontDistribute super."ircbot";
   "ircbouncer" = dontDistribute super."ircbouncer";
   "ireal" = dontDistribute super."ireal";
@@ -4923,6 +4925,7 @@ self: super: {
   "jsc" = dontDistribute super."jsc";
   "jsmw" = dontDistribute super."jsmw";
   "json-assertions" = dontDistribute super."json-assertions";
+  "json-ast" = dontDistribute super."json-ast";
   "json-autotype" = doDistribute super."json-autotype_0_2_5_13";
   "json-b" = dontDistribute super."json-b";
   "json-builder" = dontDistribute super."json-builder";
@@ -7549,6 +7552,7 @@ self: super: {
   "string-qq" = dontDistribute super."string-qq";
   "string-quote" = dontDistribute super."string-quote";
   "string-similarity" = dontDistribute super."string-similarity";
+  "string-typelits" = dontDistribute super."string-typelits";
   "stringlike" = dontDistribute super."stringlike";
   "strings" = dontDistribute super."strings";
   "stringtable-atom" = dontDistribute super."stringtable-atom";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.2.nix b/pkgs/development/haskell-modules/configuration-lts-2.2.nix
index 534c29e83259..69e76d6b5696 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.2.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.2.nix
@@ -171,6 +171,7 @@ self: super: {
   "Cartesian" = dontDistribute super."Cartesian";
   "Cascade" = dontDistribute super."Cascade";
   "Catana" = dontDistribute super."Catana";
+  "ChannelT" = dontDistribute super."ChannelT";
   "Chart" = doDistribute super."Chart_1_3_3";
   "Chart-cairo" = dontDistribute super."Chart-cairo";
   "Chart-diagrams" = doDistribute super."Chart-diagrams_1_3_3";
@@ -4890,6 +4891,7 @@ self: super: {
   "irc-fun-client" = dontDistribute super."irc-fun-client";
   "irc-fun-color" = dontDistribute super."irc-fun-color";
   "irc-fun-messages" = dontDistribute super."irc-fun-messages";
+  "irc-fun-types" = dontDistribute super."irc-fun-types";
   "ircbot" = dontDistribute super."ircbot";
   "ircbouncer" = dontDistribute super."ircbouncer";
   "ireal" = dontDistribute super."ireal";
@@ -4972,6 +4974,7 @@ self: super: {
   "jsc" = dontDistribute super."jsc";
   "jsmw" = dontDistribute super."jsmw";
   "json-assertions" = dontDistribute super."json-assertions";
+  "json-ast" = dontDistribute super."json-ast";
   "json-autotype" = doDistribute super."json-autotype_0_2_5_13";
   "json-b" = dontDistribute super."json-b";
   "json-builder" = dontDistribute super."json-builder";
@@ -7637,6 +7640,7 @@ self: super: {
   "string-qq" = dontDistribute super."string-qq";
   "string-quote" = dontDistribute super."string-quote";
   "string-similarity" = dontDistribute super."string-similarity";
+  "string-typelits" = dontDistribute super."string-typelits";
   "stringlike" = dontDistribute super."stringlike";
   "strings" = dontDistribute super."strings";
   "stringtable-atom" = dontDistribute super."stringtable-atom";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.20.nix b/pkgs/development/haskell-modules/configuration-lts-2.20.nix
index 5016b16e2faa..c107ba1cc83b 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.20.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.20.nix
@@ -171,6 +171,7 @@ self: super: {
   "Cartesian" = dontDistribute super."Cartesian";
   "Cascade" = dontDistribute super."Cascade";
   "Catana" = dontDistribute super."Catana";
+  "ChannelT" = dontDistribute super."ChannelT";
   "Chart" = doDistribute super."Chart_1_3_3";
   "Chart-cairo" = dontDistribute super."Chart-cairo";
   "Chart-diagrams" = doDistribute super."Chart-diagrams_1_3_3";
@@ -4843,6 +4844,7 @@ self: super: {
   "irc-fun-client" = dontDistribute super."irc-fun-client";
   "irc-fun-color" = dontDistribute super."irc-fun-color";
   "irc-fun-messages" = dontDistribute super."irc-fun-messages";
+  "irc-fun-types" = dontDistribute super."irc-fun-types";
   "ircbot" = dontDistribute super."ircbot";
   "ircbouncer" = dontDistribute super."ircbouncer";
   "ireal" = dontDistribute super."ireal";
@@ -4922,6 +4924,7 @@ self: super: {
   "jsc" = dontDistribute super."jsc";
   "jsmw" = dontDistribute super."jsmw";
   "json-assertions" = dontDistribute super."json-assertions";
+  "json-ast" = dontDistribute super."json-ast";
   "json-autotype" = doDistribute super."json-autotype_0_2_5_13";
   "json-b" = dontDistribute super."json-b";
   "json-builder" = dontDistribute super."json-builder";
@@ -7546,6 +7549,7 @@ self: super: {
   "string-qq" = dontDistribute super."string-qq";
   "string-quote" = dontDistribute super."string-quote";
   "string-similarity" = dontDistribute super."string-similarity";
+  "string-typelits" = dontDistribute super."string-typelits";
   "stringlike" = dontDistribute super."stringlike";
   "strings" = dontDistribute super."strings";
   "stringtable-atom" = dontDistribute super."stringtable-atom";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.21.nix b/pkgs/development/haskell-modules/configuration-lts-2.21.nix
index 0fbfc8cd3a32..414d0d4a4d2f 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.21.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.21.nix
@@ -171,6 +171,7 @@ self: super: {
   "Cartesian" = dontDistribute super."Cartesian";
   "Cascade" = dontDistribute super."Cascade";
   "Catana" = dontDistribute super."Catana";
+  "ChannelT" = dontDistribute super."ChannelT";
   "Chart" = doDistribute super."Chart_1_3_3";
   "Chart-cairo" = dontDistribute super."Chart-cairo";
   "Chart-diagrams" = doDistribute super."Chart-diagrams_1_3_3";
@@ -4843,6 +4844,7 @@ self: super: {
   "irc-fun-client" = dontDistribute super."irc-fun-client";
   "irc-fun-color" = dontDistribute super."irc-fun-color";
   "irc-fun-messages" = dontDistribute super."irc-fun-messages";
+  "irc-fun-types" = dontDistribute super."irc-fun-types";
   "ircbot" = dontDistribute super."ircbot";
   "ircbouncer" = dontDistribute super."ircbouncer";
   "ireal" = dontDistribute super."ireal";
@@ -4922,6 +4924,7 @@ self: super: {
   "jsc" = dontDistribute super."jsc";
   "jsmw" = dontDistribute super."jsmw";
   "json-assertions" = dontDistribute super."json-assertions";
+  "json-ast" = dontDistribute super."json-ast";
   "json-autotype" = doDistribute super."json-autotype_0_2_5_13";
   "json-b" = dontDistribute super."json-b";
   "json-builder" = dontDistribute super."json-builder";
@@ -7544,6 +7547,7 @@ self: super: {
   "string-qq" = dontDistribute super."string-qq";
   "string-quote" = dontDistribute super."string-quote";
   "string-similarity" = dontDistribute super."string-similarity";
+  "string-typelits" = dontDistribute super."string-typelits";
   "stringlike" = dontDistribute super."stringlike";
   "strings" = dontDistribute super."strings";
   "stringtable-atom" = dontDistribute super."stringtable-atom";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.22.nix b/pkgs/development/haskell-modules/configuration-lts-2.22.nix
index 75fc329a187a..3915f14e98db 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.22.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.22.nix
@@ -171,6 +171,7 @@ self: super: {
   "Cartesian" = dontDistribute super."Cartesian";
   "Cascade" = dontDistribute super."Cascade";
   "Catana" = dontDistribute super."Catana";
+  "ChannelT" = dontDistribute super."ChannelT";
   "Chart" = doDistribute super."Chart_1_3_3";
   "Chart-cairo" = dontDistribute super."Chart-cairo";
   "Chart-diagrams" = doDistribute super."Chart-diagrams_1_3_3";
@@ -4842,6 +4843,7 @@ self: super: {
   "irc-fun-client" = dontDistribute super."irc-fun-client";
   "irc-fun-color" = dontDistribute super."irc-fun-color";
   "irc-fun-messages" = dontDistribute super."irc-fun-messages";
+  "irc-fun-types" = dontDistribute super."irc-fun-types";
   "ircbot" = dontDistribute super."ircbot";
   "ircbouncer" = dontDistribute super."ircbouncer";
   "ireal" = dontDistribute super."ireal";
@@ -4921,6 +4923,7 @@ self: super: {
   "jsc" = dontDistribute super."jsc";
   "jsmw" = dontDistribute super."jsmw";
   "json-assertions" = dontDistribute super."json-assertions";
+  "json-ast" = dontDistribute super."json-ast";
   "json-autotype" = doDistribute super."json-autotype_0_2_5_13";
   "json-b" = dontDistribute super."json-b";
   "json-builder" = dontDistribute super."json-builder";
@@ -7542,6 +7545,7 @@ self: super: {
   "string-qq" = dontDistribute super."string-qq";
   "string-quote" = dontDistribute super."string-quote";
   "string-similarity" = dontDistribute super."string-similarity";
+  "string-typelits" = dontDistribute super."string-typelits";
   "stringlike" = dontDistribute super."stringlike";
   "strings" = dontDistribute super."strings";
   "stringtable-atom" = dontDistribute super."stringtable-atom";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.3.nix b/pkgs/development/haskell-modules/configuration-lts-2.3.nix
index e5d4da7183fc..a6e8bdea0bf5 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.3.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.3.nix
@@ -171,6 +171,7 @@ self: super: {
   "Cartesian" = dontDistribute super."Cartesian";
   "Cascade" = dontDistribute super."Cascade";
   "Catana" = dontDistribute super."Catana";
+  "ChannelT" = dontDistribute super."ChannelT";
   "Chart" = doDistribute super."Chart_1_3_3";
   "Chart-cairo" = dontDistribute super."Chart-cairo";
   "Chart-diagrams" = doDistribute super."Chart-diagrams_1_3_3";
@@ -4888,6 +4889,7 @@ self: super: {
   "irc-fun-client" = dontDistribute super."irc-fun-client";
   "irc-fun-color" = dontDistribute super."irc-fun-color";
   "irc-fun-messages" = dontDistribute super."irc-fun-messages";
+  "irc-fun-types" = dontDistribute super."irc-fun-types";
   "ircbot" = dontDistribute super."ircbot";
   "ircbouncer" = dontDistribute super."ircbouncer";
   "ireal" = dontDistribute super."ireal";
@@ -4970,6 +4972,7 @@ self: super: {
   "jsc" = dontDistribute super."jsc";
   "jsmw" = dontDistribute super."jsmw";
   "json-assertions" = dontDistribute super."json-assertions";
+  "json-ast" = dontDistribute super."json-ast";
   "json-autotype" = doDistribute super."json-autotype_0_2_5_13";
   "json-b" = dontDistribute super."json-b";
   "json-builder" = dontDistribute super."json-builder";
@@ -7635,6 +7638,7 @@ self: super: {
   "string-qq" = dontDistribute super."string-qq";
   "string-quote" = dontDistribute super."string-quote";
   "string-similarity" = dontDistribute super."string-similarity";
+  "string-typelits" = dontDistribute super."string-typelits";
   "stringlike" = dontDistribute super."stringlike";
   "strings" = dontDistribute super."strings";
   "stringtable-atom" = dontDistribute super."stringtable-atom";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.4.nix b/pkgs/development/haskell-modules/configuration-lts-2.4.nix
index 711211614556..fbf589da2a48 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.4.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.4.nix
@@ -171,6 +171,7 @@ self: super: {
   "Cartesian" = dontDistribute super."Cartesian";
   "Cascade" = dontDistribute super."Cascade";
   "Catana" = dontDistribute super."Catana";
+  "ChannelT" = dontDistribute super."ChannelT";
   "Chart" = doDistribute super."Chart_1_3_3";
   "Chart-cairo" = dontDistribute super."Chart-cairo";
   "Chart-diagrams" = doDistribute super."Chart-diagrams_1_3_3";
@@ -4887,6 +4888,7 @@ self: super: {
   "irc-fun-client" = dontDistribute super."irc-fun-client";
   "irc-fun-color" = dontDistribute super."irc-fun-color";
   "irc-fun-messages" = dontDistribute super."irc-fun-messages";
+  "irc-fun-types" = dontDistribute super."irc-fun-types";
   "ircbot" = dontDistribute super."ircbot";
   "ircbouncer" = dontDistribute super."ircbouncer";
   "ireal" = dontDistribute super."ireal";
@@ -4969,6 +4971,7 @@ self: super: {
   "jsc" = dontDistribute super."jsc";
   "jsmw" = dontDistribute super."jsmw";
   "json-assertions" = dontDistribute super."json-assertions";
+  "json-ast" = dontDistribute super."json-ast";
   "json-autotype" = doDistribute super."json-autotype_0_2_5_13";
   "json-b" = dontDistribute super."json-b";
   "json-builder" = dontDistribute super."json-builder";
@@ -7630,6 +7633,7 @@ self: super: {
   "string-qq" = dontDistribute super."string-qq";
   "string-quote" = dontDistribute super."string-quote";
   "string-similarity" = dontDistribute super."string-similarity";
+  "string-typelits" = dontDistribute super."string-typelits";
   "stringlike" = dontDistribute super."stringlike";
   "strings" = dontDistribute super."strings";
   "stringtable-atom" = dontDistribute super."stringtable-atom";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.5.nix b/pkgs/development/haskell-modules/configuration-lts-2.5.nix
index 535b00d98b8c..950c96577cbb 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.5.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.5.nix
@@ -171,6 +171,7 @@ self: super: {
   "Cartesian" = dontDistribute super."Cartesian";
   "Cascade" = dontDistribute super."Cascade";
   "Catana" = dontDistribute super."Catana";
+  "ChannelT" = dontDistribute super."ChannelT";
   "Chart" = doDistribute super."Chart_1_3_3";
   "Chart-cairo" = dontDistribute super."Chart-cairo";
   "Chart-diagrams" = doDistribute super."Chart-diagrams_1_3_3";
@@ -4886,6 +4887,7 @@ self: super: {
   "irc-fun-client" = dontDistribute super."irc-fun-client";
   "irc-fun-color" = dontDistribute super."irc-fun-color";
   "irc-fun-messages" = dontDistribute super."irc-fun-messages";
+  "irc-fun-types" = dontDistribute super."irc-fun-types";
   "ircbot" = dontDistribute super."ircbot";
   "ircbouncer" = dontDistribute super."ircbouncer";
   "ireal" = dontDistribute super."ireal";
@@ -4968,6 +4970,7 @@ self: super: {
   "jsc" = dontDistribute super."jsc";
   "jsmw" = dontDistribute super."jsmw";
   "json-assertions" = dontDistribute super."json-assertions";
+  "json-ast" = dontDistribute super."json-ast";
   "json-autotype" = doDistribute super."json-autotype_0_2_5_13";
   "json-b" = dontDistribute super."json-b";
   "json-builder" = dontDistribute super."json-builder";
@@ -7628,6 +7631,7 @@ self: super: {
   "string-qq" = dontDistribute super."string-qq";
   "string-quote" = dontDistribute super."string-quote";
   "string-similarity" = dontDistribute super."string-similarity";
+  "string-typelits" = dontDistribute super."string-typelits";
   "stringlike" = dontDistribute super."stringlike";
   "strings" = dontDistribute super."strings";
   "stringtable-atom" = dontDistribute super."stringtable-atom";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.6.nix b/pkgs/development/haskell-modules/configuration-lts-2.6.nix
index b395091088a0..38c75d61d58f 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.6.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.6.nix
@@ -171,6 +171,7 @@ self: super: {
   "Cartesian" = dontDistribute super."Cartesian";
   "Cascade" = dontDistribute super."Cascade";
   "Catana" = dontDistribute super."Catana";
+  "ChannelT" = dontDistribute super."ChannelT";
   "Chart" = doDistribute super."Chart_1_3_3";
   "Chart-cairo" = dontDistribute super."Chart-cairo";
   "Chart-diagrams" = doDistribute super."Chart-diagrams_1_3_3";
@@ -4881,6 +4882,7 @@ self: super: {
   "irc-fun-client" = dontDistribute super."irc-fun-client";
   "irc-fun-color" = dontDistribute super."irc-fun-color";
   "irc-fun-messages" = dontDistribute super."irc-fun-messages";
+  "irc-fun-types" = dontDistribute super."irc-fun-types";
   "ircbot" = dontDistribute super."ircbot";
   "ircbouncer" = dontDistribute super."ircbouncer";
   "ireal" = dontDistribute super."ireal";
@@ -4963,6 +4965,7 @@ self: super: {
   "jsc" = dontDistribute super."jsc";
   "jsmw" = dontDistribute super."jsmw";
   "json-assertions" = dontDistribute super."json-assertions";
+  "json-ast" = dontDistribute super."json-ast";
   "json-autotype" = doDistribute super."json-autotype_0_2_5_13";
   "json-b" = dontDistribute super."json-b";
   "json-builder" = dontDistribute super."json-builder";
@@ -7622,6 +7625,7 @@ self: super: {
   "string-qq" = dontDistribute super."string-qq";
   "string-quote" = dontDistribute super."string-quote";
   "string-similarity" = dontDistribute super."string-similarity";
+  "string-typelits" = dontDistribute super."string-typelits";
   "stringlike" = dontDistribute super."stringlike";
   "strings" = dontDistribute super."strings";
   "stringtable-atom" = dontDistribute super."stringtable-atom";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.7.nix b/pkgs/development/haskell-modules/configuration-lts-2.7.nix
index d6d8ea553055..997a567ddd36 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.7.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.7.nix
@@ -171,6 +171,7 @@ self: super: {
   "Cartesian" = dontDistribute super."Cartesian";
   "Cascade" = dontDistribute super."Cascade";
   "Catana" = dontDistribute super."Catana";
+  "ChannelT" = dontDistribute super."ChannelT";
   "Chart" = doDistribute super."Chart_1_3_3";
   "Chart-cairo" = dontDistribute super."Chart-cairo";
   "Chart-diagrams" = doDistribute super."Chart-diagrams_1_3_3";
@@ -4880,6 +4881,7 @@ self: super: {
   "irc-fun-client" = dontDistribute super."irc-fun-client";
   "irc-fun-color" = dontDistribute super."irc-fun-color";
   "irc-fun-messages" = dontDistribute super."irc-fun-messages";
+  "irc-fun-types" = dontDistribute super."irc-fun-types";
   "ircbot" = dontDistribute super."ircbot";
   "ircbouncer" = dontDistribute super."ircbouncer";
   "ireal" = dontDistribute super."ireal";
@@ -4962,6 +4964,7 @@ self: super: {
   "jsc" = dontDistribute super."jsc";
   "jsmw" = dontDistribute super."jsmw";
   "json-assertions" = dontDistribute super."json-assertions";
+  "json-ast" = dontDistribute super."json-ast";
   "json-autotype" = doDistribute super."json-autotype_0_2_5_13";
   "json-b" = dontDistribute super."json-b";
   "json-builder" = dontDistribute super."json-builder";
@@ -7621,6 +7624,7 @@ self: super: {
   "string-qq" = dontDistribute super."string-qq";
   "string-quote" = dontDistribute super."string-quote";
   "string-similarity" = dontDistribute super."string-similarity";
+  "string-typelits" = dontDistribute super."string-typelits";
   "stringlike" = dontDistribute super."stringlike";
   "strings" = dontDistribute super."strings";
   "stringtable-atom" = dontDistribute super."stringtable-atom";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.8.nix b/pkgs/development/haskell-modules/configuration-lts-2.8.nix
index 1186a62ceec3..ad0e17a2b4a3 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.8.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.8.nix
@@ -171,6 +171,7 @@ self: super: {
   "Cartesian" = dontDistribute super."Cartesian";
   "Cascade" = dontDistribute super."Cascade";
   "Catana" = dontDistribute super."Catana";
+  "ChannelT" = dontDistribute super."ChannelT";
   "Chart" = doDistribute super."Chart_1_3_3";
   "Chart-cairo" = dontDistribute super."Chart-cairo";
   "Chart-diagrams" = doDistribute super."Chart-diagrams_1_3_3";
@@ -4877,6 +4878,7 @@ self: super: {
   "irc-fun-client" = dontDistribute super."irc-fun-client";
   "irc-fun-color" = dontDistribute super."irc-fun-color";
   "irc-fun-messages" = dontDistribute super."irc-fun-messages";
+  "irc-fun-types" = dontDistribute super."irc-fun-types";
   "ircbot" = dontDistribute super."ircbot";
   "ircbouncer" = dontDistribute super."ircbouncer";
   "ireal" = dontDistribute super."ireal";
@@ -4959,6 +4961,7 @@ self: super: {
   "jsc" = dontDistribute super."jsc";
   "jsmw" = dontDistribute super."jsmw";
   "json-assertions" = dontDistribute super."json-assertions";
+  "json-ast" = dontDistribute super."json-ast";
   "json-autotype" = doDistribute super."json-autotype_0_2_5_13";
   "json-b" = dontDistribute super."json-b";
   "json-builder" = dontDistribute super."json-builder";
@@ -7614,6 +7617,7 @@ self: super: {
   "string-qq" = dontDistribute super."string-qq";
   "string-quote" = dontDistribute super."string-quote";
   "string-similarity" = dontDistribute super."string-similarity";
+  "string-typelits" = dontDistribute super."string-typelits";
   "stringlike" = dontDistribute super."stringlike";
   "strings" = dontDistribute super."strings";
   "stringtable-atom" = dontDistribute super."stringtable-atom";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.9.nix b/pkgs/development/haskell-modules/configuration-lts-2.9.nix
index cbc857982ef9..70df2406a7e9 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.9.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.9.nix
@@ -171,6 +171,7 @@ self: super: {
   "Cartesian" = dontDistribute super."Cartesian";
   "Cascade" = dontDistribute super."Cascade";
   "Catana" = dontDistribute super."Catana";
+  "ChannelT" = dontDistribute super."ChannelT";
   "Chart" = doDistribute super."Chart_1_3_3";
   "Chart-cairo" = dontDistribute super."Chart-cairo";
   "Chart-diagrams" = doDistribute super."Chart-diagrams_1_3_3";
@@ -4870,6 +4871,7 @@ self: super: {
   "irc-fun-client" = dontDistribute super."irc-fun-client";
   "irc-fun-color" = dontDistribute super."irc-fun-color";
   "irc-fun-messages" = dontDistribute super."irc-fun-messages";
+  "irc-fun-types" = dontDistribute super."irc-fun-types";
   "ircbot" = dontDistribute super."ircbot";
   "ircbouncer" = dontDistribute super."ircbouncer";
   "ireal" = dontDistribute super."ireal";
@@ -4952,6 +4954,7 @@ self: super: {
   "jsc" = dontDistribute super."jsc";
   "jsmw" = dontDistribute super."jsmw";
   "json-assertions" = dontDistribute super."json-assertions";
+  "json-ast" = dontDistribute super."json-ast";
   "json-autotype" = doDistribute super."json-autotype_0_2_5_13";
   "json-b" = dontDistribute super."json-b";
   "json-builder" = dontDistribute super."json-builder";
@@ -7602,6 +7605,7 @@ self: super: {
   "string-qq" = dontDistribute super."string-qq";
   "string-quote" = dontDistribute super."string-quote";
   "string-similarity" = dontDistribute super."string-similarity";
+  "string-typelits" = dontDistribute super."string-typelits";
   "stringlike" = dontDistribute super."stringlike";
   "strings" = dontDistribute super."strings";
   "stringtable-atom" = dontDistribute super."stringtable-atom";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.0.nix b/pkgs/development/haskell-modules/configuration-lts-3.0.nix
index afbede23b991..cd610a659c45 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.0.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.0.nix
@@ -163,6 +163,7 @@ self: super: {
   "Cartesian" = dontDistribute super."Cartesian";
   "Cascade" = dontDistribute super."Cascade";
   "Catana" = dontDistribute super."Catana";
+  "ChannelT" = dontDistribute super."ChannelT";
   "Chart" = doDistribute super."Chart_1_5_1";
   "Chart-cairo" = doDistribute super."Chart-cairo_1_5_1";
   "Chart-diagrams" = doDistribute super."Chart-diagrams_1_5_1";
@@ -4316,6 +4317,7 @@ self: super: {
   "hscassandra" = dontDistribute super."hscassandra";
   "hscd" = dontDistribute super."hscd";
   "hsclock" = dontDistribute super."hsclock";
+  "hscolour" = doDistribute super."hscolour_1_23";
   "hscope" = dontDistribute super."hscope";
   "hscrtmpl" = dontDistribute super."hscrtmpl";
   "hscuid" = dontDistribute super."hscuid";
@@ -4716,6 +4718,7 @@ self: super: {
   "irc-fun-client" = dontDistribute super."irc-fun-client";
   "irc-fun-color" = dontDistribute super."irc-fun-color";
   "irc-fun-messages" = dontDistribute super."irc-fun-messages";
+  "irc-fun-types" = dontDistribute super."irc-fun-types";
   "ircbot" = dontDistribute super."ircbot";
   "ircbouncer" = dontDistribute super."ircbouncer";
   "ireal" = dontDistribute super."ireal";
@@ -4792,6 +4795,7 @@ self: super: {
   "jsc" = dontDistribute super."jsc";
   "jsmw" = dontDistribute super."jsmw";
   "json-assertions" = dontDistribute super."json-assertions";
+  "json-ast" = dontDistribute super."json-ast";
   "json-autotype" = doDistribute super."json-autotype_1_0_7";
   "json-b" = dontDistribute super."json-b";
   "json-encoder" = dontDistribute super."json-encoder";
@@ -7333,6 +7337,7 @@ self: super: {
   "string-qq" = dontDistribute super."string-qq";
   "string-quote" = dontDistribute super."string-quote";
   "string-similarity" = dontDistribute super."string-similarity";
+  "string-typelits" = dontDistribute super."string-typelits";
   "stringlike" = dontDistribute super."stringlike";
   "stringprep" = dontDistribute super."stringprep";
   "strings" = dontDistribute super."strings";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.1.nix b/pkgs/development/haskell-modules/configuration-lts-3.1.nix
index b6ef780dd644..54efeb53169b 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.1.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.1.nix
@@ -163,6 +163,7 @@ self: super: {
   "Cartesian" = dontDistribute super."Cartesian";
   "Cascade" = dontDistribute super."Cascade";
   "Catana" = dontDistribute super."Catana";
+  "ChannelT" = dontDistribute super."ChannelT";
   "Chart" = doDistribute super."Chart_1_5_1";
   "Chart-cairo" = doDistribute super."Chart-cairo_1_5_1";
   "Chart-diagrams" = doDistribute super."Chart-diagrams_1_5_1";
@@ -4313,6 +4314,7 @@ self: super: {
   "hscassandra" = dontDistribute super."hscassandra";
   "hscd" = dontDistribute super."hscd";
   "hsclock" = dontDistribute super."hsclock";
+  "hscolour" = doDistribute super."hscolour_1_23";
   "hscope" = dontDistribute super."hscope";
   "hscrtmpl" = dontDistribute super."hscrtmpl";
   "hscuid" = dontDistribute super."hscuid";
@@ -4713,6 +4715,7 @@ self: super: {
   "irc-fun-client" = dontDistribute super."irc-fun-client";
   "irc-fun-color" = dontDistribute super."irc-fun-color";
   "irc-fun-messages" = dontDistribute super."irc-fun-messages";
+  "irc-fun-types" = dontDistribute super."irc-fun-types";
   "ircbot" = dontDistribute super."ircbot";
   "ircbouncer" = dontDistribute super."ircbouncer";
   "ireal" = dontDistribute super."ireal";
@@ -4789,6 +4792,7 @@ self: super: {
   "jsc" = dontDistribute super."jsc";
   "jsmw" = dontDistribute super."jsmw";
   "json-assertions" = dontDistribute super."json-assertions";
+  "json-ast" = dontDistribute super."json-ast";
   "json-autotype" = doDistribute super."json-autotype_1_0_7";
   "json-b" = dontDistribute super."json-b";
   "json-encoder" = dontDistribute super."json-encoder";
@@ -7326,6 +7330,7 @@ self: super: {
   "string-qq" = dontDistribute super."string-qq";
   "string-quote" = dontDistribute super."string-quote";
   "string-similarity" = dontDistribute super."string-similarity";
+  "string-typelits" = dontDistribute super."string-typelits";
   "stringlike" = dontDistribute super."stringlike";
   "stringprep" = dontDistribute super."stringprep";
   "strings" = dontDistribute super."strings";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.10.nix b/pkgs/development/haskell-modules/configuration-lts-3.10.nix
index 02f10dd48581..31a89af13be8 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.10.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.10.nix
@@ -163,6 +163,7 @@ self: super: {
   "Cartesian" = dontDistribute super."Cartesian";
   "Cascade" = dontDistribute super."Cascade";
   "Catana" = dontDistribute super."Catana";
+  "ChannelT" = dontDistribute super."ChannelT";
   "Chart-cairo" = doDistribute super."Chart-cairo_1_5_1";
   "Chart-gtk" = dontDistribute super."Chart-gtk";
   "Chart-simple" = dontDistribute super."Chart-simple";
@@ -4269,6 +4270,7 @@ self: super: {
   "hscassandra" = dontDistribute super."hscassandra";
   "hscd" = dontDistribute super."hscd";
   "hsclock" = dontDistribute super."hsclock";
+  "hscolour" = doDistribute super."hscolour_1_23";
   "hscope" = dontDistribute super."hscope";
   "hscrtmpl" = dontDistribute super."hscrtmpl";
   "hscuid" = dontDistribute super."hscuid";
@@ -4666,6 +4668,7 @@ self: super: {
   "irc-fun-client" = dontDistribute super."irc-fun-client";
   "irc-fun-color" = dontDistribute super."irc-fun-color";
   "irc-fun-messages" = dontDistribute super."irc-fun-messages";
+  "irc-fun-types" = dontDistribute super."irc-fun-types";
   "ircbot" = dontDistribute super."ircbot";
   "ircbouncer" = dontDistribute super."ircbouncer";
   "ireal" = dontDistribute super."ireal";
@@ -4742,6 +4745,7 @@ self: super: {
   "jsc" = dontDistribute super."jsc";
   "jsmw" = dontDistribute super."jsmw";
   "json-assertions" = dontDistribute super."json-assertions";
+  "json-ast" = dontDistribute super."json-ast";
   "json-b" = dontDistribute super."json-b";
   "json-encoder" = dontDistribute super."json-encoder";
   "json-enumerator" = dontDistribute super."json-enumerator";
@@ -7241,6 +7245,7 @@ self: super: {
   "string-qq" = dontDistribute super."string-qq";
   "string-quote" = dontDistribute super."string-quote";
   "string-similarity" = dontDistribute super."string-similarity";
+  "string-typelits" = dontDistribute super."string-typelits";
   "stringlike" = dontDistribute super."stringlike";
   "stringprep" = dontDistribute super."stringprep";
   "strings" = dontDistribute super."strings";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.11.nix b/pkgs/development/haskell-modules/configuration-lts-3.11.nix
index bbd0f94695ac..2a0ccf1d8545 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.11.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.11.nix
@@ -163,6 +163,7 @@ self: super: {
   "Cartesian" = dontDistribute super."Cartesian";
   "Cascade" = dontDistribute super."Cascade";
   "Catana" = dontDistribute super."Catana";
+  "ChannelT" = dontDistribute super."ChannelT";
   "Chart-cairo" = doDistribute super."Chart-cairo_1_5_1";
   "Chart-gtk" = dontDistribute super."Chart-gtk";
   "Chart-simple" = dontDistribute super."Chart-simple";
@@ -4266,6 +4267,7 @@ self: super: {
   "hscassandra" = dontDistribute super."hscassandra";
   "hscd" = dontDistribute super."hscd";
   "hsclock" = dontDistribute super."hsclock";
+  "hscolour" = doDistribute super."hscolour_1_23";
   "hscope" = dontDistribute super."hscope";
   "hscrtmpl" = dontDistribute super."hscrtmpl";
   "hscuid" = dontDistribute super."hscuid";
@@ -4663,6 +4665,7 @@ self: super: {
   "irc-fun-client" = dontDistribute super."irc-fun-client";
   "irc-fun-color" = dontDistribute super."irc-fun-color";
   "irc-fun-messages" = dontDistribute super."irc-fun-messages";
+  "irc-fun-types" = dontDistribute super."irc-fun-types";
   "ircbot" = dontDistribute super."ircbot";
   "ircbouncer" = dontDistribute super."ircbouncer";
   "ireal" = dontDistribute super."ireal";
@@ -4739,6 +4742,7 @@ self: super: {
   "jsc" = dontDistribute super."jsc";
   "jsmw" = dontDistribute super."jsmw";
   "json-assertions" = dontDistribute super."json-assertions";
+  "json-ast" = dontDistribute super."json-ast";
   "json-b" = dontDistribute super."json-b";
   "json-encoder" = dontDistribute super."json-encoder";
   "json-enumerator" = dontDistribute super."json-enumerator";
@@ -7236,6 +7240,7 @@ self: super: {
   "string-qq" = dontDistribute super."string-qq";
   "string-quote" = dontDistribute super."string-quote";
   "string-similarity" = dontDistribute super."string-similarity";
+  "string-typelits" = dontDistribute super."string-typelits";
   "stringlike" = dontDistribute super."stringlike";
   "stringprep" = dontDistribute super."stringprep";
   "strings" = dontDistribute super."strings";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.12.nix b/pkgs/development/haskell-modules/configuration-lts-3.12.nix
index a6de95aeb09c..bae9a9efad81 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.12.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.12.nix
@@ -163,6 +163,7 @@ self: super: {
   "Cartesian" = dontDistribute super."Cartesian";
   "Cascade" = dontDistribute super."Cascade";
   "Catana" = dontDistribute super."Catana";
+  "ChannelT" = dontDistribute super."ChannelT";
   "Chart-gtk" = dontDistribute super."Chart-gtk";
   "Chart-simple" = dontDistribute super."Chart-simple";
   "CheatSheet" = dontDistribute super."CheatSheet";
@@ -4260,6 +4261,7 @@ self: super: {
   "hscassandra" = dontDistribute super."hscassandra";
   "hscd" = dontDistribute super."hscd";
   "hsclock" = dontDistribute super."hsclock";
+  "hscolour" = doDistribute super."hscolour_1_23";
   "hscope" = dontDistribute super."hscope";
   "hscrtmpl" = dontDistribute super."hscrtmpl";
   "hscuid" = dontDistribute super."hscuid";
@@ -4657,6 +4659,7 @@ self: super: {
   "irc-fun-client" = dontDistribute super."irc-fun-client";
   "irc-fun-color" = dontDistribute super."irc-fun-color";
   "irc-fun-messages" = dontDistribute super."irc-fun-messages";
+  "irc-fun-types" = dontDistribute super."irc-fun-types";
   "ircbot" = dontDistribute super."ircbot";
   "ircbouncer" = dontDistribute super."ircbouncer";
   "ireal" = dontDistribute super."ireal";
@@ -4733,6 +4736,7 @@ self: super: {
   "jsc" = dontDistribute super."jsc";
   "jsmw" = dontDistribute super."jsmw";
   "json-assertions" = dontDistribute super."json-assertions";
+  "json-ast" = dontDistribute super."json-ast";
   "json-b" = dontDistribute super."json-b";
   "json-encoder" = dontDistribute super."json-encoder";
   "json-enumerator" = dontDistribute super."json-enumerator";
@@ -7229,6 +7233,7 @@ self: super: {
   "string-qq" = dontDistribute super."string-qq";
   "string-quote" = dontDistribute super."string-quote";
   "string-similarity" = dontDistribute super."string-similarity";
+  "string-typelits" = dontDistribute super."string-typelits";
   "stringlike" = dontDistribute super."stringlike";
   "stringprep" = dontDistribute super."stringprep";
   "strings" = dontDistribute super."strings";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.13.nix b/pkgs/development/haskell-modules/configuration-lts-3.13.nix
index b556af7d18d0..1c0bfd5e48e3 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.13.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.13.nix
@@ -163,6 +163,7 @@ self: super: {
   "Cartesian" = dontDistribute super."Cartesian";
   "Cascade" = dontDistribute super."Cascade";
   "Catana" = dontDistribute super."Catana";
+  "ChannelT" = dontDistribute super."ChannelT";
   "Chart-gtk" = dontDistribute super."Chart-gtk";
   "Chart-simple" = dontDistribute super."Chart-simple";
   "CheatSheet" = dontDistribute super."CheatSheet";
@@ -4259,6 +4260,7 @@ self: super: {
   "hscassandra" = dontDistribute super."hscassandra";
   "hscd" = dontDistribute super."hscd";
   "hsclock" = dontDistribute super."hsclock";
+  "hscolour" = doDistribute super."hscolour_1_23";
   "hscope" = dontDistribute super."hscope";
   "hscrtmpl" = dontDistribute super."hscrtmpl";
   "hscuid" = dontDistribute super."hscuid";
@@ -4656,6 +4658,7 @@ self: super: {
   "irc-fun-client" = dontDistribute super."irc-fun-client";
   "irc-fun-color" = dontDistribute super."irc-fun-color";
   "irc-fun-messages" = dontDistribute super."irc-fun-messages";
+  "irc-fun-types" = dontDistribute super."irc-fun-types";
   "ircbot" = dontDistribute super."ircbot";
   "ircbouncer" = dontDistribute super."ircbouncer";
   "ireal" = dontDistribute super."ireal";
@@ -4732,6 +4735,7 @@ self: super: {
   "jsc" = dontDistribute super."jsc";
   "jsmw" = dontDistribute super."jsmw";
   "json-assertions" = dontDistribute super."json-assertions";
+  "json-ast" = dontDistribute super."json-ast";
   "json-b" = dontDistribute super."json-b";
   "json-encoder" = dontDistribute super."json-encoder";
   "json-enumerator" = dontDistribute super."json-enumerator";
@@ -7226,6 +7230,7 @@ self: super: {
   "string-qq" = dontDistribute super."string-qq";
   "string-quote" = dontDistribute super."string-quote";
   "string-similarity" = dontDistribute super."string-similarity";
+  "string-typelits" = dontDistribute super."string-typelits";
   "stringlike" = dontDistribute super."stringlike";
   "stringprep" = dontDistribute super."stringprep";
   "strings" = dontDistribute super."strings";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.14.nix b/pkgs/development/haskell-modules/configuration-lts-3.14.nix
index c1d6d27fe835..46b637d6e69e 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.14.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.14.nix
@@ -163,6 +163,7 @@ self: super: {
   "Cartesian" = dontDistribute super."Cartesian";
   "Cascade" = dontDistribute super."Cascade";
   "Catana" = dontDistribute super."Catana";
+  "ChannelT" = dontDistribute super."ChannelT";
   "Chart-gtk" = dontDistribute super."Chart-gtk";
   "Chart-simple" = dontDistribute super."Chart-simple";
   "CheatSheet" = dontDistribute super."CheatSheet";
@@ -4252,6 +4253,7 @@ self: super: {
   "hscassandra" = dontDistribute super."hscassandra";
   "hscd" = dontDistribute super."hscd";
   "hsclock" = dontDistribute super."hsclock";
+  "hscolour" = doDistribute super."hscolour_1_23";
   "hscope" = dontDistribute super."hscope";
   "hscrtmpl" = dontDistribute super."hscrtmpl";
   "hscuid" = dontDistribute super."hscuid";
@@ -4648,6 +4650,7 @@ self: super: {
   "irc-fun-client" = dontDistribute super."irc-fun-client";
   "irc-fun-color" = dontDistribute super."irc-fun-color";
   "irc-fun-messages" = dontDistribute super."irc-fun-messages";
+  "irc-fun-types" = dontDistribute super."irc-fun-types";
   "ircbot" = dontDistribute super."ircbot";
   "ircbouncer" = dontDistribute super."ircbouncer";
   "ireal" = dontDistribute super."ireal";
@@ -4724,6 +4727,7 @@ self: super: {
   "jsc" = dontDistribute super."jsc";
   "jsmw" = dontDistribute super."jsmw";
   "json-assertions" = dontDistribute super."json-assertions";
+  "json-ast" = dontDistribute super."json-ast";
   "json-b" = dontDistribute super."json-b";
   "json-encoder" = dontDistribute super."json-encoder";
   "json-enumerator" = dontDistribute super."json-enumerator";
@@ -7216,6 +7220,7 @@ self: super: {
   "string-qq" = dontDistribute super."string-qq";
   "string-quote" = dontDistribute super."string-quote";
   "string-similarity" = dontDistribute super."string-similarity";
+  "string-typelits" = dontDistribute super."string-typelits";
   "stringlike" = dontDistribute super."stringlike";
   "stringprep" = dontDistribute super."stringprep";
   "strings" = dontDistribute super."strings";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.15.nix b/pkgs/development/haskell-modules/configuration-lts-3.15.nix
index 3fc3ebf81657..99fd4d5a0a8f 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.15.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.15.nix
@@ -163,6 +163,7 @@ self: super: {
   "Cartesian" = dontDistribute super."Cartesian";
   "Cascade" = dontDistribute super."Cascade";
   "Catana" = dontDistribute super."Catana";
+  "ChannelT" = dontDistribute super."ChannelT";
   "Chart-gtk" = dontDistribute super."Chart-gtk";
   "Chart-simple" = dontDistribute super."Chart-simple";
   "CheatSheet" = dontDistribute super."CheatSheet";
@@ -4249,6 +4250,7 @@ self: super: {
   "hscassandra" = dontDistribute super."hscassandra";
   "hscd" = dontDistribute super."hscd";
   "hsclock" = dontDistribute super."hsclock";
+  "hscolour" = doDistribute super."hscolour_1_23";
   "hscope" = dontDistribute super."hscope";
   "hscrtmpl" = dontDistribute super."hscrtmpl";
   "hscuid" = dontDistribute super."hscuid";
@@ -4644,6 +4646,7 @@ self: super: {
   "irc-fun-client" = dontDistribute super."irc-fun-client";
   "irc-fun-color" = dontDistribute super."irc-fun-color";
   "irc-fun-messages" = dontDistribute super."irc-fun-messages";
+  "irc-fun-types" = dontDistribute super."irc-fun-types";
   "ircbot" = dontDistribute super."ircbot";
   "ircbouncer" = dontDistribute super."ircbouncer";
   "ireal" = dontDistribute super."ireal";
@@ -4720,6 +4723,7 @@ self: super: {
   "jsc" = dontDistribute super."jsc";
   "jsmw" = dontDistribute super."jsmw";
   "json-assertions" = dontDistribute super."json-assertions";
+  "json-ast" = dontDistribute super."json-ast";
   "json-b" = dontDistribute super."json-b";
   "json-encoder" = dontDistribute super."json-encoder";
   "json-enumerator" = dontDistribute super."json-enumerator";
@@ -7210,6 +7214,7 @@ self: super: {
   "string-qq" = dontDistribute super."string-qq";
   "string-quote" = dontDistribute super."string-quote";
   "string-similarity" = dontDistribute super."string-similarity";
+  "string-typelits" = dontDistribute super."string-typelits";
   "stringlike" = dontDistribute super."stringlike";
   "stringprep" = dontDistribute super."stringprep";
   "strings" = dontDistribute super."strings";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.16.nix b/pkgs/development/haskell-modules/configuration-lts-3.16.nix
index 7b3293b28954..d8fd3a98d386 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.16.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.16.nix
@@ -163,6 +163,7 @@ self: super: {
   "Cartesian" = dontDistribute super."Cartesian";
   "Cascade" = dontDistribute super."Cascade";
   "Catana" = dontDistribute super."Catana";
+  "ChannelT" = dontDistribute super."ChannelT";
   "Chart-gtk" = dontDistribute super."Chart-gtk";
   "Chart-simple" = dontDistribute super."Chart-simple";
   "CheatSheet" = dontDistribute super."CheatSheet";
@@ -4245,6 +4246,7 @@ self: super: {
   "hscassandra" = dontDistribute super."hscassandra";
   "hscd" = dontDistribute super."hscd";
   "hsclock" = dontDistribute super."hsclock";
+  "hscolour" = doDistribute super."hscolour_1_23";
   "hscope" = dontDistribute super."hscope";
   "hscrtmpl" = dontDistribute super."hscrtmpl";
   "hscuid" = dontDistribute super."hscuid";
@@ -4640,6 +4642,7 @@ self: super: {
   "irc-fun-client" = dontDistribute super."irc-fun-client";
   "irc-fun-color" = dontDistribute super."irc-fun-color";
   "irc-fun-messages" = dontDistribute super."irc-fun-messages";
+  "irc-fun-types" = dontDistribute super."irc-fun-types";
   "ircbot" = dontDistribute super."ircbot";
   "ircbouncer" = dontDistribute super."ircbouncer";
   "ireal" = dontDistribute super."ireal";
@@ -4716,6 +4719,7 @@ self: super: {
   "jsc" = dontDistribute super."jsc";
   "jsmw" = dontDistribute super."jsmw";
   "json-assertions" = dontDistribute super."json-assertions";
+  "json-ast" = dontDistribute super."json-ast";
   "json-b" = dontDistribute super."json-b";
   "json-encoder" = dontDistribute super."json-encoder";
   "json-enumerator" = dontDistribute super."json-enumerator";
@@ -7199,6 +7203,7 @@ self: super: {
   "string-qq" = dontDistribute super."string-qq";
   "string-quote" = dontDistribute super."string-quote";
   "string-similarity" = dontDistribute super."string-similarity";
+  "string-typelits" = dontDistribute super."string-typelits";
   "stringlike" = dontDistribute super."stringlike";
   "stringprep" = dontDistribute super."stringprep";
   "strings" = dontDistribute super."strings";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.17.nix b/pkgs/development/haskell-modules/configuration-lts-3.17.nix
index 186a88404c2f..bdc78a327698 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.17.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.17.nix
@@ -163,6 +163,7 @@ self: super: {
   "Cartesian" = dontDistribute super."Cartesian";
   "Cascade" = dontDistribute super."Cascade";
   "Catana" = dontDistribute super."Catana";
+  "ChannelT" = dontDistribute super."ChannelT";
   "Chart-gtk" = dontDistribute super."Chart-gtk";
   "Chart-simple" = dontDistribute super."Chart-simple";
   "CheatSheet" = dontDistribute super."CheatSheet";
@@ -4241,6 +4242,7 @@ self: super: {
   "hscassandra" = dontDistribute super."hscassandra";
   "hscd" = dontDistribute super."hscd";
   "hsclock" = dontDistribute super."hsclock";
+  "hscolour" = doDistribute super."hscolour_1_23";
   "hscope" = dontDistribute super."hscope";
   "hscrtmpl" = dontDistribute super."hscrtmpl";
   "hscuid" = dontDistribute super."hscuid";
@@ -4635,6 +4637,7 @@ self: super: {
   "irc-fun-client" = dontDistribute super."irc-fun-client";
   "irc-fun-color" = dontDistribute super."irc-fun-color";
   "irc-fun-messages" = dontDistribute super."irc-fun-messages";
+  "irc-fun-types" = dontDistribute super."irc-fun-types";
   "ircbot" = dontDistribute super."ircbot";
   "ircbouncer" = dontDistribute super."ircbouncer";
   "ireal" = dontDistribute super."ireal";
@@ -4711,6 +4714,7 @@ self: super: {
   "jsc" = dontDistribute super."jsc";
   "jsmw" = dontDistribute super."jsmw";
   "json-assertions" = dontDistribute super."json-assertions";
+  "json-ast" = dontDistribute super."json-ast";
   "json-b" = dontDistribute super."json-b";
   "json-encoder" = dontDistribute super."json-encoder";
   "json-enumerator" = dontDistribute super."json-enumerator";
@@ -6496,6 +6500,7 @@ self: super: {
   "resource-pool-catchio" = dontDistribute super."resource-pool-catchio";
   "resource-pool-monad" = dontDistribute super."resource-pool-monad";
   "resource-simple" = dontDistribute super."resource-simple";
+  "resourcet" = doDistribute super."resourcet_1_1_7";
   "respond" = dontDistribute super."respond";
   "rest-client" = doDistribute super."rest-client_0_5_0_4";
   "rest-core" = doDistribute super."rest-core_0_36_0_6";
@@ -7191,6 +7196,7 @@ self: super: {
   "string-qq" = dontDistribute super."string-qq";
   "string-quote" = dontDistribute super."string-quote";
   "string-similarity" = dontDistribute super."string-similarity";
+  "string-typelits" = dontDistribute super."string-typelits";
   "stringlike" = dontDistribute super."stringlike";
   "stringprep" = dontDistribute super."stringprep";
   "strings" = dontDistribute super."strings";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.18.nix b/pkgs/development/haskell-modules/configuration-lts-3.18.nix
index beb24114b595..367f95328dc4 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.18.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.18.nix
@@ -163,6 +163,7 @@ self: super: {
   "Cartesian" = dontDistribute super."Cartesian";
   "Cascade" = dontDistribute super."Cascade";
   "Catana" = dontDistribute super."Catana";
+  "ChannelT" = dontDistribute super."ChannelT";
   "Chart-gtk" = dontDistribute super."Chart-gtk";
   "Chart-simple" = dontDistribute super."Chart-simple";
   "CheatSheet" = dontDistribute super."CheatSheet";
@@ -4234,6 +4235,7 @@ self: super: {
   "hscassandra" = dontDistribute super."hscassandra";
   "hscd" = dontDistribute super."hscd";
   "hsclock" = dontDistribute super."hsclock";
+  "hscolour" = doDistribute super."hscolour_1_23";
   "hscope" = dontDistribute super."hscope";
   "hscrtmpl" = dontDistribute super."hscrtmpl";
   "hscuid" = dontDistribute super."hscuid";
@@ -4626,6 +4628,7 @@ self: super: {
   "irc-fun-client" = dontDistribute super."irc-fun-client";
   "irc-fun-color" = dontDistribute super."irc-fun-color";
   "irc-fun-messages" = dontDistribute super."irc-fun-messages";
+  "irc-fun-types" = dontDistribute super."irc-fun-types";
   "ircbot" = dontDistribute super."ircbot";
   "ircbouncer" = dontDistribute super."ircbouncer";
   "ireal" = dontDistribute super."ireal";
@@ -4702,6 +4705,7 @@ self: super: {
   "jsc" = dontDistribute super."jsc";
   "jsmw" = dontDistribute super."jsmw";
   "json-assertions" = dontDistribute super."json-assertions";
+  "json-ast" = dontDistribute super."json-ast";
   "json-b" = dontDistribute super."json-b";
   "json-encoder" = dontDistribute super."json-encoder";
   "json-enumerator" = dontDistribute super."json-enumerator";
@@ -6484,6 +6488,7 @@ self: super: {
   "resource-pool-catchio" = dontDistribute super."resource-pool-catchio";
   "resource-pool-monad" = dontDistribute super."resource-pool-monad";
   "resource-simple" = dontDistribute super."resource-simple";
+  "resourcet" = doDistribute super."resourcet_1_1_7";
   "respond" = dontDistribute super."respond";
   "rest-client" = doDistribute super."rest-client_0_5_0_4";
   "rest-core" = doDistribute super."rest-core_0_36_0_6";
@@ -7178,6 +7183,7 @@ self: super: {
   "string-qq" = dontDistribute super."string-qq";
   "string-quote" = dontDistribute super."string-quote";
   "string-similarity" = dontDistribute super."string-similarity";
+  "string-typelits" = dontDistribute super."string-typelits";
   "stringlike" = dontDistribute super."stringlike";
   "stringprep" = dontDistribute super."stringprep";
   "strings" = dontDistribute super."strings";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.19.nix b/pkgs/development/haskell-modules/configuration-lts-3.19.nix
index b755da4a37f4..a14789bb313e 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.19.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.19.nix
@@ -162,6 +162,7 @@ self: super: {
   "Cartesian" = dontDistribute super."Cartesian";
   "Cascade" = dontDistribute super."Cascade";
   "Catana" = dontDistribute super."Catana";
+  "ChannelT" = dontDistribute super."ChannelT";
   "Chart-gtk" = dontDistribute super."Chart-gtk";
   "Chart-simple" = dontDistribute super."Chart-simple";
   "CheatSheet" = dontDistribute super."CheatSheet";
@@ -4226,6 +4227,7 @@ self: super: {
   "hscassandra" = dontDistribute super."hscassandra";
   "hscd" = dontDistribute super."hscd";
   "hsclock" = dontDistribute super."hsclock";
+  "hscolour" = doDistribute super."hscolour_1_23";
   "hscope" = dontDistribute super."hscope";
   "hscrtmpl" = dontDistribute super."hscrtmpl";
   "hscuid" = dontDistribute super."hscuid";
@@ -4617,6 +4619,7 @@ self: super: {
   "irc-fun-client" = dontDistribute super."irc-fun-client";
   "irc-fun-color" = dontDistribute super."irc-fun-color";
   "irc-fun-messages" = dontDistribute super."irc-fun-messages";
+  "irc-fun-types" = dontDistribute super."irc-fun-types";
   "ircbot" = dontDistribute super."ircbot";
   "ircbouncer" = dontDistribute super."ircbouncer";
   "ireal" = dontDistribute super."ireal";
@@ -4693,6 +4696,7 @@ self: super: {
   "jsc" = dontDistribute super."jsc";
   "jsmw" = dontDistribute super."jsmw";
   "json-assertions" = dontDistribute super."json-assertions";
+  "json-ast" = dontDistribute super."json-ast";
   "json-b" = dontDistribute super."json-b";
   "json-encoder" = dontDistribute super."json-encoder";
   "json-enumerator" = dontDistribute super."json-enumerator";
@@ -6470,6 +6474,7 @@ self: super: {
   "resource-pool-catchio" = dontDistribute super."resource-pool-catchio";
   "resource-pool-monad" = dontDistribute super."resource-pool-monad";
   "resource-simple" = dontDistribute super."resource-simple";
+  "resourcet" = doDistribute super."resourcet_1_1_7";
   "respond" = dontDistribute super."respond";
   "rest-client" = doDistribute super."rest-client_0_5_0_4";
   "rest-core" = doDistribute super."rest-core_0_36_0_6";
@@ -7162,6 +7167,7 @@ self: super: {
   "string-qq" = dontDistribute super."string-qq";
   "string-quote" = dontDistribute super."string-quote";
   "string-similarity" = dontDistribute super."string-similarity";
+  "string-typelits" = dontDistribute super."string-typelits";
   "stringlike" = dontDistribute super."stringlike";
   "stringprep" = dontDistribute super."stringprep";
   "strings" = dontDistribute super."strings";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.2.nix b/pkgs/development/haskell-modules/configuration-lts-3.2.nix
index 7e32f849b6d2..f5f538b76fc8 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.2.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.2.nix
@@ -163,6 +163,7 @@ self: super: {
   "Cartesian" = dontDistribute super."Cartesian";
   "Cascade" = dontDistribute super."Cascade";
   "Catana" = dontDistribute super."Catana";
+  "ChannelT" = dontDistribute super."ChannelT";
   "Chart" = doDistribute super."Chart_1_5_3";
   "Chart-cairo" = doDistribute super."Chart-cairo_1_5_1";
   "Chart-diagrams" = doDistribute super."Chart-diagrams_1_5_1";
@@ -4308,6 +4309,7 @@ self: super: {
   "hscassandra" = dontDistribute super."hscassandra";
   "hscd" = dontDistribute super."hscd";
   "hsclock" = dontDistribute super."hsclock";
+  "hscolour" = doDistribute super."hscolour_1_23";
   "hscope" = dontDistribute super."hscope";
   "hscrtmpl" = dontDistribute super."hscrtmpl";
   "hscuid" = dontDistribute super."hscuid";
@@ -4708,6 +4710,7 @@ self: super: {
   "irc-fun-client" = dontDistribute super."irc-fun-client";
   "irc-fun-color" = dontDistribute super."irc-fun-color";
   "irc-fun-messages" = dontDistribute super."irc-fun-messages";
+  "irc-fun-types" = dontDistribute super."irc-fun-types";
   "ircbot" = dontDistribute super."ircbot";
   "ircbouncer" = dontDistribute super."ircbouncer";
   "ireal" = dontDistribute super."ireal";
@@ -4784,6 +4787,7 @@ self: super: {
   "jsc" = dontDistribute super."jsc";
   "jsmw" = dontDistribute super."jsmw";
   "json-assertions" = dontDistribute super."json-assertions";
+  "json-ast" = dontDistribute super."json-ast";
   "json-autotype" = doDistribute super."json-autotype_1_0_7";
   "json-b" = dontDistribute super."json-b";
   "json-encoder" = dontDistribute super."json-encoder";
@@ -7315,6 +7319,7 @@ self: super: {
   "string-qq" = dontDistribute super."string-qq";
   "string-quote" = dontDistribute super."string-quote";
   "string-similarity" = dontDistribute super."string-similarity";
+  "string-typelits" = dontDistribute super."string-typelits";
   "stringlike" = dontDistribute super."stringlike";
   "stringprep" = dontDistribute super."stringprep";
   "strings" = dontDistribute super."strings";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.20.nix b/pkgs/development/haskell-modules/configuration-lts-3.20.nix
index cc1db2819f23..6ebc3598ad03 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.20.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.20.nix
@@ -162,6 +162,7 @@ self: super: {
   "Cartesian" = dontDistribute super."Cartesian";
   "Cascade" = dontDistribute super."Cascade";
   "Catana" = dontDistribute super."Catana";
+  "ChannelT" = dontDistribute super."ChannelT";
   "Chart-gtk" = dontDistribute super."Chart-gtk";
   "Chart-simple" = dontDistribute super."Chart-simple";
   "CheatSheet" = dontDistribute super."CheatSheet";
@@ -4223,6 +4224,7 @@ self: super: {
   "hscassandra" = dontDistribute super."hscassandra";
   "hscd" = dontDistribute super."hscd";
   "hsclock" = dontDistribute super."hsclock";
+  "hscolour" = doDistribute super."hscolour_1_23";
   "hscope" = dontDistribute super."hscope";
   "hscrtmpl" = dontDistribute super."hscrtmpl";
   "hscuid" = dontDistribute super."hscuid";
@@ -4614,6 +4616,7 @@ self: super: {
   "irc-fun-client" = dontDistribute super."irc-fun-client";
   "irc-fun-color" = dontDistribute super."irc-fun-color";
   "irc-fun-messages" = dontDistribute super."irc-fun-messages";
+  "irc-fun-types" = dontDistribute super."irc-fun-types";
   "ircbot" = dontDistribute super."ircbot";
   "ircbouncer" = dontDistribute super."ircbouncer";
   "ireal" = dontDistribute super."ireal";
@@ -4690,6 +4693,7 @@ self: super: {
   "jsc" = dontDistribute super."jsc";
   "jsmw" = dontDistribute super."jsmw";
   "json-assertions" = dontDistribute super."json-assertions";
+  "json-ast" = dontDistribute super."json-ast";
   "json-b" = dontDistribute super."json-b";
   "json-encoder" = dontDistribute super."json-encoder";
   "json-enumerator" = dontDistribute super."json-enumerator";
@@ -6464,6 +6468,7 @@ self: super: {
   "resource-pool-catchio" = dontDistribute super."resource-pool-catchio";
   "resource-pool-monad" = dontDistribute super."resource-pool-monad";
   "resource-simple" = dontDistribute super."resource-simple";
+  "resourcet" = doDistribute super."resourcet_1_1_7";
   "respond" = dontDistribute super."respond";
   "rest-client" = doDistribute super."rest-client_0_5_0_4";
   "rest-core" = doDistribute super."rest-core_0_36_0_6";
@@ -7155,6 +7160,7 @@ self: super: {
   "string-qq" = dontDistribute super."string-qq";
   "string-quote" = dontDistribute super."string-quote";
   "string-similarity" = dontDistribute super."string-similarity";
+  "string-typelits" = dontDistribute super."string-typelits";
   "stringlike" = dontDistribute super."stringlike";
   "stringprep" = dontDistribute super."stringprep";
   "strings" = dontDistribute super."strings";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.21.nix b/pkgs/development/haskell-modules/configuration-lts-3.21.nix
index f47982478568..40d9bdc82a17 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.21.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.21.nix
@@ -162,6 +162,7 @@ self: super: {
   "Cartesian" = dontDistribute super."Cartesian";
   "Cascade" = dontDistribute super."Cascade";
   "Catana" = dontDistribute super."Catana";
+  "ChannelT" = dontDistribute super."ChannelT";
   "Chart-gtk" = dontDistribute super."Chart-gtk";
   "Chart-simple" = dontDistribute super."Chart-simple";
   "CheatSheet" = dontDistribute super."CheatSheet";
@@ -1637,6 +1638,7 @@ self: super: {
   "blaze-html-truncate" = dontDistribute super."blaze-html-truncate";
   "blaze-json" = dontDistribute super."blaze-json";
   "blaze-shields" = dontDistribute super."blaze-shields";
+  "blaze-svg" = doDistribute super."blaze-svg_0_3_5";
   "blaze-textual-native" = dontDistribute super."blaze-textual-native";
   "blazeMarker" = dontDistribute super."blazeMarker";
   "blink1" = dontDistribute super."blink1";
@@ -4216,6 +4218,7 @@ self: super: {
   "hscassandra" = dontDistribute super."hscassandra";
   "hscd" = dontDistribute super."hscd";
   "hsclock" = dontDistribute super."hsclock";
+  "hscolour" = doDistribute super."hscolour_1_23";
   "hscope" = dontDistribute super."hscope";
   "hscrtmpl" = dontDistribute super."hscrtmpl";
   "hscuid" = dontDistribute super."hscuid";
@@ -4605,6 +4608,7 @@ self: super: {
   "irc-fun-client" = dontDistribute super."irc-fun-client";
   "irc-fun-color" = dontDistribute super."irc-fun-color";
   "irc-fun-messages" = dontDistribute super."irc-fun-messages";
+  "irc-fun-types" = dontDistribute super."irc-fun-types";
   "ircbot" = dontDistribute super."ircbot";
   "ircbouncer" = dontDistribute super."ircbouncer";
   "ireal" = dontDistribute super."ireal";
@@ -4681,6 +4685,7 @@ self: super: {
   "jsc" = dontDistribute super."jsc";
   "jsmw" = dontDistribute super."jsmw";
   "json-assertions" = dontDistribute super."json-assertions";
+  "json-ast" = dontDistribute super."json-ast";
   "json-b" = dontDistribute super."json-b";
   "json-encoder" = dontDistribute super."json-encoder";
   "json-enumerator" = dontDistribute super."json-enumerator";
@@ -6451,6 +6456,7 @@ self: super: {
   "resource-pool-catchio" = dontDistribute super."resource-pool-catchio";
   "resource-pool-monad" = dontDistribute super."resource-pool-monad";
   "resource-simple" = dontDistribute super."resource-simple";
+  "resourcet" = doDistribute super."resourcet_1_1_7";
   "respond" = dontDistribute super."respond";
   "rest-core" = doDistribute super."rest-core_0_36_0_6";
   "rest-example" = dontDistribute super."rest-example";
@@ -7131,6 +7137,7 @@ self: super: {
   "string-qq" = dontDistribute super."string-qq";
   "string-quote" = dontDistribute super."string-quote";
   "string-similarity" = dontDistribute super."string-similarity";
+  "string-typelits" = dontDistribute super."string-typelits";
   "stringlike" = dontDistribute super."stringlike";
   "stringprep" = dontDistribute super."stringprep";
   "strings" = dontDistribute super."strings";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.22.nix b/pkgs/development/haskell-modules/configuration-lts-3.22.nix
index 5b6cb97c1408..a4f288d71cf7 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.22.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.22.nix
@@ -162,6 +162,7 @@ self: super: {
   "Cartesian" = dontDistribute super."Cartesian";
   "Cascade" = dontDistribute super."Cascade";
   "Catana" = dontDistribute super."Catana";
+  "ChannelT" = dontDistribute super."ChannelT";
   "Chart-gtk" = dontDistribute super."Chart-gtk";
   "Chart-simple" = dontDistribute super."Chart-simple";
   "CheatSheet" = dontDistribute super."CheatSheet";
@@ -1637,6 +1638,7 @@ self: super: {
   "blaze-html-truncate" = dontDistribute super."blaze-html-truncate";
   "blaze-json" = dontDistribute super."blaze-json";
   "blaze-shields" = dontDistribute super."blaze-shields";
+  "blaze-svg" = doDistribute super."blaze-svg_0_3_5";
   "blaze-textual-native" = dontDistribute super."blaze-textual-native";
   "blazeMarker" = dontDistribute super."blazeMarker";
   "blink1" = dontDistribute super."blink1";
@@ -4213,6 +4215,7 @@ self: super: {
   "hscassandra" = dontDistribute super."hscassandra";
   "hscd" = dontDistribute super."hscd";
   "hsclock" = dontDistribute super."hsclock";
+  "hscolour" = doDistribute super."hscolour_1_23";
   "hscope" = dontDistribute super."hscope";
   "hscrtmpl" = dontDistribute super."hscrtmpl";
   "hscuid" = dontDistribute super."hscuid";
@@ -4599,6 +4602,7 @@ self: super: {
   "irc-fun-client" = dontDistribute super."irc-fun-client";
   "irc-fun-color" = dontDistribute super."irc-fun-color";
   "irc-fun-messages" = dontDistribute super."irc-fun-messages";
+  "irc-fun-types" = dontDistribute super."irc-fun-types";
   "ircbot" = dontDistribute super."ircbot";
   "ircbouncer" = dontDistribute super."ircbouncer";
   "ireal" = dontDistribute super."ireal";
@@ -4675,6 +4679,7 @@ self: super: {
   "jsc" = dontDistribute super."jsc";
   "jsmw" = dontDistribute super."jsmw";
   "json-assertions" = dontDistribute super."json-assertions";
+  "json-ast" = dontDistribute super."json-ast";
   "json-b" = dontDistribute super."json-b";
   "json-encoder" = dontDistribute super."json-encoder";
   "json-enumerator" = dontDistribute super."json-enumerator";
@@ -6445,6 +6450,7 @@ self: super: {
   "resource-pool-catchio" = dontDistribute super."resource-pool-catchio";
   "resource-pool-monad" = dontDistribute super."resource-pool-monad";
   "resource-simple" = dontDistribute super."resource-simple";
+  "resourcet" = doDistribute super."resourcet_1_1_7";
   "respond" = dontDistribute super."respond";
   "rest-core" = doDistribute super."rest-core_0_36_0_6";
   "rest-example" = dontDistribute super."rest-example";
@@ -7125,6 +7131,7 @@ self: super: {
   "string-qq" = dontDistribute super."string-qq";
   "string-quote" = dontDistribute super."string-quote";
   "string-similarity" = dontDistribute super."string-similarity";
+  "string-typelits" = dontDistribute super."string-typelits";
   "stringlike" = dontDistribute super."stringlike";
   "stringprep" = dontDistribute super."stringprep";
   "strings" = dontDistribute super."strings";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.3.nix b/pkgs/development/haskell-modules/configuration-lts-3.3.nix
index fe69a6af07da..7637c65cdad4 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.3.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.3.nix
@@ -163,6 +163,7 @@ self: super: {
   "Cartesian" = dontDistribute super."Cartesian";
   "Cascade" = dontDistribute super."Cascade";
   "Catana" = dontDistribute super."Catana";
+  "ChannelT" = dontDistribute super."ChannelT";
   "Chart" = doDistribute super."Chart_1_5_3";
   "Chart-cairo" = doDistribute super."Chart-cairo_1_5_1";
   "Chart-diagrams" = doDistribute super."Chart-diagrams_1_5_1";
@@ -4302,6 +4303,7 @@ self: super: {
   "hscassandra" = dontDistribute super."hscassandra";
   "hscd" = dontDistribute super."hscd";
   "hsclock" = dontDistribute super."hsclock";
+  "hscolour" = doDistribute super."hscolour_1_23";
   "hscope" = dontDistribute super."hscope";
   "hscrtmpl" = dontDistribute super."hscrtmpl";
   "hscuid" = dontDistribute super."hscuid";
@@ -4702,6 +4704,7 @@ self: super: {
   "irc-fun-client" = dontDistribute super."irc-fun-client";
   "irc-fun-color" = dontDistribute super."irc-fun-color";
   "irc-fun-messages" = dontDistribute super."irc-fun-messages";
+  "irc-fun-types" = dontDistribute super."irc-fun-types";
   "ircbot" = dontDistribute super."ircbot";
   "ircbouncer" = dontDistribute super."ircbouncer";
   "ireal" = dontDistribute super."ireal";
@@ -4778,6 +4781,7 @@ self: super: {
   "jsc" = dontDistribute super."jsc";
   "jsmw" = dontDistribute super."jsmw";
   "json-assertions" = dontDistribute super."json-assertions";
+  "json-ast" = dontDistribute super."json-ast";
   "json-autotype" = doDistribute super."json-autotype_1_0_7";
   "json-b" = dontDistribute super."json-b";
   "json-encoder" = dontDistribute super."json-encoder";
@@ -7307,6 +7311,7 @@ self: super: {
   "string-qq" = dontDistribute super."string-qq";
   "string-quote" = dontDistribute super."string-quote";
   "string-similarity" = dontDistribute super."string-similarity";
+  "string-typelits" = dontDistribute super."string-typelits";
   "stringlike" = dontDistribute super."stringlike";
   "stringprep" = dontDistribute super."stringprep";
   "strings" = dontDistribute super."strings";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.4.nix b/pkgs/development/haskell-modules/configuration-lts-3.4.nix
index e204b4662741..970d4c2622a8 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.4.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.4.nix
@@ -163,6 +163,7 @@ self: super: {
   "Cartesian" = dontDistribute super."Cartesian";
   "Cascade" = dontDistribute super."Cascade";
   "Catana" = dontDistribute super."Catana";
+  "ChannelT" = dontDistribute super."ChannelT";
   "Chart" = doDistribute super."Chart_1_5_3";
   "Chart-cairo" = doDistribute super."Chart-cairo_1_5_1";
   "Chart-diagrams" = doDistribute super."Chart-diagrams_1_5_1";
@@ -4302,6 +4303,7 @@ self: super: {
   "hscassandra" = dontDistribute super."hscassandra";
   "hscd" = dontDistribute super."hscd";
   "hsclock" = dontDistribute super."hsclock";
+  "hscolour" = doDistribute super."hscolour_1_23";
   "hscope" = dontDistribute super."hscope";
   "hscrtmpl" = dontDistribute super."hscrtmpl";
   "hscuid" = dontDistribute super."hscuid";
@@ -4702,6 +4704,7 @@ self: super: {
   "irc-fun-client" = dontDistribute super."irc-fun-client";
   "irc-fun-color" = dontDistribute super."irc-fun-color";
   "irc-fun-messages" = dontDistribute super."irc-fun-messages";
+  "irc-fun-types" = dontDistribute super."irc-fun-types";
   "ircbot" = dontDistribute super."ircbot";
   "ircbouncer" = dontDistribute super."ircbouncer";
   "ireal" = dontDistribute super."ireal";
@@ -4778,6 +4781,7 @@ self: super: {
   "jsc" = dontDistribute super."jsc";
   "jsmw" = dontDistribute super."jsmw";
   "json-assertions" = dontDistribute super."json-assertions";
+  "json-ast" = dontDistribute super."json-ast";
   "json-autotype" = doDistribute super."json-autotype_1_0_7";
   "json-b" = dontDistribute super."json-b";
   "json-encoder" = dontDistribute super."json-encoder";
@@ -7305,6 +7309,7 @@ self: super: {
   "string-qq" = dontDistribute super."string-qq";
   "string-quote" = dontDistribute super."string-quote";
   "string-similarity" = dontDistribute super."string-similarity";
+  "string-typelits" = dontDistribute super."string-typelits";
   "stringlike" = dontDistribute super."stringlike";
   "stringprep" = dontDistribute super."stringprep";
   "strings" = dontDistribute super."strings";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.5.nix b/pkgs/development/haskell-modules/configuration-lts-3.5.nix
index c8a7531a27df..3c37a041e323 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.5.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.5.nix
@@ -163,6 +163,7 @@ self: super: {
   "Cartesian" = dontDistribute super."Cartesian";
   "Cascade" = dontDistribute super."Cascade";
   "Catana" = dontDistribute super."Catana";
+  "ChannelT" = dontDistribute super."ChannelT";
   "Chart" = doDistribute super."Chart_1_5_3";
   "Chart-cairo" = doDistribute super."Chart-cairo_1_5_1";
   "Chart-diagrams" = doDistribute super."Chart-diagrams_1_5_1";
@@ -4297,6 +4298,7 @@ self: super: {
   "hscassandra" = dontDistribute super."hscassandra";
   "hscd" = dontDistribute super."hscd";
   "hsclock" = dontDistribute super."hsclock";
+  "hscolour" = doDistribute super."hscolour_1_23";
   "hscope" = dontDistribute super."hscope";
   "hscrtmpl" = dontDistribute super."hscrtmpl";
   "hscuid" = dontDistribute super."hscuid";
@@ -4694,6 +4696,7 @@ self: super: {
   "irc-fun-client" = dontDistribute super."irc-fun-client";
   "irc-fun-color" = dontDistribute super."irc-fun-color";
   "irc-fun-messages" = dontDistribute super."irc-fun-messages";
+  "irc-fun-types" = dontDistribute super."irc-fun-types";
   "ircbot" = dontDistribute super."ircbot";
   "ircbouncer" = dontDistribute super."ircbouncer";
   "ireal" = dontDistribute super."ireal";
@@ -4770,6 +4773,7 @@ self: super: {
   "jsc" = dontDistribute super."jsc";
   "jsmw" = dontDistribute super."jsmw";
   "json-assertions" = dontDistribute super."json-assertions";
+  "json-ast" = dontDistribute super."json-ast";
   "json-autotype" = doDistribute super."json-autotype_1_0_7";
   "json-b" = dontDistribute super."json-b";
   "json-encoder" = dontDistribute super."json-encoder";
@@ -7293,6 +7297,7 @@ self: super: {
   "string-qq" = dontDistribute super."string-qq";
   "string-quote" = dontDistribute super."string-quote";
   "string-similarity" = dontDistribute super."string-similarity";
+  "string-typelits" = dontDistribute super."string-typelits";
   "stringlike" = dontDistribute super."stringlike";
   "stringprep" = dontDistribute super."stringprep";
   "strings" = dontDistribute super."strings";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.6.nix b/pkgs/development/haskell-modules/configuration-lts-3.6.nix
index 5094fac64711..67e398551d15 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.6.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.6.nix
@@ -163,6 +163,7 @@ self: super: {
   "Cartesian" = dontDistribute super."Cartesian";
   "Cascade" = dontDistribute super."Cascade";
   "Catana" = dontDistribute super."Catana";
+  "ChannelT" = dontDistribute super."ChannelT";
   "Chart" = doDistribute super."Chart_1_5_3";
   "Chart-cairo" = doDistribute super."Chart-cairo_1_5_1";
   "Chart-diagrams" = doDistribute super."Chart-diagrams_1_5_1";
@@ -4294,6 +4295,7 @@ self: super: {
   "hscassandra" = dontDistribute super."hscassandra";
   "hscd" = dontDistribute super."hscd";
   "hsclock" = dontDistribute super."hsclock";
+  "hscolour" = doDistribute super."hscolour_1_23";
   "hscope" = dontDistribute super."hscope";
   "hscrtmpl" = dontDistribute super."hscrtmpl";
   "hscuid" = dontDistribute super."hscuid";
@@ -4691,6 +4693,7 @@ self: super: {
   "irc-fun-client" = dontDistribute super."irc-fun-client";
   "irc-fun-color" = dontDistribute super."irc-fun-color";
   "irc-fun-messages" = dontDistribute super."irc-fun-messages";
+  "irc-fun-types" = dontDistribute super."irc-fun-types";
   "ircbot" = dontDistribute super."ircbot";
   "ircbouncer" = dontDistribute super."ircbouncer";
   "ireal" = dontDistribute super."ireal";
@@ -4767,6 +4770,7 @@ self: super: {
   "jsc" = dontDistribute super."jsc";
   "jsmw" = dontDistribute super."jsmw";
   "json-assertions" = dontDistribute super."json-assertions";
+  "json-ast" = dontDistribute super."json-ast";
   "json-autotype" = doDistribute super."json-autotype_1_0_7";
   "json-b" = dontDistribute super."json-b";
   "json-encoder" = dontDistribute super."json-encoder";
@@ -7285,6 +7289,7 @@ self: super: {
   "string-qq" = dontDistribute super."string-qq";
   "string-quote" = dontDistribute super."string-quote";
   "string-similarity" = dontDistribute super."string-similarity";
+  "string-typelits" = dontDistribute super."string-typelits";
   "stringlike" = dontDistribute super."stringlike";
   "stringprep" = dontDistribute super."stringprep";
   "strings" = dontDistribute super."strings";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.7.nix b/pkgs/development/haskell-modules/configuration-lts-3.7.nix
index 89ac31497cc5..128ce65ac51f 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.7.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.7.nix
@@ -163,6 +163,7 @@ self: super: {
   "Cartesian" = dontDistribute super."Cartesian";
   "Cascade" = dontDistribute super."Cascade";
   "Catana" = dontDistribute super."Catana";
+  "ChannelT" = dontDistribute super."ChannelT";
   "Chart" = doDistribute super."Chart_1_5_3";
   "Chart-cairo" = doDistribute super."Chart-cairo_1_5_1";
   "Chart-diagrams" = doDistribute super."Chart-diagrams_1_5_1";
@@ -4288,6 +4289,7 @@ self: super: {
   "hscassandra" = dontDistribute super."hscassandra";
   "hscd" = dontDistribute super."hscd";
   "hsclock" = dontDistribute super."hsclock";
+  "hscolour" = doDistribute super."hscolour_1_23";
   "hscope" = dontDistribute super."hscope";
   "hscrtmpl" = dontDistribute super."hscrtmpl";
   "hscuid" = dontDistribute super."hscuid";
@@ -4685,6 +4687,7 @@ self: super: {
   "irc-fun-client" = dontDistribute super."irc-fun-client";
   "irc-fun-color" = dontDistribute super."irc-fun-color";
   "irc-fun-messages" = dontDistribute super."irc-fun-messages";
+  "irc-fun-types" = dontDistribute super."irc-fun-types";
   "ircbot" = dontDistribute super."ircbot";
   "ircbouncer" = dontDistribute super."ircbouncer";
   "ireal" = dontDistribute super."ireal";
@@ -4761,6 +4764,7 @@ self: super: {
   "jsc" = dontDistribute super."jsc";
   "jsmw" = dontDistribute super."jsmw";
   "json-assertions" = dontDistribute super."json-assertions";
+  "json-ast" = dontDistribute super."json-ast";
   "json-b" = dontDistribute super."json-b";
   "json-encoder" = dontDistribute super."json-encoder";
   "json-enumerator" = dontDistribute super."json-enumerator";
@@ -7272,6 +7276,7 @@ self: super: {
   "string-qq" = dontDistribute super."string-qq";
   "string-quote" = dontDistribute super."string-quote";
   "string-similarity" = dontDistribute super."string-similarity";
+  "string-typelits" = dontDistribute super."string-typelits";
   "stringlike" = dontDistribute super."stringlike";
   "stringprep" = dontDistribute super."stringprep";
   "strings" = dontDistribute super."strings";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.8.nix b/pkgs/development/haskell-modules/configuration-lts-3.8.nix
index 1a980f587413..40455e3d2f8d 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.8.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.8.nix
@@ -163,6 +163,7 @@ self: super: {
   "Cartesian" = dontDistribute super."Cartesian";
   "Cascade" = dontDistribute super."Cascade";
   "Catana" = dontDistribute super."Catana";
+  "ChannelT" = dontDistribute super."ChannelT";
   "Chart" = doDistribute super."Chart_1_5_3";
   "Chart-cairo" = doDistribute super."Chart-cairo_1_5_1";
   "Chart-diagrams" = doDistribute super."Chart-diagrams_1_5_1";
@@ -4280,6 +4281,7 @@ self: super: {
   "hscassandra" = dontDistribute super."hscassandra";
   "hscd" = dontDistribute super."hscd";
   "hsclock" = dontDistribute super."hsclock";
+  "hscolour" = doDistribute super."hscolour_1_23";
   "hscope" = dontDistribute super."hscope";
   "hscrtmpl" = dontDistribute super."hscrtmpl";
   "hscuid" = dontDistribute super."hscuid";
@@ -4677,6 +4679,7 @@ self: super: {
   "irc-fun-client" = dontDistribute super."irc-fun-client";
   "irc-fun-color" = dontDistribute super."irc-fun-color";
   "irc-fun-messages" = dontDistribute super."irc-fun-messages";
+  "irc-fun-types" = dontDistribute super."irc-fun-types";
   "ircbot" = dontDistribute super."ircbot";
   "ircbouncer" = dontDistribute super."ircbouncer";
   "ireal" = dontDistribute super."ireal";
@@ -4753,6 +4756,7 @@ self: super: {
   "jsc" = dontDistribute super."jsc";
   "jsmw" = dontDistribute super."jsmw";
   "json-assertions" = dontDistribute super."json-assertions";
+  "json-ast" = dontDistribute super."json-ast";
   "json-b" = dontDistribute super."json-b";
   "json-encoder" = dontDistribute super."json-encoder";
   "json-enumerator" = dontDistribute super."json-enumerator";
@@ -7259,6 +7263,7 @@ self: super: {
   "string-qq" = dontDistribute super."string-qq";
   "string-quote" = dontDistribute super."string-quote";
   "string-similarity" = dontDistribute super."string-similarity";
+  "string-typelits" = dontDistribute super."string-typelits";
   "stringlike" = dontDistribute super."stringlike";
   "stringprep" = dontDistribute super."stringprep";
   "strings" = dontDistribute super."strings";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.9.nix b/pkgs/development/haskell-modules/configuration-lts-3.9.nix
index 4f5197bb6c69..142bdfbec043 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.9.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.9.nix
@@ -163,6 +163,7 @@ self: super: {
   "Cartesian" = dontDistribute super."Cartesian";
   "Cascade" = dontDistribute super."Cascade";
   "Catana" = dontDistribute super."Catana";
+  "ChannelT" = dontDistribute super."ChannelT";
   "Chart" = doDistribute super."Chart_1_5_3";
   "Chart-cairo" = doDistribute super."Chart-cairo_1_5_1";
   "Chart-diagrams" = doDistribute super."Chart-diagrams_1_5_1";
@@ -4275,6 +4276,7 @@ self: super: {
   "hscassandra" = dontDistribute super."hscassandra";
   "hscd" = dontDistribute super."hscd";
   "hsclock" = dontDistribute super."hsclock";
+  "hscolour" = doDistribute super."hscolour_1_23";
   "hscope" = dontDistribute super."hscope";
   "hscrtmpl" = dontDistribute super."hscrtmpl";
   "hscuid" = dontDistribute super."hscuid";
@@ -4672,6 +4674,7 @@ self: super: {
   "irc-fun-client" = dontDistribute super."irc-fun-client";
   "irc-fun-color" = dontDistribute super."irc-fun-color";
   "irc-fun-messages" = dontDistribute super."irc-fun-messages";
+  "irc-fun-types" = dontDistribute super."irc-fun-types";
   "ircbot" = dontDistribute super."ircbot";
   "ircbouncer" = dontDistribute super."ircbouncer";
   "ireal" = dontDistribute super."ireal";
@@ -4748,6 +4751,7 @@ self: super: {
   "jsc" = dontDistribute super."jsc";
   "jsmw" = dontDistribute super."jsmw";
   "json-assertions" = dontDistribute super."json-assertions";
+  "json-ast" = dontDistribute super."json-ast";
   "json-b" = dontDistribute super."json-b";
   "json-encoder" = dontDistribute super."json-encoder";
   "json-enumerator" = dontDistribute super."json-enumerator";
@@ -7253,6 +7257,7 @@ self: super: {
   "string-qq" = dontDistribute super."string-qq";
   "string-quote" = dontDistribute super."string-quote";
   "string-similarity" = dontDistribute super."string-similarity";
+  "string-typelits" = dontDistribute super."string-typelits";
   "stringlike" = dontDistribute super."stringlike";
   "stringprep" = dontDistribute super."stringprep";
   "strings" = dontDistribute super."strings";
diff --git a/pkgs/development/haskell-modules/configuration-lts-4.0.nix b/pkgs/development/haskell-modules/configuration-lts-4.0.nix
index 41d40d31cee5..6076099d2699 100644
--- a/pkgs/development/haskell-modules/configuration-lts-4.0.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-4.0.nix
@@ -162,6 +162,7 @@ self: super: {
   "Cartesian" = dontDistribute super."Cartesian";
   "Cascade" = dontDistribute super."Cascade";
   "Catana" = dontDistribute super."Catana";
+  "ChannelT" = dontDistribute super."ChannelT";
   "Chart-diagrams" = dontDistribute super."Chart-diagrams";
   "Chart-gtk" = dontDistribute super."Chart-gtk";
   "Chart-simple" = dontDistribute super."Chart-simple";
@@ -1083,6 +1084,7 @@ self: super: {
   "aeson-applicative" = dontDistribute super."aeson-applicative";
   "aeson-bson" = dontDistribute super."aeson-bson";
   "aeson-diff" = dontDistribute super."aeson-diff";
+  "aeson-extra" = doDistribute super."aeson-extra_0_3_0_0";
   "aeson-filthy" = dontDistribute super."aeson-filthy";
   "aeson-iproute" = dontDistribute super."aeson-iproute";
   "aeson-lens" = dontDistribute super."aeson-lens";
@@ -1527,6 +1529,7 @@ self: super: {
   "blaze-html-truncate" = dontDistribute super."blaze-html-truncate";
   "blaze-json" = dontDistribute super."blaze-json";
   "blaze-shields" = dontDistribute super."blaze-shields";
+  "blaze-svg" = doDistribute super."blaze-svg_0_3_5";
   "blaze-textual-native" = dontDistribute super."blaze-textual-native";
   "blazeMarker" = dontDistribute super."blazeMarker";
   "blink1" = dontDistribute super."blink1";
@@ -4003,6 +4006,7 @@ self: super: {
   "hscassandra" = dontDistribute super."hscassandra";
   "hscd" = dontDistribute super."hscd";
   "hsclock" = dontDistribute super."hsclock";
+  "hscolour" = doDistribute super."hscolour_1_23";
   "hscope" = dontDistribute super."hscope";
   "hscrtmpl" = dontDistribute super."hscrtmpl";
   "hscuid" = dontDistribute super."hscuid";
@@ -4356,6 +4360,7 @@ self: super: {
   "irc-fun-client" = dontDistribute super."irc-fun-client";
   "irc-fun-color" = dontDistribute super."irc-fun-color";
   "irc-fun-messages" = dontDistribute super."irc-fun-messages";
+  "irc-fun-types" = dontDistribute super."irc-fun-types";
   "ircbot" = dontDistribute super."ircbot";
   "ircbouncer" = dontDistribute super."ircbouncer";
   "ireal" = dontDistribute super."ireal";
@@ -4427,6 +4432,7 @@ self: super: {
   "jsc" = dontDistribute super."jsc";
   "jsmw" = dontDistribute super."jsmw";
   "json-assertions" = dontDistribute super."json-assertions";
+  "json-ast" = dontDistribute super."json-ast";
   "json-b" = dontDistribute super."json-b";
   "json-encoder" = dontDistribute super."json-encoder";
   "json-enumerator" = dontDistribute super."json-enumerator";
@@ -5033,6 +5039,7 @@ self: super: {
   "modulespection" = dontDistribute super."modulespection";
   "modulo" = dontDistribute super."modulo";
   "moe" = dontDistribute super."moe";
+  "moesocks" = doDistribute super."moesocks_1_0_0_40";
   "mohws" = dontDistribute super."mohws";
   "monad-abort-fd" = dontDistribute super."monad-abort-fd";
   "monad-atom" = dontDistribute super."monad-atom";
@@ -5620,6 +5627,7 @@ self: super: {
   "piet" = dontDistribute super."piet";
   "piki" = dontDistribute super."piki";
   "pinboard" = dontDistribute super."pinboard";
+  "pinchot" = doDistribute super."pinchot_0_6_0_0";
   "pipe-enumerator" = dontDistribute super."pipe-enumerator";
   "pipeclip" = dontDistribute super."pipeclip";
   "pipes" = doDistribute super."pipes_4_1_7";
@@ -5844,6 +5852,7 @@ self: super: {
   "pseudo-trie" = dontDistribute super."pseudo-trie";
   "pseudomacros" = dontDistribute super."pseudomacros";
   "pub" = dontDistribute super."pub";
+  "publicsuffix" = doDistribute super."publicsuffix_0_20151212";
   "publicsuffixlist" = dontDistribute super."publicsuffixlist";
   "publicsuffixlistcreate" = dontDistribute super."publicsuffixlistcreate";
   "pubnub" = dontDistribute super."pubnub";
@@ -6115,6 +6124,7 @@ self: super: {
   "resource-pool-catchio" = dontDistribute super."resource-pool-catchio";
   "resource-pool-monad" = dontDistribute super."resource-pool-monad";
   "resource-simple" = dontDistribute super."resource-simple";
+  "resourcet" = doDistribute super."resourcet_1_1_7";
   "respond" = dontDistribute super."respond";
   "rest-example" = dontDistribute super."rest-example";
   "restful-snap" = dontDistribute super."restful-snap";
@@ -6757,6 +6767,7 @@ self: super: {
   "string-convert" = dontDistribute super."string-convert";
   "string-quote" = dontDistribute super."string-quote";
   "string-similarity" = dontDistribute super."string-similarity";
+  "string-typelits" = dontDistribute super."string-typelits";
   "stringlike" = dontDistribute super."stringlike";
   "stringprep" = dontDistribute super."stringprep";
   "strings" = dontDistribute super."strings";
diff --git a/pkgs/development/haskell-modules/configuration-lts-4.1.nix b/pkgs/development/haskell-modules/configuration-lts-4.1.nix
index ec7cbbf490f2..516164aa9eee 100644
--- a/pkgs/development/haskell-modules/configuration-lts-4.1.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-4.1.nix
@@ -162,6 +162,7 @@ self: super: {
   "Cartesian" = dontDistribute super."Cartesian";
   "Cascade" = dontDistribute super."Cascade";
   "Catana" = dontDistribute super."Catana";
+  "ChannelT" = dontDistribute super."ChannelT";
   "Chart-diagrams" = dontDistribute super."Chart-diagrams";
   "Chart-gtk" = dontDistribute super."Chart-gtk";
   "Chart-simple" = dontDistribute super."Chart-simple";
@@ -1082,6 +1083,7 @@ self: super: {
   "aeson-applicative" = dontDistribute super."aeson-applicative";
   "aeson-bson" = dontDistribute super."aeson-bson";
   "aeson-diff" = dontDistribute super."aeson-diff";
+  "aeson-extra" = doDistribute super."aeson-extra_0_3_0_0";
   "aeson-filthy" = dontDistribute super."aeson-filthy";
   "aeson-iproute" = dontDistribute super."aeson-iproute";
   "aeson-lens" = dontDistribute super."aeson-lens";
@@ -1525,6 +1527,7 @@ self: super: {
   "blaze-html-truncate" = dontDistribute super."blaze-html-truncate";
   "blaze-json" = dontDistribute super."blaze-json";
   "blaze-shields" = dontDistribute super."blaze-shields";
+  "blaze-svg" = doDistribute super."blaze-svg_0_3_5";
   "blaze-textual-native" = dontDistribute super."blaze-textual-native";
   "blazeMarker" = dontDistribute super."blazeMarker";
   "blink1" = dontDistribute super."blink1";
@@ -3996,6 +3999,7 @@ self: super: {
   "hscassandra" = dontDistribute super."hscassandra";
   "hscd" = dontDistribute super."hscd";
   "hsclock" = dontDistribute super."hsclock";
+  "hscolour" = doDistribute super."hscolour_1_23";
   "hscope" = dontDistribute super."hscope";
   "hscrtmpl" = dontDistribute super."hscrtmpl";
   "hscuid" = dontDistribute super."hscuid";
@@ -4344,6 +4348,7 @@ self: super: {
   "irc-fun-client" = dontDistribute super."irc-fun-client";
   "irc-fun-color" = dontDistribute super."irc-fun-color";
   "irc-fun-messages" = dontDistribute super."irc-fun-messages";
+  "irc-fun-types" = dontDistribute super."irc-fun-types";
   "ircbot" = dontDistribute super."ircbot";
   "ircbouncer" = dontDistribute super."ircbouncer";
   "ireal" = dontDistribute super."ireal";
@@ -4415,6 +4420,7 @@ self: super: {
   "jsc" = dontDistribute super."jsc";
   "jsmw" = dontDistribute super."jsmw";
   "json-assertions" = dontDistribute super."json-assertions";
+  "json-ast" = dontDistribute super."json-ast";
   "json-b" = dontDistribute super."json-b";
   "json-encoder" = dontDistribute super."json-encoder";
   "json-enumerator" = dontDistribute super."json-enumerator";
@@ -5018,6 +5024,7 @@ self: super: {
   "modulespection" = dontDistribute super."modulespection";
   "modulo" = dontDistribute super."modulo";
   "moe" = dontDistribute super."moe";
+  "moesocks" = doDistribute super."moesocks_1_0_0_40";
   "mohws" = dontDistribute super."mohws";
   "monad-abort-fd" = dontDistribute super."monad-abort-fd";
   "monad-atom" = dontDistribute super."monad-atom";
@@ -5604,6 +5611,7 @@ self: super: {
   "piet" = dontDistribute super."piet";
   "piki" = dontDistribute super."piki";
   "pinboard" = dontDistribute super."pinboard";
+  "pinchot" = doDistribute super."pinchot_0_6_0_0";
   "pipe-enumerator" = dontDistribute super."pipe-enumerator";
   "pipeclip" = dontDistribute super."pipeclip";
   "pipes" = doDistribute super."pipes_4_1_7";
@@ -5827,6 +5835,7 @@ self: super: {
   "pseudo-trie" = dontDistribute super."pseudo-trie";
   "pseudomacros" = dontDistribute super."pseudomacros";
   "pub" = dontDistribute super."pub";
+  "publicsuffix" = doDistribute super."publicsuffix_0_20151212";
   "publicsuffixlist" = dontDistribute super."publicsuffixlist";
   "publicsuffixlistcreate" = dontDistribute super."publicsuffixlistcreate";
   "pubnub" = dontDistribute super."pubnub";
@@ -6097,6 +6106,7 @@ self: super: {
   "resource-pool-catchio" = dontDistribute super."resource-pool-catchio";
   "resource-pool-monad" = dontDistribute super."resource-pool-monad";
   "resource-simple" = dontDistribute super."resource-simple";
+  "resourcet" = doDistribute super."resourcet_1_1_7";
   "respond" = dontDistribute super."respond";
   "rest-example" = dontDistribute super."rest-example";
   "restful-snap" = dontDistribute super."restful-snap";
@@ -6739,6 +6749,7 @@ self: super: {
   "string-convert" = dontDistribute super."string-convert";
   "string-quote" = dontDistribute super."string-quote";
   "string-similarity" = dontDistribute super."string-similarity";
+  "string-typelits" = dontDistribute super."string-typelits";
   "stringlike" = dontDistribute super."stringlike";
   "stringprep" = dontDistribute super."stringprep";
   "strings" = dontDistribute super."strings";
diff --git a/pkgs/development/haskell-modules/configuration-lts-4.2.nix b/pkgs/development/haskell-modules/configuration-lts-4.2.nix
index 9ca6a8a3c8fb..fb60f2f5ac57 100644
--- a/pkgs/development/haskell-modules/configuration-lts-4.2.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-4.2.nix
@@ -162,6 +162,7 @@ self: super: {
   "Cartesian" = dontDistribute super."Cartesian";
   "Cascade" = dontDistribute super."Cascade";
   "Catana" = dontDistribute super."Catana";
+  "ChannelT" = dontDistribute super."ChannelT";
   "Chart-diagrams" = dontDistribute super."Chart-diagrams";
   "Chart-gtk" = dontDistribute super."Chart-gtk";
   "Chart-simple" = dontDistribute super."Chart-simple";
@@ -1078,6 +1079,7 @@ self: super: {
   "aeson-applicative" = dontDistribute super."aeson-applicative";
   "aeson-bson" = dontDistribute super."aeson-bson";
   "aeson-diff" = dontDistribute super."aeson-diff";
+  "aeson-extra" = doDistribute super."aeson-extra_0_3_0_0";
   "aeson-filthy" = dontDistribute super."aeson-filthy";
   "aeson-iproute" = dontDistribute super."aeson-iproute";
   "aeson-lens" = dontDistribute super."aeson-lens";
@@ -1520,6 +1522,7 @@ self: super: {
   "blaze-html-truncate" = dontDistribute super."blaze-html-truncate";
   "blaze-json" = dontDistribute super."blaze-json";
   "blaze-shields" = dontDistribute super."blaze-shields";
+  "blaze-svg" = doDistribute super."blaze-svg_0_3_5";
   "blaze-textual-native" = dontDistribute super."blaze-textual-native";
   "blazeMarker" = dontDistribute super."blazeMarker";
   "blink1" = dontDistribute super."blink1";
@@ -3957,6 +3960,7 @@ self: super: {
   "hscassandra" = dontDistribute super."hscassandra";
   "hscd" = dontDistribute super."hscd";
   "hsclock" = dontDistribute super."hsclock";
+  "hscolour" = doDistribute super."hscolour_1_23";
   "hscope" = dontDistribute super."hscope";
   "hscrtmpl" = dontDistribute super."hscrtmpl";
   "hscuid" = dontDistribute super."hscuid";
@@ -4297,6 +4301,7 @@ self: super: {
   "irc-fun-client" = dontDistribute super."irc-fun-client";
   "irc-fun-color" = dontDistribute super."irc-fun-color";
   "irc-fun-messages" = dontDistribute super."irc-fun-messages";
+  "irc-fun-types" = dontDistribute super."irc-fun-types";
   "ircbot" = dontDistribute super."ircbot";
   "ircbouncer" = dontDistribute super."ircbouncer";
   "ireal" = dontDistribute super."ireal";
@@ -4368,6 +4373,7 @@ self: super: {
   "jsc" = dontDistribute super."jsc";
   "jsmw" = dontDistribute super."jsmw";
   "json-assertions" = dontDistribute super."json-assertions";
+  "json-ast" = dontDistribute super."json-ast";
   "json-b" = dontDistribute super."json-b";
   "json-encoder" = dontDistribute super."json-encoder";
   "json-enumerator" = dontDistribute super."json-enumerator";
@@ -4967,6 +4973,7 @@ self: super: {
   "modulespection" = dontDistribute super."modulespection";
   "modulo" = dontDistribute super."modulo";
   "moe" = dontDistribute super."moe";
+  "moesocks" = doDistribute super."moesocks_1_0_0_40";
   "mohws" = dontDistribute super."mohws";
   "monad-abort-fd" = dontDistribute super."monad-abort-fd";
   "monad-atom" = dontDistribute super."monad-atom";
@@ -5549,6 +5556,7 @@ self: super: {
   "piet" = dontDistribute super."piet";
   "piki" = dontDistribute super."piki";
   "pinboard" = dontDistribute super."pinboard";
+  "pinchot" = doDistribute super."pinchot_0_6_0_0";
   "pipe-enumerator" = dontDistribute super."pipe-enumerator";
   "pipeclip" = dontDistribute super."pipeclip";
   "pipes" = doDistribute super."pipes_4_1_7";
@@ -5769,6 +5777,7 @@ self: super: {
   "pseudo-trie" = dontDistribute super."pseudo-trie";
   "pseudomacros" = dontDistribute super."pseudomacros";
   "pub" = dontDistribute super."pub";
+  "publicsuffix" = doDistribute super."publicsuffix_0_20151212";
   "publicsuffixlist" = dontDistribute super."publicsuffixlist";
   "publicsuffixlistcreate" = dontDistribute super."publicsuffixlistcreate";
   "pubnub" = dontDistribute super."pubnub";
@@ -6037,6 +6046,7 @@ self: super: {
   "resource-pool-catchio" = dontDistribute super."resource-pool-catchio";
   "resource-pool-monad" = dontDistribute super."resource-pool-monad";
   "resource-simple" = dontDistribute super."resource-simple";
+  "resourcet" = doDistribute super."resourcet_1_1_7";
   "respond" = dontDistribute super."respond";
   "rest-example" = dontDistribute super."rest-example";
   "restful-snap" = dontDistribute super."restful-snap";
@@ -6670,6 +6680,7 @@ self: super: {
   "string-convert" = dontDistribute super."string-convert";
   "string-quote" = dontDistribute super."string-quote";
   "string-similarity" = dontDistribute super."string-similarity";
+  "string-typelits" = dontDistribute super."string-typelits";
   "stringlike" = dontDistribute super."stringlike";
   "stringprep" = dontDistribute super."stringprep";
   "strings" = dontDistribute super."strings";
diff --git a/pkgs/development/haskell-modules/configuration-lts-5.0.nix b/pkgs/development/haskell-modules/configuration-lts-5.0.nix
index 5a4647fc77f5..7941c97d177a 100644
--- a/pkgs/development/haskell-modules/configuration-lts-5.0.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-5.0.nix
@@ -122,6 +122,7 @@ self: super: {
   "BitSyntax" = dontDistribute super."BitSyntax";
   "Bitly" = dontDistribute super."Bitly";
   "Blobs" = dontDistribute super."Blobs";
+  "BlogLiterately" = doDistribute super."BlogLiterately_0_8_1_4";
   "BluePrintCSS" = dontDistribute super."BluePrintCSS";
   "Blueprint" = dontDistribute super."Blueprint";
   "Bookshelf" = dontDistribute super."Bookshelf";
@@ -160,6 +161,7 @@ self: super: {
   "Cartesian" = dontDistribute super."Cartesian";
   "Cascade" = dontDistribute super."Cascade";
   "Catana" = dontDistribute super."Catana";
+  "ChannelT" = dontDistribute super."ChannelT";
   "Chart-diagrams" = dontDistribute super."Chart-diagrams";
   "Chart-gtk" = dontDistribute super."Chart-gtk";
   "Chart-simple" = dontDistribute super."Chart-simple";
@@ -1060,6 +1062,7 @@ self: super: {
   "aeson-applicative" = dontDistribute super."aeson-applicative";
   "aeson-bson" = dontDistribute super."aeson-bson";
   "aeson-diff" = dontDistribute super."aeson-diff";
+  "aeson-extra" = doDistribute super."aeson-extra_0_3_0_0";
   "aeson-filthy" = dontDistribute super."aeson-filthy";
   "aeson-iproute" = dontDistribute super."aeson-iproute";
   "aeson-lens" = dontDistribute super."aeson-lens";
@@ -1489,6 +1492,7 @@ self: super: {
   "blaze-html-truncate" = dontDistribute super."blaze-html-truncate";
   "blaze-json" = dontDistribute super."blaze-json";
   "blaze-shields" = dontDistribute super."blaze-shields";
+  "blaze-svg" = doDistribute super."blaze-svg_0_3_5";
   "blaze-textual-native" = dontDistribute super."blaze-textual-native";
   "blazeMarker" = dontDistribute super."blazeMarker";
   "blink1" = dontDistribute super."blink1";
@@ -2939,6 +2943,7 @@ self: super: {
   "ginsu" = dontDistribute super."ginsu";
   "gist" = dontDistribute super."gist";
   "git-all" = dontDistribute super."git-all";
+  "git-annex" = doDistribute super."git-annex_6_20160114";
   "git-checklist" = dontDistribute super."git-checklist";
   "git-date" = dontDistribute super."git-date";
   "git-embed" = dontDistribute super."git-embed";
@@ -3871,6 +3876,7 @@ self: super: {
   "hscassandra" = dontDistribute super."hscassandra";
   "hscd" = dontDistribute super."hscd";
   "hsclock" = dontDistribute super."hsclock";
+  "hscolour" = doDistribute super."hscolour_1_23";
   "hscope" = dontDistribute super."hscope";
   "hscrtmpl" = dontDistribute super."hscrtmpl";
   "hscuid" = dontDistribute super."hscuid";
@@ -4204,6 +4210,7 @@ self: super: {
   "irc-fun-client" = dontDistribute super."irc-fun-client";
   "irc-fun-color" = dontDistribute super."irc-fun-color";
   "irc-fun-messages" = dontDistribute super."irc-fun-messages";
+  "irc-fun-types" = dontDistribute super."irc-fun-types";
   "ircbot" = dontDistribute super."ircbot";
   "ircbouncer" = dontDistribute super."ircbouncer";
   "ireal" = dontDistribute super."ireal";
@@ -4274,6 +4281,7 @@ self: super: {
   "jsc" = dontDistribute super."jsc";
   "jsmw" = dontDistribute super."jsmw";
   "json-assertions" = dontDistribute super."json-assertions";
+  "json-ast" = dontDistribute super."json-ast";
   "json-b" = dontDistribute super."json-b";
   "json-encoder" = dontDistribute super."json-encoder";
   "json-enumerator" = dontDistribute super."json-enumerator";
@@ -4440,6 +4448,7 @@ self: super: {
   "language-slice" = dontDistribute super."language-slice";
   "language-spelling" = dontDistribute super."language-spelling";
   "language-sqlite" = dontDistribute super."language-sqlite";
+  "language-thrift" = doDistribute super."language-thrift_0_7_0_0";
   "language-typescript" = dontDistribute super."language-typescript";
   "language-vhdl" = dontDistribute super."language-vhdl";
   "lat" = dontDistribute super."lat";
@@ -4856,6 +4865,7 @@ self: super: {
   "modulespection" = dontDistribute super."modulespection";
   "modulo" = dontDistribute super."modulo";
   "moe" = dontDistribute super."moe";
+  "moesocks" = doDistribute super."moesocks_1_0_0_40";
   "mohws" = dontDistribute super."mohws";
   "monad-abort-fd" = dontDistribute super."monad-abort-fd";
   "monad-atom" = dontDistribute super."monad-atom";
@@ -5426,6 +5436,7 @@ self: super: {
   "piet" = dontDistribute super."piet";
   "piki" = dontDistribute super."piki";
   "pinboard" = dontDistribute super."pinboard";
+  "pinchot" = doDistribute super."pinchot_0_6_0_0";
   "pipe-enumerator" = dontDistribute super."pipe-enumerator";
   "pipeclip" = dontDistribute super."pipeclip";
   "pipes-async" = dontDistribute super."pipes-async";
@@ -5638,6 +5649,7 @@ self: super: {
   "pseudo-trie" = dontDistribute super."pseudo-trie";
   "pseudomacros" = dontDistribute super."pseudomacros";
   "pub" = dontDistribute super."pub";
+  "publicsuffix" = doDistribute super."publicsuffix_0_20151212";
   "publicsuffixlist" = dontDistribute super."publicsuffixlist";
   "publicsuffixlistcreate" = dontDistribute super."publicsuffixlistcreate";
   "pubnub" = dontDistribute super."pubnub";
@@ -5900,6 +5912,7 @@ self: super: {
   "resource-pool-catchio" = dontDistribute super."resource-pool-catchio";
   "resource-pool-monad" = dontDistribute super."resource-pool-monad";
   "resource-simple" = dontDistribute super."resource-simple";
+  "resourcet" = doDistribute super."resourcet_1_1_7";
   "respond" = dontDistribute super."respond";
   "rest-example" = dontDistribute super."rest-example";
   "restful-snap" = dontDistribute super."restful-snap";
@@ -6520,6 +6533,7 @@ self: super: {
   "string-convert" = dontDistribute super."string-convert";
   "string-quote" = dontDistribute super."string-quote";
   "string-similarity" = dontDistribute super."string-similarity";
+  "string-typelits" = dontDistribute super."string-typelits";
   "stringlike" = dontDistribute super."stringlike";
   "stringprep" = dontDistribute super."stringprep";
   "strings" = dontDistribute super."strings";
diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index 8d1090965f8e..6112997fc01b 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -1829,7 +1829,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "BlogLiterately" = callPackage
+  "BlogLiterately_0_8_1_4" = callPackage
     ({ mkDerivation, base, blaze-html, bool-extras, bytestring, cmdargs
      , containers, data-default, directory, filepath, HaXml, haxr
      , highlighting-kate, hscolour, lens, mtl, pandoc, pandoc-citeproc
@@ -1849,12 +1849,14 @@ self: {
          process split strict temporary transformers
        ];
        executableHaskellDepends = [ base cmdargs ];
+       jailbreak = true;
        homepage = "http://byorgey.wordpress.com/blogliterately/";
        description = "A tool for posting Haskelly articles to blogs";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "BlogLiterately_0_8_1_5" = callPackage
+  "BlogLiterately" = callPackage
     ({ mkDerivation, base, blaze-html, bool-extras, bytestring, cmdargs
      , containers, data-default, directory, filepath, HaXml, haxr
      , highlighting-kate, hscolour, lens, mtl, pandoc, pandoc-citeproc
@@ -1877,7 +1879,6 @@ self: {
        homepage = "http://byorgey.wordpress.com/blogliterately/";
        description = "A tool for posting Haskelly articles to blogs";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "BlogLiterately-diagrams_0_1_4_3" = callPackage
@@ -2772,6 +2773,18 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "ChannelT" = callPackage
+    ({ mkDerivation, base, free, mmorph, mtl, transformers-base }:
+     mkDerivation {
+       pname = "ChannelT";
+       version = "0.0.0.2";
+       sha256 = "1ca364133211d323a743424a45677e2f61051f704e80223247b8fdc86f8aa7a0";
+       libraryHaskellDepends = [ base free mmorph mtl transformers-base ];
+       homepage = "https://github.com/pthariensflame/ChannelT";
+       description = "Generalized stream processors";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "Chart_1_3_2" = callPackage
     ({ mkDerivation, array, base, colour, data-default-class, lens, mtl
      , old-locale, operational, time
@@ -5035,8 +5048,8 @@ self: {
      }:
      mkDerivation {
        pname = "EdisonCore";
-       version = "1.3.1";
-       sha256 = "9d460a8e51e5b6d36e106a49c07a40f49d7ddcd46d1b32978bccd0c8ae9a4ad8";
+       version = "1.3.1.1";
+       sha256 = "3e0720ee3b179304f563b99dd446c1d6911e31ddc4d0f78d6550b18e59ed501b";
        libraryHaskellDepends = [
          array base containers EdisonAPI mtl QuickCheck
        ];
@@ -13217,6 +13230,8 @@ self: {
        pname = "MissingH";
        version = "1.3.0.1";
        sha256 = "ba0d60673e70c64c6eebe785fb4da729bcfd3dae37fba721c7318b8df1838db3";
+       revision = "1";
+       editedCabalFile = "5d7bf9ce1efa6e8c4a9dc43ea0dc03e66aca4c5950a420d811d2701510a038a0";
        libraryHaskellDepends = [
          array base containers directory filepath hslogger HUnit mtl network
          old-locale old-time parsec process random regex-compat time unix
@@ -13404,8 +13419,8 @@ self: {
      }:
      mkDerivation {
        pname = "MonadCompose";
-       version = "0.8.3.1";
-       sha256 = "aa5bc8d00caea4fb9bce70e3a98bb7618bf567a1b0f383601a6330cec45f5b5a";
+       version = "0.8.4.1";
+       sha256 = "16efab2564b74f253d3a6e034adb2afff12e0b8dff45ac0883fff30895815186";
        libraryHaskellDepends = [
          base data-default ghc-prim mmorph monad-loops monad-products mtl
          parallel random transformers transformers-compat
@@ -22797,7 +22812,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "aeson-extra" = callPackage
+  "aeson-extra_0_3_0_0" = callPackage
     ({ mkDerivation, aeson, aeson-compat, base, base-compat, bytestring
      , containers, exceptions, hashable, parsec, quickcheck-instances
      , scientific, tasty, tasty-hunit, tasty-quickcheck
@@ -22827,7 +22842,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "aeson-extra_0_3_0_1" = callPackage
+  "aeson-extra" = callPackage
     ({ mkDerivation, aeson, aeson-compat, base, base-compat, bytestring
      , containers, exceptions, hashable, parsec, quickcheck-instances
      , scientific, tasty, tasty-hunit, tasty-quickcheck
@@ -22855,6 +22870,35 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "aeson-extra_0_3_1_0" = callPackage
+    ({ mkDerivation, aeson, aeson-compat, base, base-compat, bytestring
+     , containers, exceptions, hashable, parsec, quickcheck-instances
+     , recursion-schemes, scientific, tasty, tasty-hunit
+     , tasty-quickcheck, template-haskell, text, these, time
+     , time-parsers, transformers, unordered-containers, vector
+     }:
+     mkDerivation {
+       pname = "aeson-extra";
+       version = "0.3.1.0";
+       sha256 = "d82c92ea155ee103d8feaaf772c813b4d73182a3e10f8f0739ab845cdfbb8831";
+       libraryHaskellDepends = [
+         aeson aeson-compat base base-compat bytestring containers
+         exceptions hashable parsec recursion-schemes scientific
+         template-haskell text time time-parsers transformers
+         unordered-containers vector
+       ];
+       testHaskellDepends = [
+         aeson aeson-compat base base-compat bytestring containers
+         exceptions hashable parsec quickcheck-instances scientific tasty
+         tasty-hunit tasty-quickcheck template-haskell text these time
+         time-parsers unordered-containers vector
+       ];
+       homepage = "https://github.com/phadej/aeson-extra#readme";
+       description = "Extra goodies for aeson";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "aeson-filthy" = callPackage
     ({ mkDerivation, aeson, base, bytestring, doctest, text
      , unordered-containers
@@ -27889,6 +27933,35 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "amqp_0_13_1" = callPackage
+    ({ mkDerivation, base, binary, bytestring, clock, connection
+     , containers, data-binary-ieee754, hspec, hspec-expectations
+     , monad-control, network, network-uri, split, stm, text, vector
+     , xml
+     }:
+     mkDerivation {
+       pname = "amqp";
+       version = "0.13.1";
+       sha256 = "3ea6523228f1c2bf0622d52ebf73c9e3c2e2af637a7ea29908c07ff9fa0dd4ae";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base binary bytestring clock connection containers
+         data-binary-ieee754 monad-control network network-uri split stm
+         text vector
+       ];
+       executableHaskellDepends = [ base containers xml ];
+       testHaskellDepends = [
+         base binary bytestring clock connection containers
+         data-binary-ieee754 hspec hspec-expectations network network-uri
+         split stm text vector
+       ];
+       homepage = "https://github.com/hreinhardt/amqp";
+       description = "Client library for AMQP servers (currently only RabbitMQ)";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "amqp-conduit" = callPackage
     ({ mkDerivation, amqp, base, bytestring, conduit, exceptions, hspec
      , HUnit, lifted-base, monad-control, mtl, resourcet, text
@@ -31935,6 +32008,34 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "avers_0_0_14" = callPackage
+    ({ mkDerivation, aeson, attoparsec, base, base16-bytestring
+     , bytestring, clock, containers, cryptohash, filepath, hspec
+     , inflections, MonadRandom, mtl, network, network-uri
+     , resource-pool, rethinkdb-client-driver, safe, scrypt, stm
+     , template-haskell, text, time, unordered-containers, vector
+     }:
+     mkDerivation {
+       pname = "avers";
+       version = "0.0.14";
+       sha256 = "44eb3978af5da284cc152237ea5217d5706815bd1c46be1fb63251fb99e58aa1";
+       libraryHaskellDepends = [
+         aeson attoparsec base base16-bytestring bytestring clock containers
+         cryptohash filepath inflections MonadRandom mtl network network-uri
+         resource-pool rethinkdb-client-driver safe scrypt stm
+         template-haskell text time unordered-containers vector
+       ];
+       testHaskellDepends = [
+         aeson attoparsec base base16-bytestring bytestring containers
+         cryptohash hspec inflections MonadRandom mtl resource-pool
+         rethinkdb-client-driver scrypt stm text time unordered-containers
+         vector
+       ];
+       description = "empty";
+       license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "avers-api" = callPackage
     ({ mkDerivation, aeson, avers, base, bytestring, cookie, servant
      , text, time
@@ -31952,6 +32053,23 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "avers-api_0_0_2" = callPackage
+    ({ mkDerivation, aeson, avers, base, bytestring, cookie, servant
+     , text, time
+     }:
+     mkDerivation {
+       pname = "avers-api";
+       version = "0.0.2";
+       sha256 = "c2f61dc6c15dc4976584ab68c086488b8d7a0ab21ff4b50c0236e3ef0f8fe4f8";
+       libraryHaskellDepends = [
+         aeson avers base bytestring cookie servant text time
+       ];
+       homepage = "http://github.com/wereHamster/avers-api";
+       description = "Types describing the core and extended Avers APIs";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "avers-server" = callPackage
     ({ mkDerivation, aeson, avers, avers-api, base, bytestring
      , bytestring-conversion, cookie, either, http-types, mtl
@@ -31972,6 +32090,29 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "avers-server_0_0_2" = callPackage
+    ({ mkDerivation, aeson, avers, avers-api, base, base64-bytestring
+     , bytestring, bytestring-conversion, cookie, cryptohash, either
+     , http-types, mtl, resource-pool, rethinkdb-client-driver, servant
+     , servant-server, text, time, transformers, wai, wai-websockets
+     , websockets
+     }:
+     mkDerivation {
+       pname = "avers-server";
+       version = "0.0.2";
+       sha256 = "0f02f100dd5ebaf8e3a538ef3075ecb61dbe38c1d9fad9f3e7735708ca96a55f";
+       libraryHaskellDepends = [
+         aeson avers avers-api base base64-bytestring bytestring
+         bytestring-conversion cookie cryptohash either http-types mtl
+         resource-pool rethinkdb-client-driver servant servant-server text
+         time transformers wai wai-websockets websockets
+       ];
+       homepage = "http://github.com/wereHamster/avers-server";
+       description = "Server implementation of the Avers API";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "avl-static" = callPackage
     ({ mkDerivation, base, QuickCheck, test-framework
      , test-framework-quickcheck2
@@ -35419,6 +35560,8 @@ self: {
        pname = "binary-orphans";
        version = "0.1.4.0";
        sha256 = "0a952a7521747a7aacf4aa1638674130262f2efacb7121727c1932d49017f742";
+       revision = "1";
+       editedCabalFile = "be6bd79c7ab5ca7f7f4f92479064945b4242dc092f512e10497a3aafd9b625fb";
        libraryHaskellDepends = [
          aeson base binary hashable scientific semigroups tagged text
          text-binary time unordered-containers vector
@@ -38106,7 +38249,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "blaze-svg" = callPackage
+  "blaze-svg_0_3_5" = callPackage
     ({ mkDerivation, base, blaze-markup, mtl }:
      mkDerivation {
        pname = "blaze-svg";
@@ -38116,9 +38259,10 @@ self: {
        homepage = "https://github.com/deepakjois/blaze-svg";
        description = "SVG combinator library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "blaze-svg_0_3_6" = callPackage
+  "blaze-svg" = callPackage
     ({ mkDerivation, base, blaze-markup, mtl }:
      mkDerivation {
        pname = "blaze-svg";
@@ -38128,7 +38272,6 @@ self: {
        homepage = "https://github.com/deepakjois/blaze-svg";
        description = "SVG combinator library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "blaze-textual_0_2_0_9" = callPackage
@@ -39870,6 +40013,34 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {system-glib = pkgs.glib;};
 
+  "bustle_0_5_4" = callPackage
+    ({ mkDerivation, base, bytestring, cairo, containers, dbus
+     , directory, filepath, gio, glib, gtk3, hgettext, HUnit, mtl, pango
+     , parsec, pcap, process, QuickCheck, setlocale, system-glib
+     , test-framework, test-framework-hunit, text, time
+     }:
+     mkDerivation {
+       pname = "bustle";
+       version = "0.5.4";
+       sha256 = "921c2cbbb957dcb02c3aa8fd1eeff3534cb437fa9eeca1c25206ad1e741a3f14";
+       isLibrary = false;
+       isExecutable = true;
+       libraryPkgconfigDepends = [ system-glib ];
+       executableHaskellDepends = [
+         base bytestring cairo containers dbus directory filepath gio glib
+         gtk3 hgettext mtl pango parsec pcap process setlocale text time
+       ];
+       testHaskellDepends = [
+         base bytestring cairo containers dbus directory filepath gtk3
+         hgettext HUnit mtl pango pcap QuickCheck setlocale test-framework
+         test-framework-hunit text
+       ];
+       homepage = "http://www.freedesktop.org/wiki/Software/Bustle/";
+       description = "Draw sequence diagrams of D-Bus traffic";
+       license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {system-glib = pkgs.glib;};
+
   "butterflies" = callPackage
     ({ mkDerivation, base, bytestring, gl-capture, GLUT, OpenGLRaw
      , OpenGLRaw21, repa, repa-devil
@@ -43178,15 +43349,15 @@ self: {
   "casadi-bindings" = callPackage
     ({ mkDerivation, base, binary, casadi, casadi-bindings-core
      , casadi-bindings-internal, cereal, containers, doctest, linear
-     , vector, vector-binary-instances
+     , spatial-math, vector, vector-binary-instances
      }:
      mkDerivation {
        pname = "casadi-bindings";
-       version = "2.4.1.6";
-       sha256 = "cc4e7f894581bf7847733dbffc0c2692c41235822e91459052ffd3b483319a48";
+       version = "2.4.1.7";
+       sha256 = "beb816ed9978392c3523aca99bf6f3a615e9a39bd67f090455505b21b430dba6";
        libraryHaskellDepends = [
          base binary casadi-bindings-core casadi-bindings-internal cereal
-         containers linear vector vector-binary-instances
+         containers linear spatial-math vector vector-binary-instances
        ];
        libraryPkgconfigDepends = [ casadi ];
        testHaskellDepends = [ base doctest ];
@@ -43744,8 +43915,8 @@ self: {
      }:
      mkDerivation {
        pname = "cassava-conduit";
-       version = "0.3.0";
-       sha256 = "ff78cceac3c0f2af3b12c7931d65def5fcd6cb1e9f3507044bdc3cc9c36572a6";
+       version = "0.3.1";
+       sha256 = "3f712d0128a0fa02ad66378f6eddb6be3c846ba666cfbb3fff138c516e6cede6";
        libraryHaskellDepends = [
          array base bifunctors bytestring cassava conduit conduit-extra
          containers mtl text
@@ -67506,8 +67677,8 @@ self: {
      }:
      mkDerivation {
        pname = "elm-init";
-       version = "1.0.1.1";
-       sha256 = "6e5d8b45552e4629040efa8026d8c756db4e105a25a2f71e6d61a484b4f6e2aa";
+       version = "1.0.2";
+       sha256 = "a0a3559b0e3abcc2cf11deaf97144fa5fc6b19dda84896cb0fdc90d90c061079";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -77187,27 +77358,28 @@ self: {
      }) {};
 
   "funbot" = callPackage
-    ({ mkDerivation, aeson, auto-update, base, bytestring, clock
-     , containers, data-default-class, feed, feed-collect
-     , funbot-ext-events, HTTP, http-client, http-client-tls
-     , http-listen, irc-fun-bot, irc-fun-color, json-state, network-uri
-     , settings, tagsoup, text, time, time-interval, time-units
-     , transformers, unordered-containers, utf8-string
+    ({ mkDerivation, aeson, auto-update, base, bytestring
+     , case-insensitive, clock, containers, data-default-class, feed
+     , feed-collect, formatting, funbot-ext-events, hashable, HTTP
+     , http-client, http-client-tls, http-listen, irc-fun-bot
+     , irc-fun-client, irc-fun-color, irc-fun-types, json-state
+     , network-uri, settings, tagsoup, text, time, time-interval
+     , time-units, transformers, unordered-containers, utf8-string
      , vcs-web-hook-parse
      }:
      mkDerivation {
        pname = "funbot";
-       version = "0.4.0.1";
-       sha256 = "444da7bc772b17de0aa329292dbe1a3ad3134990f824d6f88d6355ff28c3537e";
+       version = "0.5";
+       sha256 = "7efaf158080ee56dec38b141a7856e872eb58703c2f5d5fa501804bdabb053aa";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
-         aeson auto-update base bytestring clock containers
-         data-default-class feed feed-collect funbot-ext-events HTTP
-         http-client http-client-tls http-listen irc-fun-bot irc-fun-color
-         json-state network-uri settings tagsoup text time time-interval
-         time-units transformers unordered-containers utf8-string
-         vcs-web-hook-parse
+         aeson auto-update base bytestring case-insensitive clock containers
+         data-default-class feed feed-collect formatting funbot-ext-events
+         hashable HTTP http-client http-client-tls http-listen irc-fun-bot
+         irc-fun-client irc-fun-color irc-fun-types json-state network-uri
+         settings tagsoup text time time-interval time-units transformers
+         unordered-containers utf8-string vcs-web-hook-parse
        ];
        homepage = "https://notabug.org/fr33domlover/funbot";
        description = "IRC bot for fun, learning, creativity and collaboration";
@@ -77238,10 +77410,10 @@ self: {
     ({ mkDerivation, aeson, base, text }:
      mkDerivation {
        pname = "funbot-ext-events";
-       version = "0.2.0.0";
-       sha256 = "5224fee263e625708cc937356cdb5dfcf55f0cfd26bf61a8fcb9b2392aa37e26";
+       version = "0.3.0.0";
+       sha256 = "088850454d4b5e0cedd7dd80aab4d5dbfda08b251b9f3d99a0506ea27814b01c";
        libraryHaskellDepends = [ aeson base text ];
-       homepage = "https://notabug.org/fr33domlover/funbot-ext-events/";
+       homepage = "https://notabug.org/fr33domlover/funbot-ext-events";
        description = "Interact with FunBot's external events";
        license = stdenv.lib.licenses.publicDomain;
      }) {};
@@ -78262,8 +78434,8 @@ self: {
        pname = "generic-aeson";
        version = "0.2.0.7";
        sha256 = "1ff3c270634ba8393ff019d2b2dd47a86d98cc2ec83495324fed6fe3b2fa0c1b";
-       revision = "3";
-       editedCabalFile = "c360aa4138bfd4325a48f77b2bbebf11117bb8325b76e03d194c971d4f3446d4";
+       revision = "4";
+       editedCabalFile = "3d30e4aa0f8c020eb282ff899dee145caa151bebac2894a376cd9bc577dd211a";
        libraryHaskellDepends = [
          aeson attoparsec base generic-deriving mtl tagged text
          unordered-containers vector
@@ -78547,6 +78719,8 @@ self: {
        pname = "generic-xmlpickler";
        version = "0.1.0.4";
        sha256 = "3bc18f38bdbd0071f424763172ca1117fac10309546e8eac2a29208ded593404";
+       revision = "1";
+       editedCabalFile = "89fde0e961736eea86ecca91f2c66e2e315523b48e313a6f2f3bc4ec1fc52144";
        libraryHaskellDepends = [ base generic-deriving hxt text ];
        testHaskellDepends = [
          base hxt hxt-pickle-utils tasty tasty-hunit tasty-th
@@ -79412,7 +79586,6 @@ self: {
        homepage = "https://github.com/carlohamalainen/ghc-imported-from";
        description = "Find the Haddock documentation for a symbol";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ghc-make" = callPackage
@@ -80995,7 +81168,7 @@ self: {
          inherit (pkgs) perl; inherit (pkgs) rsync; inherit (pkgs) wget; 
          inherit (pkgs) which;};
 
-  "git-annex" = callPackage
+  "git-annex_6_20160114" = callPackage
     ({ mkDerivation, aeson, async, aws, base, blaze-builder
      , bloomfilter, bup, byteable, bytestring, case-insensitive
      , clientsession, concurrent-output, conduit, conduit-extra
@@ -81054,13 +81227,14 @@ self: {
        homepage = "http://git-annex.branchable.com/";
        description = "manage files with git, without checking their contents into git";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
        maintainers = with stdenv.lib.maintainers; [ simons ];
      }) {inherit (pkgs) bup; inherit (pkgs) curl; inherit (pkgs) git; 
          inherit (pkgs) gnupg; inherit (pkgs) lsof; inherit (pkgs) openssh; 
          inherit (pkgs) perl; inherit (pkgs) rsync; inherit (pkgs) wget; 
          inherit (pkgs) which;};
 
-  "git-annex_6_20160126" = callPackage
+  "git-annex" = callPackage
     ({ mkDerivation, aeson, async, aws, base, blaze-builder
      , bloomfilter, bup, byteable, bytestring, case-insensitive
      , clientsession, concurrent-output, conduit, conduit-extra
@@ -81119,7 +81293,6 @@ self: {
        homepage = "http://git-annex.branchable.com/";
        description = "manage files with git, without checking their contents into git";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
        maintainers = with stdenv.lib.maintainers; [ simons ];
      }) {inherit (pkgs) bup; inherit (pkgs) curl; inherit (pkgs) git; 
          inherit (pkgs) gnupg; inherit (pkgs) lsof; inherit (pkgs) openssh; 
@@ -84979,8 +85152,8 @@ self: {
     ({ mkDerivation, base, base-unicode-symbols, containers, mtl }:
      mkDerivation {
        pname = "graph-rewriting";
-       version = "0.7.7";
-       sha256 = "2e0be0ffd95d245caa506f73553cf5d3d501b06e27de7188a1f281178ded2eef";
+       version = "0.7.8";
+       sha256 = "cece8e180698771b872f2ab18cf73eafa4704fcd0e1b0e94a1924d6f9cc2b688";
        libraryHaskellDepends = [
          base base-unicode-symbols containers mtl
        ];
@@ -91325,13 +91498,12 @@ self: {
      }:
      mkDerivation {
        pname = "hardware-edsl";
-       version = "0.1.0.0";
-       sha256 = "13fe072ff4fbad2d16c4e80749db3cfe56a90df8499e86e615c4afda38589143";
+       version = "0.1.0.1";
+       sha256 = "cb208be2c2db96264ff37bfcc81810e127d9e6faf15ab48cebe7251bd55fc38c";
        libraryHaskellDepends = [
          array base bytestring constraints containers language-vhdl mtl
          operational-alacarte pretty syntactic
        ];
-       jailbreak = true;
        homepage = "https://github.com/markus-git/hardware-edsl";
        description = "Deep embedding of hardware descriptions with code generation";
        license = stdenv.lib.licenses.bsd3;
@@ -94847,6 +95019,38 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "hasql_0_19_4" = callPackage
+    ({ mkDerivation, aeson, attoparsec, base, base-prelude, bytestring
+     , contravariant, contravariant-extras, data-default-class, dlist
+     , either, hashable, hashtables, loch-th, mtl, placeholders
+     , postgresql-binary, postgresql-libpq, profunctors, QuickCheck
+     , quickcheck-instances, scientific, tasty, tasty-hunit
+     , tasty-quickcheck, tasty-smallcheck, text, time, transformers
+     , uuid, vector
+     }:
+     mkDerivation {
+       pname = "hasql";
+       version = "0.19.4";
+       sha256 = "392d4fd66779940d072356621037bb75be2383ec2d1e781cf18e9dafa06764ae";
+       libraryHaskellDepends = [
+         aeson attoparsec base base-prelude bytestring contravariant
+         contravariant-extras data-default-class dlist either hashable
+         hashtables loch-th mtl placeholders postgresql-binary
+         postgresql-libpq profunctors scientific text time transformers uuid
+         vector
+       ];
+       testHaskellDepends = [
+         base base-prelude bytestring contravariant contravariant-extras
+         data-default-class dlist either hashable profunctors QuickCheck
+         quickcheck-instances scientific tasty tasty-hunit tasty-quickcheck
+         tasty-smallcheck text time transformers uuid vector
+       ];
+       homepage = "https://github.com/nikita-volkov/hasql";
+       description = "A very efficient PostgreSQL driver and a flexible mapping API";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "hasql-backend_0_2_1" = callPackage
     ({ mkDerivation, base, base-prelude, bytestring, list-t, text
      , vector
@@ -95383,8 +95587,8 @@ self: {
        pname = "hastache";
        version = "0.6.1";
        sha256 = "8c8f89669d6125201d7163385ea9055ab8027a69d1513259f8fbdd53c244b464";
-       revision = "3";
-       editedCabalFile = "29ee2fa8aa0d428e48e444a4bc6f287ca4e8db25ae04db0a18d72af06129dd51";
+       revision = "4";
+       editedCabalFile = "10661eb3aea897aae7d81242de0dbba4eb412ee282d3a7343ed88ce626fd6bd8";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -103722,18 +103926,18 @@ self: {
      }) {};
 
   "hothasktags" = callPackage
-    ({ mkDerivation, array, base, containers, cpphs, filepath
-     , haskell-src-exts, optparse-applicative, split
+    ({ mkDerivation, array, base, containers, cpphs, filemanip
+     , filepath, Glob, haskell-src-exts, optparse-applicative, split
      }:
      mkDerivation {
        pname = "hothasktags";
-       version = "0.3.4";
-       sha256 = "be41b5109ba887eeea36c3a2141a0e0f2d7868af728e3ccb4d828a896707d75e";
+       version = "0.3.5";
+       sha256 = "6f0ed1707e5470aacef8e8ab959f430e356a05a0ed40b4b0a37c176cc3a89426";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
-         array base containers cpphs filepath haskell-src-exts
-         optparse-applicative split
+         array base containers cpphs filemanip filepath Glob
+         haskell-src-exts optparse-applicative split
        ];
        homepage = "http://github.com/luqui/hothasktags";
        description = "Generates ctags for Haskell, incorporating import lists and qualified imports";
@@ -105961,7 +106165,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "hscolour" = callPackage
+  "hscolour_1_23" = callPackage
     ({ mkDerivation, base, containers }:
      mkDerivation {
        pname = "hscolour";
@@ -105974,9 +106178,10 @@ self: {
        homepage = "http://code.haskell.org/~malcolm/hscolour/";
        description = "Colourise Haskell code";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "hscolour_1_24" = callPackage
+  "hscolour" = callPackage
     ({ mkDerivation, base, containers }:
      mkDerivation {
        pname = "hscolour";
@@ -105989,7 +106194,6 @@ self: {
        homepage = "http://code.haskell.org/~malcolm/hscolour/";
        description = "Colourise Haskell code";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hscope" = callPackage
@@ -108827,7 +109031,10 @@ self: {
        pname = "hstats";
        version = "0.3";
        sha256 = "12266f4e5212f72826281346058c1667f28af8fdb5292aab4f115ca2e01b6013";
+       revision = "1";
+       editedCabalFile = "0dcd5745170aeea7a6970ad9042c1043cc073f4fe40403af5795af09f9a062bf";
        libraryHaskellDepends = [ base haskell98 ];
+       jailbreak = true;
        homepage = "http://github.com/unmarshal/hstats/";
        description = "Statistical Computing in Haskell";
        license = stdenv.lib.licenses.bsd3;
@@ -113501,6 +113708,32 @@ self: {
        license = stdenv.lib.licenses.gpl2;
      }) {};
 
+  "hzulip_1_1_1_3" = callPackage
+    ({ mkDerivation, aeson, async, base, bytestring, conduit
+     , exceptions, hspec, http-client, http-client-tls, http-types, lens
+     , lens-aeson, mtl, raw-strings-qq, scotty, stm, stm-conduit, text
+     , transformers
+     }:
+     mkDerivation {
+       pname = "hzulip";
+       version = "1.1.1.3";
+       sha256 = "a49c129e665984ebfc013bffdf7f997b76e7362fb66d622e5f43a35ba1468661";
+       libraryHaskellDepends = [
+         aeson base bytestring conduit exceptions http-client
+         http-client-tls http-types lens lens-aeson mtl stm stm-conduit text
+         transformers
+       ];
+       testHaskellDepends = [
+         aeson async base bytestring conduit exceptions hspec http-client
+         http-client-tls http-types lens lens-aeson mtl raw-strings-qq
+         scotty stm stm-conduit text transformers
+       ];
+       homepage = "https://github.com/yamadapc/hzulip";
+       description = "A haskell wrapper for the Zulip API";
+       license = stdenv.lib.licenses.gpl2;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "i18n" = callPackage
     ({ mkDerivation, array, base, containers, directory, filepath, mtl
      , old-locale, old-time, parsec, utf8-string
@@ -117591,35 +117824,38 @@ self: {
      }) {};
 
   "irc-fun-bot" = callPackage
-    ({ mkDerivation, aeson, auto-update, base, clock, containers
-     , fast-logger, irc-fun-client, irc-fun-messages, json-state, time
+    ({ mkDerivation, aeson, auto-update, base, case-insensitive, clock
+     , containers, data-default-class, fast-logger, formatting
+     , irc-fun-client, irc-fun-types, json-state, text, time
      , time-interval, time-units, transformers, unordered-containers
      }:
      mkDerivation {
        pname = "irc-fun-bot";
-       version = "0.5.0.0";
-       sha256 = "1104c508068dcfba3f8c60c39d5cc8ccb9b264af57097e8fa2b61e68e3754b51";
+       version = "0.6.0.0";
+       sha256 = "1284142d5957d8b30975fb9178908cec8414d60cebd5b5e6d04af6c41809cd82";
        libraryHaskellDepends = [
-         aeson auto-update base clock containers fast-logger irc-fun-client
-         irc-fun-messages json-state time time-interval time-units
+         aeson auto-update base case-insensitive clock containers
+         data-default-class fast-logger formatting irc-fun-client
+         irc-fun-types json-state text time time-interval time-units
          transformers unordered-containers
        ];
-       jailbreak = true;
        homepage = "http://rel4tion.org/projects/irc-fun-bot/";
        description = "Library for writing fun IRC bots";
        license = stdenv.lib.licenses.publicDomain;
      }) {};
 
   "irc-fun-client" = callPackage
-    ({ mkDerivation, auto-update, base, fast-logger, irc-fun-messages
-     , network, time, time-units, unordered-containers
+    ({ mkDerivation, auto-update, base, bytestring, connection
+     , data-default-class, fast-logger, hashable, irc-fun-messages
+     , irc-fun-types, text, time, time-units, unordered-containers
      }:
      mkDerivation {
        pname = "irc-fun-client";
-       version = "0.4.0.0";
-       sha256 = "2567be16b259a37a4234a1716bef694d6f1ce6c3b7c9f553d9d0a12a0be65c33";
+       version = "0.5.0.0";
+       sha256 = "a8a6bb0835fd2ff4b0697306d76d639802ced44dba23b8e661ed8e4aea31525a";
        libraryHaskellDepends = [
-         auto-update base fast-logger irc-fun-messages network time
+         auto-update base bytestring connection data-default-class
+         fast-logger hashable irc-fun-messages irc-fun-types text time
          time-units unordered-containers
        ];
        homepage = "http://rel4tion.org/projects/irc-fun-client/";
@@ -117628,32 +117864,48 @@ self: {
      }) {};
 
   "irc-fun-color" = callPackage
-    ({ mkDerivation, base }:
+    ({ mkDerivation, base, dlist, formatting, irc-fun-types, text
+     , text-show
+     }:
      mkDerivation {
        pname = "irc-fun-color";
-       version = "0.1.0.1";
-       sha256 = "8b87a8c9e6325f6185b42c213bc56aa8bee080f20ef1fdf53c1c8b26031bf088";
-       revision = "1";
-       editedCabalFile = "91737e98e11349079179790b93588c5c52a6ef31eb96bf4dfc99eb7672b96696";
-       libraryHaskellDepends = [ base ];
-       testHaskellDepends = [ base ];
+       version = "0.2.0.0";
+       sha256 = "d08930a2d5b39411515cd1477804416a0d1882cb4af716cfdddffc0bf3e20780";
+       libraryHaskellDepends = [
+         base dlist formatting irc-fun-types text text-show
+       ];
+       testHaskellDepends = [ base text ];
        homepage = "http://rel4tion.org/projects/irc-fun-color/";
        description = "Add color and style decorations to IRC messages";
        license = stdenv.lib.licenses.publicDomain;
      }) {};
 
   "irc-fun-messages" = callPackage
-    ({ mkDerivation, base, regex-applicative }:
+    ({ mkDerivation, base, irc-fun-types, regex-applicative, text }:
      mkDerivation {
        pname = "irc-fun-messages";
-       version = "0.2.0.1";
-       sha256 = "b54ab9b8a259c49a495f111bc7a56c5cd50334c4708dea6e3f06b66534325198";
-       libraryHaskellDepends = [ base regex-applicative ];
+       version = "0.3.0.0";
+       sha256 = "bfabe5cd9eff9d2e41c7adf0b7729fee4713a133a1f9da6b2b410753c0ecd04f";
+       libraryHaskellDepends = [
+         base irc-fun-types regex-applicative text
+       ];
        homepage = "http://rel4tion.org/projects/irc-fun-messages/";
        description = "Types and functions for working with the IRC protocol";
        license = stdenv.lib.licenses.publicDomain;
      }) {};
 
+  "irc-fun-types" = callPackage
+    ({ mkDerivation, base, text }:
+     mkDerivation {
+       pname = "irc-fun-types";
+       version = "0.1.0.0";
+       sha256 = "818255949173d1c4fb982f8bef99d9261b1b7ee77ad3183872d4a0fcbfe5341f";
+       libraryHaskellDepends = [ base text ];
+       homepage = "http://hub.darcs.net/fr33domlover/irc-fun-types";
+       description = "Common types for IRC related packages";
+       license = stdenv.lib.licenses.publicDomain;
+     }) {};
+
   "ircbot" = callPackage
     ({ mkDerivation, base, bytestring, containers, directory, filepath
      , irc, mtl, network, parsec, random, SafeSemaphore, stm, time, unix
@@ -119330,6 +119582,22 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "json-ast" = callPackage
+    ({ mkDerivation, base, scientific, text, unordered-containers
+     , vector
+     }:
+     mkDerivation {
+       pname = "json-ast";
+       version = "0.1";
+       sha256 = "8f66d6a977794f21cc5a9af8551ed237ff57677b5777f269a1cebd8e05a3141f";
+       libraryHaskellDepends = [
+         base scientific text unordered-containers vector
+       ];
+       homepage = "https://github.com/nikita-volkov/json-ast";
+       description = "Universal JSON AST datastructure";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "json-autotype_0_2_5_4" = callPackage
     ({ mkDerivation, aeson, base, bytestring, containers, filepath
      , GenericPretty, hashable, hflags, lens, mtl, pretty, process
@@ -120021,6 +120289,8 @@ self: {
        pname = "json-schema";
        version = "0.7.4.1";
        sha256 = "560d6a17d6eab734f43d329e51967e3ed62f8df2a6fea4a92d06359fe77d7c96";
+       revision = "1";
+       editedCabalFile = "4d1dfd0f92e4a804930e202d9e8078d63dcfec2b002d1e863cbc95f648e004e0";
        libraryHaskellDepends = [
          aeson base containers generic-aeson generic-deriving mtl scientific
          text time unordered-containers vector
@@ -124227,7 +124497,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "language-thrift" = callPackage
+  "language-thrift_0_7_0_0" = callPackage
     ({ mkDerivation, ansi-wl-pprint, base, hspec, hspec-discover, lens
      , parsers, QuickCheck, template-haskell, text, transformers
      , trifecta, wl-pprint
@@ -124250,6 +124520,28 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "language-thrift" = callPackage
+    ({ mkDerivation, ansi-wl-pprint, base, hspec, hspec-discover, lens
+     , parsers, QuickCheck, text, transformers, trifecta, wl-pprint
+     }:
+     mkDerivation {
+       pname = "language-thrift";
+       version = "0.7.0.1";
+       sha256 = "67d26a72529fe49bb3e9a9cc087dc5ee302ba3cf19b62cda601e9a68adfbbdc5";
+       libraryHaskellDepends = [
+         ansi-wl-pprint base lens parsers text transformers trifecta
+         wl-pprint
+       ];
+       testHaskellDepends = [
+         ansi-wl-pprint base hspec hspec-discover parsers QuickCheck text
+         trifecta wl-pprint
+       ];
+       homepage = "https://github.com/abhinav/language-thrift";
+       description = "Parser and pretty printer for the Thrift IDL format";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "language-typescript" = callPackage
     ({ mkDerivation, base, containers, parsec, pretty }:
      mkDerivation {
@@ -124266,8 +124558,8 @@ self: {
     ({ mkDerivation, base, pretty }:
      mkDerivation {
        pname = "language-vhdl";
-       version = "0.1.2.4";
-       sha256 = "f3a19de12610c6273138467bfc89795e98d7dddc1064f8e1a947b0d8c16fe93b";
+       version = "0.1.2.6";
+       sha256 = "87d000bdf5872b26329980825c0dd668ae6070f48e32836d13e3817ad10f7ddc";
        libraryHaskellDepends = [ base pretty ];
        homepage = "https://github.com/markus-git/language-vhdl";
        description = "VHDL AST and pretty printer in Haskell";
@@ -127478,8 +127770,8 @@ self: {
      }:
      mkDerivation {
        pname = "link-relations";
-       version = "0.1.0.0";
-       sha256 = "4944ffa47d4758135c40f776634e1f7b542c8886ef62b61f224a973c143173cb";
+       version = "0.1.1.0";
+       sha256 = "3d6805c4e0f78239d3aedfa0baf9b488da9163058e5d4c58e4b7440b508cbb2a";
        libraryHaskellDepends = [
          base bytestring hashable unordered-containers uri-bytestring
        ];
@@ -132185,14 +132477,14 @@ self: {
     ({ mkDerivation, base, containers, hspec, parsec, QuickCheck }:
      mkDerivation {
        pname = "mappy";
-       version = "0.1.0.0";
-       sha256 = "5164ba7bc9e920252e00e0e01357b929f16795bf7f032e122c8ddaf85e1e038a";
+       version = "0.1.0.2";
+       sha256 = "138923424b51cfa0008fa9224af8327f1455c097421c7ec4969a4689790230af";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base containers parsec ];
        executableHaskellDepends = [ base parsec ];
        testHaskellDepends = [ base containers hspec parsec QuickCheck ];
-       homepage = "http://github.com/githubuser/mappy#readme";
+       homepage = "https://github.com/PolyglotSymposium/mappy";
        description = "A functional programming language focused around maps";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -135749,7 +136041,7 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "moesocks" = callPackage
+  "moesocks_1_0_0_40" = callPackage
     ({ mkDerivation, aeson, async, attoparsec, base, binary, bytestring
      , containers, cryptohash, hslogger, HsOpenSSL, iproute, lens
      , lens-aeson, mtl, network, optparse-applicative, random, stm
@@ -135770,9 +136062,10 @@ self: {
        homepage = "https://github.com/nfjinjing/moesocks";
        description = "A functional firewall killer";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "moesocks_1_0_0_41" = callPackage
+  "moesocks" = callPackage
     ({ mkDerivation, aeson, async, attoparsec, base, binary, bytestring
      , containers, cryptohash, hslogger, HsOpenSSL, iproute, lens
      , lens-aeson, mtl, network, optparse-applicative, random, stm
@@ -135793,7 +136086,6 @@ self: {
        homepage = "https://github.com/nfjinjing/moesocks";
        description = "A functional firewall killer";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "mohws" = callPackage
@@ -135987,6 +136279,23 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "monad-control_1_0_0_5" = callPackage
+    ({ mkDerivation, base, stm, transformers, transformers-base
+     , transformers-compat
+     }:
+     mkDerivation {
+       pname = "monad-control";
+       version = "1.0.0.5";
+       sha256 = "055f715701c82e2c238282e363807d5bd6300e82cb38eaf37283987bfa8943f9";
+       libraryHaskellDepends = [
+         base stm transformers transformers-base transformers-compat
+       ];
+       homepage = "https://github.com/basvandijk/monad-control";
+       description = "Lift control operations, like exception catching, through monad transformers";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "monad-coroutine_0_8" = callPackage
     ({ mkDerivation, base, monad-parallel, transformers }:
      mkDerivation {
@@ -141124,38 +141433,37 @@ self: {
      }) {};
 
   "nested-routes" = callPackage
-    ({ mkDerivation, attoparsec, base, base64-bytestring, blaze-builder
-     , bytestring, composition-extra, containers, cookie, cryptonite
-     , data-default, errors, hspec, hspec-wai, http-types, iso8601-time
-     , lucid, memory, mtl, poly-arity, pred-trie, regex-compat
-     , semigroups, stm, text, time, transformers, tries, utf8-string
-     , wai-extra, wai-middleware-content-type, wai-middleware-verbs
-     , wai-session, wai-transformers, warp
+    ({ mkDerivation, attoparsec, base, bytestring, composition-extra
+     , errors, exceptions, hashable, hspec, hspec-wai, http-types, mtl
+     , poly-arity, pred-trie, regex-compat, semigroups, text
+     , transformers, tries, unordered-containers
+     , wai-middleware-content-type, wai-middleware-verbs
+     , wai-transformers, warp
      }:
      mkDerivation {
        pname = "nested-routes";
-       version = "6.1.0";
-       sha256 = "9eddbc6ce2fa029a54f27c753bc28c7093f8a351a5ae6d4fec11b6ec6d4fd8b1";
+       version = "7.0.0";
+       sha256 = "eac01cd730d3cbcafab4a0ac2b6b8c3ca8cdcd31f996379092f2f60bc31c21a2";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
-         attoparsec base bytestring composition-extra containers mtl
-         poly-arity pred-trie regex-compat semigroups text transformers
-         tries wai-middleware-content-type wai-middleware-verbs
-         wai-transformers
+         attoparsec base bytestring composition-extra errors exceptions
+         hashable mtl poly-arity pred-trie regex-compat semigroups text
+         transformers tries unordered-containers wai-middleware-content-type
+         wai-middleware-verbs wai-transformers
        ];
        executableHaskellDepends = [
-         attoparsec base base64-bytestring blaze-builder bytestring
-         composition-extra containers cookie cryptonite data-default errors
-         http-types iso8601-time lucid memory mtl poly-arity pred-trie
-         regex-compat semigroups stm text time transformers tries
-         utf8-string wai-extra wai-middleware-content-type
-         wai-middleware-verbs wai-session wai-transformers warp
+         attoparsec base bytestring composition-extra errors exceptions
+         hashable http-types mtl poly-arity pred-trie regex-compat
+         semigroups text transformers tries unordered-containers
+         wai-middleware-content-type wai-middleware-verbs wai-transformers
+         warp
        ];
        testHaskellDepends = [
-         attoparsec base bytestring composition-extra containers hspec
-         hspec-wai http-types mtl poly-arity pred-trie regex-compat
-         semigroups text transformers tries wai-middleware-content-type
+         attoparsec base bytestring composition-extra errors exceptions
+         hashable hspec hspec-wai http-types mtl poly-arity pred-trie
+         regex-compat semigroups text transformers tries
+         unordered-containers wai-middleware-content-type
          wai-middleware-verbs wai-transformers
        ];
        description = "Declarative, compositional Wai responses";
@@ -152767,7 +153075,7 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "pinchot" = callPackage
+  "pinchot_0_6_0_0" = callPackage
     ({ mkDerivation, base, containers, Earley, lens, template-haskell
      , transformers
      }:
@@ -152783,9 +153091,10 @@ self: {
        homepage = "http://www.github.com/massysett/pinchot";
        description = "Build parsers and ASTs for context-free grammars";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "pinchot_0_8_0_0" = callPackage
+  "pinchot" = callPackage
     ({ mkDerivation, base, containers, Earley, lens, template-haskell
      , transformers
      }:
@@ -152801,6 +153110,24 @@ self: {
        homepage = "http://www.github.com/massysett/pinchot";
        description = "Build parsers and ASTs for context-free grammars";
        license = stdenv.lib.licenses.bsd3;
+     }) {};
+
+  "pinchot_0_10_0_0" = callPackage
+    ({ mkDerivation, base, containers, Earley, lens, template-haskell
+     , transformers
+     }:
+     mkDerivation {
+       pname = "pinchot";
+       version = "0.10.0.0";
+       sha256 = "59a9e3b5e5eb323b11fba24d90d7f371e22653d46bf7a31b9676220a0e78a797";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base containers Earley lens template-haskell transformers
+       ];
+       homepage = "http://www.github.com/massysett/pinchot";
+       description = "Build parsers and ASTs for context-free grammars";
+       license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
@@ -155796,6 +156123,35 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "postgresql-binary_0_7_6" = callPackage
+    ({ mkDerivation, aeson, base, base-prelude, binary-parser
+     , bytestring, conversion, conversion-bytestring, conversion-text
+     , either, foldl, loch-th, placeholders, postgresql-libpq
+     , QuickCheck, quickcheck-instances, scientific, tasty, tasty-hunit
+     , tasty-quickcheck, tasty-smallcheck, text, time, transformers
+     , uuid, vector
+     }:
+     mkDerivation {
+       pname = "postgresql-binary";
+       version = "0.7.6";
+       sha256 = "19a2ed82a6f924194b79d6a0759299495f802c00d5b563841decacb8adb30a42";
+       libraryHaskellDepends = [
+         aeson base base-prelude binary-parser bytestring foldl loch-th
+         placeholders scientific text time transformers uuid vector
+       ];
+       testHaskellDepends = [
+         base base-prelude bytestring conversion conversion-bytestring
+         conversion-text either loch-th placeholders postgresql-libpq
+         QuickCheck quickcheck-instances scientific tasty tasty-hunit
+         tasty-quickcheck tasty-smallcheck text time transformers uuid
+         vector
+       ];
+       homepage = "https://github.com/nikita-volkov/postgresql-binary";
+       description = "Encoders and decoders for the PostgreSQL's binary format";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "postgresql-config" = callPackage
     ({ mkDerivation, aeson, base, bytestring, monad-control, mtl
      , postgresql-simple, resource-pool, time
@@ -158939,7 +159295,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "publicsuffix" = callPackage
+  "publicsuffix_0_20151212" = callPackage
     ({ mkDerivation, base, filepath, hspec, template-haskell }:
      mkDerivation {
        pname = "publicsuffix";
@@ -158950,9 +159306,10 @@ self: {
        homepage = "https://github.com/wereHamster/publicsuffix-haskell/";
        description = "The publicsuffix list exposed as proper Haskell types";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "publicsuffix_0_20160126" = callPackage
+  "publicsuffix" = callPackage
     ({ mkDerivation, base, filepath, hspec, template-haskell }:
      mkDerivation {
        pname = "publicsuffix";
@@ -158963,7 +159320,6 @@ self: {
        homepage = "https://github.com/wereHamster/publicsuffix-haskell/";
        description = "The publicsuffix list exposed as proper Haskell types";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "publicsuffixlist" = callPackage
@@ -165495,7 +165851,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "resourcet" = callPackage
+  "resourcet_1_1_7" = callPackage
     ({ mkDerivation, base, containers, exceptions, hspec, lifted-base
      , mmorph, monad-control, mtl, transformers, transformers-base
      , transformers-compat
@@ -165512,9 +165868,10 @@ self: {
        homepage = "http://github.com/snoyberg/conduit";
        description = "Deterministic allocation and freeing of scarce resources";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "resourcet_1_1_7_1" = callPackage
+  "resourcet" = callPackage
     ({ mkDerivation, base, containers, exceptions, hspec, lifted-base
      , mmorph, monad-control, mtl, transformers, transformers-base
      , transformers-compat
@@ -165531,7 +165888,6 @@ self: {
        homepage = "http://github.com/snoyberg/conduit";
        description = "Deterministic allocation and freeing of scarce resources";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "respond" = callPackage
@@ -173474,6 +173830,28 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "servant-swagger_0_1_2" = callPackage
+    ({ mkDerivation, aeson, aeson-qq, base, bytestring, hspec
+     , http-media, lens, servant, swagger2, text, time
+     , unordered-containers
+     }:
+     mkDerivation {
+       pname = "servant-swagger";
+       version = "0.1.2";
+       sha256 = "44b189a3dabe0b2f6dd5fe8366b81df5622bd9435674670a8fe3e67ecf1e9c1b";
+       libraryHaskellDepends = [
+         aeson base bytestring http-media lens servant swagger2 text
+         unordered-containers
+       ];
+       testHaskellDepends = [
+         aeson aeson-qq base hspec lens servant swagger2 text time
+       ];
+       homepage = "https://github.com/dmjio/servant-swagger";
+       description = "Generate Swagger specification for your servant API";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "servant-yaml" = callPackage
     ({ mkDerivation, aeson, base, base-compat, bytestring, http-media
      , servant, servant-server, wai, warp, yaml
@@ -174003,16 +174381,12 @@ self: {
      }) {};
 
   "settings" = callPackage
-    ({ mkDerivation, aeson, aeson-pretty, base, bytestring, time-units
-     , unordered-containers
-     }:
+    ({ mkDerivation, base, text, unordered-containers }:
      mkDerivation {
        pname = "settings";
-       version = "0.2.2.0";
-       sha256 = "8ca39518d7ed4d0575dbb3bce2064aca006c449765c842906d07484fecf0b831";
-       libraryHaskellDepends = [
-         aeson aeson-pretty base bytestring time-units unordered-containers
-       ];
+       version = "0.3.0.0";
+       sha256 = "48e36d5337bcfe077acd4db4d1a2c03b15f0423cf02731a87c4cc494b2c8cbc2";
+       libraryHaskellDepends = [ base text unordered-containers ];
        homepage = "http://rel4tion.org/projects/settings/";
        description = "Runtime-editable program settings";
        license = stdenv.lib.licenses.publicDomain;
@@ -180635,8 +181009,8 @@ self: {
      }:
      mkDerivation {
        pname = "spatial-math";
-       version = "0.2.5.0";
-       sha256 = "3fbdac29649d0bba318766e271eab808732acd529667c4a9f064aab2858d3ef8";
+       version = "0.2.7.0";
+       sha256 = "a40636d9639ebd4f81b6b10a25ffd3f03af7e3a904d80ac00d2c6892d9ad2859";
        libraryHaskellDepends = [
          base binary cereal ghc-prim lens linear
        ];
@@ -185484,6 +185858,22 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "string-typelits" = callPackage
+    ({ mkDerivation, base, template-haskell, type-combinators
+     , type-combinators-quote
+     }:
+     mkDerivation {
+       pname = "string-typelits";
+       version = "0.1.0.0";
+       sha256 = "ff35b6eb25b8e7a18f3fd495c8c911acf3e866876cb521c44bae31ef2934abbb";
+       libraryHaskellDepends = [
+         base template-haskell type-combinators type-combinators-quote
+       ];
+       homepage = "https://github.com/kylcarte/string-typelits";
+       description = "Type-level Chars and Strings, with decidable equality";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "stringable" = callPackage
     ({ mkDerivation, base, bytestring, system-filepath, text }:
      mkDerivation {
@@ -198400,6 +198790,8 @@ self: {
        pname = "uhttpc";
        version = "0.1.1.0";
        sha256 = "cbfa7b8d008c766be1055dca52f467cfded9e5577405b96a8bd622fc5146cece";
+       revision = "1";
+       editedCabalFile = "ff2f7c17cf679f095238229bd36f5438c5f2a6ed2279eee34daf1a3ceef9ba48";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -198409,7 +198801,6 @@ self: {
          async base bytestring bytestring-lexing deepseq network
          optparse-applicative
        ];
-       jailbreak = true;
        homepage = "https://github.com/hvr/uhttpc";
        description = "Minimal HTTP client library optimized for benchmarking";
        license = stdenv.lib.licenses.gpl3;
@@ -201803,10 +202194,8 @@ self: {
     ({ mkDerivation, aeson, base, bytestring, text }:
      mkDerivation {
        pname = "vcs-web-hook-parse";
-       version = "0.1.0.0";
-       sha256 = "578cceeed56d13410a33663987268c85f3c54693759cb6dc4e008b3953217961";
-       revision = "1";
-       editedCabalFile = "c43fff776c16fd1de7f9a9c1464de4ed773634ff0ca48a6eb5e008d07f292357";
+       version = "0.2.0.0";
+       sha256 = "db8293f8edabf50787d0290c15fe1971abdc9104c8e2e561757671993f23950a";
        libraryHaskellDepends = [ aeson base bytestring text ];
        homepage = "http://rel4tion.org/projects/vcs-web-hook-parse/";
        description = "Parse development platform web hook messages";
@@ -205132,8 +205521,8 @@ self: {
      }:
      mkDerivation {
        pname = "wai-middleware-content-type";
-       version = "0.3.0";
-       sha256 = "2fadb84ee1f8a25d3e3d4f07bb8c92056eccf8bd3c0dabadb0a860653407f7c4";
+       version = "0.4.0";
+       sha256 = "bccf5fb49c39cde628d8e73b4afff934186cba6824a8b04501bb3fbada4229eb";
        libraryHaskellDepends = [
          aeson base blaze-builder blaze-html bytestring clay exceptions
          hashable http-media http-types lucid mmorph monad-control
@@ -205147,7 +205536,7 @@ self: {
          shakespeare tasty tasty-hspec text transformers transformers-base
          unordered-containers urlpath wai wai-transformers warp
        ];
-       description = "Route to different middlewares based on the incoming Accept header";
+       description = "A simple WAI library for responding with content";
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
@@ -208350,16 +208739,17 @@ self: {
 
   "webfinger-client" = callPackage
     ({ mkDerivation, aeson, base, bytestring, data-default-class
-     , hashable, http-client, http-client-tls, http-types, text
-     , unordered-containers, uri-bytestring
+     , hashable, http-client, http-client-tls, http-types
+     , link-relations, text, unordered-containers, uri-bytestring
      }:
      mkDerivation {
        pname = "webfinger-client";
-       version = "0.1.0.0";
-       sha256 = "e3b1a231ebe4bc957eddcf24a19ee5d90134b9a95984a75a945c8dc4b17a56e0";
+       version = "0.2.0.0";
+       sha256 = "1311f198704ba1dc9439a20427e1d909ceab86dbd196d31ded52835291b85a2a";
        libraryHaskellDepends = [
          aeson base bytestring data-default-class hashable http-client
-         http-client-tls http-types text unordered-containers uri-bytestring
+         http-client-tls http-types link-relations text unordered-containers
+         uri-bytestring
        ];
        homepage = "http://hub.darcs.net/fr33domlover/webfinger-client";
        description = "WebFinger client library";
@@ -217737,14 +218127,13 @@ self: {
      }:
      mkDerivation {
        pname = "yesod-markdown";
-       version = "0.10.0";
-       sha256 = "f1039ae939be04bdb9480206e5029f73c95f686bdda07f81e43a218ddc653959";
+       version = "0.11.0";
+       sha256 = "80465e11fc54ee786109f8e2d2d6c4560ee44e5a1de46618c95c56eeb29ea433";
        libraryHaskellDepends = [
          base blaze-html blaze-markup bytestring directory pandoc persistent
          shakespeare texmath text xss-sanitize yesod-core yesod-form
        ];
        testHaskellDepends = [ base blaze-html hspec text ];
-       jailbreak = true;
        homepage = "http://github.com/pbrisbin/yesod-markdown";
        description = "Tools for using markdown in a yesod application";
        license = stdenv.lib.licenses.gpl2;