about summary refs log tree commit diff
path: root/pkgs
diff options
context:
space:
mode:
authorPeter Simons <simons@cryp.to>2015-11-10 16:37:56 +0100
committerPeter Simons <simons@cryp.to>2015-11-12 22:30:54 +0100
commit4856880cab3e507567a025f11a577325a4538566 (patch)
treec9839972dbb841722bcee522e80683cc4f87bf15 /pkgs
parenta99a634acf674730975f0d29ce31d2c71226821b (diff)
downloadnixlib-4856880cab3e507567a025f11a577325a4538566.tar
nixlib-4856880cab3e507567a025f11a577325a4538566.tar.gz
nixlib-4856880cab3e507567a025f11a577325a4538566.tar.bz2
nixlib-4856880cab3e507567a025f11a577325a4538566.tar.lz
nixlib-4856880cab3e507567a025f11a577325a4538566.tar.xz
nixlib-4856880cab3e507567a025f11a577325a4538566.tar.zst
nixlib-4856880cab3e507567a025f11a577325a4538566.zip
hackage-packages.nix: update Haskell package set
This update was generated by hackage2nix v20150922-36-ge0ee7ef using the following inputs:

  - Nixpkgs: https://github.com/NixOS/nixpkgs/commit/7c001f31b0626f380947c484a308567a2d4397d4
  - Hackage: https://github.com/commercialhaskell/all-cabal-hashes/commit/46f2de463b1405cc9a58aba91ee215bd32894e33
  - LTS Haskell: https://github.com/fpco/lts-haskell/commit/1ae555e197af31e8d2cd56ac766ee2f085fcc6ee
  - Stackage Nightly: https://github.com/fpco/stackage-nightly/commit/4113b2e369fb5bff8cee9d5c02a9788d5569abed
Diffstat (limited to 'pkgs')
-rw-r--r--pkgs/development/haskell-modules/configuration-lts-0.0.nix3
-rw-r--r--pkgs/development/haskell-modules/configuration-lts-0.1.nix3
-rw-r--r--pkgs/development/haskell-modules/configuration-lts-0.2.nix3
-rw-r--r--pkgs/development/haskell-modules/configuration-lts-0.3.nix3
-rw-r--r--pkgs/development/haskell-modules/configuration-lts-0.4.nix3
-rw-r--r--pkgs/development/haskell-modules/configuration-lts-0.5.nix3
-rw-r--r--pkgs/development/haskell-modules/configuration-lts-0.6.nix3
-rw-r--r--pkgs/development/haskell-modules/configuration-lts-0.7.nix3
-rw-r--r--pkgs/development/haskell-modules/configuration-lts-1.0.nix3
-rw-r--r--pkgs/development/haskell-modules/configuration-lts-1.1.nix3
-rw-r--r--pkgs/development/haskell-modules/configuration-lts-1.10.nix3
-rw-r--r--pkgs/development/haskell-modules/configuration-lts-1.11.nix3
-rw-r--r--pkgs/development/haskell-modules/configuration-lts-1.12.nix3
-rw-r--r--pkgs/development/haskell-modules/configuration-lts-1.13.nix3
-rw-r--r--pkgs/development/haskell-modules/configuration-lts-1.14.nix3
-rw-r--r--pkgs/development/haskell-modules/configuration-lts-1.15.nix3
-rw-r--r--pkgs/development/haskell-modules/configuration-lts-1.2.nix3
-rw-r--r--pkgs/development/haskell-modules/configuration-lts-1.4.nix3
-rw-r--r--pkgs/development/haskell-modules/configuration-lts-1.5.nix3
-rw-r--r--pkgs/development/haskell-modules/configuration-lts-1.7.nix3
-rw-r--r--pkgs/development/haskell-modules/configuration-lts-1.8.nix3
-rw-r--r--pkgs/development/haskell-modules/configuration-lts-1.9.nix3
-rw-r--r--pkgs/development/haskell-modules/configuration-lts-2.0.nix3
-rw-r--r--pkgs/development/haskell-modules/configuration-lts-2.1.nix3
-rw-r--r--pkgs/development/haskell-modules/configuration-lts-2.10.nix3
-rw-r--r--pkgs/development/haskell-modules/configuration-lts-2.11.nix3
-rw-r--r--pkgs/development/haskell-modules/configuration-lts-2.12.nix3
-rw-r--r--pkgs/development/haskell-modules/configuration-lts-2.13.nix3
-rw-r--r--pkgs/development/haskell-modules/configuration-lts-2.14.nix3
-rw-r--r--pkgs/development/haskell-modules/configuration-lts-2.15.nix3
-rw-r--r--pkgs/development/haskell-modules/configuration-lts-2.16.nix3
-rw-r--r--pkgs/development/haskell-modules/configuration-lts-2.17.nix3
-rw-r--r--pkgs/development/haskell-modules/configuration-lts-2.18.nix3
-rw-r--r--pkgs/development/haskell-modules/configuration-lts-2.19.nix3
-rw-r--r--pkgs/development/haskell-modules/configuration-lts-2.2.nix3
-rw-r--r--pkgs/development/haskell-modules/configuration-lts-2.20.nix3
-rw-r--r--pkgs/development/haskell-modules/configuration-lts-2.21.nix3
-rw-r--r--pkgs/development/haskell-modules/configuration-lts-2.22.nix3
-rw-r--r--pkgs/development/haskell-modules/configuration-lts-2.3.nix3
-rw-r--r--pkgs/development/haskell-modules/configuration-lts-2.4.nix3
-rw-r--r--pkgs/development/haskell-modules/configuration-lts-2.5.nix3
-rw-r--r--pkgs/development/haskell-modules/configuration-lts-2.6.nix3
-rw-r--r--pkgs/development/haskell-modules/configuration-lts-2.7.nix3
-rw-r--r--pkgs/development/haskell-modules/configuration-lts-2.8.nix3
-rw-r--r--pkgs/development/haskell-modules/configuration-lts-2.9.nix3
-rw-r--r--pkgs/development/haskell-modules/configuration-lts-3.0.nix7
-rw-r--r--pkgs/development/haskell-modules/configuration-lts-3.1.nix8
-rw-r--r--pkgs/development/haskell-modules/configuration-lts-3.10.nix17
-rw-r--r--pkgs/development/haskell-modules/configuration-lts-3.11.nix17
-rw-r--r--pkgs/development/haskell-modules/configuration-lts-3.12.nix17
-rw-r--r--pkgs/development/haskell-modules/configuration-lts-3.13.nix18
-rw-r--r--pkgs/development/haskell-modules/configuration-lts-3.2.nix8
-rw-r--r--pkgs/development/haskell-modules/configuration-lts-3.3.nix8
-rw-r--r--pkgs/development/haskell-modules/configuration-lts-3.4.nix8
-rw-r--r--pkgs/development/haskell-modules/configuration-lts-3.5.nix8
-rw-r--r--pkgs/development/haskell-modules/configuration-lts-3.6.nix12
-rw-r--r--pkgs/development/haskell-modules/configuration-lts-3.7.nix13
-rw-r--r--pkgs/development/haskell-modules/configuration-lts-3.8.nix16
-rw-r--r--pkgs/development/haskell-modules/configuration-lts-3.9.nix17
-rw-r--r--pkgs/development/haskell-modules/hackage-packages.nix627
60 files changed, 784 insertions, 152 deletions
diff --git a/pkgs/development/haskell-modules/configuration-lts-0.0.nix b/pkgs/development/haskell-modules/configuration-lts-0.0.nix
index 9553257305fc..5137b35d2b44 100644
--- a/pkgs/development/haskell-modules/configuration-lts-0.0.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-0.0.nix
@@ -1157,6 +1157,7 @@ self: super: {
   "aeson-filthy" = dontDistribute super."aeson-filthy";
   "aeson-lens" = dontDistribute super."aeson-lens";
   "aeson-native" = dontDistribute super."aeson-native";
+  "aeson-parsec-picky" = dontDistribute super."aeson-parsec-picky";
   "aeson-qq" = doDistribute super."aeson-qq_0_7_4";
   "aeson-schema" = dontDistribute super."aeson-schema";
   "aeson-serialize" = dontDistribute super."aeson-serialize";
@@ -1509,6 +1510,7 @@ self: super: {
   "bamboo-theme-mini-html5" = dontDistribute super."bamboo-theme-mini-html5";
   "bamse" = dontDistribute super."bamse";
   "bamstats" = dontDistribute super."bamstats";
+  "bank-holiday-usa" = dontDistribute super."bank-holiday-usa";
   "bank-holidays-england" = dontDistribute super."bank-holidays-england";
   "banwords" = dontDistribute super."banwords";
   "barchart" = dontDistribute super."barchart";
@@ -3432,6 +3434,7 @@ self: super: {
   "glapp" = dontDistribute super."glapp";
   "glasso" = dontDistribute super."glasso";
   "glib" = doDistribute super."glib_0_13_0_6";
+  "glicko" = dontDistribute super."glicko";
   "glider-nlp" = dontDistribute super."glider-nlp";
   "glintcollider" = dontDistribute super."glintcollider";
   "gll" = dontDistribute super."gll";
diff --git a/pkgs/development/haskell-modules/configuration-lts-0.1.nix b/pkgs/development/haskell-modules/configuration-lts-0.1.nix
index a12b7dc1733b..d59fab77fde2 100644
--- a/pkgs/development/haskell-modules/configuration-lts-0.1.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-0.1.nix
@@ -1157,6 +1157,7 @@ self: super: {
   "aeson-filthy" = dontDistribute super."aeson-filthy";
   "aeson-lens" = dontDistribute super."aeson-lens";
   "aeson-native" = dontDistribute super."aeson-native";
+  "aeson-parsec-picky" = dontDistribute super."aeson-parsec-picky";
   "aeson-qq" = doDistribute super."aeson-qq_0_7_4";
   "aeson-schema" = dontDistribute super."aeson-schema";
   "aeson-serialize" = dontDistribute super."aeson-serialize";
@@ -1509,6 +1510,7 @@ self: super: {
   "bamboo-theme-mini-html5" = dontDistribute super."bamboo-theme-mini-html5";
   "bamse" = dontDistribute super."bamse";
   "bamstats" = dontDistribute super."bamstats";
+  "bank-holiday-usa" = dontDistribute super."bank-holiday-usa";
   "bank-holidays-england" = dontDistribute super."bank-holidays-england";
   "banwords" = dontDistribute super."banwords";
   "barchart" = dontDistribute super."barchart";
@@ -3431,6 +3433,7 @@ self: super: {
   "glapp" = dontDistribute super."glapp";
   "glasso" = dontDistribute super."glasso";
   "glib" = doDistribute super."glib_0_13_0_6";
+  "glicko" = dontDistribute super."glicko";
   "glider-nlp" = dontDistribute super."glider-nlp";
   "glintcollider" = dontDistribute super."glintcollider";
   "gll" = dontDistribute super."gll";
diff --git a/pkgs/development/haskell-modules/configuration-lts-0.2.nix b/pkgs/development/haskell-modules/configuration-lts-0.2.nix
index 8134823e4661..f2b5997156d7 100644
--- a/pkgs/development/haskell-modules/configuration-lts-0.2.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-0.2.nix
@@ -1157,6 +1157,7 @@ self: super: {
   "aeson-filthy" = dontDistribute super."aeson-filthy";
   "aeson-lens" = dontDistribute super."aeson-lens";
   "aeson-native" = dontDistribute super."aeson-native";
+  "aeson-parsec-picky" = dontDistribute super."aeson-parsec-picky";
   "aeson-qq" = doDistribute super."aeson-qq_0_7_4";
   "aeson-schema" = dontDistribute super."aeson-schema";
   "aeson-serialize" = dontDistribute super."aeson-serialize";
@@ -1509,6 +1510,7 @@ self: super: {
   "bamboo-theme-mini-html5" = dontDistribute super."bamboo-theme-mini-html5";
   "bamse" = dontDistribute super."bamse";
   "bamstats" = dontDistribute super."bamstats";
+  "bank-holiday-usa" = dontDistribute super."bank-holiday-usa";
   "bank-holidays-england" = dontDistribute super."bank-holidays-england";
   "banwords" = dontDistribute super."banwords";
   "barchart" = dontDistribute super."barchart";
@@ -3431,6 +3433,7 @@ self: super: {
   "glapp" = dontDistribute super."glapp";
   "glasso" = dontDistribute super."glasso";
   "glib" = doDistribute super."glib_0_13_0_6";
+  "glicko" = dontDistribute super."glicko";
   "glider-nlp" = dontDistribute super."glider-nlp";
   "glintcollider" = dontDistribute super."glintcollider";
   "gll" = dontDistribute super."gll";
diff --git a/pkgs/development/haskell-modules/configuration-lts-0.3.nix b/pkgs/development/haskell-modules/configuration-lts-0.3.nix
index 517f95efbf66..992030f620c9 100644
--- a/pkgs/development/haskell-modules/configuration-lts-0.3.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-0.3.nix
@@ -1157,6 +1157,7 @@ self: super: {
   "aeson-filthy" = dontDistribute super."aeson-filthy";
   "aeson-lens" = dontDistribute super."aeson-lens";
   "aeson-native" = dontDistribute super."aeson-native";
+  "aeson-parsec-picky" = dontDistribute super."aeson-parsec-picky";
   "aeson-qq" = doDistribute super."aeson-qq_0_7_4";
   "aeson-schema" = dontDistribute super."aeson-schema";
   "aeson-serialize" = dontDistribute super."aeson-serialize";
@@ -1509,6 +1510,7 @@ self: super: {
   "bamboo-theme-mini-html5" = dontDistribute super."bamboo-theme-mini-html5";
   "bamse" = dontDistribute super."bamse";
   "bamstats" = dontDistribute super."bamstats";
+  "bank-holiday-usa" = dontDistribute super."bank-holiday-usa";
   "bank-holidays-england" = dontDistribute super."bank-holidays-england";
   "banwords" = dontDistribute super."banwords";
   "barchart" = dontDistribute super."barchart";
@@ -3431,6 +3433,7 @@ self: super: {
   "glapp" = dontDistribute super."glapp";
   "glasso" = dontDistribute super."glasso";
   "glib" = doDistribute super."glib_0_13_0_6";
+  "glicko" = dontDistribute super."glicko";
   "glider-nlp" = dontDistribute super."glider-nlp";
   "glintcollider" = dontDistribute super."glintcollider";
   "gll" = dontDistribute super."gll";
diff --git a/pkgs/development/haskell-modules/configuration-lts-0.4.nix b/pkgs/development/haskell-modules/configuration-lts-0.4.nix
index a3e12afb5b25..2adb68442f0e 100644
--- a/pkgs/development/haskell-modules/configuration-lts-0.4.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-0.4.nix
@@ -1157,6 +1157,7 @@ self: super: {
   "aeson-filthy" = dontDistribute super."aeson-filthy";
   "aeson-lens" = dontDistribute super."aeson-lens";
   "aeson-native" = dontDistribute super."aeson-native";
+  "aeson-parsec-picky" = dontDistribute super."aeson-parsec-picky";
   "aeson-qq" = doDistribute super."aeson-qq_0_7_4";
   "aeson-schema" = dontDistribute super."aeson-schema";
   "aeson-serialize" = dontDistribute super."aeson-serialize";
@@ -1509,6 +1510,7 @@ self: super: {
   "bamboo-theme-mini-html5" = dontDistribute super."bamboo-theme-mini-html5";
   "bamse" = dontDistribute super."bamse";
   "bamstats" = dontDistribute super."bamstats";
+  "bank-holiday-usa" = dontDistribute super."bank-holiday-usa";
   "bank-holidays-england" = dontDistribute super."bank-holidays-england";
   "banwords" = dontDistribute super."banwords";
   "barchart" = dontDistribute super."barchart";
@@ -3430,6 +3432,7 @@ self: super: {
   "glapp" = dontDistribute super."glapp";
   "glasso" = dontDistribute super."glasso";
   "glib" = doDistribute super."glib_0_13_0_6";
+  "glicko" = dontDistribute super."glicko";
   "glider-nlp" = dontDistribute super."glider-nlp";
   "glintcollider" = dontDistribute super."glintcollider";
   "gll" = dontDistribute super."gll";
diff --git a/pkgs/development/haskell-modules/configuration-lts-0.5.nix b/pkgs/development/haskell-modules/configuration-lts-0.5.nix
index ac9e00ddd06e..07496b464cc4 100644
--- a/pkgs/development/haskell-modules/configuration-lts-0.5.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-0.5.nix
@@ -1157,6 +1157,7 @@ self: super: {
   "aeson-filthy" = dontDistribute super."aeson-filthy";
   "aeson-lens" = dontDistribute super."aeson-lens";
   "aeson-native" = dontDistribute super."aeson-native";
+  "aeson-parsec-picky" = dontDistribute super."aeson-parsec-picky";
   "aeson-qq" = doDistribute super."aeson-qq_0_7_4";
   "aeson-schema" = dontDistribute super."aeson-schema";
   "aeson-serialize" = dontDistribute super."aeson-serialize";
@@ -1509,6 +1510,7 @@ self: super: {
   "bamboo-theme-mini-html5" = dontDistribute super."bamboo-theme-mini-html5";
   "bamse" = dontDistribute super."bamse";
   "bamstats" = dontDistribute super."bamstats";
+  "bank-holiday-usa" = dontDistribute super."bank-holiday-usa";
   "bank-holidays-england" = dontDistribute super."bank-holidays-england";
   "banwords" = dontDistribute super."banwords";
   "barchart" = dontDistribute super."barchart";
@@ -3430,6 +3432,7 @@ self: super: {
   "glapp" = dontDistribute super."glapp";
   "glasso" = dontDistribute super."glasso";
   "glib" = doDistribute super."glib_0_13_0_6";
+  "glicko" = dontDistribute super."glicko";
   "glider-nlp" = dontDistribute super."glider-nlp";
   "glintcollider" = dontDistribute super."glintcollider";
   "gll" = dontDistribute super."gll";
diff --git a/pkgs/development/haskell-modules/configuration-lts-0.6.nix b/pkgs/development/haskell-modules/configuration-lts-0.6.nix
index d006c1629f85..282cf73f759d 100644
--- a/pkgs/development/haskell-modules/configuration-lts-0.6.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-0.6.nix
@@ -1156,6 +1156,7 @@ self: super: {
   "aeson-filthy" = dontDistribute super."aeson-filthy";
   "aeson-lens" = dontDistribute super."aeson-lens";
   "aeson-native" = dontDistribute super."aeson-native";
+  "aeson-parsec-picky" = dontDistribute super."aeson-parsec-picky";
   "aeson-qq" = doDistribute super."aeson-qq_0_7_4";
   "aeson-schema" = dontDistribute super."aeson-schema";
   "aeson-serialize" = dontDistribute super."aeson-serialize";
@@ -1506,6 +1507,7 @@ self: super: {
   "bamboo-theme-mini-html5" = dontDistribute super."bamboo-theme-mini-html5";
   "bamse" = dontDistribute super."bamse";
   "bamstats" = dontDistribute super."bamstats";
+  "bank-holiday-usa" = dontDistribute super."bank-holiday-usa";
   "bank-holidays-england" = dontDistribute super."bank-holidays-england";
   "banwords" = dontDistribute super."banwords";
   "barchart" = dontDistribute super."barchart";
@@ -3427,6 +3429,7 @@ self: super: {
   "glapp" = dontDistribute super."glapp";
   "glasso" = dontDistribute super."glasso";
   "glib" = doDistribute super."glib_0_13_0_7";
+  "glicko" = dontDistribute super."glicko";
   "glider-nlp" = dontDistribute super."glider-nlp";
   "glintcollider" = dontDistribute super."glintcollider";
   "gll" = dontDistribute super."gll";
diff --git a/pkgs/development/haskell-modules/configuration-lts-0.7.nix b/pkgs/development/haskell-modules/configuration-lts-0.7.nix
index 8b2d933f7562..afce24d2d4f6 100644
--- a/pkgs/development/haskell-modules/configuration-lts-0.7.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-0.7.nix
@@ -1156,6 +1156,7 @@ self: super: {
   "aeson-filthy" = dontDistribute super."aeson-filthy";
   "aeson-lens" = dontDistribute super."aeson-lens";
   "aeson-native" = dontDistribute super."aeson-native";
+  "aeson-parsec-picky" = dontDistribute super."aeson-parsec-picky";
   "aeson-qq" = doDistribute super."aeson-qq_0_7_4";
   "aeson-schema" = dontDistribute super."aeson-schema";
   "aeson-serialize" = dontDistribute super."aeson-serialize";
@@ -1506,6 +1507,7 @@ self: super: {
   "bamboo-theme-mini-html5" = dontDistribute super."bamboo-theme-mini-html5";
   "bamse" = dontDistribute super."bamse";
   "bamstats" = dontDistribute super."bamstats";
+  "bank-holiday-usa" = dontDistribute super."bank-holiday-usa";
   "bank-holidays-england" = dontDistribute super."bank-holidays-england";
   "banwords" = dontDistribute super."banwords";
   "barchart" = dontDistribute super."barchart";
@@ -3427,6 +3429,7 @@ self: super: {
   "glapp" = dontDistribute super."glapp";
   "glasso" = dontDistribute super."glasso";
   "glib" = doDistribute super."glib_0_13_0_7";
+  "glicko" = dontDistribute super."glicko";
   "glider-nlp" = dontDistribute super."glider-nlp";
   "glintcollider" = dontDistribute super."glintcollider";
   "gll" = dontDistribute super."gll";
diff --git a/pkgs/development/haskell-modules/configuration-lts-1.0.nix b/pkgs/development/haskell-modules/configuration-lts-1.0.nix
index fc5935da11ce..354c2223c5bf 100644
--- a/pkgs/development/haskell-modules/configuration-lts-1.0.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.0.nix
@@ -1152,6 +1152,7 @@ self: super: {
   "aeson-filthy" = dontDistribute super."aeson-filthy";
   "aeson-lens" = dontDistribute super."aeson-lens";
   "aeson-native" = dontDistribute super."aeson-native";
+  "aeson-parsec-picky" = dontDistribute super."aeson-parsec-picky";
   "aeson-qq" = doDistribute super."aeson-qq_0_7_4";
   "aeson-schema" = dontDistribute super."aeson-schema";
   "aeson-serialize" = dontDistribute super."aeson-serialize";
@@ -1502,6 +1503,7 @@ self: super: {
   "bamboo-theme-mini-html5" = dontDistribute super."bamboo-theme-mini-html5";
   "bamse" = dontDistribute super."bamse";
   "bamstats" = dontDistribute super."bamstats";
+  "bank-holiday-usa" = dontDistribute super."bank-holiday-usa";
   "bank-holidays-england" = doDistribute super."bank-holidays-england_0_1_0_2";
   "banwords" = dontDistribute super."banwords";
   "barchart" = dontDistribute super."barchart";
@@ -3416,6 +3418,7 @@ self: super: {
   "glapp" = dontDistribute super."glapp";
   "glasso" = dontDistribute super."glasso";
   "glib" = doDistribute super."glib_0_13_0_7";
+  "glicko" = dontDistribute super."glicko";
   "glider-nlp" = dontDistribute super."glider-nlp";
   "glintcollider" = dontDistribute super."glintcollider";
   "gll" = dontDistribute super."gll";
diff --git a/pkgs/development/haskell-modules/configuration-lts-1.1.nix b/pkgs/development/haskell-modules/configuration-lts-1.1.nix
index 1f2e8174e2bf..ea4847e195ed 100644
--- a/pkgs/development/haskell-modules/configuration-lts-1.1.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.1.nix
@@ -1152,6 +1152,7 @@ self: super: {
   "aeson-filthy" = dontDistribute super."aeson-filthy";
   "aeson-lens" = dontDistribute super."aeson-lens";
   "aeson-native" = dontDistribute super."aeson-native";
+  "aeson-parsec-picky" = dontDistribute super."aeson-parsec-picky";
   "aeson-qq" = doDistribute super."aeson-qq_0_7_4";
   "aeson-schema" = dontDistribute super."aeson-schema";
   "aeson-serialize" = dontDistribute super."aeson-serialize";
@@ -1501,6 +1502,7 @@ self: super: {
   "bamboo-theme-mini-html5" = dontDistribute super."bamboo-theme-mini-html5";
   "bamse" = dontDistribute super."bamse";
   "bamstats" = dontDistribute super."bamstats";
+  "bank-holiday-usa" = dontDistribute super."bank-holiday-usa";
   "bank-holidays-england" = doDistribute super."bank-holidays-england_0_1_0_2";
   "banwords" = dontDistribute super."banwords";
   "barchart" = dontDistribute super."barchart";
@@ -3410,6 +3412,7 @@ self: super: {
   "glapp" = dontDistribute super."glapp";
   "glasso" = dontDistribute super."glasso";
   "glib" = doDistribute super."glib_0_13_0_7";
+  "glicko" = dontDistribute super."glicko";
   "glider-nlp" = dontDistribute super."glider-nlp";
   "glintcollider" = dontDistribute super."glintcollider";
   "gll" = dontDistribute super."gll";
diff --git a/pkgs/development/haskell-modules/configuration-lts-1.10.nix b/pkgs/development/haskell-modules/configuration-lts-1.10.nix
index 9a79fa1358a5..43148f41a5df 100644
--- a/pkgs/development/haskell-modules/configuration-lts-1.10.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.10.nix
@@ -1151,6 +1151,7 @@ self: super: {
   "aeson-filthy" = dontDistribute super."aeson-filthy";
   "aeson-lens" = dontDistribute super."aeson-lens";
   "aeson-native" = dontDistribute super."aeson-native";
+  "aeson-parsec-picky" = dontDistribute super."aeson-parsec-picky";
   "aeson-qq" = doDistribute super."aeson-qq_0_7_4";
   "aeson-schema" = dontDistribute super."aeson-schema";
   "aeson-serialize" = dontDistribute super."aeson-serialize";
@@ -1500,6 +1501,7 @@ self: super: {
   "bamboo-theme-mini-html5" = dontDistribute super."bamboo-theme-mini-html5";
   "bamse" = dontDistribute super."bamse";
   "bamstats" = dontDistribute super."bamstats";
+  "bank-holiday-usa" = dontDistribute super."bank-holiday-usa";
   "bank-holidays-england" = doDistribute super."bank-holidays-england_0_1_0_2";
   "banwords" = dontDistribute super."banwords";
   "barchart" = dontDistribute super."barchart";
@@ -3399,6 +3401,7 @@ self: super: {
   "glapp" = dontDistribute super."glapp";
   "glasso" = dontDistribute super."glasso";
   "glib" = doDistribute super."glib_0_13_1_0";
+  "glicko" = dontDistribute super."glicko";
   "glider-nlp" = dontDistribute super."glider-nlp";
   "glintcollider" = dontDistribute super."glintcollider";
   "gll" = dontDistribute super."gll";
diff --git a/pkgs/development/haskell-modules/configuration-lts-1.11.nix b/pkgs/development/haskell-modules/configuration-lts-1.11.nix
index c1be8c797159..b0ca28c201be 100644
--- a/pkgs/development/haskell-modules/configuration-lts-1.11.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.11.nix
@@ -1151,6 +1151,7 @@ self: super: {
   "aeson-filthy" = dontDistribute super."aeson-filthy";
   "aeson-lens" = dontDistribute super."aeson-lens";
   "aeson-native" = dontDistribute super."aeson-native";
+  "aeson-parsec-picky" = dontDistribute super."aeson-parsec-picky";
   "aeson-qq" = doDistribute super."aeson-qq_0_7_4";
   "aeson-schema" = dontDistribute super."aeson-schema";
   "aeson-serialize" = dontDistribute super."aeson-serialize";
@@ -1500,6 +1501,7 @@ self: super: {
   "bamboo-theme-mini-html5" = dontDistribute super."bamboo-theme-mini-html5";
   "bamse" = dontDistribute super."bamse";
   "bamstats" = dontDistribute super."bamstats";
+  "bank-holiday-usa" = dontDistribute super."bank-holiday-usa";
   "bank-holidays-england" = doDistribute super."bank-holidays-england_0_1_0_2";
   "banwords" = dontDistribute super."banwords";
   "barchart" = dontDistribute super."barchart";
@@ -3398,6 +3400,7 @@ self: super: {
   "glapp" = dontDistribute super."glapp";
   "glasso" = dontDistribute super."glasso";
   "glib" = doDistribute super."glib_0_13_1_0";
+  "glicko" = dontDistribute super."glicko";
   "glider-nlp" = dontDistribute super."glider-nlp";
   "glintcollider" = dontDistribute super."glintcollider";
   "gll" = dontDistribute super."gll";
diff --git a/pkgs/development/haskell-modules/configuration-lts-1.12.nix b/pkgs/development/haskell-modules/configuration-lts-1.12.nix
index 19a80a348d78..397dfdc81e08 100644
--- a/pkgs/development/haskell-modules/configuration-lts-1.12.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.12.nix
@@ -1151,6 +1151,7 @@ self: super: {
   "aeson-filthy" = dontDistribute super."aeson-filthy";
   "aeson-lens" = dontDistribute super."aeson-lens";
   "aeson-native" = dontDistribute super."aeson-native";
+  "aeson-parsec-picky" = dontDistribute super."aeson-parsec-picky";
   "aeson-qq" = doDistribute super."aeson-qq_0_7_4";
   "aeson-schema" = dontDistribute super."aeson-schema";
   "aeson-serialize" = dontDistribute super."aeson-serialize";
@@ -1500,6 +1501,7 @@ self: super: {
   "bamboo-theme-mini-html5" = dontDistribute super."bamboo-theme-mini-html5";
   "bamse" = dontDistribute super."bamse";
   "bamstats" = dontDistribute super."bamstats";
+  "bank-holiday-usa" = dontDistribute super."bank-holiday-usa";
   "bank-holidays-england" = doDistribute super."bank-holidays-england_0_1_0_2";
   "banwords" = dontDistribute super."banwords";
   "barchart" = dontDistribute super."barchart";
@@ -3398,6 +3400,7 @@ self: super: {
   "glapp" = dontDistribute super."glapp";
   "glasso" = dontDistribute super."glasso";
   "glib" = doDistribute super."glib_0_13_1_0";
+  "glicko" = dontDistribute super."glicko";
   "glider-nlp" = dontDistribute super."glider-nlp";
   "glintcollider" = dontDistribute super."glintcollider";
   "gll" = dontDistribute super."gll";
diff --git a/pkgs/development/haskell-modules/configuration-lts-1.13.nix b/pkgs/development/haskell-modules/configuration-lts-1.13.nix
index 75a9ad629797..ce83e19f3ea4 100644
--- a/pkgs/development/haskell-modules/configuration-lts-1.13.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.13.nix
@@ -1151,6 +1151,7 @@ self: super: {
   "aeson-filthy" = dontDistribute super."aeson-filthy";
   "aeson-lens" = dontDistribute super."aeson-lens";
   "aeson-native" = dontDistribute super."aeson-native";
+  "aeson-parsec-picky" = dontDistribute super."aeson-parsec-picky";
   "aeson-qq" = doDistribute super."aeson-qq_0_7_4";
   "aeson-schema" = dontDistribute super."aeson-schema";
   "aeson-serialize" = dontDistribute super."aeson-serialize";
@@ -1500,6 +1501,7 @@ self: super: {
   "bamboo-theme-mini-html5" = dontDistribute super."bamboo-theme-mini-html5";
   "bamse" = dontDistribute super."bamse";
   "bamstats" = dontDistribute super."bamstats";
+  "bank-holiday-usa" = dontDistribute super."bank-holiday-usa";
   "bank-holidays-england" = doDistribute super."bank-holidays-england_0_1_0_2";
   "banwords" = dontDistribute super."banwords";
   "barchart" = dontDistribute super."barchart";
@@ -3397,6 +3399,7 @@ self: super: {
   "glapp" = dontDistribute super."glapp";
   "glasso" = dontDistribute super."glasso";
   "glib" = doDistribute super."glib_0_13_1_0";
+  "glicko" = dontDistribute super."glicko";
   "glider-nlp" = dontDistribute super."glider-nlp";
   "glintcollider" = dontDistribute super."glintcollider";
   "gll" = dontDistribute super."gll";
diff --git a/pkgs/development/haskell-modules/configuration-lts-1.14.nix b/pkgs/development/haskell-modules/configuration-lts-1.14.nix
index 502eb7ed6d61..29f8ecc080d4 100644
--- a/pkgs/development/haskell-modules/configuration-lts-1.14.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.14.nix
@@ -1150,6 +1150,7 @@ self: super: {
   "aeson-filthy" = dontDistribute super."aeson-filthy";
   "aeson-lens" = dontDistribute super."aeson-lens";
   "aeson-native" = dontDistribute super."aeson-native";
+  "aeson-parsec-picky" = dontDistribute super."aeson-parsec-picky";
   "aeson-qq" = doDistribute super."aeson-qq_0_7_4";
   "aeson-schema" = dontDistribute super."aeson-schema";
   "aeson-serialize" = dontDistribute super."aeson-serialize";
@@ -1499,6 +1500,7 @@ self: super: {
   "bamboo-theme-mini-html5" = dontDistribute super."bamboo-theme-mini-html5";
   "bamse" = dontDistribute super."bamse";
   "bamstats" = dontDistribute super."bamstats";
+  "bank-holiday-usa" = dontDistribute super."bank-holiday-usa";
   "bank-holidays-england" = doDistribute super."bank-holidays-england_0_1_0_2";
   "banwords" = dontDistribute super."banwords";
   "barchart" = dontDistribute super."barchart";
@@ -3394,6 +3396,7 @@ self: super: {
   "glapp" = dontDistribute super."glapp";
   "glasso" = dontDistribute super."glasso";
   "glib" = doDistribute super."glib_0_13_1_0";
+  "glicko" = dontDistribute super."glicko";
   "glider-nlp" = dontDistribute super."glider-nlp";
   "glintcollider" = dontDistribute super."glintcollider";
   "gll" = dontDistribute super."gll";
diff --git a/pkgs/development/haskell-modules/configuration-lts-1.15.nix b/pkgs/development/haskell-modules/configuration-lts-1.15.nix
index cb6415b47a6a..4e57cccbf852 100644
--- a/pkgs/development/haskell-modules/configuration-lts-1.15.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.15.nix
@@ -1149,6 +1149,7 @@ self: super: {
   "aeson-filthy" = dontDistribute super."aeson-filthy";
   "aeson-lens" = dontDistribute super."aeson-lens";
   "aeson-native" = dontDistribute super."aeson-native";
+  "aeson-parsec-picky" = dontDistribute super."aeson-parsec-picky";
   "aeson-qq" = doDistribute super."aeson-qq_0_7_4";
   "aeson-schema" = dontDistribute super."aeson-schema";
   "aeson-serialize" = dontDistribute super."aeson-serialize";
@@ -1498,6 +1499,7 @@ self: super: {
   "bamboo-theme-mini-html5" = dontDistribute super."bamboo-theme-mini-html5";
   "bamse" = dontDistribute super."bamse";
   "bamstats" = dontDistribute super."bamstats";
+  "bank-holiday-usa" = dontDistribute super."bank-holiday-usa";
   "bank-holidays-england" = doDistribute super."bank-holidays-england_0_1_0_2";
   "banwords" = dontDistribute super."banwords";
   "barchart" = dontDistribute super."barchart";
@@ -3389,6 +3391,7 @@ self: super: {
   "glapp" = dontDistribute super."glapp";
   "glasso" = dontDistribute super."glasso";
   "glib" = doDistribute super."glib_0_13_1_0";
+  "glicko" = dontDistribute super."glicko";
   "glider-nlp" = dontDistribute super."glider-nlp";
   "glintcollider" = dontDistribute super."glintcollider";
   "gll" = dontDistribute super."gll";
diff --git a/pkgs/development/haskell-modules/configuration-lts-1.2.nix b/pkgs/development/haskell-modules/configuration-lts-1.2.nix
index c8386d7125d1..35d7d388685f 100644
--- a/pkgs/development/haskell-modules/configuration-lts-1.2.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.2.nix
@@ -1152,6 +1152,7 @@ self: super: {
   "aeson-filthy" = dontDistribute super."aeson-filthy";
   "aeson-lens" = dontDistribute super."aeson-lens";
   "aeson-native" = dontDistribute super."aeson-native";
+  "aeson-parsec-picky" = dontDistribute super."aeson-parsec-picky";
   "aeson-qq" = doDistribute super."aeson-qq_0_7_4";
   "aeson-schema" = dontDistribute super."aeson-schema";
   "aeson-serialize" = dontDistribute super."aeson-serialize";
@@ -1501,6 +1502,7 @@ self: super: {
   "bamboo-theme-mini-html5" = dontDistribute super."bamboo-theme-mini-html5";
   "bamse" = dontDistribute super."bamse";
   "bamstats" = dontDistribute super."bamstats";
+  "bank-holiday-usa" = dontDistribute super."bank-holiday-usa";
   "bank-holidays-england" = doDistribute super."bank-holidays-england_0_1_0_2";
   "banwords" = dontDistribute super."banwords";
   "barchart" = dontDistribute super."barchart";
@@ -3407,6 +3409,7 @@ self: super: {
   "glapp" = dontDistribute super."glapp";
   "glasso" = dontDistribute super."glasso";
   "glib" = doDistribute super."glib_0_13_0_7";
+  "glicko" = dontDistribute super."glicko";
   "glider-nlp" = dontDistribute super."glider-nlp";
   "glintcollider" = dontDistribute super."glintcollider";
   "gll" = dontDistribute super."gll";
diff --git a/pkgs/development/haskell-modules/configuration-lts-1.4.nix b/pkgs/development/haskell-modules/configuration-lts-1.4.nix
index be1f171166a3..3e1d09683821 100644
--- a/pkgs/development/haskell-modules/configuration-lts-1.4.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.4.nix
@@ -1151,6 +1151,7 @@ self: super: {
   "aeson-filthy" = dontDistribute super."aeson-filthy";
   "aeson-lens" = dontDistribute super."aeson-lens";
   "aeson-native" = dontDistribute super."aeson-native";
+  "aeson-parsec-picky" = dontDistribute super."aeson-parsec-picky";
   "aeson-qq" = doDistribute super."aeson-qq_0_7_4";
   "aeson-schema" = dontDistribute super."aeson-schema";
   "aeson-serialize" = dontDistribute super."aeson-serialize";
@@ -1500,6 +1501,7 @@ self: super: {
   "bamboo-theme-mini-html5" = dontDistribute super."bamboo-theme-mini-html5";
   "bamse" = dontDistribute super."bamse";
   "bamstats" = dontDistribute super."bamstats";
+  "bank-holiday-usa" = dontDistribute super."bank-holiday-usa";
   "bank-holidays-england" = doDistribute super."bank-holidays-england_0_1_0_2";
   "banwords" = dontDistribute super."banwords";
   "barchart" = dontDistribute super."barchart";
@@ -3405,6 +3407,7 @@ self: super: {
   "glapp" = dontDistribute super."glapp";
   "glasso" = dontDistribute super."glasso";
   "glib" = doDistribute super."glib_0_13_0_7";
+  "glicko" = dontDistribute super."glicko";
   "glider-nlp" = dontDistribute super."glider-nlp";
   "glintcollider" = dontDistribute super."glintcollider";
   "gll" = dontDistribute super."gll";
diff --git a/pkgs/development/haskell-modules/configuration-lts-1.5.nix b/pkgs/development/haskell-modules/configuration-lts-1.5.nix
index 55a955af3f51..cca26bf637b3 100644
--- a/pkgs/development/haskell-modules/configuration-lts-1.5.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.5.nix
@@ -1151,6 +1151,7 @@ self: super: {
   "aeson-filthy" = dontDistribute super."aeson-filthy";
   "aeson-lens" = dontDistribute super."aeson-lens";
   "aeson-native" = dontDistribute super."aeson-native";
+  "aeson-parsec-picky" = dontDistribute super."aeson-parsec-picky";
   "aeson-qq" = doDistribute super."aeson-qq_0_7_4";
   "aeson-schema" = dontDistribute super."aeson-schema";
   "aeson-serialize" = dontDistribute super."aeson-serialize";
@@ -1500,6 +1501,7 @@ self: super: {
   "bamboo-theme-mini-html5" = dontDistribute super."bamboo-theme-mini-html5";
   "bamse" = dontDistribute super."bamse";
   "bamstats" = dontDistribute super."bamstats";
+  "bank-holiday-usa" = dontDistribute super."bank-holiday-usa";
   "bank-holidays-england" = doDistribute super."bank-holidays-england_0_1_0_2";
   "banwords" = dontDistribute super."banwords";
   "barchart" = dontDistribute super."barchart";
@@ -3404,6 +3406,7 @@ self: super: {
   "glapp" = dontDistribute super."glapp";
   "glasso" = dontDistribute super."glasso";
   "glib" = doDistribute super."glib_0_13_0_7";
+  "glicko" = dontDistribute super."glicko";
   "glider-nlp" = dontDistribute super."glider-nlp";
   "glintcollider" = dontDistribute super."glintcollider";
   "gll" = dontDistribute super."gll";
diff --git a/pkgs/development/haskell-modules/configuration-lts-1.7.nix b/pkgs/development/haskell-modules/configuration-lts-1.7.nix
index fb24e81fcc08..9a8879d27844 100644
--- a/pkgs/development/haskell-modules/configuration-lts-1.7.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.7.nix
@@ -1151,6 +1151,7 @@ self: super: {
   "aeson-filthy" = dontDistribute super."aeson-filthy";
   "aeson-lens" = dontDistribute super."aeson-lens";
   "aeson-native" = dontDistribute super."aeson-native";
+  "aeson-parsec-picky" = dontDistribute super."aeson-parsec-picky";
   "aeson-qq" = doDistribute super."aeson-qq_0_7_4";
   "aeson-schema" = dontDistribute super."aeson-schema";
   "aeson-serialize" = dontDistribute super."aeson-serialize";
@@ -1500,6 +1501,7 @@ self: super: {
   "bamboo-theme-mini-html5" = dontDistribute super."bamboo-theme-mini-html5";
   "bamse" = dontDistribute super."bamse";
   "bamstats" = dontDistribute super."bamstats";
+  "bank-holiday-usa" = dontDistribute super."bank-holiday-usa";
   "bank-holidays-england" = doDistribute super."bank-holidays-england_0_1_0_2";
   "banwords" = dontDistribute super."banwords";
   "barchart" = dontDistribute super."barchart";
@@ -3404,6 +3406,7 @@ self: super: {
   "glapp" = dontDistribute super."glapp";
   "glasso" = dontDistribute super."glasso";
   "glib" = doDistribute super."glib_0_13_0_7";
+  "glicko" = dontDistribute super."glicko";
   "glider-nlp" = dontDistribute super."glider-nlp";
   "glintcollider" = dontDistribute super."glintcollider";
   "gll" = dontDistribute super."gll";
diff --git a/pkgs/development/haskell-modules/configuration-lts-1.8.nix b/pkgs/development/haskell-modules/configuration-lts-1.8.nix
index 62958eaddd5d..022edcd992a3 100644
--- a/pkgs/development/haskell-modules/configuration-lts-1.8.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.8.nix
@@ -1151,6 +1151,7 @@ self: super: {
   "aeson-filthy" = dontDistribute super."aeson-filthy";
   "aeson-lens" = dontDistribute super."aeson-lens";
   "aeson-native" = dontDistribute super."aeson-native";
+  "aeson-parsec-picky" = dontDistribute super."aeson-parsec-picky";
   "aeson-qq" = doDistribute super."aeson-qq_0_7_4";
   "aeson-schema" = dontDistribute super."aeson-schema";
   "aeson-serialize" = dontDistribute super."aeson-serialize";
@@ -1500,6 +1501,7 @@ self: super: {
   "bamboo-theme-mini-html5" = dontDistribute super."bamboo-theme-mini-html5";
   "bamse" = dontDistribute super."bamse";
   "bamstats" = dontDistribute super."bamstats";
+  "bank-holiday-usa" = dontDistribute super."bank-holiday-usa";
   "bank-holidays-england" = doDistribute super."bank-holidays-england_0_1_0_2";
   "banwords" = dontDistribute super."banwords";
   "barchart" = dontDistribute super."barchart";
@@ -3402,6 +3404,7 @@ self: super: {
   "glapp" = dontDistribute super."glapp";
   "glasso" = dontDistribute super."glasso";
   "glib" = doDistribute super."glib_0_13_0_7";
+  "glicko" = dontDistribute super."glicko";
   "glider-nlp" = dontDistribute super."glider-nlp";
   "glintcollider" = dontDistribute super."glintcollider";
   "gll" = dontDistribute super."gll";
diff --git a/pkgs/development/haskell-modules/configuration-lts-1.9.nix b/pkgs/development/haskell-modules/configuration-lts-1.9.nix
index 34f55432ce26..a9f4c92bdd0a 100644
--- a/pkgs/development/haskell-modules/configuration-lts-1.9.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.9.nix
@@ -1151,6 +1151,7 @@ self: super: {
   "aeson-filthy" = dontDistribute super."aeson-filthy";
   "aeson-lens" = dontDistribute super."aeson-lens";
   "aeson-native" = dontDistribute super."aeson-native";
+  "aeson-parsec-picky" = dontDistribute super."aeson-parsec-picky";
   "aeson-qq" = doDistribute super."aeson-qq_0_7_4";
   "aeson-schema" = dontDistribute super."aeson-schema";
   "aeson-serialize" = dontDistribute super."aeson-serialize";
@@ -1500,6 +1501,7 @@ self: super: {
   "bamboo-theme-mini-html5" = dontDistribute super."bamboo-theme-mini-html5";
   "bamse" = dontDistribute super."bamse";
   "bamstats" = dontDistribute super."bamstats";
+  "bank-holiday-usa" = dontDistribute super."bank-holiday-usa";
   "bank-holidays-england" = doDistribute super."bank-holidays-england_0_1_0_2";
   "banwords" = dontDistribute super."banwords";
   "barchart" = dontDistribute super."barchart";
@@ -3401,6 +3403,7 @@ self: super: {
   "glapp" = dontDistribute super."glapp";
   "glasso" = dontDistribute super."glasso";
   "glib" = doDistribute super."glib_0_13_0_7";
+  "glicko" = dontDistribute super."glicko";
   "glider-nlp" = dontDistribute super."glider-nlp";
   "glintcollider" = dontDistribute super."glintcollider";
   "gll" = dontDistribute super."gll";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.0.nix b/pkgs/development/haskell-modules/configuration-lts-2.0.nix
index 04ed9f69e250..a3db86cc9935 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.0.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.0.nix
@@ -1140,6 +1140,7 @@ self: super: {
   "aeson-filthy" = dontDistribute super."aeson-filthy";
   "aeson-lens" = dontDistribute super."aeson-lens";
   "aeson-native" = dontDistribute super."aeson-native";
+  "aeson-parsec-picky" = dontDistribute super."aeson-parsec-picky";
   "aeson-qq" = doDistribute super."aeson-qq_0_7_4";
   "aeson-schema" = dontDistribute super."aeson-schema";
   "aeson-serialize" = dontDistribute super."aeson-serialize";
@@ -1487,6 +1488,7 @@ self: super: {
   "bamboo-theme-mini-html5" = dontDistribute super."bamboo-theme-mini-html5";
   "bamse" = dontDistribute super."bamse";
   "bamstats" = dontDistribute super."bamstats";
+  "bank-holiday-usa" = dontDistribute super."bank-holiday-usa";
   "bank-holidays-england" = doDistribute super."bank-holidays-england_0_1_0_2";
   "banwords" = dontDistribute super."banwords";
   "barchart" = dontDistribute super."barchart";
@@ -3365,6 +3367,7 @@ self: super: {
   "glapp" = dontDistribute super."glapp";
   "glasso" = dontDistribute super."glasso";
   "glib" = doDistribute super."glib_0_13_1_0";
+  "glicko" = dontDistribute super."glicko";
   "glider-nlp" = dontDistribute super."glider-nlp";
   "glintcollider" = dontDistribute super."glintcollider";
   "gll" = dontDistribute super."gll";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.1.nix b/pkgs/development/haskell-modules/configuration-lts-2.1.nix
index 3c56b4e4fd2e..a1f3c0fe1245 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.1.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.1.nix
@@ -1140,6 +1140,7 @@ self: super: {
   "aeson-filthy" = dontDistribute super."aeson-filthy";
   "aeson-lens" = dontDistribute super."aeson-lens";
   "aeson-native" = dontDistribute super."aeson-native";
+  "aeson-parsec-picky" = dontDistribute super."aeson-parsec-picky";
   "aeson-qq" = doDistribute super."aeson-qq_0_7_4";
   "aeson-schema" = dontDistribute super."aeson-schema";
   "aeson-serialize" = dontDistribute super."aeson-serialize";
@@ -1487,6 +1488,7 @@ self: super: {
   "bamboo-theme-mini-html5" = dontDistribute super."bamboo-theme-mini-html5";
   "bamse" = dontDistribute super."bamse";
   "bamstats" = dontDistribute super."bamstats";
+  "bank-holiday-usa" = dontDistribute super."bank-holiday-usa";
   "bank-holidays-england" = doDistribute super."bank-holidays-england_0_1_0_2";
   "banwords" = dontDistribute super."banwords";
   "barchart" = dontDistribute super."barchart";
@@ -3364,6 +3366,7 @@ self: super: {
   "glapp" = dontDistribute super."glapp";
   "glasso" = dontDistribute super."glasso";
   "glib" = doDistribute super."glib_0_13_1_0";
+  "glicko" = dontDistribute super."glicko";
   "glider-nlp" = dontDistribute super."glider-nlp";
   "glintcollider" = dontDistribute super."glintcollider";
   "gll" = dontDistribute super."gll";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.10.nix b/pkgs/development/haskell-modules/configuration-lts-2.10.nix
index d25f94a6bf87..1b8a27b5a960 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.10.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.10.nix
@@ -1135,6 +1135,7 @@ self: super: {
   "aeson-filthy" = dontDistribute super."aeson-filthy";
   "aeson-lens" = dontDistribute super."aeson-lens";
   "aeson-native" = dontDistribute super."aeson-native";
+  "aeson-parsec-picky" = dontDistribute super."aeson-parsec-picky";
   "aeson-qq" = doDistribute super."aeson-qq_0_7_4";
   "aeson-schema" = dontDistribute super."aeson-schema";
   "aeson-serialize" = dontDistribute super."aeson-serialize";
@@ -1480,6 +1481,7 @@ self: super: {
   "bamboo-theme-mini-html5" = dontDistribute super."bamboo-theme-mini-html5";
   "bamse" = dontDistribute super."bamse";
   "bamstats" = dontDistribute super."bamstats";
+  "bank-holiday-usa" = dontDistribute super."bank-holiday-usa";
   "banwords" = dontDistribute super."banwords";
   "barchart" = dontDistribute super."barchart";
   "barcodes-code128" = dontDistribute super."barcodes-code128";
@@ -3343,6 +3345,7 @@ self: super: {
   "glapp" = dontDistribute super."glapp";
   "glasso" = dontDistribute super."glasso";
   "glib" = doDistribute super."glib_0_13_1_0";
+  "glicko" = dontDistribute super."glicko";
   "glider-nlp" = dontDistribute super."glider-nlp";
   "glintcollider" = dontDistribute super."glintcollider";
   "gll" = dontDistribute super."gll";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.11.nix b/pkgs/development/haskell-modules/configuration-lts-2.11.nix
index 60c6c485904a..e95306a1cf17 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.11.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.11.nix
@@ -1135,6 +1135,7 @@ self: super: {
   "aeson-filthy" = dontDistribute super."aeson-filthy";
   "aeson-lens" = dontDistribute super."aeson-lens";
   "aeson-native" = dontDistribute super."aeson-native";
+  "aeson-parsec-picky" = dontDistribute super."aeson-parsec-picky";
   "aeson-qq" = doDistribute super."aeson-qq_0_7_4";
   "aeson-schema" = dontDistribute super."aeson-schema";
   "aeson-serialize" = dontDistribute super."aeson-serialize";
@@ -1479,6 +1480,7 @@ self: super: {
   "bamboo-theme-mini-html5" = dontDistribute super."bamboo-theme-mini-html5";
   "bamse" = dontDistribute super."bamse";
   "bamstats" = dontDistribute super."bamstats";
+  "bank-holiday-usa" = dontDistribute super."bank-holiday-usa";
   "banwords" = dontDistribute super."banwords";
   "barchart" = dontDistribute super."barchart";
   "barcodes-code128" = dontDistribute super."barcodes-code128";
@@ -3341,6 +3343,7 @@ self: super: {
   "glapp" = dontDistribute super."glapp";
   "glasso" = dontDistribute super."glasso";
   "glib" = doDistribute super."glib_0_13_1_0";
+  "glicko" = dontDistribute super."glicko";
   "glider-nlp" = dontDistribute super."glider-nlp";
   "glintcollider" = dontDistribute super."glintcollider";
   "gll" = dontDistribute super."gll";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.12.nix b/pkgs/development/haskell-modules/configuration-lts-2.12.nix
index fa7662b916a8..acebc1a7c78d 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.12.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.12.nix
@@ -1135,6 +1135,7 @@ self: super: {
   "aeson-filthy" = dontDistribute super."aeson-filthy";
   "aeson-lens" = dontDistribute super."aeson-lens";
   "aeson-native" = dontDistribute super."aeson-native";
+  "aeson-parsec-picky" = dontDistribute super."aeson-parsec-picky";
   "aeson-qq" = doDistribute super."aeson-qq_0_7_4";
   "aeson-schema" = dontDistribute super."aeson-schema";
   "aeson-serialize" = dontDistribute super."aeson-serialize";
@@ -1479,6 +1480,7 @@ self: super: {
   "bamboo-theme-mini-html5" = dontDistribute super."bamboo-theme-mini-html5";
   "bamse" = dontDistribute super."bamse";
   "bamstats" = dontDistribute super."bamstats";
+  "bank-holiday-usa" = dontDistribute super."bank-holiday-usa";
   "banwords" = dontDistribute super."banwords";
   "barchart" = dontDistribute super."barchart";
   "barcodes-code128" = dontDistribute super."barcodes-code128";
@@ -3341,6 +3343,7 @@ self: super: {
   "glapp" = dontDistribute super."glapp";
   "glasso" = dontDistribute super."glasso";
   "glib" = doDistribute super."glib_0_13_1_0";
+  "glicko" = dontDistribute super."glicko";
   "glider-nlp" = dontDistribute super."glider-nlp";
   "glintcollider" = dontDistribute super."glintcollider";
   "gll" = dontDistribute super."gll";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.13.nix b/pkgs/development/haskell-modules/configuration-lts-2.13.nix
index 54bc0ad45145..1c9f90d24182 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.13.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.13.nix
@@ -1135,6 +1135,7 @@ self: super: {
   "aeson-filthy" = dontDistribute super."aeson-filthy";
   "aeson-lens" = dontDistribute super."aeson-lens";
   "aeson-native" = dontDistribute super."aeson-native";
+  "aeson-parsec-picky" = dontDistribute super."aeson-parsec-picky";
   "aeson-qq" = doDistribute super."aeson-qq_0_7_4";
   "aeson-schema" = dontDistribute super."aeson-schema";
   "aeson-serialize" = dontDistribute super."aeson-serialize";
@@ -1479,6 +1480,7 @@ self: super: {
   "bamboo-theme-mini-html5" = dontDistribute super."bamboo-theme-mini-html5";
   "bamse" = dontDistribute super."bamse";
   "bamstats" = dontDistribute super."bamstats";
+  "bank-holiday-usa" = dontDistribute super."bank-holiday-usa";
   "banwords" = dontDistribute super."banwords";
   "barchart" = dontDistribute super."barchart";
   "barcodes-code128" = dontDistribute super."barcodes-code128";
@@ -3341,6 +3343,7 @@ self: super: {
   "glapp" = dontDistribute super."glapp";
   "glasso" = dontDistribute super."glasso";
   "glib" = doDistribute super."glib_0_13_1_0";
+  "glicko" = dontDistribute super."glicko";
   "glider-nlp" = dontDistribute super."glider-nlp";
   "glintcollider" = dontDistribute super."glintcollider";
   "gll" = dontDistribute super."gll";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.14.nix b/pkgs/development/haskell-modules/configuration-lts-2.14.nix
index 64a7ef0c311d..511ddb8e26a4 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.14.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.14.nix
@@ -1135,6 +1135,7 @@ self: super: {
   "aeson-filthy" = dontDistribute super."aeson-filthy";
   "aeson-lens" = dontDistribute super."aeson-lens";
   "aeson-native" = dontDistribute super."aeson-native";
+  "aeson-parsec-picky" = dontDistribute super."aeson-parsec-picky";
   "aeson-qq" = doDistribute super."aeson-qq_0_7_4";
   "aeson-schema" = dontDistribute super."aeson-schema";
   "aeson-serialize" = dontDistribute super."aeson-serialize";
@@ -1478,6 +1479,7 @@ self: super: {
   "bamboo-theme-mini-html5" = dontDistribute super."bamboo-theme-mini-html5";
   "bamse" = dontDistribute super."bamse";
   "bamstats" = dontDistribute super."bamstats";
+  "bank-holiday-usa" = dontDistribute super."bank-holiday-usa";
   "banwords" = dontDistribute super."banwords";
   "barchart" = dontDistribute super."barchart";
   "barcodes-code128" = dontDistribute super."barcodes-code128";
@@ -3339,6 +3341,7 @@ self: super: {
   "glapp" = dontDistribute super."glapp";
   "glasso" = dontDistribute super."glasso";
   "glib" = doDistribute super."glib_0_13_1_0";
+  "glicko" = dontDistribute super."glicko";
   "glider-nlp" = dontDistribute super."glider-nlp";
   "glintcollider" = dontDistribute super."glintcollider";
   "gll" = dontDistribute super."gll";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.15.nix b/pkgs/development/haskell-modules/configuration-lts-2.15.nix
index fe2b59f08a60..2fe29c6ac02a 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.15.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.15.nix
@@ -1135,6 +1135,7 @@ self: super: {
   "aeson-filthy" = dontDistribute super."aeson-filthy";
   "aeson-lens" = dontDistribute super."aeson-lens";
   "aeson-native" = dontDistribute super."aeson-native";
+  "aeson-parsec-picky" = dontDistribute super."aeson-parsec-picky";
   "aeson-qq" = doDistribute super."aeson-qq_0_7_4";
   "aeson-schema" = dontDistribute super."aeson-schema";
   "aeson-serialize" = dontDistribute super."aeson-serialize";
@@ -1478,6 +1479,7 @@ self: super: {
   "bamboo-theme-mini-html5" = dontDistribute super."bamboo-theme-mini-html5";
   "bamse" = dontDistribute super."bamse";
   "bamstats" = dontDistribute super."bamstats";
+  "bank-holiday-usa" = dontDistribute super."bank-holiday-usa";
   "banwords" = dontDistribute super."banwords";
   "barchart" = dontDistribute super."barchart";
   "barcodes-code128" = dontDistribute super."barcodes-code128";
@@ -3338,6 +3340,7 @@ self: super: {
   "glapp" = dontDistribute super."glapp";
   "glasso" = dontDistribute super."glasso";
   "glib" = doDistribute super."glib_0_13_1_0";
+  "glicko" = dontDistribute super."glicko";
   "glider-nlp" = dontDistribute super."glider-nlp";
   "glintcollider" = dontDistribute super."glintcollider";
   "gll" = dontDistribute super."gll";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.16.nix b/pkgs/development/haskell-modules/configuration-lts-2.16.nix
index d1f7a7a7f198..06a38db2c0f9 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.16.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.16.nix
@@ -1133,6 +1133,7 @@ self: super: {
   "aeson-filthy" = dontDistribute super."aeson-filthy";
   "aeson-lens" = dontDistribute super."aeson-lens";
   "aeson-native" = dontDistribute super."aeson-native";
+  "aeson-parsec-picky" = dontDistribute super."aeson-parsec-picky";
   "aeson-qq" = doDistribute super."aeson-qq_0_7_4";
   "aeson-schema" = dontDistribute super."aeson-schema";
   "aeson-serialize" = dontDistribute super."aeson-serialize";
@@ -1476,6 +1477,7 @@ self: super: {
   "bamboo-theme-mini-html5" = dontDistribute super."bamboo-theme-mini-html5";
   "bamse" = dontDistribute super."bamse";
   "bamstats" = dontDistribute super."bamstats";
+  "bank-holiday-usa" = dontDistribute super."bank-holiday-usa";
   "banwords" = dontDistribute super."banwords";
   "barchart" = dontDistribute super."barchart";
   "barcodes-code128" = dontDistribute super."barcodes-code128";
@@ -3331,6 +3333,7 @@ self: super: {
   "glapp" = dontDistribute super."glapp";
   "glasso" = dontDistribute super."glasso";
   "glib" = doDistribute super."glib_0_13_1_1";
+  "glicko" = dontDistribute super."glicko";
   "glider-nlp" = dontDistribute super."glider-nlp";
   "glintcollider" = dontDistribute super."glintcollider";
   "gll" = dontDistribute super."gll";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.17.nix b/pkgs/development/haskell-modules/configuration-lts-2.17.nix
index 67c6700b7e71..0cc30d1a6f16 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.17.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.17.nix
@@ -1133,6 +1133,7 @@ self: super: {
   "aeson-filthy" = dontDistribute super."aeson-filthy";
   "aeson-lens" = dontDistribute super."aeson-lens";
   "aeson-native" = dontDistribute super."aeson-native";
+  "aeson-parsec-picky" = dontDistribute super."aeson-parsec-picky";
   "aeson-qq" = doDistribute super."aeson-qq_0_7_4";
   "aeson-schema" = dontDistribute super."aeson-schema";
   "aeson-serialize" = dontDistribute super."aeson-serialize";
@@ -1474,6 +1475,7 @@ self: super: {
   "bamboo-theme-mini-html5" = dontDistribute super."bamboo-theme-mini-html5";
   "bamse" = dontDistribute super."bamse";
   "bamstats" = dontDistribute super."bamstats";
+  "bank-holiday-usa" = dontDistribute super."bank-holiday-usa";
   "banwords" = dontDistribute super."banwords";
   "barchart" = dontDistribute super."barchart";
   "barcodes-code128" = dontDistribute super."barcodes-code128";
@@ -3324,6 +3326,7 @@ self: super: {
   "glapp" = dontDistribute super."glapp";
   "glasso" = dontDistribute super."glasso";
   "glib" = doDistribute super."glib_0_13_1_1";
+  "glicko" = dontDistribute super."glicko";
   "glider-nlp" = dontDistribute super."glider-nlp";
   "glintcollider" = dontDistribute super."glintcollider";
   "gll" = dontDistribute super."gll";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.18.nix b/pkgs/development/haskell-modules/configuration-lts-2.18.nix
index ff8f1e824459..7e29a592c3b2 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.18.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.18.nix
@@ -1132,6 +1132,7 @@ self: super: {
   "aeson-filthy" = dontDistribute super."aeson-filthy";
   "aeson-lens" = dontDistribute super."aeson-lens";
   "aeson-native" = dontDistribute super."aeson-native";
+  "aeson-parsec-picky" = dontDistribute super."aeson-parsec-picky";
   "aeson-qq" = doDistribute super."aeson-qq_0_7_4";
   "aeson-schema" = dontDistribute super."aeson-schema";
   "aeson-serialize" = dontDistribute super."aeson-serialize";
@@ -1473,6 +1474,7 @@ self: super: {
   "bamboo-theme-mini-html5" = dontDistribute super."bamboo-theme-mini-html5";
   "bamse" = dontDistribute super."bamse";
   "bamstats" = dontDistribute super."bamstats";
+  "bank-holiday-usa" = dontDistribute super."bank-holiday-usa";
   "banwords" = dontDistribute super."banwords";
   "barchart" = dontDistribute super."barchart";
   "barcodes-code128" = dontDistribute super."barcodes-code128";
@@ -3319,6 +3321,7 @@ self: super: {
   "glapp" = dontDistribute super."glapp";
   "glasso" = dontDistribute super."glasso";
   "glib" = doDistribute super."glib_0_13_1_1";
+  "glicko" = dontDistribute super."glicko";
   "glider-nlp" = dontDistribute super."glider-nlp";
   "glintcollider" = dontDistribute super."glintcollider";
   "gll" = dontDistribute super."gll";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.19.nix b/pkgs/development/haskell-modules/configuration-lts-2.19.nix
index c2130cb00f87..72b01f9fe46b 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.19.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.19.nix
@@ -1132,6 +1132,7 @@ self: super: {
   "aeson-filthy" = dontDistribute super."aeson-filthy";
   "aeson-lens" = dontDistribute super."aeson-lens";
   "aeson-native" = dontDistribute super."aeson-native";
+  "aeson-parsec-picky" = dontDistribute super."aeson-parsec-picky";
   "aeson-qq" = doDistribute super."aeson-qq_0_7_4";
   "aeson-schema" = dontDistribute super."aeson-schema";
   "aeson-serialize" = dontDistribute super."aeson-serialize";
@@ -1473,6 +1474,7 @@ self: super: {
   "bamboo-theme-mini-html5" = dontDistribute super."bamboo-theme-mini-html5";
   "bamse" = dontDistribute super."bamse";
   "bamstats" = dontDistribute super."bamstats";
+  "bank-holiday-usa" = dontDistribute super."bank-holiday-usa";
   "banwords" = dontDistribute super."banwords";
   "barchart" = dontDistribute super."barchart";
   "barcodes-code128" = dontDistribute super."barcodes-code128";
@@ -3318,6 +3320,7 @@ self: super: {
   "glapp" = dontDistribute super."glapp";
   "glasso" = dontDistribute super."glasso";
   "glib" = doDistribute super."glib_0_13_1_1";
+  "glicko" = dontDistribute super."glicko";
   "glider-nlp" = dontDistribute super."glider-nlp";
   "glintcollider" = dontDistribute super."glintcollider";
   "gll" = dontDistribute super."gll";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.2.nix b/pkgs/development/haskell-modules/configuration-lts-2.2.nix
index c0c871b8873a..6391877d336f 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.2.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.2.nix
@@ -1139,6 +1139,7 @@ self: super: {
   "aeson-filthy" = dontDistribute super."aeson-filthy";
   "aeson-lens" = dontDistribute super."aeson-lens";
   "aeson-native" = dontDistribute super."aeson-native";
+  "aeson-parsec-picky" = dontDistribute super."aeson-parsec-picky";
   "aeson-qq" = doDistribute super."aeson-qq_0_7_4";
   "aeson-schema" = dontDistribute super."aeson-schema";
   "aeson-serialize" = dontDistribute super."aeson-serialize";
@@ -1486,6 +1487,7 @@ self: super: {
   "bamboo-theme-mini-html5" = dontDistribute super."bamboo-theme-mini-html5";
   "bamse" = dontDistribute super."bamse";
   "bamstats" = dontDistribute super."bamstats";
+  "bank-holiday-usa" = dontDistribute super."bank-holiday-usa";
   "bank-holidays-england" = doDistribute super."bank-holidays-england_0_1_0_2";
   "banwords" = dontDistribute super."banwords";
   "barchart" = dontDistribute super."barchart";
@@ -3360,6 +3362,7 @@ self: super: {
   "glapp" = dontDistribute super."glapp";
   "glasso" = dontDistribute super."glasso";
   "glib" = doDistribute super."glib_0_13_1_0";
+  "glicko" = dontDistribute super."glicko";
   "glider-nlp" = dontDistribute super."glider-nlp";
   "glintcollider" = dontDistribute super."glintcollider";
   "gll" = dontDistribute super."gll";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.20.nix b/pkgs/development/haskell-modules/configuration-lts-2.20.nix
index 8bc869c7dae8..355ec3be30b0 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.20.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.20.nix
@@ -1132,6 +1132,7 @@ self: super: {
   "aeson-filthy" = dontDistribute super."aeson-filthy";
   "aeson-lens" = dontDistribute super."aeson-lens";
   "aeson-native" = dontDistribute super."aeson-native";
+  "aeson-parsec-picky" = dontDistribute super."aeson-parsec-picky";
   "aeson-qq" = doDistribute super."aeson-qq_0_7_4";
   "aeson-schema" = dontDistribute super."aeson-schema";
   "aeson-serialize" = dontDistribute super."aeson-serialize";
@@ -1473,6 +1474,7 @@ self: super: {
   "bamboo-theme-mini-html5" = dontDistribute super."bamboo-theme-mini-html5";
   "bamse" = dontDistribute super."bamse";
   "bamstats" = dontDistribute super."bamstats";
+  "bank-holiday-usa" = dontDistribute super."bank-holiday-usa";
   "banwords" = dontDistribute super."banwords";
   "barchart" = dontDistribute super."barchart";
   "barcodes-code128" = dontDistribute super."barcodes-code128";
@@ -3315,6 +3317,7 @@ self: super: {
   "glapp" = dontDistribute super."glapp";
   "glasso" = dontDistribute super."glasso";
   "glib" = doDistribute super."glib_0_13_1_1";
+  "glicko" = dontDistribute super."glicko";
   "glider-nlp" = dontDistribute super."glider-nlp";
   "glintcollider" = dontDistribute super."glintcollider";
   "gll" = dontDistribute super."gll";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.21.nix b/pkgs/development/haskell-modules/configuration-lts-2.21.nix
index dba8206320e2..cd905ea541f6 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.21.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.21.nix
@@ -1132,6 +1132,7 @@ self: super: {
   "aeson-filthy" = dontDistribute super."aeson-filthy";
   "aeson-lens" = dontDistribute super."aeson-lens";
   "aeson-native" = dontDistribute super."aeson-native";
+  "aeson-parsec-picky" = dontDistribute super."aeson-parsec-picky";
   "aeson-qq" = doDistribute super."aeson-qq_0_7_4";
   "aeson-schema" = dontDistribute super."aeson-schema";
   "aeson-serialize" = dontDistribute super."aeson-serialize";
@@ -1473,6 +1474,7 @@ self: super: {
   "bamboo-theme-mini-html5" = dontDistribute super."bamboo-theme-mini-html5";
   "bamse" = dontDistribute super."bamse";
   "bamstats" = dontDistribute super."bamstats";
+  "bank-holiday-usa" = dontDistribute super."bank-holiday-usa";
   "banwords" = dontDistribute super."banwords";
   "barchart" = dontDistribute super."barchart";
   "barcodes-code128" = dontDistribute super."barcodes-code128";
@@ -3314,6 +3316,7 @@ self: super: {
   "glambda" = dontDistribute super."glambda";
   "glapp" = dontDistribute super."glapp";
   "glasso" = dontDistribute super."glasso";
+  "glicko" = dontDistribute super."glicko";
   "glider-nlp" = dontDistribute super."glider-nlp";
   "glintcollider" = dontDistribute super."glintcollider";
   "gll" = dontDistribute super."gll";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.22.nix b/pkgs/development/haskell-modules/configuration-lts-2.22.nix
index 8d2d25861877..00448fb5d76a 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.22.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.22.nix
@@ -1131,6 +1131,7 @@ self: super: {
   "aeson-filthy" = dontDistribute super."aeson-filthy";
   "aeson-lens" = dontDistribute super."aeson-lens";
   "aeson-native" = dontDistribute super."aeson-native";
+  "aeson-parsec-picky" = dontDistribute super."aeson-parsec-picky";
   "aeson-qq" = doDistribute super."aeson-qq_0_7_4";
   "aeson-schema" = dontDistribute super."aeson-schema";
   "aeson-serialize" = dontDistribute super."aeson-serialize";
@@ -1472,6 +1473,7 @@ self: super: {
   "bamboo-theme-mini-html5" = dontDistribute super."bamboo-theme-mini-html5";
   "bamse" = dontDistribute super."bamse";
   "bamstats" = dontDistribute super."bamstats";
+  "bank-holiday-usa" = dontDistribute super."bank-holiday-usa";
   "banwords" = dontDistribute super."banwords";
   "barchart" = dontDistribute super."barchart";
   "barcodes-code128" = dontDistribute super."barcodes-code128";
@@ -3313,6 +3315,7 @@ self: super: {
   "glambda" = dontDistribute super."glambda";
   "glapp" = dontDistribute super."glapp";
   "glasso" = dontDistribute super."glasso";
+  "glicko" = dontDistribute super."glicko";
   "glider-nlp" = dontDistribute super."glider-nlp";
   "glintcollider" = dontDistribute super."glintcollider";
   "gll" = dontDistribute super."gll";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.3.nix b/pkgs/development/haskell-modules/configuration-lts-2.3.nix
index 9b3a7affe7fe..450ab4caeedf 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.3.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.3.nix
@@ -1139,6 +1139,7 @@ self: super: {
   "aeson-filthy" = dontDistribute super."aeson-filthy";
   "aeson-lens" = dontDistribute super."aeson-lens";
   "aeson-native" = dontDistribute super."aeson-native";
+  "aeson-parsec-picky" = dontDistribute super."aeson-parsec-picky";
   "aeson-qq" = doDistribute super."aeson-qq_0_7_4";
   "aeson-schema" = dontDistribute super."aeson-schema";
   "aeson-serialize" = dontDistribute super."aeson-serialize";
@@ -1486,6 +1487,7 @@ self: super: {
   "bamboo-theme-mini-html5" = dontDistribute super."bamboo-theme-mini-html5";
   "bamse" = dontDistribute super."bamse";
   "bamstats" = dontDistribute super."bamstats";
+  "bank-holiday-usa" = dontDistribute super."bank-holiday-usa";
   "bank-holidays-england" = doDistribute super."bank-holidays-england_0_1_0_2";
   "banwords" = dontDistribute super."banwords";
   "barchart" = dontDistribute super."barchart";
@@ -3359,6 +3361,7 @@ self: super: {
   "glapp" = dontDistribute super."glapp";
   "glasso" = dontDistribute super."glasso";
   "glib" = doDistribute super."glib_0_13_1_0";
+  "glicko" = dontDistribute super."glicko";
   "glider-nlp" = dontDistribute super."glider-nlp";
   "glintcollider" = dontDistribute super."glintcollider";
   "gll" = dontDistribute super."gll";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.4.nix b/pkgs/development/haskell-modules/configuration-lts-2.4.nix
index 4de304cd6079..b736042e490b 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.4.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.4.nix
@@ -1139,6 +1139,7 @@ self: super: {
   "aeson-filthy" = dontDistribute super."aeson-filthy";
   "aeson-lens" = dontDistribute super."aeson-lens";
   "aeson-native" = dontDistribute super."aeson-native";
+  "aeson-parsec-picky" = dontDistribute super."aeson-parsec-picky";
   "aeson-qq" = doDistribute super."aeson-qq_0_7_4";
   "aeson-schema" = dontDistribute super."aeson-schema";
   "aeson-serialize" = dontDistribute super."aeson-serialize";
@@ -1486,6 +1487,7 @@ self: super: {
   "bamboo-theme-mini-html5" = dontDistribute super."bamboo-theme-mini-html5";
   "bamse" = dontDistribute super."bamse";
   "bamstats" = dontDistribute super."bamstats";
+  "bank-holiday-usa" = dontDistribute super."bank-holiday-usa";
   "bank-holidays-england" = doDistribute super."bank-holidays-england_0_1_0_2";
   "banwords" = dontDistribute super."banwords";
   "barchart" = dontDistribute super."barchart";
@@ -3358,6 +3360,7 @@ self: super: {
   "glapp" = dontDistribute super."glapp";
   "glasso" = dontDistribute super."glasso";
   "glib" = doDistribute super."glib_0_13_1_0";
+  "glicko" = dontDistribute super."glicko";
   "glider-nlp" = dontDistribute super."glider-nlp";
   "glintcollider" = dontDistribute super."glintcollider";
   "gll" = dontDistribute super."gll";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.5.nix b/pkgs/development/haskell-modules/configuration-lts-2.5.nix
index 45a803ad6308..c9b55a9ce48d 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.5.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.5.nix
@@ -1139,6 +1139,7 @@ self: super: {
   "aeson-filthy" = dontDistribute super."aeson-filthy";
   "aeson-lens" = dontDistribute super."aeson-lens";
   "aeson-native" = dontDistribute super."aeson-native";
+  "aeson-parsec-picky" = dontDistribute super."aeson-parsec-picky";
   "aeson-qq" = doDistribute super."aeson-qq_0_7_4";
   "aeson-schema" = dontDistribute super."aeson-schema";
   "aeson-serialize" = dontDistribute super."aeson-serialize";
@@ -1486,6 +1487,7 @@ self: super: {
   "bamboo-theme-mini-html5" = dontDistribute super."bamboo-theme-mini-html5";
   "bamse" = dontDistribute super."bamse";
   "bamstats" = dontDistribute super."bamstats";
+  "bank-holiday-usa" = dontDistribute super."bank-holiday-usa";
   "bank-holidays-england" = doDistribute super."bank-holidays-england_0_1_0_2";
   "banwords" = dontDistribute super."banwords";
   "barchart" = dontDistribute super."barchart";
@@ -3357,6 +3359,7 @@ self: super: {
   "glapp" = dontDistribute super."glapp";
   "glasso" = dontDistribute super."glasso";
   "glib" = doDistribute super."glib_0_13_1_0";
+  "glicko" = dontDistribute super."glicko";
   "glider-nlp" = dontDistribute super."glider-nlp";
   "glintcollider" = dontDistribute super."glintcollider";
   "gll" = dontDistribute super."gll";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.6.nix b/pkgs/development/haskell-modules/configuration-lts-2.6.nix
index f1a40360db27..41f68d2f1fec 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.6.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.6.nix
@@ -1137,6 +1137,7 @@ self: super: {
   "aeson-filthy" = dontDistribute super."aeson-filthy";
   "aeson-lens" = dontDistribute super."aeson-lens";
   "aeson-native" = dontDistribute super."aeson-native";
+  "aeson-parsec-picky" = dontDistribute super."aeson-parsec-picky";
   "aeson-qq" = doDistribute super."aeson-qq_0_7_4";
   "aeson-schema" = dontDistribute super."aeson-schema";
   "aeson-serialize" = dontDistribute super."aeson-serialize";
@@ -1484,6 +1485,7 @@ self: super: {
   "bamboo-theme-mini-html5" = dontDistribute super."bamboo-theme-mini-html5";
   "bamse" = dontDistribute super."bamse";
   "bamstats" = dontDistribute super."bamstats";
+  "bank-holiday-usa" = dontDistribute super."bank-holiday-usa";
   "banwords" = dontDistribute super."banwords";
   "barchart" = dontDistribute super."barchart";
   "barcodes-code128" = dontDistribute super."barcodes-code128";
@@ -3354,6 +3356,7 @@ self: super: {
   "glapp" = dontDistribute super."glapp";
   "glasso" = dontDistribute super."glasso";
   "glib" = doDistribute super."glib_0_13_1_0";
+  "glicko" = dontDistribute super."glicko";
   "glider-nlp" = dontDistribute super."glider-nlp";
   "glintcollider" = dontDistribute super."glintcollider";
   "gll" = dontDistribute super."gll";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.7.nix b/pkgs/development/haskell-modules/configuration-lts-2.7.nix
index 6db6aec53d3d..6a1d797b29fa 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.7.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.7.nix
@@ -1136,6 +1136,7 @@ self: super: {
   "aeson-filthy" = dontDistribute super."aeson-filthy";
   "aeson-lens" = dontDistribute super."aeson-lens";
   "aeson-native" = dontDistribute super."aeson-native";
+  "aeson-parsec-picky" = dontDistribute super."aeson-parsec-picky";
   "aeson-qq" = doDistribute super."aeson-qq_0_7_4";
   "aeson-schema" = dontDistribute super."aeson-schema";
   "aeson-serialize" = dontDistribute super."aeson-serialize";
@@ -1483,6 +1484,7 @@ self: super: {
   "bamboo-theme-mini-html5" = dontDistribute super."bamboo-theme-mini-html5";
   "bamse" = dontDistribute super."bamse";
   "bamstats" = dontDistribute super."bamstats";
+  "bank-holiday-usa" = dontDistribute super."bank-holiday-usa";
   "banwords" = dontDistribute super."banwords";
   "barchart" = dontDistribute super."barchart";
   "barcodes-code128" = dontDistribute super."barcodes-code128";
@@ -3353,6 +3355,7 @@ self: super: {
   "glapp" = dontDistribute super."glapp";
   "glasso" = dontDistribute super."glasso";
   "glib" = doDistribute super."glib_0_13_1_0";
+  "glicko" = dontDistribute super."glicko";
   "glider-nlp" = dontDistribute super."glider-nlp";
   "glintcollider" = dontDistribute super."glintcollider";
   "gll" = dontDistribute super."gll";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.8.nix b/pkgs/development/haskell-modules/configuration-lts-2.8.nix
index 8e131b4ca50d..762355a74e9d 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.8.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.8.nix
@@ -1135,6 +1135,7 @@ self: super: {
   "aeson-filthy" = dontDistribute super."aeson-filthy";
   "aeson-lens" = dontDistribute super."aeson-lens";
   "aeson-native" = dontDistribute super."aeson-native";
+  "aeson-parsec-picky" = dontDistribute super."aeson-parsec-picky";
   "aeson-qq" = doDistribute super."aeson-qq_0_7_4";
   "aeson-schema" = dontDistribute super."aeson-schema";
   "aeson-serialize" = dontDistribute super."aeson-serialize";
@@ -1482,6 +1483,7 @@ self: super: {
   "bamboo-theme-mini-html5" = dontDistribute super."bamboo-theme-mini-html5";
   "bamse" = dontDistribute super."bamse";
   "bamstats" = dontDistribute super."bamstats";
+  "bank-holiday-usa" = dontDistribute super."bank-holiday-usa";
   "banwords" = dontDistribute super."banwords";
   "barchart" = dontDistribute super."barchart";
   "barcodes-code128" = dontDistribute super."barcodes-code128";
@@ -3351,6 +3353,7 @@ self: super: {
   "glapp" = dontDistribute super."glapp";
   "glasso" = dontDistribute super."glasso";
   "glib" = doDistribute super."glib_0_13_1_0";
+  "glicko" = dontDistribute super."glicko";
   "glider-nlp" = dontDistribute super."glider-nlp";
   "glintcollider" = dontDistribute super."glintcollider";
   "gll" = dontDistribute super."gll";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.9.nix b/pkgs/development/haskell-modules/configuration-lts-2.9.nix
index d7609a9fb852..68effeb13d60 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.9.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.9.nix
@@ -1135,6 +1135,7 @@ self: super: {
   "aeson-filthy" = dontDistribute super."aeson-filthy";
   "aeson-lens" = dontDistribute super."aeson-lens";
   "aeson-native" = dontDistribute super."aeson-native";
+  "aeson-parsec-picky" = dontDistribute super."aeson-parsec-picky";
   "aeson-qq" = doDistribute super."aeson-qq_0_7_4";
   "aeson-schema" = dontDistribute super."aeson-schema";
   "aeson-serialize" = dontDistribute super."aeson-serialize";
@@ -1480,6 +1481,7 @@ self: super: {
   "bamboo-theme-mini-html5" = dontDistribute super."bamboo-theme-mini-html5";
   "bamse" = dontDistribute super."bamse";
   "bamstats" = dontDistribute super."bamstats";
+  "bank-holiday-usa" = dontDistribute super."bank-holiday-usa";
   "banwords" = dontDistribute super."banwords";
   "barchart" = dontDistribute super."barchart";
   "barcodes-code128" = dontDistribute super."barcodes-code128";
@@ -3345,6 +3347,7 @@ self: super: {
   "glapp" = dontDistribute super."glapp";
   "glasso" = dontDistribute super."glasso";
   "glib" = doDistribute super."glib_0_13_1_0";
+  "glicko" = dontDistribute super."glicko";
   "glider-nlp" = dontDistribute super."glider-nlp";
   "glintcollider" = dontDistribute super."glintcollider";
   "gll" = dontDistribute super."gll";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.0.nix b/pkgs/development/haskell-modules/configuration-lts-3.0.nix
index 1a781371a451..d37a6547894c 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.0.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.0.nix
@@ -1105,6 +1105,7 @@ self: super: {
   "aeson-filthy" = dontDistribute super."aeson-filthy";
   "aeson-lens" = dontDistribute super."aeson-lens";
   "aeson-native" = dontDistribute super."aeson-native";
+  "aeson-parsec-picky" = dontDistribute super."aeson-parsec-picky";
   "aeson-qq" = doDistribute super."aeson-qq_0_8_0";
   "aeson-schema" = doDistribute super."aeson-schema_0_3_0_7";
   "aeson-serialize" = dontDistribute super."aeson-serialize";
@@ -1428,6 +1429,7 @@ self: super: {
   "bamboo-theme-mini-html5" = dontDistribute super."bamboo-theme-mini-html5";
   "bamse" = dontDistribute super."bamse";
   "bamstats" = dontDistribute super."bamstats";
+  "bank-holiday-usa" = dontDistribute super."bank-holiday-usa";
   "banwords" = dontDistribute super."banwords";
   "barchart" = dontDistribute super."barchart";
   "barcodes-code128" = dontDistribute super."barcodes-code128";
@@ -3195,6 +3197,7 @@ self: super: {
   "glambda" = dontDistribute super."glambda";
   "glapp" = dontDistribute super."glapp";
   "glasso" = dontDistribute super."glasso";
+  "glicko" = dontDistribute super."glicko";
   "glider-nlp" = dontDistribute super."glider-nlp";
   "glintcollider" = dontDistribute super."glintcollider";
   "gll" = dontDistribute super."gll";
@@ -3865,6 +3868,7 @@ self: super: {
   "himerge" = dontDistribute super."himerge";
   "himg" = dontDistribute super."himg";
   "himpy" = dontDistribute super."himpy";
+  "hindent" = doDistribute super."hindent_4_5_4";
   "hinduce-associations-apriori" = dontDistribute super."hinduce-associations-apriori";
   "hinduce-classifier" = dontDistribute super."hinduce-classifier";
   "hinduce-classifier-decisiontree" = dontDistribute super."hinduce-classifier-decisiontree";
@@ -7121,6 +7125,7 @@ self: super: {
   "tasty-program" = dontDistribute super."tasty-program";
   "tasty-quickcheck" = doDistribute super."tasty-quickcheck_0_8_3_2";
   "tasty-rerun" = doDistribute super."tasty-rerun_1_1_4";
+  "tasty-silver" = doDistribute super."tasty-silver_3_1_7";
   "tasty-tap" = dontDistribute super."tasty-tap";
   "tau" = dontDistribute super."tau";
   "tbox" = dontDistribute super."tbox";
@@ -7693,6 +7698,7 @@ self: super: {
   "waddle" = dontDistribute super."waddle";
   "wai" = doDistribute super."wai_3_0_3_0";
   "wai-app-file-cgi" = dontDistribute super."wai-app-file-cgi";
+  "wai-app-static" = doDistribute super."wai-app-static_3_1_1";
   "wai-cors" = doDistribute super."wai-cors_0_2_3";
   "wai-devel" = dontDistribute super."wai-devel";
   "wai-digestive-functors" = dontDistribute super."wai-digestive-functors";
@@ -7787,6 +7793,7 @@ self: super: {
   "webkit-javascriptcore" = dontDistribute super."webkit-javascriptcore";
   "webkitgtk3" = dontDistribute super."webkitgtk3";
   "webkitgtk3-javascriptcore" = dontDistribute super."webkitgtk3-javascriptcore";
+  "webpage" = doDistribute super."webpage_0_0_3_1";
   "webrtc-vad" = dontDistribute super."webrtc-vad";
   "webserver" = dontDistribute super."webserver";
   "websnap" = dontDistribute super."websnap";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.1.nix b/pkgs/development/haskell-modules/configuration-lts-3.1.nix
index 40e3108bb7e0..347705d09041 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.1.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.1.nix
@@ -1084,6 +1084,7 @@ self: super: {
   "activehs-base" = dontDistribute super."activehs-base";
   "activitystreams-aeson" = dontDistribute super."activitystreams-aeson";
   "actor" = dontDistribute super."actor";
+  "ad" = doDistribute super."ad_4_2_4";
   "adaptive-containers" = dontDistribute super."adaptive-containers";
   "adaptive-tuple" = dontDistribute super."adaptive-tuple";
   "adb" = dontDistribute super."adb";
@@ -1104,6 +1105,7 @@ self: super: {
   "aeson-filthy" = dontDistribute super."aeson-filthy";
   "aeson-lens" = dontDistribute super."aeson-lens";
   "aeson-native" = dontDistribute super."aeson-native";
+  "aeson-parsec-picky" = dontDistribute super."aeson-parsec-picky";
   "aeson-schema" = doDistribute super."aeson-schema_0_3_0_7";
   "aeson-serialize" = dontDistribute super."aeson-serialize";
   "aeson-smart" = dontDistribute super."aeson-smart";
@@ -1426,6 +1428,7 @@ self: super: {
   "bamboo-theme-mini-html5" = dontDistribute super."bamboo-theme-mini-html5";
   "bamse" = dontDistribute super."bamse";
   "bamstats" = dontDistribute super."bamstats";
+  "bank-holiday-usa" = dontDistribute super."bank-holiday-usa";
   "banwords" = dontDistribute super."banwords";
   "barchart" = dontDistribute super."barchart";
   "barcodes-code128" = dontDistribute super."barcodes-code128";
@@ -3189,6 +3192,7 @@ self: super: {
   "glambda" = dontDistribute super."glambda";
   "glapp" = dontDistribute super."glapp";
   "glasso" = dontDistribute super."glasso";
+  "glicko" = dontDistribute super."glicko";
   "glider-nlp" = dontDistribute super."glider-nlp";
   "glintcollider" = dontDistribute super."glintcollider";
   "gll" = dontDistribute super."gll";
@@ -3858,6 +3862,7 @@ self: super: {
   "himerge" = dontDistribute super."himerge";
   "himg" = dontDistribute super."himg";
   "himpy" = dontDistribute super."himpy";
+  "hindent" = doDistribute super."hindent_4_5_4";
   "hinduce-associations-apriori" = dontDistribute super."hinduce-associations-apriori";
   "hinduce-classifier" = dontDistribute super."hinduce-classifier";
   "hinduce-classifier-decisiontree" = dontDistribute super."hinduce-classifier-decisiontree";
@@ -7110,6 +7115,7 @@ self: super: {
   "tasty-program" = dontDistribute super."tasty-program";
   "tasty-quickcheck" = doDistribute super."tasty-quickcheck_0_8_3_2";
   "tasty-rerun" = doDistribute super."tasty-rerun_1_1_4";
+  "tasty-silver" = doDistribute super."tasty-silver_3_1_7";
   "tasty-tap" = dontDistribute super."tasty-tap";
   "tau" = dontDistribute super."tau";
   "tbox" = dontDistribute super."tbox";
@@ -7681,6 +7687,7 @@ self: super: {
   "waddle" = dontDistribute super."waddle";
   "wai" = doDistribute super."wai_3_0_3_0";
   "wai-app-file-cgi" = dontDistribute super."wai-app-file-cgi";
+  "wai-app-static" = doDistribute super."wai-app-static_3_1_1";
   "wai-cors" = doDistribute super."wai-cors_0_2_3";
   "wai-devel" = dontDistribute super."wai-devel";
   "wai-digestive-functors" = dontDistribute super."wai-digestive-functors";
@@ -7775,6 +7782,7 @@ self: super: {
   "webkit-javascriptcore" = dontDistribute super."webkit-javascriptcore";
   "webkitgtk3" = dontDistribute super."webkitgtk3";
   "webkitgtk3-javascriptcore" = dontDistribute super."webkitgtk3-javascriptcore";
+  "webpage" = doDistribute super."webpage_0_0_3_1";
   "webrtc-vad" = dontDistribute super."webrtc-vad";
   "webserver" = dontDistribute super."webserver";
   "websnap" = dontDistribute super."websnap";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.10.nix b/pkgs/development/haskell-modules/configuration-lts-3.10.nix
index 4c6371538f1c..1dc5b3fac905 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.10.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.10.nix
@@ -1070,10 +1070,12 @@ self: super: {
   "acme-timemachine" = dontDistribute super."acme-timemachine";
   "acme-year" = dontDistribute super."acme-year";
   "acme-zero" = dontDistribute super."acme-zero";
+  "active" = doDistribute super."active_0_2_0_6";
   "activehs" = dontDistribute super."activehs";
   "activehs-base" = dontDistribute super."activehs-base";
   "activitystreams-aeson" = dontDistribute super."activitystreams-aeson";
   "actor" = dontDistribute super."actor";
+  "ad" = doDistribute super."ad_4_2_4";
   "adaptive-containers" = dontDistribute super."adaptive-containers";
   "adaptive-tuple" = dontDistribute super."adaptive-tuple";
   "adb" = dontDistribute super."adb";
@@ -1089,9 +1091,11 @@ self: super: {
   "aeson-bson" = dontDistribute super."aeson-bson";
   "aeson-casing" = dontDistribute super."aeson-casing";
   "aeson-diff" = dontDistribute super."aeson-diff";
+  "aeson-extra" = doDistribute super."aeson-extra_0_2_1_0";
   "aeson-filthy" = dontDistribute super."aeson-filthy";
   "aeson-lens" = dontDistribute super."aeson-lens";
   "aeson-native" = dontDistribute super."aeson-native";
+  "aeson-parsec-picky" = dontDistribute super."aeson-parsec-picky";
   "aeson-schema" = doDistribute super."aeson-schema_0_3_0_7";
   "aeson-serialize" = dontDistribute super."aeson-serialize";
   "aeson-smart" = dontDistribute super."aeson-smart";
@@ -1405,6 +1409,7 @@ self: super: {
   "bamboo-theme-mini-html5" = dontDistribute super."bamboo-theme-mini-html5";
   "bamse" = dontDistribute super."bamse";
   "bamstats" = dontDistribute super."bamstats";
+  "bank-holiday-usa" = dontDistribute super."bank-holiday-usa";
   "banwords" = dontDistribute super."banwords";
   "barchart" = dontDistribute super."barchart";
   "barcodes-code128" = dontDistribute super."barcodes-code128";
@@ -2370,14 +2375,18 @@ self: super: {
   "dia-base" = dontDistribute super."dia-base";
   "dia-functions" = dontDistribute super."dia-functions";
   "diagrams-canvas" = dontDistribute super."diagrams-canvas";
+  "diagrams-contrib" = doDistribute super."diagrams-contrib_1_3_0_7";
+  "diagrams-core" = doDistribute super."diagrams-core_1_3_0_3";
   "diagrams-graphviz" = dontDistribute super."diagrams-graphviz";
   "diagrams-gtk" = dontDistribute super."diagrams-gtk";
   "diagrams-hsqml" = dontDistribute super."diagrams-hsqml";
   "diagrams-pandoc" = dontDistribute super."diagrams-pandoc";
   "diagrams-pdf" = dontDistribute super."diagrams-pdf";
   "diagrams-pgf" = dontDistribute super."diagrams-pgf";
+  "diagrams-postscript" = doDistribute super."diagrams-postscript_1_3_0_3";
   "diagrams-qrcode" = dontDistribute super."diagrams-qrcode";
   "diagrams-rubiks-cube" = dontDistribute super."diagrams-rubiks-cube";
+  "diagrams-svg" = doDistribute super."diagrams-svg_1_3_1_6";
   "diagrams-tikz" = dontDistribute super."diagrams-tikz";
   "dice-entropy-conduit" = dontDistribute super."dice-entropy-conduit";
   "dicom" = dontDistribute super."dicom";
@@ -2509,6 +2518,7 @@ self: super: {
   "dtd-types" = dontDistribute super."dtd-types";
   "dtrace" = dontDistribute super."dtrace";
   "dtw" = dontDistribute super."dtw";
+  "dual-tree" = doDistribute super."dual-tree_0_2_0_7";
   "dump" = dontDistribute super."dump";
   "duplo" = dontDistribute super."duplo";
   "dvda" = dontDistribute super."dvda";
@@ -3119,6 +3129,7 @@ self: super: {
   "glambda" = dontDistribute super."glambda";
   "glapp" = dontDistribute super."glapp";
   "glasso" = dontDistribute super."glasso";
+  "glicko" = dontDistribute super."glicko";
   "glider-nlp" = dontDistribute super."glider-nlp";
   "glintcollider" = dontDistribute super."glintcollider";
   "gll" = dontDistribute super."gll";
@@ -3565,6 +3576,7 @@ self: super: {
   "haskell-reflect" = dontDistribute super."haskell-reflect";
   "haskell-rules" = dontDistribute super."haskell-rules";
   "haskell-src-exts-qq" = dontDistribute super."haskell-src-exts-qq";
+  "haskell-src-meta" = doDistribute super."haskell-src-meta_0_6_0_11";
   "haskell-src-meta-mwotton" = dontDistribute super."haskell-src-meta-mwotton";
   "haskell-token-utils" = dontDistribute super."haskell-token-utils";
   "haskell-type-exts" = dontDistribute super."haskell-type-exts";
@@ -3780,6 +3792,7 @@ self: super: {
   "himerge" = dontDistribute super."himerge";
   "himg" = dontDistribute super."himg";
   "himpy" = dontDistribute super."himpy";
+  "hindent" = doDistribute super."hindent_4_5_4";
   "hinduce-associations-apriori" = dontDistribute super."hinduce-associations-apriori";
   "hinduce-classifier" = dontDistribute super."hinduce-classifier";
   "hinduce-classifier-decisiontree" = dontDistribute super."hinduce-classifier-decisiontree";
@@ -5107,6 +5120,7 @@ self: super: {
   "mono-foldable" = dontDistribute super."mono-foldable";
   "mono-traversable" = doDistribute super."mono-traversable_0_9_3";
   "monoid-absorbing" = dontDistribute super."monoid-absorbing";
+  "monoid-extras" = doDistribute super."monoid-extras_0_4_0_2";
   "monoid-owns" = dontDistribute super."monoid-owns";
   "monoid-record" = dontDistribute super."monoid-record";
   "monoid-statistics" = dontDistribute super."monoid-statistics";
@@ -6951,6 +6965,7 @@ self: super: {
   "tasty-laws" = dontDistribute super."tasty-laws";
   "tasty-lens" = dontDistribute super."tasty-lens";
   "tasty-program" = dontDistribute super."tasty-program";
+  "tasty-silver" = doDistribute super."tasty-silver_3_1_7";
   "tasty-tap" = dontDistribute super."tasty-tap";
   "tau" = dontDistribute super."tau";
   "tbox" = dontDistribute super."tbox";
@@ -7513,6 +7528,7 @@ self: super: {
   "vty-ui-extras" = dontDistribute super."vty-ui-extras";
   "waddle" = dontDistribute super."waddle";
   "wai-app-file-cgi" = dontDistribute super."wai-app-file-cgi";
+  "wai-app-static" = doDistribute super."wai-app-static_3_1_1";
   "wai-cors" = doDistribute super."wai-cors_0_2_3";
   "wai-devel" = dontDistribute super."wai-devel";
   "wai-digestive-functors" = dontDistribute super."wai-digestive-functors";
@@ -7601,6 +7617,7 @@ self: super: {
   "webkit-javascriptcore" = dontDistribute super."webkit-javascriptcore";
   "webkitgtk3" = dontDistribute super."webkitgtk3";
   "webkitgtk3-javascriptcore" = dontDistribute super."webkitgtk3-javascriptcore";
+  "webpage" = doDistribute super."webpage_0_0_3_1";
   "webrtc-vad" = dontDistribute super."webrtc-vad";
   "webserver" = dontDistribute super."webserver";
   "websnap" = dontDistribute super."websnap";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.11.nix b/pkgs/development/haskell-modules/configuration-lts-3.11.nix
index 20f538e28fed..a6a91837f99a 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.11.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.11.nix
@@ -1070,10 +1070,12 @@ self: super: {
   "acme-timemachine" = dontDistribute super."acme-timemachine";
   "acme-year" = dontDistribute super."acme-year";
   "acme-zero" = dontDistribute super."acme-zero";
+  "active" = doDistribute super."active_0_2_0_6";
   "activehs" = dontDistribute super."activehs";
   "activehs-base" = dontDistribute super."activehs-base";
   "activitystreams-aeson" = dontDistribute super."activitystreams-aeson";
   "actor" = dontDistribute super."actor";
+  "ad" = doDistribute super."ad_4_2_4";
   "adaptive-containers" = dontDistribute super."adaptive-containers";
   "adaptive-tuple" = dontDistribute super."adaptive-tuple";
   "adb" = dontDistribute super."adb";
@@ -1089,9 +1091,11 @@ self: super: {
   "aeson-bson" = dontDistribute super."aeson-bson";
   "aeson-casing" = dontDistribute super."aeson-casing";
   "aeson-diff" = dontDistribute super."aeson-diff";
+  "aeson-extra" = doDistribute super."aeson-extra_0_2_1_0";
   "aeson-filthy" = dontDistribute super."aeson-filthy";
   "aeson-lens" = dontDistribute super."aeson-lens";
   "aeson-native" = dontDistribute super."aeson-native";
+  "aeson-parsec-picky" = dontDistribute super."aeson-parsec-picky";
   "aeson-schema" = doDistribute super."aeson-schema_0_3_0_7";
   "aeson-serialize" = dontDistribute super."aeson-serialize";
   "aeson-smart" = dontDistribute super."aeson-smart";
@@ -1404,6 +1408,7 @@ self: super: {
   "bamboo-theme-mini-html5" = dontDistribute super."bamboo-theme-mini-html5";
   "bamse" = dontDistribute super."bamse";
   "bamstats" = dontDistribute super."bamstats";
+  "bank-holiday-usa" = dontDistribute super."bank-holiday-usa";
   "banwords" = dontDistribute super."banwords";
   "barchart" = dontDistribute super."barchart";
   "barcodes-code128" = dontDistribute super."barcodes-code128";
@@ -2366,14 +2371,18 @@ self: super: {
   "dia-base" = dontDistribute super."dia-base";
   "dia-functions" = dontDistribute super."dia-functions";
   "diagrams-canvas" = dontDistribute super."diagrams-canvas";
+  "diagrams-contrib" = doDistribute super."diagrams-contrib_1_3_0_7";
+  "diagrams-core" = doDistribute super."diagrams-core_1_3_0_3";
   "diagrams-graphviz" = dontDistribute super."diagrams-graphviz";
   "diagrams-gtk" = dontDistribute super."diagrams-gtk";
   "diagrams-hsqml" = dontDistribute super."diagrams-hsqml";
   "diagrams-pandoc" = dontDistribute super."diagrams-pandoc";
   "diagrams-pdf" = dontDistribute super."diagrams-pdf";
   "diagrams-pgf" = dontDistribute super."diagrams-pgf";
+  "diagrams-postscript" = doDistribute super."diagrams-postscript_1_3_0_3";
   "diagrams-qrcode" = dontDistribute super."diagrams-qrcode";
   "diagrams-rubiks-cube" = dontDistribute super."diagrams-rubiks-cube";
+  "diagrams-svg" = doDistribute super."diagrams-svg_1_3_1_6";
   "diagrams-tikz" = dontDistribute super."diagrams-tikz";
   "dice-entropy-conduit" = dontDistribute super."dice-entropy-conduit";
   "dicom" = dontDistribute super."dicom";
@@ -2505,6 +2514,7 @@ self: super: {
   "dtd-types" = dontDistribute super."dtd-types";
   "dtrace" = dontDistribute super."dtrace";
   "dtw" = dontDistribute super."dtw";
+  "dual-tree" = doDistribute super."dual-tree_0_2_0_7";
   "dump" = dontDistribute super."dump";
   "duplo" = dontDistribute super."duplo";
   "dvda" = dontDistribute super."dvda";
@@ -3113,6 +3123,7 @@ self: super: {
   "glambda" = dontDistribute super."glambda";
   "glapp" = dontDistribute super."glapp";
   "glasso" = dontDistribute super."glasso";
+  "glicko" = dontDistribute super."glicko";
   "glider-nlp" = dontDistribute super."glider-nlp";
   "glintcollider" = dontDistribute super."glintcollider";
   "gll" = dontDistribute super."gll";
@@ -3558,6 +3569,7 @@ self: super: {
   "haskell-reflect" = dontDistribute super."haskell-reflect";
   "haskell-rules" = dontDistribute super."haskell-rules";
   "haskell-src-exts-qq" = dontDistribute super."haskell-src-exts-qq";
+  "haskell-src-meta" = doDistribute super."haskell-src-meta_0_6_0_11";
   "haskell-src-meta-mwotton" = dontDistribute super."haskell-src-meta-mwotton";
   "haskell-token-utils" = dontDistribute super."haskell-token-utils";
   "haskell-type-exts" = dontDistribute super."haskell-type-exts";
@@ -3773,6 +3785,7 @@ self: super: {
   "himerge" = dontDistribute super."himerge";
   "himg" = dontDistribute super."himg";
   "himpy" = dontDistribute super."himpy";
+  "hindent" = doDistribute super."hindent_4_5_4";
   "hinduce-associations-apriori" = dontDistribute super."hinduce-associations-apriori";
   "hinduce-classifier" = dontDistribute super."hinduce-classifier";
   "hinduce-classifier-decisiontree" = dontDistribute super."hinduce-classifier-decisiontree";
@@ -5099,6 +5112,7 @@ self: super: {
   "mono-foldable" = dontDistribute super."mono-foldable";
   "mono-traversable" = doDistribute super."mono-traversable_0_9_3";
   "monoid-absorbing" = dontDistribute super."monoid-absorbing";
+  "monoid-extras" = doDistribute super."monoid-extras_0_4_0_2";
   "monoid-owns" = dontDistribute super."monoid-owns";
   "monoid-record" = dontDistribute super."monoid-record";
   "monoid-statistics" = dontDistribute super."monoid-statistics";
@@ -6938,6 +6952,7 @@ self: super: {
   "tasty-laws" = dontDistribute super."tasty-laws";
   "tasty-lens" = dontDistribute super."tasty-lens";
   "tasty-program" = dontDistribute super."tasty-program";
+  "tasty-silver" = doDistribute super."tasty-silver_3_1_7";
   "tasty-tap" = dontDistribute super."tasty-tap";
   "tau" = dontDistribute super."tau";
   "tbox" = dontDistribute super."tbox";
@@ -7500,6 +7515,7 @@ self: super: {
   "vty-ui-extras" = dontDistribute super."vty-ui-extras";
   "waddle" = dontDistribute super."waddle";
   "wai-app-file-cgi" = dontDistribute super."wai-app-file-cgi";
+  "wai-app-static" = doDistribute super."wai-app-static_3_1_1";
   "wai-cors" = doDistribute super."wai-cors_0_2_3";
   "wai-devel" = dontDistribute super."wai-devel";
   "wai-digestive-functors" = dontDistribute super."wai-digestive-functors";
@@ -7588,6 +7604,7 @@ self: super: {
   "webkit-javascriptcore" = dontDistribute super."webkit-javascriptcore";
   "webkitgtk3" = dontDistribute super."webkitgtk3";
   "webkitgtk3-javascriptcore" = dontDistribute super."webkitgtk3-javascriptcore";
+  "webpage" = doDistribute super."webpage_0_0_3_1";
   "webrtc-vad" = dontDistribute super."webrtc-vad";
   "webserver" = dontDistribute super."webserver";
   "websnap" = dontDistribute super."websnap";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.12.nix b/pkgs/development/haskell-modules/configuration-lts-3.12.nix
index 2a91b049abd7..5f8ec0341155 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.12.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.12.nix
@@ -1068,10 +1068,12 @@ self: super: {
   "acme-timemachine" = dontDistribute super."acme-timemachine";
   "acme-year" = dontDistribute super."acme-year";
   "acme-zero" = dontDistribute super."acme-zero";
+  "active" = doDistribute super."active_0_2_0_6";
   "activehs" = dontDistribute super."activehs";
   "activehs-base" = dontDistribute super."activehs-base";
   "activitystreams-aeson" = dontDistribute super."activitystreams-aeson";
   "actor" = dontDistribute super."actor";
+  "ad" = doDistribute super."ad_4_2_4";
   "adaptive-containers" = dontDistribute super."adaptive-containers";
   "adaptive-tuple" = dontDistribute super."adaptive-tuple";
   "adb" = dontDistribute super."adb";
@@ -1087,9 +1089,11 @@ self: super: {
   "aeson-bson" = dontDistribute super."aeson-bson";
   "aeson-casing" = dontDistribute super."aeson-casing";
   "aeson-diff" = dontDistribute super."aeson-diff";
+  "aeson-extra" = doDistribute super."aeson-extra_0_2_1_0";
   "aeson-filthy" = dontDistribute super."aeson-filthy";
   "aeson-lens" = dontDistribute super."aeson-lens";
   "aeson-native" = dontDistribute super."aeson-native";
+  "aeson-parsec-picky" = dontDistribute super."aeson-parsec-picky";
   "aeson-schema" = doDistribute super."aeson-schema_0_3_0_7";
   "aeson-serialize" = dontDistribute super."aeson-serialize";
   "aeson-smart" = dontDistribute super."aeson-smart";
@@ -1402,6 +1406,7 @@ self: super: {
   "bamboo-theme-mini-html5" = dontDistribute super."bamboo-theme-mini-html5";
   "bamse" = dontDistribute super."bamse";
   "bamstats" = dontDistribute super."bamstats";
+  "bank-holiday-usa" = dontDistribute super."bank-holiday-usa";
   "banwords" = dontDistribute super."banwords";
   "barchart" = dontDistribute super."barchart";
   "barcodes-code128" = dontDistribute super."barcodes-code128";
@@ -2360,14 +2365,18 @@ self: super: {
   "dia-base" = dontDistribute super."dia-base";
   "dia-functions" = dontDistribute super."dia-functions";
   "diagrams-canvas" = dontDistribute super."diagrams-canvas";
+  "diagrams-contrib" = doDistribute super."diagrams-contrib_1_3_0_7";
+  "diagrams-core" = doDistribute super."diagrams-core_1_3_0_3";
   "diagrams-graphviz" = dontDistribute super."diagrams-graphviz";
   "diagrams-gtk" = dontDistribute super."diagrams-gtk";
   "diagrams-hsqml" = dontDistribute super."diagrams-hsqml";
   "diagrams-pandoc" = dontDistribute super."diagrams-pandoc";
   "diagrams-pdf" = dontDistribute super."diagrams-pdf";
   "diagrams-pgf" = dontDistribute super."diagrams-pgf";
+  "diagrams-postscript" = doDistribute super."diagrams-postscript_1_3_0_3";
   "diagrams-qrcode" = dontDistribute super."diagrams-qrcode";
   "diagrams-rubiks-cube" = dontDistribute super."diagrams-rubiks-cube";
+  "diagrams-svg" = doDistribute super."diagrams-svg_1_3_1_6";
   "diagrams-tikz" = dontDistribute super."diagrams-tikz";
   "dice-entropy-conduit" = dontDistribute super."dice-entropy-conduit";
   "dicom" = dontDistribute super."dicom";
@@ -2499,6 +2508,7 @@ self: super: {
   "dtd-types" = dontDistribute super."dtd-types";
   "dtrace" = dontDistribute super."dtrace";
   "dtw" = dontDistribute super."dtw";
+  "dual-tree" = doDistribute super."dual-tree_0_2_0_7";
   "dump" = dontDistribute super."dump";
   "duplo" = dontDistribute super."duplo";
   "dvda" = dontDistribute super."dvda";
@@ -3106,6 +3116,7 @@ self: super: {
   "glambda" = dontDistribute super."glambda";
   "glapp" = dontDistribute super."glapp";
   "glasso" = dontDistribute super."glasso";
+  "glicko" = dontDistribute super."glicko";
   "glider-nlp" = dontDistribute super."glider-nlp";
   "glintcollider" = dontDistribute super."glintcollider";
   "gll" = dontDistribute super."gll";
@@ -3550,6 +3561,7 @@ self: super: {
   "haskell-reflect" = dontDistribute super."haskell-reflect";
   "haskell-rules" = dontDistribute super."haskell-rules";
   "haskell-src-exts-qq" = dontDistribute super."haskell-src-exts-qq";
+  "haskell-src-meta" = doDistribute super."haskell-src-meta_0_6_0_11";
   "haskell-src-meta-mwotton" = dontDistribute super."haskell-src-meta-mwotton";
   "haskell-token-utils" = dontDistribute super."haskell-token-utils";
   "haskell-type-exts" = dontDistribute super."haskell-type-exts";
@@ -3765,6 +3777,7 @@ self: super: {
   "himerge" = dontDistribute super."himerge";
   "himg" = dontDistribute super."himg";
   "himpy" = dontDistribute super."himpy";
+  "hindent" = doDistribute super."hindent_4_5_4";
   "hinduce-associations-apriori" = dontDistribute super."hinduce-associations-apriori";
   "hinduce-classifier" = dontDistribute super."hinduce-classifier";
   "hinduce-classifier-decisiontree" = dontDistribute super."hinduce-classifier-decisiontree";
@@ -5089,6 +5102,7 @@ self: super: {
   "mono-foldable" = dontDistribute super."mono-foldable";
   "mono-traversable" = doDistribute super."mono-traversable_0_9_3";
   "monoid-absorbing" = dontDistribute super."monoid-absorbing";
+  "monoid-extras" = doDistribute super."monoid-extras_0_4_0_2";
   "monoid-owns" = dontDistribute super."monoid-owns";
   "monoid-record" = dontDistribute super."monoid-record";
   "monoid-statistics" = dontDistribute super."monoid-statistics";
@@ -6926,6 +6940,7 @@ self: super: {
   "tasty-laws" = dontDistribute super."tasty-laws";
   "tasty-lens" = dontDistribute super."tasty-lens";
   "tasty-program" = dontDistribute super."tasty-program";
+  "tasty-silver" = doDistribute super."tasty-silver_3_1_7";
   "tasty-tap" = dontDistribute super."tasty-tap";
   "tau" = dontDistribute super."tau";
   "tbox" = dontDistribute super."tbox";
@@ -7485,6 +7500,7 @@ self: super: {
   "vty-ui-extras" = dontDistribute super."vty-ui-extras";
   "waddle" = dontDistribute super."waddle";
   "wai-app-file-cgi" = dontDistribute super."wai-app-file-cgi";
+  "wai-app-static" = doDistribute super."wai-app-static_3_1_1";
   "wai-cors" = doDistribute super."wai-cors_0_2_3";
   "wai-devel" = dontDistribute super."wai-devel";
   "wai-digestive-functors" = dontDistribute super."wai-digestive-functors";
@@ -7573,6 +7589,7 @@ self: super: {
   "webkit-javascriptcore" = dontDistribute super."webkit-javascriptcore";
   "webkitgtk3" = dontDistribute super."webkitgtk3";
   "webkitgtk3-javascriptcore" = dontDistribute super."webkitgtk3-javascriptcore";
+  "webpage" = doDistribute super."webpage_0_0_3_1";
   "webrtc-vad" = dontDistribute super."webrtc-vad";
   "webserver" = dontDistribute super."webserver";
   "websnap" = dontDistribute super."websnap";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.13.nix b/pkgs/development/haskell-modules/configuration-lts-3.13.nix
index 0577a3ec7fcb..ec6e8e619586 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.13.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.13.nix
@@ -1068,10 +1068,12 @@ self: super: {
   "acme-timemachine" = dontDistribute super."acme-timemachine";
   "acme-year" = dontDistribute super."acme-year";
   "acme-zero" = dontDistribute super."acme-zero";
+  "active" = doDistribute super."active_0_2_0_6";
   "activehs" = dontDistribute super."activehs";
   "activehs-base" = dontDistribute super."activehs-base";
   "activitystreams-aeson" = dontDistribute super."activitystreams-aeson";
   "actor" = dontDistribute super."actor";
+  "ad" = doDistribute super."ad_4_2_4";
   "adaptive-containers" = dontDistribute super."adaptive-containers";
   "adaptive-tuple" = dontDistribute super."adaptive-tuple";
   "adb" = dontDistribute super."adb";
@@ -1087,9 +1089,11 @@ self: super: {
   "aeson-bson" = dontDistribute super."aeson-bson";
   "aeson-casing" = dontDistribute super."aeson-casing";
   "aeson-diff" = dontDistribute super."aeson-diff";
+  "aeson-extra" = doDistribute super."aeson-extra_0_2_1_0";
   "aeson-filthy" = dontDistribute super."aeson-filthy";
   "aeson-lens" = dontDistribute super."aeson-lens";
   "aeson-native" = dontDistribute super."aeson-native";
+  "aeson-parsec-picky" = dontDistribute super."aeson-parsec-picky";
   "aeson-schema" = doDistribute super."aeson-schema_0_3_0_7";
   "aeson-serialize" = dontDistribute super."aeson-serialize";
   "aeson-smart" = dontDistribute super."aeson-smart";
@@ -1402,6 +1406,7 @@ self: super: {
   "bamboo-theme-mini-html5" = dontDistribute super."bamboo-theme-mini-html5";
   "bamse" = dontDistribute super."bamse";
   "bamstats" = dontDistribute super."bamstats";
+  "bank-holiday-usa" = dontDistribute super."bank-holiday-usa";
   "banwords" = dontDistribute super."banwords";
   "barchart" = dontDistribute super."barchart";
   "barcodes-code128" = dontDistribute super."barcodes-code128";
@@ -2358,14 +2363,18 @@ self: super: {
   "dia-base" = dontDistribute super."dia-base";
   "dia-functions" = dontDistribute super."dia-functions";
   "diagrams-canvas" = dontDistribute super."diagrams-canvas";
+  "diagrams-contrib" = doDistribute super."diagrams-contrib_1_3_0_7";
+  "diagrams-core" = doDistribute super."diagrams-core_1_3_0_3";
   "diagrams-graphviz" = dontDistribute super."diagrams-graphviz";
   "diagrams-gtk" = dontDistribute super."diagrams-gtk";
   "diagrams-hsqml" = dontDistribute super."diagrams-hsqml";
   "diagrams-pandoc" = dontDistribute super."diagrams-pandoc";
   "diagrams-pdf" = dontDistribute super."diagrams-pdf";
   "diagrams-pgf" = dontDistribute super."diagrams-pgf";
+  "diagrams-postscript" = doDistribute super."diagrams-postscript_1_3_0_3";
   "diagrams-qrcode" = dontDistribute super."diagrams-qrcode";
   "diagrams-rubiks-cube" = dontDistribute super."diagrams-rubiks-cube";
+  "diagrams-svg" = doDistribute super."diagrams-svg_1_3_1_6";
   "diagrams-tikz" = dontDistribute super."diagrams-tikz";
   "dice-entropy-conduit" = dontDistribute super."dice-entropy-conduit";
   "dicom" = dontDistribute super."dicom";
@@ -2497,6 +2506,7 @@ self: super: {
   "dtd-types" = dontDistribute super."dtd-types";
   "dtrace" = dontDistribute super."dtrace";
   "dtw" = dontDistribute super."dtw";
+  "dual-tree" = doDistribute super."dual-tree_0_2_0_7";
   "dump" = dontDistribute super."dump";
   "duplo" = dontDistribute super."duplo";
   "dvda" = dontDistribute super."dvda";
@@ -3104,6 +3114,7 @@ self: super: {
   "glambda" = dontDistribute super."glambda";
   "glapp" = dontDistribute super."glapp";
   "glasso" = dontDistribute super."glasso";
+  "glicko" = dontDistribute super."glicko";
   "glider-nlp" = dontDistribute super."glider-nlp";
   "glintcollider" = dontDistribute super."glintcollider";
   "gll" = dontDistribute super."gll";
@@ -3548,6 +3559,7 @@ self: super: {
   "haskell-reflect" = dontDistribute super."haskell-reflect";
   "haskell-rules" = dontDistribute super."haskell-rules";
   "haskell-src-exts-qq" = dontDistribute super."haskell-src-exts-qq";
+  "haskell-src-meta" = doDistribute super."haskell-src-meta_0_6_0_11";
   "haskell-src-meta-mwotton" = dontDistribute super."haskell-src-meta-mwotton";
   "haskell-token-utils" = dontDistribute super."haskell-token-utils";
   "haskell-type-exts" = dontDistribute super."haskell-type-exts";
@@ -3762,6 +3774,7 @@ self: super: {
   "himerge" = dontDistribute super."himerge";
   "himg" = dontDistribute super."himg";
   "himpy" = dontDistribute super."himpy";
+  "hindent" = doDistribute super."hindent_4_5_4";
   "hinduce-associations-apriori" = dontDistribute super."hinduce-associations-apriori";
   "hinduce-classifier" = dontDistribute super."hinduce-classifier";
   "hinduce-classifier-decisiontree" = dontDistribute super."hinduce-classifier-decisiontree";
@@ -4831,6 +4844,7 @@ self: super: {
   "luachunk" = dontDistribute super."luachunk";
   "luautils" = dontDistribute super."luautils";
   "lub" = dontDistribute super."lub";
+  "lucid" = doDistribute super."lucid_2_9_3";
   "lucid-foundation" = dontDistribute super."lucid-foundation";
   "lucienne" = dontDistribute super."lucienne";
   "luhn" = dontDistribute super."luhn";
@@ -5083,6 +5097,7 @@ self: super: {
   "mono-foldable" = dontDistribute super."mono-foldable";
   "mono-traversable" = doDistribute super."mono-traversable_0_9_3";
   "monoid-absorbing" = dontDistribute super."monoid-absorbing";
+  "monoid-extras" = doDistribute super."monoid-extras_0_4_0_2";
   "monoid-owns" = dontDistribute super."monoid-owns";
   "monoid-record" = dontDistribute super."monoid-record";
   "monoid-statistics" = dontDistribute super."monoid-statistics";
@@ -6917,6 +6932,7 @@ self: super: {
   "tasty-laws" = dontDistribute super."tasty-laws";
   "tasty-lens" = dontDistribute super."tasty-lens";
   "tasty-program" = dontDistribute super."tasty-program";
+  "tasty-silver" = doDistribute super."tasty-silver_3_1_7";
   "tasty-tap" = dontDistribute super."tasty-tap";
   "tau" = dontDistribute super."tau";
   "tbox" = dontDistribute super."tbox";
@@ -7476,6 +7492,7 @@ self: super: {
   "vty-ui-extras" = dontDistribute super."vty-ui-extras";
   "waddle" = dontDistribute super."waddle";
   "wai-app-file-cgi" = dontDistribute super."wai-app-file-cgi";
+  "wai-app-static" = doDistribute super."wai-app-static_3_1_1";
   "wai-devel" = dontDistribute super."wai-devel";
   "wai-digestive-functors" = dontDistribute super."wai-digestive-functors";
   "wai-dispatch" = dontDistribute super."wai-dispatch";
@@ -7563,6 +7580,7 @@ self: super: {
   "webkit-javascriptcore" = dontDistribute super."webkit-javascriptcore";
   "webkitgtk3" = dontDistribute super."webkitgtk3";
   "webkitgtk3-javascriptcore" = dontDistribute super."webkitgtk3-javascriptcore";
+  "webpage" = doDistribute super."webpage_0_0_3_1";
   "webrtc-vad" = dontDistribute super."webrtc-vad";
   "webserver" = dontDistribute super."webserver";
   "websnap" = dontDistribute super."websnap";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.2.nix b/pkgs/development/haskell-modules/configuration-lts-3.2.nix
index c7b3498c2d89..541793134154 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.2.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.2.nix
@@ -1082,6 +1082,7 @@ self: super: {
   "activehs-base" = dontDistribute super."activehs-base";
   "activitystreams-aeson" = dontDistribute super."activitystreams-aeson";
   "actor" = dontDistribute super."actor";
+  "ad" = doDistribute super."ad_4_2_4";
   "adaptive-containers" = dontDistribute super."adaptive-containers";
   "adaptive-tuple" = dontDistribute super."adaptive-tuple";
   "adb" = dontDistribute super."adb";
@@ -1102,6 +1103,7 @@ self: super: {
   "aeson-filthy" = dontDistribute super."aeson-filthy";
   "aeson-lens" = dontDistribute super."aeson-lens";
   "aeson-native" = dontDistribute super."aeson-native";
+  "aeson-parsec-picky" = dontDistribute super."aeson-parsec-picky";
   "aeson-schema" = doDistribute super."aeson-schema_0_3_0_7";
   "aeson-serialize" = dontDistribute super."aeson-serialize";
   "aeson-smart" = dontDistribute super."aeson-smart";
@@ -1423,6 +1425,7 @@ self: super: {
   "bamboo-theme-mini-html5" = dontDistribute super."bamboo-theme-mini-html5";
   "bamse" = dontDistribute super."bamse";
   "bamstats" = dontDistribute super."bamstats";
+  "bank-holiday-usa" = dontDistribute super."bank-holiday-usa";
   "banwords" = dontDistribute super."banwords";
   "barchart" = dontDistribute super."barchart";
   "barcodes-code128" = dontDistribute super."barcodes-code128";
@@ -3184,6 +3187,7 @@ self: super: {
   "glambda" = dontDistribute super."glambda";
   "glapp" = dontDistribute super."glapp";
   "glasso" = dontDistribute super."glasso";
+  "glicko" = dontDistribute super."glicko";
   "glider-nlp" = dontDistribute super."glider-nlp";
   "glintcollider" = dontDistribute super."glintcollider";
   "gll" = dontDistribute super."gll";
@@ -3852,6 +3856,7 @@ self: super: {
   "himerge" = dontDistribute super."himerge";
   "himg" = dontDistribute super."himg";
   "himpy" = dontDistribute super."himpy";
+  "hindent" = doDistribute super."hindent_4_5_4";
   "hinduce-associations-apriori" = dontDistribute super."hinduce-associations-apriori";
   "hinduce-classifier" = dontDistribute super."hinduce-classifier";
   "hinduce-classifier-decisiontree" = dontDistribute super."hinduce-classifier-decisiontree";
@@ -7095,6 +7100,7 @@ self: super: {
   "tasty-program" = dontDistribute super."tasty-program";
   "tasty-quickcheck" = doDistribute super."tasty-quickcheck_0_8_3_2";
   "tasty-rerun" = doDistribute super."tasty-rerun_1_1_4";
+  "tasty-silver" = doDistribute super."tasty-silver_3_1_7";
   "tasty-tap" = dontDistribute super."tasty-tap";
   "tau" = dontDistribute super."tau";
   "tbox" = dontDistribute super."tbox";
@@ -7666,6 +7672,7 @@ self: super: {
   "waddle" = dontDistribute super."waddle";
   "wai" = doDistribute super."wai_3_0_3_0";
   "wai-app-file-cgi" = dontDistribute super."wai-app-file-cgi";
+  "wai-app-static" = doDistribute super."wai-app-static_3_1_1";
   "wai-cors" = doDistribute super."wai-cors_0_2_3";
   "wai-devel" = dontDistribute super."wai-devel";
   "wai-digestive-functors" = dontDistribute super."wai-digestive-functors";
@@ -7759,6 +7766,7 @@ self: super: {
   "webkit-javascriptcore" = dontDistribute super."webkit-javascriptcore";
   "webkitgtk3" = dontDistribute super."webkitgtk3";
   "webkitgtk3-javascriptcore" = dontDistribute super."webkitgtk3-javascriptcore";
+  "webpage" = doDistribute super."webpage_0_0_3_1";
   "webrtc-vad" = dontDistribute super."webrtc-vad";
   "webserver" = dontDistribute super."webserver";
   "websnap" = dontDistribute super."websnap";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.3.nix b/pkgs/development/haskell-modules/configuration-lts-3.3.nix
index e6d2a4c46894..0d9e480c860b 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.3.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.3.nix
@@ -1082,6 +1082,7 @@ self: super: {
   "activehs-base" = dontDistribute super."activehs-base";
   "activitystreams-aeson" = dontDistribute super."activitystreams-aeson";
   "actor" = dontDistribute super."actor";
+  "ad" = doDistribute super."ad_4_2_4";
   "adaptive-containers" = dontDistribute super."adaptive-containers";
   "adaptive-tuple" = dontDistribute super."adaptive-tuple";
   "adb" = dontDistribute super."adb";
@@ -1102,6 +1103,7 @@ self: super: {
   "aeson-filthy" = dontDistribute super."aeson-filthy";
   "aeson-lens" = dontDistribute super."aeson-lens";
   "aeson-native" = dontDistribute super."aeson-native";
+  "aeson-parsec-picky" = dontDistribute super."aeson-parsec-picky";
   "aeson-schema" = doDistribute super."aeson-schema_0_3_0_7";
   "aeson-serialize" = dontDistribute super."aeson-serialize";
   "aeson-smart" = dontDistribute super."aeson-smart";
@@ -1422,6 +1424,7 @@ self: super: {
   "bamboo-theme-mini-html5" = dontDistribute super."bamboo-theme-mini-html5";
   "bamse" = dontDistribute super."bamse";
   "bamstats" = dontDistribute super."bamstats";
+  "bank-holiday-usa" = dontDistribute super."bank-holiday-usa";
   "banwords" = dontDistribute super."banwords";
   "barchart" = dontDistribute super."barchart";
   "barcodes-code128" = dontDistribute super."barcodes-code128";
@@ -3179,6 +3182,7 @@ self: super: {
   "glambda" = dontDistribute super."glambda";
   "glapp" = dontDistribute super."glapp";
   "glasso" = dontDistribute super."glasso";
+  "glicko" = dontDistribute super."glicko";
   "glider-nlp" = dontDistribute super."glider-nlp";
   "glintcollider" = dontDistribute super."glintcollider";
   "gll" = dontDistribute super."gll";
@@ -3847,6 +3851,7 @@ self: super: {
   "himerge" = dontDistribute super."himerge";
   "himg" = dontDistribute super."himg";
   "himpy" = dontDistribute super."himpy";
+  "hindent" = doDistribute super."hindent_4_5_4";
   "hinduce-associations-apriori" = dontDistribute super."hinduce-associations-apriori";
   "hinduce-classifier" = dontDistribute super."hinduce-classifier";
   "hinduce-classifier-decisiontree" = dontDistribute super."hinduce-classifier-decisiontree";
@@ -7084,6 +7089,7 @@ self: super: {
   "tasty-program" = dontDistribute super."tasty-program";
   "tasty-quickcheck" = doDistribute super."tasty-quickcheck_0_8_3_2";
   "tasty-rerun" = doDistribute super."tasty-rerun_1_1_4";
+  "tasty-silver" = doDistribute super."tasty-silver_3_1_7";
   "tasty-tap" = dontDistribute super."tasty-tap";
   "tau" = dontDistribute super."tau";
   "tbox" = dontDistribute super."tbox";
@@ -7654,6 +7660,7 @@ self: super: {
   "waddle" = dontDistribute super."waddle";
   "wai" = doDistribute super."wai_3_0_3_0";
   "wai-app-file-cgi" = dontDistribute super."wai-app-file-cgi";
+  "wai-app-static" = doDistribute super."wai-app-static_3_1_1";
   "wai-cors" = doDistribute super."wai-cors_0_2_3";
   "wai-devel" = dontDistribute super."wai-devel";
   "wai-digestive-functors" = dontDistribute super."wai-digestive-functors";
@@ -7747,6 +7754,7 @@ self: super: {
   "webkit-javascriptcore" = dontDistribute super."webkit-javascriptcore";
   "webkitgtk3" = dontDistribute super."webkitgtk3";
   "webkitgtk3-javascriptcore" = dontDistribute super."webkitgtk3-javascriptcore";
+  "webpage" = doDistribute super."webpage_0_0_3_1";
   "webrtc-vad" = dontDistribute super."webrtc-vad";
   "webserver" = dontDistribute super."webserver";
   "websnap" = dontDistribute super."websnap";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.4.nix b/pkgs/development/haskell-modules/configuration-lts-3.4.nix
index 27f2a0c4f7f9..787bed1d87b0 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.4.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.4.nix
@@ -1082,6 +1082,7 @@ self: super: {
   "activehs-base" = dontDistribute super."activehs-base";
   "activitystreams-aeson" = dontDistribute super."activitystreams-aeson";
   "actor" = dontDistribute super."actor";
+  "ad" = doDistribute super."ad_4_2_4";
   "adaptive-containers" = dontDistribute super."adaptive-containers";
   "adaptive-tuple" = dontDistribute super."adaptive-tuple";
   "adb" = dontDistribute super."adb";
@@ -1102,6 +1103,7 @@ self: super: {
   "aeson-filthy" = dontDistribute super."aeson-filthy";
   "aeson-lens" = dontDistribute super."aeson-lens";
   "aeson-native" = dontDistribute super."aeson-native";
+  "aeson-parsec-picky" = dontDistribute super."aeson-parsec-picky";
   "aeson-schema" = doDistribute super."aeson-schema_0_3_0_7";
   "aeson-serialize" = dontDistribute super."aeson-serialize";
   "aeson-smart" = dontDistribute super."aeson-smart";
@@ -1422,6 +1424,7 @@ self: super: {
   "bamboo-theme-mini-html5" = dontDistribute super."bamboo-theme-mini-html5";
   "bamse" = dontDistribute super."bamse";
   "bamstats" = dontDistribute super."bamstats";
+  "bank-holiday-usa" = dontDistribute super."bank-holiday-usa";
   "banwords" = dontDistribute super."banwords";
   "barchart" = dontDistribute super."barchart";
   "barcodes-code128" = dontDistribute super."barcodes-code128";
@@ -3178,6 +3181,7 @@ self: super: {
   "glambda" = dontDistribute super."glambda";
   "glapp" = dontDistribute super."glapp";
   "glasso" = dontDistribute super."glasso";
+  "glicko" = dontDistribute super."glicko";
   "glider-nlp" = dontDistribute super."glider-nlp";
   "glintcollider" = dontDistribute super."glintcollider";
   "gll" = dontDistribute super."gll";
@@ -3846,6 +3850,7 @@ self: super: {
   "himerge" = dontDistribute super."himerge";
   "himg" = dontDistribute super."himg";
   "himpy" = dontDistribute super."himpy";
+  "hindent" = doDistribute super."hindent_4_5_4";
   "hinduce-associations-apriori" = dontDistribute super."hinduce-associations-apriori";
   "hinduce-classifier" = dontDistribute super."hinduce-classifier";
   "hinduce-classifier-decisiontree" = dontDistribute super."hinduce-classifier-decisiontree";
@@ -7081,6 +7086,7 @@ self: super: {
   "tasty-program" = dontDistribute super."tasty-program";
   "tasty-quickcheck" = doDistribute super."tasty-quickcheck_0_8_3_2";
   "tasty-rerun" = doDistribute super."tasty-rerun_1_1_4";
+  "tasty-silver" = doDistribute super."tasty-silver_3_1_7";
   "tasty-tap" = dontDistribute super."tasty-tap";
   "tau" = dontDistribute super."tau";
   "tbox" = dontDistribute super."tbox";
@@ -7651,6 +7657,7 @@ self: super: {
   "waddle" = dontDistribute super."waddle";
   "wai" = doDistribute super."wai_3_0_3_0";
   "wai-app-file-cgi" = dontDistribute super."wai-app-file-cgi";
+  "wai-app-static" = doDistribute super."wai-app-static_3_1_1";
   "wai-cors" = doDistribute super."wai-cors_0_2_3";
   "wai-devel" = dontDistribute super."wai-devel";
   "wai-digestive-functors" = dontDistribute super."wai-digestive-functors";
@@ -7743,6 +7750,7 @@ self: super: {
   "webkit-javascriptcore" = dontDistribute super."webkit-javascriptcore";
   "webkitgtk3" = dontDistribute super."webkitgtk3";
   "webkitgtk3-javascriptcore" = dontDistribute super."webkitgtk3-javascriptcore";
+  "webpage" = doDistribute super."webpage_0_0_3_1";
   "webrtc-vad" = dontDistribute super."webrtc-vad";
   "webserver" = dontDistribute super."webserver";
   "websnap" = dontDistribute super."websnap";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.5.nix b/pkgs/development/haskell-modules/configuration-lts-3.5.nix
index acb5bb915a48..6268d1b4afd1 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.5.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.5.nix
@@ -1082,6 +1082,7 @@ self: super: {
   "activehs-base" = dontDistribute super."activehs-base";
   "activitystreams-aeson" = dontDistribute super."activitystreams-aeson";
   "actor" = dontDistribute super."actor";
+  "ad" = doDistribute super."ad_4_2_4";
   "adaptive-containers" = dontDistribute super."adaptive-containers";
   "adaptive-tuple" = dontDistribute super."adaptive-tuple";
   "adb" = dontDistribute super."adb";
@@ -1102,6 +1103,7 @@ self: super: {
   "aeson-filthy" = dontDistribute super."aeson-filthy";
   "aeson-lens" = dontDistribute super."aeson-lens";
   "aeson-native" = dontDistribute super."aeson-native";
+  "aeson-parsec-picky" = dontDistribute super."aeson-parsec-picky";
   "aeson-schema" = doDistribute super."aeson-schema_0_3_0_7";
   "aeson-serialize" = dontDistribute super."aeson-serialize";
   "aeson-smart" = dontDistribute super."aeson-smart";
@@ -1421,6 +1423,7 @@ self: super: {
   "bamboo-theme-mini-html5" = dontDistribute super."bamboo-theme-mini-html5";
   "bamse" = dontDistribute super."bamse";
   "bamstats" = dontDistribute super."bamstats";
+  "bank-holiday-usa" = dontDistribute super."bank-holiday-usa";
   "banwords" = dontDistribute super."banwords";
   "barchart" = dontDistribute super."barchart";
   "barcodes-code128" = dontDistribute super."barcodes-code128";
@@ -3173,6 +3176,7 @@ self: super: {
   "glambda" = dontDistribute super."glambda";
   "glapp" = dontDistribute super."glapp";
   "glasso" = dontDistribute super."glasso";
+  "glicko" = dontDistribute super."glicko";
   "glider-nlp" = dontDistribute super."glider-nlp";
   "glintcollider" = dontDistribute super."glintcollider";
   "gll" = dontDistribute super."gll";
@@ -3839,6 +3843,7 @@ self: super: {
   "himerge" = dontDistribute super."himerge";
   "himg" = dontDistribute super."himg";
   "himpy" = dontDistribute super."himpy";
+  "hindent" = doDistribute super."hindent_4_5_4";
   "hinduce-associations-apriori" = dontDistribute super."hinduce-associations-apriori";
   "hinduce-classifier" = dontDistribute super."hinduce-classifier";
   "hinduce-classifier-decisiontree" = dontDistribute super."hinduce-classifier-decisiontree";
@@ -7061,6 +7066,7 @@ self: super: {
   "tasty-lens" = dontDistribute super."tasty-lens";
   "tasty-program" = dontDistribute super."tasty-program";
   "tasty-quickcheck" = doDistribute super."tasty-quickcheck_0_8_3_2";
+  "tasty-silver" = doDistribute super."tasty-silver_3_1_7";
   "tasty-tap" = dontDistribute super."tasty-tap";
   "tau" = dontDistribute super."tau";
   "tbox" = dontDistribute super."tbox";
@@ -7630,6 +7636,7 @@ self: super: {
   "waddle" = dontDistribute super."waddle";
   "wai" = doDistribute super."wai_3_0_3_0";
   "wai-app-file-cgi" = dontDistribute super."wai-app-file-cgi";
+  "wai-app-static" = doDistribute super."wai-app-static_3_1_1";
   "wai-cors" = doDistribute super."wai-cors_0_2_3";
   "wai-devel" = dontDistribute super."wai-devel";
   "wai-digestive-functors" = dontDistribute super."wai-digestive-functors";
@@ -7722,6 +7729,7 @@ self: super: {
   "webkit-javascriptcore" = dontDistribute super."webkit-javascriptcore";
   "webkitgtk3" = dontDistribute super."webkitgtk3";
   "webkitgtk3-javascriptcore" = dontDistribute super."webkitgtk3-javascriptcore";
+  "webpage" = doDistribute super."webpage_0_0_3_1";
   "webrtc-vad" = dontDistribute super."webrtc-vad";
   "webserver" = dontDistribute super."webserver";
   "websnap" = dontDistribute super."websnap";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.6.nix b/pkgs/development/haskell-modules/configuration-lts-3.6.nix
index 395e92838896..adaa090dcf1a 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.6.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.6.nix
@@ -1077,10 +1077,12 @@ self: super: {
   "acme-timemachine" = dontDistribute super."acme-timemachine";
   "acme-year" = dontDistribute super."acme-year";
   "acme-zero" = dontDistribute super."acme-zero";
+  "active" = doDistribute super."active_0_2_0_6";
   "activehs" = dontDistribute super."activehs";
   "activehs-base" = dontDistribute super."activehs-base";
   "activitystreams-aeson" = dontDistribute super."activitystreams-aeson";
   "actor" = dontDistribute super."actor";
+  "ad" = doDistribute super."ad_4_2_4";
   "adaptive-containers" = dontDistribute super."adaptive-containers";
   "adaptive-tuple" = dontDistribute super."adaptive-tuple";
   "adb" = dontDistribute super."adb";
@@ -1100,6 +1102,7 @@ self: super: {
   "aeson-filthy" = dontDistribute super."aeson-filthy";
   "aeson-lens" = dontDistribute super."aeson-lens";
   "aeson-native" = dontDistribute super."aeson-native";
+  "aeson-parsec-picky" = dontDistribute super."aeson-parsec-picky";
   "aeson-schema" = doDistribute super."aeson-schema_0_3_0_7";
   "aeson-serialize" = dontDistribute super."aeson-serialize";
   "aeson-smart" = dontDistribute super."aeson-smart";
@@ -1419,6 +1422,7 @@ self: super: {
   "bamboo-theme-mini-html5" = dontDistribute super."bamboo-theme-mini-html5";
   "bamse" = dontDistribute super."bamse";
   "bamstats" = dontDistribute super."bamstats";
+  "bank-holiday-usa" = dontDistribute super."bank-holiday-usa";
   "banwords" = dontDistribute super."banwords";
   "barchart" = dontDistribute super."barchart";
   "barcodes-code128" = dontDistribute super."barcodes-code128";
@@ -2397,6 +2401,7 @@ self: super: {
   "diagrams-cairo" = doDistribute super."diagrams-cairo_1_3_0_4";
   "diagrams-canvas" = dontDistribute super."diagrams-canvas";
   "diagrams-contrib" = doDistribute super."diagrams-contrib_1_3_0_6";
+  "diagrams-core" = doDistribute super."diagrams-core_1_3_0_3";
   "diagrams-graphviz" = dontDistribute super."diagrams-graphviz";
   "diagrams-gtk" = dontDistribute super."diagrams-gtk";
   "diagrams-haddock" = doDistribute super."diagrams-haddock_0_3_0_6";
@@ -2545,6 +2550,7 @@ self: super: {
   "dtd-types" = dontDistribute super."dtd-types";
   "dtrace" = dontDistribute super."dtrace";
   "dtw" = dontDistribute super."dtw";
+  "dual-tree" = doDistribute super."dual-tree_0_2_0_7";
   "dump" = dontDistribute super."dump";
   "duplo" = dontDistribute super."duplo";
   "dvda" = dontDistribute super."dvda";
@@ -3163,6 +3169,7 @@ self: super: {
   "glambda" = dontDistribute super."glambda";
   "glapp" = dontDistribute super."glapp";
   "glasso" = dontDistribute super."glasso";
+  "glicko" = dontDistribute super."glicko";
   "glider-nlp" = dontDistribute super."glider-nlp";
   "glintcollider" = dontDistribute super."glintcollider";
   "gll" = dontDistribute super."gll";
@@ -3828,6 +3835,7 @@ self: super: {
   "himerge" = dontDistribute super."himerge";
   "himg" = dontDistribute super."himg";
   "himpy" = dontDistribute super."himpy";
+  "hindent" = doDistribute super."hindent_4_5_4";
   "hinduce-associations-apriori" = dontDistribute super."hinduce-associations-apriori";
   "hinduce-classifier" = dontDistribute super."hinduce-classifier";
   "hinduce-classifier-decisiontree" = dontDistribute super."hinduce-classifier-decisiontree";
@@ -5165,6 +5173,7 @@ self: super: {
   "mono-foldable" = dontDistribute super."mono-foldable";
   "mono-traversable" = doDistribute super."mono-traversable_0_9_3";
   "monoid-absorbing" = dontDistribute super."monoid-absorbing";
+  "monoid-extras" = doDistribute super."monoid-extras_0_4_0_2";
   "monoid-owns" = dontDistribute super."monoid-owns";
   "monoid-record" = dontDistribute super."monoid-record";
   "monoid-statistics" = dontDistribute super."monoid-statistics";
@@ -7038,6 +7047,7 @@ self: super: {
   "tasty-lens" = dontDistribute super."tasty-lens";
   "tasty-program" = dontDistribute super."tasty-program";
   "tasty-quickcheck" = doDistribute super."tasty-quickcheck_0_8_3_2";
+  "tasty-silver" = doDistribute super."tasty-silver_3_1_7";
   "tasty-tap" = dontDistribute super."tasty-tap";
   "tau" = dontDistribute super."tau";
   "tbox" = dontDistribute super."tbox";
@@ -7605,6 +7615,7 @@ self: super: {
   "waddle" = dontDistribute super."waddle";
   "wai" = doDistribute super."wai_3_0_3_0";
   "wai-app-file-cgi" = dontDistribute super."wai-app-file-cgi";
+  "wai-app-static" = doDistribute super."wai-app-static_3_1_1";
   "wai-cors" = doDistribute super."wai-cors_0_2_3";
   "wai-devel" = dontDistribute super."wai-devel";
   "wai-digestive-functors" = dontDistribute super."wai-digestive-functors";
@@ -7696,6 +7707,7 @@ self: super: {
   "webkit-javascriptcore" = dontDistribute super."webkit-javascriptcore";
   "webkitgtk3" = dontDistribute super."webkitgtk3";
   "webkitgtk3-javascriptcore" = dontDistribute super."webkitgtk3-javascriptcore";
+  "webpage" = doDistribute super."webpage_0_0_3_1";
   "webrtc-vad" = dontDistribute super."webrtc-vad";
   "webserver" = dontDistribute super."webserver";
   "websnap" = dontDistribute super."websnap";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.7.nix b/pkgs/development/haskell-modules/configuration-lts-3.7.nix
index beb5e3581f53..b23f77a12809 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.7.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.7.nix
@@ -1076,10 +1076,12 @@ self: super: {
   "acme-timemachine" = dontDistribute super."acme-timemachine";
   "acme-year" = dontDistribute super."acme-year";
   "acme-zero" = dontDistribute super."acme-zero";
+  "active" = doDistribute super."active_0_2_0_6";
   "activehs" = dontDistribute super."activehs";
   "activehs-base" = dontDistribute super."activehs-base";
   "activitystreams-aeson" = dontDistribute super."activitystreams-aeson";
   "actor" = dontDistribute super."actor";
+  "ad" = doDistribute super."ad_4_2_4";
   "adaptive-containers" = dontDistribute super."adaptive-containers";
   "adaptive-tuple" = dontDistribute super."adaptive-tuple";
   "adb" = dontDistribute super."adb";
@@ -1099,6 +1101,7 @@ self: super: {
   "aeson-filthy" = dontDistribute super."aeson-filthy";
   "aeson-lens" = dontDistribute super."aeson-lens";
   "aeson-native" = dontDistribute super."aeson-native";
+  "aeson-parsec-picky" = dontDistribute super."aeson-parsec-picky";
   "aeson-schema" = doDistribute super."aeson-schema_0_3_0_7";
   "aeson-serialize" = dontDistribute super."aeson-serialize";
   "aeson-smart" = dontDistribute super."aeson-smart";
@@ -1414,6 +1417,7 @@ self: super: {
   "bamboo-theme-mini-html5" = dontDistribute super."bamboo-theme-mini-html5";
   "bamse" = dontDistribute super."bamse";
   "bamstats" = dontDistribute super."bamstats";
+  "bank-holiday-usa" = dontDistribute super."bank-holiday-usa";
   "banwords" = dontDistribute super."banwords";
   "barchart" = dontDistribute super."barchart";
   "barcodes-code128" = dontDistribute super."barcodes-code128";
@@ -2390,6 +2394,7 @@ self: super: {
   "diagrams-cairo" = doDistribute super."diagrams-cairo_1_3_0_4";
   "diagrams-canvas" = dontDistribute super."diagrams-canvas";
   "diagrams-contrib" = doDistribute super."diagrams-contrib_1_3_0_6";
+  "diagrams-core" = doDistribute super."diagrams-core_1_3_0_3";
   "diagrams-graphviz" = dontDistribute super."diagrams-graphviz";
   "diagrams-gtk" = dontDistribute super."diagrams-gtk";
   "diagrams-hsqml" = dontDistribute super."diagrams-hsqml";
@@ -2397,6 +2402,7 @@ self: super: {
   "diagrams-pandoc" = dontDistribute super."diagrams-pandoc";
   "diagrams-pdf" = dontDistribute super."diagrams-pdf";
   "diagrams-pgf" = dontDistribute super."diagrams-pgf";
+  "diagrams-postscript" = doDistribute super."diagrams-postscript_1_3_0_3";
   "diagrams-qrcode" = dontDistribute super."diagrams-qrcode";
   "diagrams-rasterific" = doDistribute super."diagrams-rasterific_1_3_1_4";
   "diagrams-rubiks-cube" = dontDistribute super."diagrams-rubiks-cube";
@@ -2535,6 +2541,7 @@ self: super: {
   "dtd-types" = dontDistribute super."dtd-types";
   "dtrace" = dontDistribute super."dtrace";
   "dtw" = dontDistribute super."dtw";
+  "dual-tree" = doDistribute super."dual-tree_0_2_0_7";
   "dump" = dontDistribute super."dump";
   "duplo" = dontDistribute super."duplo";
   "dvda" = dontDistribute super."dvda";
@@ -3151,6 +3158,7 @@ self: super: {
   "glambda" = dontDistribute super."glambda";
   "glapp" = dontDistribute super."glapp";
   "glasso" = dontDistribute super."glasso";
+  "glicko" = dontDistribute super."glicko";
   "glider-nlp" = dontDistribute super."glider-nlp";
   "glintcollider" = dontDistribute super."glintcollider";
   "gll" = dontDistribute super."gll";
@@ -3814,6 +3822,7 @@ self: super: {
   "himerge" = dontDistribute super."himerge";
   "himg" = dontDistribute super."himg";
   "himpy" = dontDistribute super."himpy";
+  "hindent" = doDistribute super."hindent_4_5_4";
   "hinduce-associations-apriori" = dontDistribute super."hinduce-associations-apriori";
   "hinduce-classifier" = dontDistribute super."hinduce-classifier";
   "hinduce-classifier-decisiontree" = dontDistribute super."hinduce-classifier-decisiontree";
@@ -5147,6 +5156,7 @@ self: super: {
   "mono-foldable" = dontDistribute super."mono-foldable";
   "mono-traversable" = doDistribute super."mono-traversable_0_9_3";
   "monoid-absorbing" = dontDistribute super."monoid-absorbing";
+  "monoid-extras" = doDistribute super."monoid-extras_0_4_0_2";
   "monoid-owns" = dontDistribute super."monoid-owns";
   "monoid-record" = dontDistribute super."monoid-record";
   "monoid-statistics" = dontDistribute super."monoid-statistics";
@@ -7012,6 +7022,7 @@ self: super: {
   "tasty-lens" = dontDistribute super."tasty-lens";
   "tasty-program" = dontDistribute super."tasty-program";
   "tasty-quickcheck" = doDistribute super."tasty-quickcheck_0_8_3_2";
+  "tasty-silver" = doDistribute super."tasty-silver_3_1_7";
   "tasty-tap" = dontDistribute super."tasty-tap";
   "tau" = dontDistribute super."tau";
   "tbox" = dontDistribute super."tbox";
@@ -7578,6 +7589,7 @@ self: super: {
   "waddle" = dontDistribute super."waddle";
   "wai" = doDistribute super."wai_3_0_3_0";
   "wai-app-file-cgi" = dontDistribute super."wai-app-file-cgi";
+  "wai-app-static" = doDistribute super."wai-app-static_3_1_1";
   "wai-cors" = doDistribute super."wai-cors_0_2_3";
   "wai-devel" = dontDistribute super."wai-devel";
   "wai-digestive-functors" = dontDistribute super."wai-digestive-functors";
@@ -7668,6 +7680,7 @@ self: super: {
   "webkit-javascriptcore" = dontDistribute super."webkit-javascriptcore";
   "webkitgtk3" = dontDistribute super."webkitgtk3";
   "webkitgtk3-javascriptcore" = dontDistribute super."webkitgtk3-javascriptcore";
+  "webpage" = doDistribute super."webpage_0_0_3_1";
   "webrtc-vad" = dontDistribute super."webrtc-vad";
   "webserver" = dontDistribute super."webserver";
   "websnap" = dontDistribute super."websnap";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.8.nix b/pkgs/development/haskell-modules/configuration-lts-3.8.nix
index 20a7555e10bc..3af51a64177f 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.8.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.8.nix
@@ -1075,10 +1075,12 @@ self: super: {
   "acme-timemachine" = dontDistribute super."acme-timemachine";
   "acme-year" = dontDistribute super."acme-year";
   "acme-zero" = dontDistribute super."acme-zero";
+  "active" = doDistribute super."active_0_2_0_6";
   "activehs" = dontDistribute super."activehs";
   "activehs-base" = dontDistribute super."activehs-base";
   "activitystreams-aeson" = dontDistribute super."activitystreams-aeson";
   "actor" = dontDistribute super."actor";
+  "ad" = doDistribute super."ad_4_2_4";
   "adaptive-containers" = dontDistribute super."adaptive-containers";
   "adaptive-tuple" = dontDistribute super."adaptive-tuple";
   "adb" = dontDistribute super."adb";
@@ -1098,6 +1100,7 @@ self: super: {
   "aeson-filthy" = dontDistribute super."aeson-filthy";
   "aeson-lens" = dontDistribute super."aeson-lens";
   "aeson-native" = dontDistribute super."aeson-native";
+  "aeson-parsec-picky" = dontDistribute super."aeson-parsec-picky";
   "aeson-schema" = doDistribute super."aeson-schema_0_3_0_7";
   "aeson-serialize" = dontDistribute super."aeson-serialize";
   "aeson-smart" = dontDistribute super."aeson-smart";
@@ -1413,6 +1416,7 @@ self: super: {
   "bamboo-theme-mini-html5" = dontDistribute super."bamboo-theme-mini-html5";
   "bamse" = dontDistribute super."bamse";
   "bamstats" = dontDistribute super."bamstats";
+  "bank-holiday-usa" = dontDistribute super."bank-holiday-usa";
   "banwords" = dontDistribute super."banwords";
   "barchart" = dontDistribute super."barchart";
   "barcodes-code128" = dontDistribute super."barcodes-code128";
@@ -2381,14 +2385,18 @@ self: super: {
   "dia-base" = dontDistribute super."dia-base";
   "dia-functions" = dontDistribute super."dia-functions";
   "diagrams-canvas" = dontDistribute super."diagrams-canvas";
+  "diagrams-contrib" = doDistribute super."diagrams-contrib_1_3_0_7";
+  "diagrams-core" = doDistribute super."diagrams-core_1_3_0_3";
   "diagrams-graphviz" = dontDistribute super."diagrams-graphviz";
   "diagrams-gtk" = dontDistribute super."diagrams-gtk";
   "diagrams-hsqml" = dontDistribute super."diagrams-hsqml";
   "diagrams-pandoc" = dontDistribute super."diagrams-pandoc";
   "diagrams-pdf" = dontDistribute super."diagrams-pdf";
   "diagrams-pgf" = dontDistribute super."diagrams-pgf";
+  "diagrams-postscript" = doDistribute super."diagrams-postscript_1_3_0_3";
   "diagrams-qrcode" = dontDistribute super."diagrams-qrcode";
   "diagrams-rubiks-cube" = dontDistribute super."diagrams-rubiks-cube";
+  "diagrams-svg" = doDistribute super."diagrams-svg_1_3_1_6";
   "diagrams-tikz" = dontDistribute super."diagrams-tikz";
   "dice-entropy-conduit" = dontDistribute super."dice-entropy-conduit";
   "dicom" = dontDistribute super."dicom";
@@ -2521,6 +2529,7 @@ self: super: {
   "dtd-types" = dontDistribute super."dtd-types";
   "dtrace" = dontDistribute super."dtrace";
   "dtw" = dontDistribute super."dtw";
+  "dual-tree" = doDistribute super."dual-tree_0_2_0_7";
   "dump" = dontDistribute super."dump";
   "duplo" = dontDistribute super."duplo";
   "dvda" = dontDistribute super."dvda";
@@ -3137,6 +3146,7 @@ self: super: {
   "glambda" = dontDistribute super."glambda";
   "glapp" = dontDistribute super."glapp";
   "glasso" = dontDistribute super."glasso";
+  "glicko" = dontDistribute super."glicko";
   "glider-nlp" = dontDistribute super."glider-nlp";
   "glintcollider" = dontDistribute super."glintcollider";
   "gll" = dontDistribute super."gll";
@@ -3584,6 +3594,7 @@ self: super: {
   "haskell-reflect" = dontDistribute super."haskell-reflect";
   "haskell-rules" = dontDistribute super."haskell-rules";
   "haskell-src-exts-qq" = dontDistribute super."haskell-src-exts-qq";
+  "haskell-src-meta" = doDistribute super."haskell-src-meta_0_6_0_11";
   "haskell-src-meta-mwotton" = dontDistribute super."haskell-src-meta-mwotton";
   "haskell-token-utils" = dontDistribute super."haskell-token-utils";
   "haskell-type-exts" = dontDistribute super."haskell-type-exts";
@@ -3799,6 +3810,7 @@ self: super: {
   "himerge" = dontDistribute super."himerge";
   "himg" = dontDistribute super."himg";
   "himpy" = dontDistribute super."himpy";
+  "hindent" = doDistribute super."hindent_4_5_4";
   "hinduce-associations-apriori" = dontDistribute super."hinduce-associations-apriori";
   "hinduce-classifier" = dontDistribute super."hinduce-classifier";
   "hinduce-classifier-decisiontree" = dontDistribute super."hinduce-classifier-decisiontree";
@@ -5130,6 +5142,7 @@ self: super: {
   "mono-foldable" = dontDistribute super."mono-foldable";
   "mono-traversable" = doDistribute super."mono-traversable_0_9_3";
   "monoid-absorbing" = dontDistribute super."monoid-absorbing";
+  "monoid-extras" = doDistribute super."monoid-extras_0_4_0_2";
   "monoid-owns" = dontDistribute super."monoid-owns";
   "monoid-record" = dontDistribute super."monoid-record";
   "monoid-statistics" = dontDistribute super."monoid-statistics";
@@ -6988,6 +7001,7 @@ self: super: {
   "tasty-laws" = dontDistribute super."tasty-laws";
   "tasty-lens" = dontDistribute super."tasty-lens";
   "tasty-program" = dontDistribute super."tasty-program";
+  "tasty-silver" = doDistribute super."tasty-silver_3_1_7";
   "tasty-tap" = dontDistribute super."tasty-tap";
   "tau" = dontDistribute super."tau";
   "tbox" = dontDistribute super."tbox";
@@ -7553,6 +7567,7 @@ self: super: {
   "vty-ui-extras" = dontDistribute super."vty-ui-extras";
   "waddle" = dontDistribute super."waddle";
   "wai-app-file-cgi" = dontDistribute super."wai-app-file-cgi";
+  "wai-app-static" = doDistribute super."wai-app-static_3_1_1";
   "wai-cors" = doDistribute super."wai-cors_0_2_3";
   "wai-devel" = dontDistribute super."wai-devel";
   "wai-digestive-functors" = dontDistribute super."wai-digestive-functors";
@@ -7643,6 +7658,7 @@ self: super: {
   "webkit-javascriptcore" = dontDistribute super."webkit-javascriptcore";
   "webkitgtk3" = dontDistribute super."webkitgtk3";
   "webkitgtk3-javascriptcore" = dontDistribute super."webkitgtk3-javascriptcore";
+  "webpage" = doDistribute super."webpage_0_0_3_1";
   "webrtc-vad" = dontDistribute super."webrtc-vad";
   "webserver" = dontDistribute super."webserver";
   "websnap" = dontDistribute super."websnap";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.9.nix b/pkgs/development/haskell-modules/configuration-lts-3.9.nix
index 9bb14c7d6215..6efbe331eab2 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.9.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.9.nix
@@ -1073,10 +1073,12 @@ self: super: {
   "acme-timemachine" = dontDistribute super."acme-timemachine";
   "acme-year" = dontDistribute super."acme-year";
   "acme-zero" = dontDistribute super."acme-zero";
+  "active" = doDistribute super."active_0_2_0_6";
   "activehs" = dontDistribute super."activehs";
   "activehs-base" = dontDistribute super."activehs-base";
   "activitystreams-aeson" = dontDistribute super."activitystreams-aeson";
   "actor" = dontDistribute super."actor";
+  "ad" = doDistribute super."ad_4_2_4";
   "adaptive-containers" = dontDistribute super."adaptive-containers";
   "adaptive-tuple" = dontDistribute super."adaptive-tuple";
   "adb" = dontDistribute super."adb";
@@ -1092,9 +1094,11 @@ self: super: {
   "aeson-bson" = dontDistribute super."aeson-bson";
   "aeson-casing" = dontDistribute super."aeson-casing";
   "aeson-diff" = dontDistribute super."aeson-diff";
+  "aeson-extra" = doDistribute super."aeson-extra_0_2_1_0";
   "aeson-filthy" = dontDistribute super."aeson-filthy";
   "aeson-lens" = dontDistribute super."aeson-lens";
   "aeson-native" = dontDistribute super."aeson-native";
+  "aeson-parsec-picky" = dontDistribute super."aeson-parsec-picky";
   "aeson-schema" = doDistribute super."aeson-schema_0_3_0_7";
   "aeson-serialize" = dontDistribute super."aeson-serialize";
   "aeson-smart" = dontDistribute super."aeson-smart";
@@ -1410,6 +1414,7 @@ self: super: {
   "bamboo-theme-mini-html5" = dontDistribute super."bamboo-theme-mini-html5";
   "bamse" = dontDistribute super."bamse";
   "bamstats" = dontDistribute super."bamstats";
+  "bank-holiday-usa" = dontDistribute super."bank-holiday-usa";
   "banwords" = dontDistribute super."banwords";
   "barchart" = dontDistribute super."barchart";
   "barcodes-code128" = dontDistribute super."barcodes-code128";
@@ -2375,14 +2380,18 @@ self: super: {
   "dia-base" = dontDistribute super."dia-base";
   "dia-functions" = dontDistribute super."dia-functions";
   "diagrams-canvas" = dontDistribute super."diagrams-canvas";
+  "diagrams-contrib" = doDistribute super."diagrams-contrib_1_3_0_7";
+  "diagrams-core" = doDistribute super."diagrams-core_1_3_0_3";
   "diagrams-graphviz" = dontDistribute super."diagrams-graphviz";
   "diagrams-gtk" = dontDistribute super."diagrams-gtk";
   "diagrams-hsqml" = dontDistribute super."diagrams-hsqml";
   "diagrams-pandoc" = dontDistribute super."diagrams-pandoc";
   "diagrams-pdf" = dontDistribute super."diagrams-pdf";
   "diagrams-pgf" = dontDistribute super."diagrams-pgf";
+  "diagrams-postscript" = doDistribute super."diagrams-postscript_1_3_0_3";
   "diagrams-qrcode" = dontDistribute super."diagrams-qrcode";
   "diagrams-rubiks-cube" = dontDistribute super."diagrams-rubiks-cube";
+  "diagrams-svg" = doDistribute super."diagrams-svg_1_3_1_6";
   "diagrams-tikz" = dontDistribute super."diagrams-tikz";
   "dice-entropy-conduit" = dontDistribute super."dice-entropy-conduit";
   "dicom" = dontDistribute super."dicom";
@@ -2515,6 +2524,7 @@ self: super: {
   "dtd-types" = dontDistribute super."dtd-types";
   "dtrace" = dontDistribute super."dtrace";
   "dtw" = dontDistribute super."dtw";
+  "dual-tree" = doDistribute super."dual-tree_0_2_0_7";
   "dump" = dontDistribute super."dump";
   "duplo" = dontDistribute super."duplo";
   "dvda" = dontDistribute super."dvda";
@@ -3128,6 +3138,7 @@ self: super: {
   "glambda" = dontDistribute super."glambda";
   "glapp" = dontDistribute super."glapp";
   "glasso" = dontDistribute super."glasso";
+  "glicko" = dontDistribute super."glicko";
   "glider-nlp" = dontDistribute super."glider-nlp";
   "glintcollider" = dontDistribute super."glintcollider";
   "gll" = dontDistribute super."gll";
@@ -3575,6 +3586,7 @@ self: super: {
   "haskell-reflect" = dontDistribute super."haskell-reflect";
   "haskell-rules" = dontDistribute super."haskell-rules";
   "haskell-src-exts-qq" = dontDistribute super."haskell-src-exts-qq";
+  "haskell-src-meta" = doDistribute super."haskell-src-meta_0_6_0_11";
   "haskell-src-meta-mwotton" = dontDistribute super."haskell-src-meta-mwotton";
   "haskell-token-utils" = dontDistribute super."haskell-token-utils";
   "haskell-type-exts" = dontDistribute super."haskell-type-exts";
@@ -3790,6 +3802,7 @@ self: super: {
   "himerge" = dontDistribute super."himerge";
   "himg" = dontDistribute super."himg";
   "himpy" = dontDistribute super."himpy";
+  "hindent" = doDistribute super."hindent_4_5_4";
   "hinduce-associations-apriori" = dontDistribute super."hinduce-associations-apriori";
   "hinduce-classifier" = dontDistribute super."hinduce-classifier";
   "hinduce-classifier-decisiontree" = dontDistribute super."hinduce-classifier-decisiontree";
@@ -5120,6 +5133,7 @@ self: super: {
   "mono-foldable" = dontDistribute super."mono-foldable";
   "mono-traversable" = doDistribute super."mono-traversable_0_9_3";
   "monoid-absorbing" = dontDistribute super."monoid-absorbing";
+  "monoid-extras" = doDistribute super."monoid-extras_0_4_0_2";
   "monoid-owns" = dontDistribute super."monoid-owns";
   "monoid-record" = dontDistribute super."monoid-record";
   "monoid-statistics" = dontDistribute super."monoid-statistics";
@@ -6976,6 +6990,7 @@ self: super: {
   "tasty-laws" = dontDistribute super."tasty-laws";
   "tasty-lens" = dontDistribute super."tasty-lens";
   "tasty-program" = dontDistribute super."tasty-program";
+  "tasty-silver" = doDistribute super."tasty-silver_3_1_7";
   "tasty-tap" = dontDistribute super."tasty-tap";
   "tau" = dontDistribute super."tau";
   "tbox" = dontDistribute super."tbox";
@@ -7541,6 +7556,7 @@ self: super: {
   "vty-ui-extras" = dontDistribute super."vty-ui-extras";
   "waddle" = dontDistribute super."waddle";
   "wai-app-file-cgi" = dontDistribute super."wai-app-file-cgi";
+  "wai-app-static" = doDistribute super."wai-app-static_3_1_1";
   "wai-cors" = doDistribute super."wai-cors_0_2_3";
   "wai-devel" = dontDistribute super."wai-devel";
   "wai-digestive-functors" = dontDistribute super."wai-digestive-functors";
@@ -7631,6 +7647,7 @@ self: super: {
   "webkit-javascriptcore" = dontDistribute super."webkit-javascriptcore";
   "webkitgtk3" = dontDistribute super."webkitgtk3";
   "webkitgtk3-javascriptcore" = dontDistribute super."webkitgtk3-javascriptcore";
+  "webpage" = doDistribute super."webpage_0_0_3_1";
   "webrtc-vad" = dontDistribute super."webrtc-vad";
   "webserver" = dontDistribute super."webserver";
   "websnap" = dontDistribute super."websnap";
diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index 4ecb0fe132ca..e246b9ecf9a9 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -4761,8 +4761,8 @@ self: {
      }:
      mkDerivation {
        pname = "Earley";
-       version = "0.10.0.1";
-       sha256 = "4d2d3f248bac0acdbcd782d5b6981ea7c2bc3e28b6dc81f7dee8e8fed071869e";
+       version = "0.10.1.0";
+       sha256 = "a90c5c1e210a0e37db577ace20b1ca2aa33d22454766ecaeb5dc253cb7d4887e";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base ListLike ];
@@ -10376,8 +10376,8 @@ self: {
      }:
      mkDerivation {
        pname = "HulkImport";
-       version = "0.1.0.2";
-       sha256 = "41fd2d9fb6b474298421fbe5d951585fb9bf6a3501892570b107ad2b6f5ba1e4";
+       version = "0.1.0.3";
+       sha256 = "70d0a2a086dab3c2f08592cc421f2f005ec65dd00b83a42c957a54bfd39496cd";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ attoparsec base pretty text ];
@@ -11146,8 +11146,8 @@ self: {
      }:
      mkDerivation {
        pname = "JuicyPixels-scale-dct";
-       version = "0.1.0.0";
-       sha256 = "2237de808b5ed2fd2f60e79ed974a136296a67c157db072d9cb1158a0d849a57";
+       version = "0.1.1.0";
+       sha256 = "dc7ee68f2e28e2b2344bdaabd5810ebfc15353d4013cd10387289189e8bae9f9";
        libraryHaskellDepends = [
          base base-compat carray fft JuicyPixels
        ];
@@ -20886,7 +20886,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "active" = callPackage
+  "active_0_2_0_6" = callPackage
     ({ mkDerivation, base, lens, linear, QuickCheck, semigroupoids
      , semigroups, vector
      }:
@@ -20902,6 +20902,25 @@ self: {
        ];
        description = "Abstractions for animation";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "active" = callPackage
+    ({ mkDerivation, base, lens, linear, QuickCheck, semigroupoids
+     , semigroups, vector
+     }:
+     mkDerivation {
+       pname = "active";
+       version = "0.2.0.8";
+       sha256 = "a8335dd10b4bab3a2a73a2f8fa49cb20ab2f9ec1400fa7a49de3d92f9e887fdf";
+       libraryHaskellDepends = [
+         base lens linear semigroupoids semigroups vector
+       ];
+       testHaskellDepends = [
+         base lens linear QuickCheck semigroupoids semigroups vector
+       ];
+       description = "Abstractions for animation";
+       license = stdenv.lib.licenses.bsd3;
      }) {};
 
   "activehs" = callPackage
@@ -21034,7 +21053,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "ad" = callPackage
+  "ad_4_2_4" = callPackage
     ({ mkDerivation, array, base, comonad, containers, data-reify
      , directory, doctest, erf, filepath, free, nats, reflection
      , transformers
@@ -21052,6 +21071,26 @@ self: {
        homepage = "http://github.com/ekmett/ad";
        description = "Automatic Differentiation";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "ad" = callPackage
+    ({ mkDerivation, array, base, comonad, containers, data-reify
+     , directory, doctest, erf, filepath, free, nats, reflection
+     , transformers
+     }:
+     mkDerivation {
+       pname = "ad";
+       version = "4.3.1";
+       sha256 = "da9baee8042acd8a266863604dd4c02b5903f366dc8b5208584745c54e027392";
+       libraryHaskellDepends = [
+         array base comonad containers data-reify erf free nats reflection
+         transformers
+       ];
+       testHaskellDepends = [ base directory doctest filepath ];
+       homepage = "http://github.com/ekmett/ad";
+       description = "Automatic Differentiation";
+       license = stdenv.lib.licenses.bsd3;
      }) {};
 
   "adaptive-containers" = callPackage
@@ -21498,7 +21537,7 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "aeson-extra" = callPackage
+  "aeson-extra_0_2_1_0" = callPackage
     ({ mkDerivation, aeson, attoparsec, base, bytestring, containers
      , exceptions, hashable, quickcheck-instances, scientific, tagged
      , tasty, tasty-hunit, tasty-quickcheck, text, unordered-containers
@@ -21522,6 +21561,31 @@ self: {
        homepage = "https://github.com/phadej/aeson-extra#readme";
        description = "Extra goodies for aeson";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "aeson-extra" = callPackage
+    ({ mkDerivation, aeson, attoparsec, base, bytestring, containers
+     , exceptions, hashable, quickcheck-instances, scientific, tasty
+     , tasty-hunit, tasty-quickcheck, text, time, unordered-containers
+     , vector
+     }:
+     mkDerivation {
+       pname = "aeson-extra";
+       version = "0.2.2.0";
+       sha256 = "368aa018e650f323a1d52cfd38596fe419667e1ef3f83faf0f7255518b18dc45";
+       libraryHaskellDepends = [
+         aeson attoparsec base bytestring containers exceptions hashable
+         scientific text time unordered-containers vector
+       ];
+       testHaskellDepends = [
+         aeson attoparsec base bytestring containers exceptions hashable
+         quickcheck-instances scientific tasty tasty-hunit tasty-quickcheck
+         text time unordered-containers vector
+       ];
+       homepage = "https://github.com/phadej/aeson-extra#readme";
+       description = "Extra goodies for aeson";
+       license = stdenv.lib.licenses.bsd3;
      }) {};
 
   "aeson-filthy" = callPackage
@@ -21580,6 +21644,23 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "aeson-parsec-picky" = callPackage
+    ({ mkDerivation, aeson, base, parsec, scientific, text
+     , unordered-containers, vector
+     }:
+     mkDerivation {
+       pname = "aeson-parsec-picky";
+       version = "0.1.0.0";
+       sha256 = "bd5fa3ae9322fe1f486d52d046823d843538bf85204371a0ba17736412ea9cbc";
+       libraryHaskellDepends = [
+         aeson base parsec scientific text unordered-containers vector
+       ];
+       jailbreak = true;
+       homepage = "https://github.com/FPBrno/aeson-parsec-picky";
+       description = "Alternative JSON parser based on Parsec and Aeson";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "aeson-pretty" = callPackage
     ({ mkDerivation, aeson, attoparsec, base, bytestring, cmdargs, text
      , unordered-containers, vector
@@ -28588,25 +28669,20 @@ self: {
      }) {};
 
   "ascii-progress" = callPackage
-    ({ mkDerivation, ansi-terminal, async, base, bytestring, conduit
-     , data-default, hspec, HTTP, http-conduit, http-types, QuickCheck
-     , time, transformers
+    ({ mkDerivation, async, base, concurrent-output, data-default
+     , hspec, QuickCheck, time
      }:
      mkDerivation {
        pname = "ascii-progress";
-       version = "0.2.1.2";
-       sha256 = "3c384b6401243bbe5acb735f1550b59622cf5b2fa8ef4cb8b870c2f609bcdd52";
+       version = "0.3.2.0";
+       sha256 = "51a70a0d1fd39138f6d143bf52080c765d0f0b69d5af887f2fa80a950448c771";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
-         ansi-terminal async base data-default time
-       ];
-       executableHaskellDepends = [
-         ansi-terminal async base bytestring conduit data-default HTTP
-         http-conduit http-types time transformers
+         async base concurrent-output data-default time
        ];
        testHaskellDepends = [
-         ansi-terminal async base data-default hspec QuickCheck time
+         async base concurrent-output data-default hspec QuickCheck time
        ];
        homepage = "https://github.com/yamadapc/haskell-ascii-progress";
        description = "A simple progress bar for the console";
@@ -31492,6 +31568,19 @@ self: {
        license = "GPL";
      }) {};
 
+  "bank-holiday-usa" = callPackage
+    ({ mkDerivation, base, hspec, HUnit, QuickCheck, time }:
+     mkDerivation {
+       pname = "bank-holiday-usa";
+       version = "0.0.1";
+       sha256 = "f46c4950c96f0e790477d95e75709d13f0409abb53c60382fcfcc7637f204270";
+       libraryHaskellDepends = [ base time ];
+       testHaskellDepends = [ base hspec HUnit QuickCheck time ];
+       homepage = "https://github.com/tippenein/BankHoliday";
+       description = "A library for determining US bank holidays";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "bank-holidays-england_0_1_0_2" = callPackage
     ({ mkDerivation, base, containers, hspec, QuickCheck, time }:
      mkDerivation {
@@ -32388,8 +32477,8 @@ self: {
     ({ mkDerivation, base, mtl, parsec }:
      mkDerivation {
        pname = "bbdb";
-       version = "0.4";
-       sha256 = "6900c123b8a06ea8da186a9f246dbef5554458a02cfbca315ae71f075e3bc0a1";
+       version = "0.5";
+       sha256 = "03a1cc86802658fe10d6967d6d29ce07451173ae8f8d0197758fc7108139ee8e";
        libraryHaskellDepends = [ base mtl parsec ];
        homepage = "http://www.nadineloveshenry.com/haskell/database-bbdb.html";
        description = "Ability to read, write, and examine BBDB files";
@@ -39662,28 +39751,6 @@ self: {
      }:
      mkDerivation {
        pname = "cacophony";
-       version = "0.2.0";
-       sha256 = "5825a01a93e959e1da25d095e1b79c28f44abfba3e8fbc3eefac21423f953bb5";
-       libraryHaskellDepends = [
-         base bytestring cryptonite lens memory mtl
-       ];
-       testHaskellDepends = [
-         base bytestring directory doctest filepath hlint mtl QuickCheck
-         tasty tasty-quickcheck
-       ];
-       doCheck = false;
-       homepage = "https://github.com/centromere/cacophony";
-       description = "A library implementing the Noise protocol";
-       license = stdenv.lib.licenses.publicDomain;
-     }) {};
-
-  "cacophony_0_3_0" = callPackage
-    ({ mkDerivation, base, bytestring, cryptonite, directory, doctest
-     , filepath, hlint, lens, memory, mtl, QuickCheck, tasty
-     , tasty-quickcheck
-     }:
-     mkDerivation {
-       pname = "cacophony";
        version = "0.3.0";
        sha256 = "7128a382bec1e74356c6b231e2cfa71b7be8f98781ee7cb5e20c2d9097081032";
        libraryHaskellDepends = [
@@ -39693,10 +39760,10 @@ self: {
          base bytestring directory doctest filepath hlint mtl QuickCheck
          tasty tasty-quickcheck
        ];
+       doCheck = false;
        homepage = "https://github.com/centromere/cacophony";
        description = "A library implementing the Noise protocol";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "caf" = callPackage
@@ -40374,8 +40441,8 @@ self: {
      }:
      mkDerivation {
        pname = "casadi-bindings";
-       version = "2.4.1.3";
-       sha256 = "0fd77702edacc58260f555cf77c8225662717cbf69f4f0755c0339ec754d8c48";
+       version = "2.4.1.4";
+       sha256 = "f04064cf031d10675b5295252dace0ab4b4fc401f78c5d0a4802a2a6dbea6fab";
        libraryHaskellDepends = [
          base binary casadi-bindings-core casadi-bindings-internal cereal
          containers linear vector vector-binary-instances
@@ -47010,10 +47077,8 @@ self: {
      }:
      mkDerivation {
        pname = "concurrent-output";
-       version = "1.6.1";
-       sha256 = "ea81fcaac04ef0dc612b403c1630f9035bfccd59a8c8894c6a64c54e31bd00f5";
-       revision = "3";
-       editedCabalFile = "9a39c6788c7ba0dc6ef247f5d92e880b3b6f57875b05ec4ee6bb21959b36a132";
+       version = "1.7.0";
+       sha256 = "f2ca9f606d34b1faa53f48315deb5d68d2e5019055341010b86b6f6f8470ed92";
        libraryHaskellDepends = [
          ansi-terminal async base directory exceptions process stm
          terminal-size text transformers unix
@@ -48399,6 +48464,24 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "constraints_0_6" = callPackage
+    ({ mkDerivation, base, binary, deepseq, ghc-prim, hashable, mtl
+     , transformers, transformers-compat
+     }:
+     mkDerivation {
+       pname = "constraints";
+       version = "0.6";
+       sha256 = "bcec9873c2701e411dc54cbc142d159ff5816c9a653561ccd1719f9e5a517b27";
+       libraryHaskellDepends = [
+         base binary deepseq ghc-prim hashable mtl transformers
+         transformers-compat
+       ];
+       homepage = "http://github.com/ekmett/constraints/";
+       description = "Constraint manipulation";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "constructible" = callPackage
     ({ mkDerivation, arithmoi, base, binary-search, complex-generic }:
      mkDerivation {
@@ -56746,7 +56829,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "diagrams-contrib" = callPackage
+  "diagrams-contrib_1_3_0_7" = callPackage
     ({ mkDerivation, base, circle-packing, colour, containers
      , data-default, data-default-class, diagrams-core, diagrams-lib
      , diagrams-solve, force-layout, HUnit, lens, linear, MonadRandom
@@ -56771,6 +56854,34 @@ self: {
        homepage = "http://projects.haskell.org/diagrams/";
        description = "Collection of user contributions to diagrams EDSL";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "diagrams-contrib" = callPackage
+    ({ mkDerivation, base, circle-packing, colour, containers
+     , data-default, data-default-class, diagrams-core, diagrams-lib
+     , diagrams-solve, force-layout, HUnit, lens, linear, MonadRandom
+     , mtl, parsec, QuickCheck, random, semigroups, split
+     , test-framework, test-framework-hunit, test-framework-quickcheck2
+     , text
+     }:
+     mkDerivation {
+       pname = "diagrams-contrib";
+       version = "1.3.0.8";
+       sha256 = "e311406aed0718c315ba910cb96324810bceb6f526790a7c2978e44a09558dec";
+       libraryHaskellDepends = [
+         base circle-packing colour containers data-default
+         data-default-class diagrams-core diagrams-lib diagrams-solve
+         force-layout lens linear MonadRandom mtl parsec random semigroups
+         split text
+       ];
+       testHaskellDepends = [
+         base containers diagrams-lib HUnit QuickCheck test-framework
+         test-framework-hunit test-framework-quickcheck2
+       ];
+       homepage = "http://projects.haskell.org/diagrams/";
+       description = "Collection of user contributions to diagrams EDSL";
+       license = stdenv.lib.licenses.bsd3;
      }) {};
 
   "diagrams-core_1_2_0_4" = callPackage
@@ -56852,7 +56963,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "diagrams-core" = callPackage
+  "diagrams-core_1_3_0_3" = callPackage
     ({ mkDerivation, adjunctions, base, containers, distributive
      , dual-tree, lens, linear, monoid-extras, mtl, semigroups
      , unordered-containers
@@ -56868,6 +56979,25 @@ self: {
        homepage = "http://projects.haskell.org/diagrams";
        description = "Core libraries for diagrams EDSL";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "diagrams-core" = callPackage
+    ({ mkDerivation, adjunctions, base, containers, distributive
+     , dual-tree, lens, linear, monoid-extras, mtl, semigroups
+     , unordered-containers
+     }:
+     mkDerivation {
+       pname = "diagrams-core";
+       version = "1.3.0.4";
+       sha256 = "1f2ca2f8c7b9e096b76ac62b563f02c83fec53c61bd2b0de4a8f557d14fc5935";
+       libraryHaskellDepends = [
+         adjunctions base containers distributive dual-tree lens linear
+         monoid-extras mtl semigroups unordered-containers
+       ];
+       homepage = "http://projects.haskell.org/diagrams";
+       description = "Core libraries for diagrams EDSL";
+       license = stdenv.lib.licenses.bsd3;
      }) {};
 
   "diagrams-graphviz" = callPackage
@@ -57211,7 +57341,7 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "diagrams-lib_1_3_0_7" = callPackage
+  "diagrams-lib_1_3_0_8" = callPackage
     ({ mkDerivation, active, adjunctions, array, base, colour
      , containers, data-default-class, diagrams-core, diagrams-solve
      , directory, distributive, dual-tree, exceptions, filepath
@@ -57221,8 +57351,8 @@ self: {
      }:
      mkDerivation {
        pname = "diagrams-lib";
-       version = "1.3.0.7";
-       sha256 = "2c491d234d9ce8b358bcd29b3349bfb5e852380e5c1ed74d437e7d9d64d75a01";
+       version = "1.3.0.8";
+       sha256 = "4d46b91284b3de5bbbf4f0aded5bdbf72670322f47992ad9b868b2a79c4ef53b";
        libraryHaskellDepends = [
          active adjunctions array base colour containers data-default-class
          diagrams-core diagrams-solve directory distributive dual-tree
@@ -57384,7 +57514,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "diagrams-postscript" = callPackage
+  "diagrams-postscript_1_3_0_3" = callPackage
     ({ mkDerivation, base, containers, data-default-class
      , diagrams-core, diagrams-lib, dlist, filepath, hashable, lens
      , monoid-extras, mtl, semigroups, split, statestack
@@ -57401,6 +57531,26 @@ self: {
        homepage = "http://projects.haskell.org/diagrams/";
        description = "Postscript backend for diagrams drawing EDSL";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "diagrams-postscript" = callPackage
+    ({ mkDerivation, base, containers, data-default-class
+     , diagrams-core, diagrams-lib, dlist, filepath, hashable, lens
+     , monoid-extras, mtl, semigroups, split, statestack
+     }:
+     mkDerivation {
+       pname = "diagrams-postscript";
+       version = "1.3.0.4";
+       sha256 = "9b1829899a52b53500f415dabb719955e8a468031f91d505b1c2e93221913a35";
+       libraryHaskellDepends = [
+         base containers data-default-class diagrams-core diagrams-lib dlist
+         filepath hashable lens monoid-extras mtl semigroups split
+         statestack
+       ];
+       homepage = "http://projects.haskell.org/diagrams/";
+       description = "Postscript backend for diagrams drawing EDSL";
+       license = stdenv.lib.licenses.bsd3;
      }) {};
 
   "diagrams-qrcode" = callPackage
@@ -57670,7 +57820,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "diagrams-svg" = callPackage
+  "diagrams-svg_1_3_1_6" = callPackage
     ({ mkDerivation, base, base64-bytestring, bytestring, colour
      , containers, diagrams-core, diagrams-lib, directory, filepath
      , hashable, JuicyPixels, lens, lucid-svg, monoid-extras, mtl
@@ -57690,6 +57840,29 @@ self: {
        homepage = "http://projects.haskell.org/diagrams/";
        description = "SVG backend for diagrams drawing EDSL";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "diagrams-svg" = callPackage
+    ({ mkDerivation, base, base64-bytestring, bytestring, colour
+     , containers, diagrams-core, diagrams-lib, directory, filepath
+     , hashable, JuicyPixels, lens, lucid-svg, monoid-extras, mtl
+     , old-time, optparse-applicative, process, semigroups, split, text
+     , time
+     }:
+     mkDerivation {
+       pname = "diagrams-svg";
+       version = "1.3.1.7";
+       sha256 = "88929b31c02bfc585613e85e325e707d157cf753de6cc7f2dfca44d2987a6ecc";
+       libraryHaskellDepends = [
+         base base64-bytestring bytestring colour containers diagrams-core
+         diagrams-lib directory filepath hashable JuicyPixels lens lucid-svg
+         monoid-extras mtl old-time optparse-applicative process semigroups
+         split text time
+       ];
+       homepage = "http://projects.haskell.org/diagrams/";
+       description = "SVG backend for diagrams drawing EDSL";
+       license = stdenv.lib.licenses.bsd3;
      }) {};
 
   "diagrams-tikz" = callPackage
@@ -61056,13 +61229,12 @@ self: {
     ({ mkDerivation, array, base, random }:
      mkDerivation {
        pname = "dsp";
-       version = "0.2.3";
-       sha256 = "9b6c128bffaea8806b8a4bc85f9e104463aff5272a39b3e949782efec41afec0";
+       version = "0.2.3.1";
+       sha256 = "d5c21c9bf0a7c40b4a7f1bfed04250251a770d3a3c1935ba0b358bc43191dda2";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ array base random ];
        executableHaskellDepends = [ array base ];
-       jailbreak = true;
        homepage = "http://www.haskell.org/haskellwiki/DSP";
        description = "Haskell Digital Signal Processing";
        license = "GPL";
@@ -61212,7 +61384,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "dual-tree" = callPackage
+  "dual-tree_0_2_0_7" = callPackage
     ({ mkDerivation, base, monoid-extras, newtype, semigroups }:
      mkDerivation {
        pname = "dual-tree";
@@ -61221,6 +61393,18 @@ self: {
        libraryHaskellDepends = [ base monoid-extras newtype semigroups ];
        description = "Rose trees with cached and accumulating monoidal annotations";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "dual-tree" = callPackage
+    ({ mkDerivation, base, monoid-extras, newtype, semigroups }:
+     mkDerivation {
+       pname = "dual-tree";
+       version = "0.2.0.8";
+       sha256 = "53c5829fc5567f6e76adc3666c9db2755d17f606e0c5789bc00e0d6b7b97c273";
+       libraryHaskellDepends = [ base monoid-extras newtype semigroups ];
+       description = "Rose trees with cached and accumulating monoidal annotations";
+       license = stdenv.lib.licenses.bsd3;
      }) {};
 
   "dump" = callPackage
@@ -63987,8 +64171,8 @@ self: {
      }:
      mkDerivation {
        pname = "envy";
-       version = "0.3.0.2";
-       sha256 = "b8aaf779fefd85d8836f9cb2dd98abe6cb79391e889f02d4a9851517fe64f280";
+       version = "0.3.1.2";
+       sha256 = "265ccb8868ef0a3cfabf1e42da6e11dabeadcedb4b7481f96ed332d00beb487d";
        libraryHaskellDepends = [
          base bytestring containers mtl text time transformers
        ];
@@ -68034,25 +68218,6 @@ self: {
 
   "fft" = callPackage
     ({ mkDerivation, array, base, carray, fftw, fftwFloat, ix-shapable
-     , QuickCheck, storable-complex, syb
-     }:
-     mkDerivation {
-       pname = "fft";
-       version = "0.1.8.1";
-       sha256 = "9c3348297388346c752adbe2d3fdd3f0dac0d5386cd9562c20c797c8b5910103";
-       libraryHaskellDepends = [
-         array base carray ix-shapable storable-complex syb
-       ];
-       libraryPkgconfigDepends = [ fftw fftwFloat ];
-       testHaskellDepends = [ base carray QuickCheck storable-complex ];
-       jailbreak = true;
-       doCheck = false;
-       description = "Bindings to the FFTW library";
-       license = stdenv.lib.licenses.bsd3;
-     }) {inherit (pkgs) fftw; inherit (pkgs) fftwFloat;};
-
-  "fft_0_1_8_2" = callPackage
-    ({ mkDerivation, array, base, carray, fftw, fftwFloat, ix-shapable
      , QuickCheck, storable-complex, syb, transformers
      }:
      mkDerivation {
@@ -68064,9 +68229,9 @@ self: {
        ];
        libraryPkgconfigDepends = [ fftw fftwFloat ];
        testHaskellDepends = [ base carray QuickCheck storable-complex ];
+       doCheck = false;
        description = "Bindings to the FFTW library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) fftw; inherit (pkgs) fftwFloat;};
 
   "fftwRaw" = callPackage
@@ -76620,6 +76785,22 @@ self: {
        license = stdenv.lib.licenses.lgpl21;
      }) {inherit (pkgs) glib;};
 
+  "glicko" = callPackage
+    ({ mkDerivation, base, containers, data-default, deepseq, hspec
+     , lens, parallel, QuickCheck, statistics
+     }:
+     mkDerivation {
+       pname = "glicko";
+       version = "0.1.1.0";
+       sha256 = "740b5850982ea36f750c137930bf6e070b365618a547a520fcdab34fd4f913e9";
+       libraryHaskellDepends = [
+         base containers data-default deepseq lens parallel statistics
+       ];
+       testHaskellDepends = [ base data-default hspec lens QuickCheck ];
+       description = "Glicko-2 implementation in Haskell";
+       license = stdenv.lib.licenses.gpl3;
+     }) {};
+
   "glider-nlp" = callPackage
     ({ mkDerivation, base, Cabal, containers, HUnit, text }:
      mkDerivation {
@@ -86551,7 +86732,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "haskell-src-meta" = callPackage
+  "haskell-src-meta_0_6_0_11" = callPackage
     ({ mkDerivation, base, haskell-src-exts, pretty, syb
      , template-haskell, th-orphans
      }:
@@ -86564,6 +86745,22 @@ self: {
        ];
        description = "Parse source to template-haskell abstract syntax";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "haskell-src-meta" = callPackage
+    ({ mkDerivation, base, haskell-src-exts, pretty, syb
+     , template-haskell, th-orphans
+     }:
+     mkDerivation {
+       pname = "haskell-src-meta";
+       version = "0.6.0.12";
+       sha256 = "143742510abf5863de67e3d717721c80049f3f55a60e8e0c40f21aba5d76ebd7";
+       libraryHaskellDepends = [
+         base haskell-src-exts pretty syb template-haskell th-orphans
+       ];
+       description = "Parse source to template-haskell abstract syntax";
+       license = stdenv.lib.licenses.bsd3;
      }) {};
 
   "haskell-src-meta-mwotton" = callPackage
@@ -92133,7 +92330,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "hindent" = callPackage
+  "hindent_4_5_4" = callPackage
     ({ mkDerivation, applicative-quoters, base, data-default
      , descriptive, directory, ghc-prim, haskell-src-exts, hspec
      , monad-loops, mtl, text, transformers
@@ -92159,6 +92356,35 @@ self: {
        homepage = "http://www.github.com/chrisdone/hindent";
        description = "Extensible Haskell pretty printer";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "hindent" = callPackage
+    ({ mkDerivation, applicative-quoters, base, data-default
+     , descriptive, directory, ghc-prim, haskell-src-exts, hspec
+     , monad-loops, mtl, text, transformers
+     }:
+     mkDerivation {
+       pname = "hindent";
+       version = "4.5.5";
+       sha256 = "a2a5ccc62a6f8975e621b271e43ae9ac6a2315c652df7317ecc0221c9f11c662";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base data-default haskell-src-exts monad-loops mtl text
+         transformers
+       ];
+       executableHaskellDepends = [
+         applicative-quoters base descriptive directory ghc-prim
+         haskell-src-exts text
+       ];
+       testHaskellDepends = [
+         base data-default directory haskell-src-exts hspec monad-loops mtl
+         text
+       ];
+       homepage = "http://www.github.com/chrisdone/hindent";
+       description = "Extensible Haskell pretty printer";
+       license = stdenv.lib.licenses.bsd3;
      }) {};
 
   "hinduce-associations-apriori" = callPackage
@@ -120933,7 +121159,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "lucid" = callPackage
+  "lucid_2_9_3" = callPackage
     ({ mkDerivation, base, bifunctors, blaze-builder, bytestring
      , containers, hashable, hspec, HUnit, mtl, parsec, text
      , transformers, unordered-containers
@@ -120952,6 +121178,28 @@ self: {
        homepage = "https://github.com/chrisdone/lucid";
        description = "Clear to write, read and edit DSL for HTML";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "lucid" = callPackage
+    ({ mkDerivation, base, bifunctors, blaze-builder, bytestring
+     , containers, hashable, hspec, HUnit, mtl, parsec, text
+     , transformers, unordered-containers
+     }:
+     mkDerivation {
+       pname = "lucid";
+       version = "2.9.4";
+       sha256 = "9e87cfc2591d9b79d5eb5351299e4110b50a9fa6b05f9912a65274e0ddfbb9cc";
+       libraryHaskellDepends = [
+         base blaze-builder bytestring containers hashable mtl text
+         transformers unordered-containers
+       ];
+       testHaskellDepends = [
+         base bifunctors hspec HUnit mtl parsec text
+       ];
+       homepage = "https://github.com/chrisdone/lucid";
+       description = "Clear to write, read and edit DSL for HTML";
+       license = stdenv.lib.licenses.bsd3;
      }) {};
 
   "lucid-foundation" = callPackage
@@ -123035,20 +123283,22 @@ self: {
      }) {};
 
   "markup" = callPackage
-    ({ mkDerivation, base, blaze-html, blaze-markup, comonad
-     , exceptions, lucid, mmorph, monad-control, monad-logger, mtl
-     , path-extra, resourcet, text, transformers-base, urlpath
+    ({ mkDerivation, base, blaze-html, blaze-markup, clay, comonad
+     , lucid, mmorph, monad-control, monad-logger, mtl, path-extra
+     , resourcet, text, transformers-base, urlpath
      }:
      mkDerivation {
        pname = "markup";
-       version = "2.2.0";
-       sha256 = "8eccd19b6519f4d36816261061d58c65de56e0163b85df4973168e7d173585b3";
+       version = "3.0.0";
+       sha256 = "2495c69daa4b75be45e5607c7dfbc5caafac34ed82eab1f8ee835af4ab72cdf4";
+       revision = "1";
+       editedCabalFile = "b9f36bbdca34f4e226d974e6c446738f22cd36e31ec301417ada0d2b55bb39ae";
        libraryHaskellDepends = [
-         base blaze-html blaze-markup comonad exceptions lucid mmorph
+         base blaze-html blaze-markup clay comonad lucid mmorph
          monad-control monad-logger mtl path-extra resourcet text
          transformers-base urlpath
        ];
-       description = "Abstraction for markup languages";
+       description = "Abstraction for HTML-embedded content";
        license = stdenv.lib.licenses.mit;
      }) {};
 
@@ -127872,7 +128122,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "monoid-extras" = callPackage
+  "monoid-extras_0_4_0_2" = callPackage
     ({ mkDerivation, base, groups, semigroupoids, semigroups }:
      mkDerivation {
        pname = "monoid-extras";
@@ -127881,6 +128131,18 @@ self: {
        libraryHaskellDepends = [ base groups semigroupoids semigroups ];
        description = "Various extra monoid-related definitions and utilities";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "monoid-extras" = callPackage
+    ({ mkDerivation, base, groups, semigroupoids, semigroups }:
+     mkDerivation {
+       pname = "monoid-extras";
+       version = "0.4.0.3";
+       sha256 = "ad2949f8f76d0716d5a7890d767c5af58b1419586aa47dd081d20b370080c30a";
+       libraryHaskellDepends = [ base groups semigroupoids semigroups ];
+       description = "Various extra monoid-related definitions and utilities";
+       license = stdenv.lib.licenses.bsd3;
      }) {};
 
   "monoid-owns" = callPackage
@@ -137354,8 +137616,8 @@ self: {
      }:
      mkDerivation {
        pname = "pandoc-crossref";
-       version = "0.1.5.5";
-       sha256 = "7ef23698170135f78e9f21472fd5abeb3fea887da714c587279db4ae7aa6ceba";
+       version = "0.1.5.6";
+       sha256 = "0164dcfa4d23c9e5b41172ab4e14e3f6a2aad4067c9cc3e151828baeb5d5164d";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -138553,8 +138815,8 @@ self: {
      }:
      mkDerivation {
        pname = "patches-vector";
-       version = "0.1.4.2";
-       sha256 = "39e1784b8e1177c72abc74a7db90210aa317f0aafc8c69defea216ed99d3c70d";
+       version = "0.1.4.4";
+       sha256 = "44eb961a4e4d8424b73080c3003bd31a66a89cf73a0bc0db6322d76f3751e782";
        libraryHaskellDepends = [
          base edit-distance-vector microlens vector
        ];
@@ -138585,8 +138847,8 @@ self: {
     ({ mkDerivation, base, path }:
      mkDerivation {
        pname = "path-extra";
-       version = "0.0.1";
-       sha256 = "bd45c7ea5226902a3d25a506e5725a7608c4d3dec6453268d8c23e2100ceddf4";
+       version = "0.0.2";
+       sha256 = "8c5048018f855e72c0aadd6a6539a533c96dc9260a22ec2cc21c92598db17408";
        libraryHaskellDepends = [ base path ];
        description = "Chris Done's path library, enriched with URL-related goodies";
        license = stdenv.lib.licenses.bsd3;
@@ -142223,27 +142485,6 @@ self: {
      }:
      mkDerivation {
        pname = "pipes-cacophony";
-       version = "0.1.0";
-       sha256 = "f259f272a246d179aa76c1943bef6ceef0c008266b54e4828fc35b419ed66695";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [ base bytestring cacophony pipes ];
-       testHaskellDepends = [
-         async base bytestring cacophony hlint mtl pipes QuickCheck tasty
-         tasty-quickcheck
-       ];
-       doCheck = false;
-       homepage = "https://github.com/centromere/pipes-cacophony";
-       description = "Pipes for Noise-secured network connections";
-       license = stdenv.lib.licenses.publicDomain;
-     }) {};
-
-  "pipes-cacophony_0_1_1" = callPackage
-    ({ mkDerivation, async, base, bytestring, cacophony, hlint, mtl
-     , pipes, QuickCheck, tasty, tasty-quickcheck
-     }:
-     mkDerivation {
-       pname = "pipes-cacophony";
        version = "0.1.1";
        sha256 = "a0af2c1ee6a53e959b7f269a1c29cbbd9ce096977e98e58f503dd62d663cf811";
        isLibrary = true;
@@ -142256,7 +142497,6 @@ self: {
        homepage = "https://github.com/centromere/pipes-cacophony";
        description = "Pipes for Noise-secured network connections";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "pipes-cellular" = callPackage
@@ -144977,8 +145217,8 @@ self: {
      }:
      mkDerivation {
        pname = "postgresql-typed";
-       version = "0.4.2";
-       sha256 = "7cbb155d47a31524c67272bb4e6f1c6485da73cd1f0593ab271fed55c5d09e49";
+       version = "0.4.2.1";
+       sha256 = "25ac84380478c09cd3c8c3638766f98a77d27391769ac8339fa177b18da5cfdc";
        libraryHaskellDepends = [
          aeson array attoparsec base binary bytestring containers cryptohash
          haskell-src-meta network old-locale postgresql-binary scientific
@@ -152083,9 +152323,12 @@ self: {
        pname = "regex-tdfa-utf8";
        version = "1.0";
        sha256 = "93380c3d808ffcfdd2932cf4eb408d977da4162eddb58a3edc5bb7b40788ad44";
+       revision = "1";
+       editedCabalFile = "81e8b881e28f1943ad542e543795c1db7dcb3644311b029da4b1c110aba5997c";
        libraryHaskellDepends = [
          array base bytestring regex-base regex-tdfa utf8-string
        ];
+       jailbreak = true;
        description = "This combines regex-tdfa with utf8-string to allow searching over UTF8 encoded lazy bytestrings";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -157543,15 +157786,15 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "sbv_5_3" = callPackage
+  "sbv_5_5" = callPackage
     ({ mkDerivation, array, async, base, base-compat, containers
      , crackNum, data-binary-ieee754, deepseq, directory, filepath, mtl
      , old-time, pretty, process, QuickCheck, random, syb
      }:
      mkDerivation {
        pname = "sbv";
-       version = "5.3";
-       sha256 = "35ce51ab2130faf4d497569959dbd6451b497cffc25c4cb96e10d064811c56f7";
+       version = "5.5";
+       sha256 = "ee5f5b81b1e84a85285870a34295a4a40a8ab6203a6be5f8f596921a15c2cd67";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -173224,16 +173467,16 @@ self: {
 
   "swagger2" = callPackage
     ({ mkDerivation, aeson, aeson-qq, base, containers, hashable, hspec
-     , http-media, HUnit, network, QuickCheck, template-haskell, text
-     , unordered-containers, vector
+     , http-media, HUnit, lens, network, QuickCheck, template-haskell
+     , text, unordered-containers, vector
      }:
      mkDerivation {
        pname = "swagger2";
-       version = "0.1";
-       sha256 = "d0dfc842ec0099ba20e8e9b6f2366b7b18bf5715e0ae4e3d29a1b45ed1347c83";
+       version = "0.3";
+       sha256 = "74109f1c1f67be44f86a4e7d181487b7fbffea275cf25ea37ad9967e74c6eef0";
        libraryHaskellDepends = [
-         aeson base containers hashable http-media network template-haskell
-         text unordered-containers
+         aeson base containers hashable http-media lens network
+         template-haskell text unordered-containers
        ];
        testHaskellDepends = [
          aeson aeson-qq base hspec HUnit QuickCheck text
@@ -175670,8 +175913,8 @@ self: {
      }:
      mkDerivation {
        pname = "tasty-html";
-       version = "0.4.1";
-       sha256 = "8fc35288736407e08618ddb8a47e0a4d8b59685350cd59df4d99a3fa08479228";
+       version = "0.4.1.1";
+       sha256 = "0eea1c9fcf1ef3aeb94b811086e11d87ce59f90bb91afa8765152b943c591f1a";
        libraryHaskellDepends = [
          base blaze-html bytestring containers filepath generic-deriving mtl
          stm tagged tasty text transformers
@@ -175917,7 +176160,7 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "tasty-silver" = callPackage
+  "tasty-silver_3_1_7" = callPackage
     ({ mkDerivation, ansi-terminal, async, base, bytestring, containers
      , deepseq, directory, filepath, mtl, optparse-applicative, process
      , process-extras, regex-tdfa, stm, tagged, tasty, tasty-hunit
@@ -175939,6 +176182,31 @@ self: {
        homepage = "https://github.com/phile314/tasty-silver";
        description = "A fancy test runner, including support for golden tests";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "tasty-silver" = callPackage
+    ({ mkDerivation, ansi-terminal, async, base, bytestring, containers
+     , deepseq, directory, filepath, mtl, optparse-applicative, process
+     , process-extras, regex-tdfa, stm, tagged, tasty, tasty-hunit
+     , temporary, text, transformers
+     }:
+     mkDerivation {
+       pname = "tasty-silver";
+       version = "3.1.8";
+       sha256 = "044f65a91ef677545264d7fff0bf7a9ef5fa7ad49a6b3cb402c96f3b81aba430";
+       libraryHaskellDepends = [
+         ansi-terminal async base bytestring containers deepseq directory
+         filepath mtl optparse-applicative process process-extras regex-tdfa
+         stm tagged tasty temporary text
+       ];
+       testHaskellDepends = [
+         base directory filepath process tasty tasty-hunit temporary
+         transformers
+       ];
+       homepage = "https://github.com/phile314/tasty-silver";
+       description = "A fancy test runner, including support for golden tests";
+       license = stdenv.lib.licenses.mit;
      }) {};
 
   "tasty-smallcheck" = callPackage
@@ -176183,8 +176451,8 @@ self: {
      }:
      mkDerivation {
        pname = "tellbot";
-       version = "0.6.0.4";
-       sha256 = "b17a8b6a9bbe77393d0de26cab3e9dfe68d8364cde327abae45ffa35e73dbbbc";
+       version = "0.6.0.5";
+       sha256 = "280b709ff34acc24395fa33eec9c1c647ac5f438947af5cc7066b31da51bd88c";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -181372,6 +181640,8 @@ self: {
        pname = "transient";
        version = "0.1.1";
        sha256 = "edd779a4ef2c7762ddd097427a16dc96eddc6d1d0fbf714f85b7304c290819ed";
+       revision = "2";
+       editedCabalFile = "ed7129095502ad5fc1ca8aa9dbfe7526110681f7d1ffb6ff8249b359d52d3b40";
        libraryHaskellDepends = [
          base bytestring containers directory filepath HTTP mtl network
          network-info process random SHA stm TCache time transformers
@@ -185715,8 +185985,8 @@ self: {
      }:
      mkDerivation {
        pname = "urlpath";
-       version = "3.3.0";
-       sha256 = "b9539bd28c4f4b48047c7bcf6ec746e01ee1c88538d3bb0d0c2c778ecd8d3004";
+       version = "4.0.0.1";
+       sha256 = "01651fc809c8fc8ce62e0bc473a40877b698b4f589cafe3216ef0799cc187671";
        libraryHaskellDepends = [
          base exceptions mmorph monad-control monad-logger mtl path-extra
          resourcet transformers transformers-base
@@ -188930,7 +189200,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "wai-app-static" = callPackage
+  "wai-app-static_3_1_1" = callPackage
     ({ mkDerivation, base, base64-bytestring, blaze-builder, blaze-html
      , blaze-markup, byteable, bytestring, containers, cryptohash
      , cryptohash-conduit, directory, file-embed, filepath, hspec
@@ -188962,6 +189232,43 @@ self: {
        homepage = "http://www.yesodweb.com/book/web-application-interface";
        description = "WAI application for static serving";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "wai-app-static" = callPackage
+    ({ mkDerivation, base, base64-bytestring, blaze-builder, blaze-html
+     , blaze-markup, byteable, bytestring, containers, cryptohash
+     , cryptohash-conduit, directory, file-embed, filepath, hspec
+     , http-date, http-types, mime-types, network, old-locale
+     , optparse-applicative, template-haskell, temporary, text, time
+     , transformers, unix-compat, unordered-containers, wai, wai-extra
+     , warp, zlib
+     }:
+     mkDerivation {
+       pname = "wai-app-static";
+       version = "3.1.2";
+       sha256 = "5c592511781fcb3185998faba55c2f6869ad829b64103a0da499058a43b19cd3";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base base64-bytestring blaze-builder blaze-html blaze-markup
+         byteable bytestring containers cryptohash cryptohash-conduit
+         directory file-embed filepath http-date http-types mime-types
+         old-locale optparse-applicative template-haskell text time
+         transformers unix-compat unordered-containers wai wai-extra warp
+         zlib
+       ];
+       executableHaskellDepends = [
+         base bytestring containers directory mime-types text
+       ];
+       testHaskellDepends = [
+         base bytestring filepath hspec http-date http-types mime-types
+         network old-locale temporary text time transformers unix-compat wai
+         wai-extra zlib
+       ];
+       homepage = "http://www.yesodweb.com/book/web-application-interface";
+       description = "WAI application for static serving";
+       license = stdenv.lib.licenses.mit;
      }) {};
 
   "wai-conduit_3_0_0_1" = callPackage
@@ -192875,7 +193182,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) webkit;};
 
-  "webpage" = callPackage
+  "webpage_0_0_3_1" = callPackage
     ({ mkDerivation, base, blaze-html, data-default, hastache, lucid
      , text
      }:
@@ -192890,6 +193197,20 @@ self: {
        ];
        description = "Organized and simple web page scaffold for blaze and lucid";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "webpage" = callPackage
+    ({ mkDerivation, base, blaze-html, data-default, lucid, text }:
+     mkDerivation {
+       pname = "webpage";
+       version = "0.0.4";
+       sha256 = "17fba395357bf4d1462d1a50e2a06d1004d0df02cab524dc26e982a90f70c648";
+       libraryHaskellDepends = [
+         base blaze-html data-default lucid text
+       ];
+       description = "Organized and simple web page scaffold for blaze and lucid";
+       license = stdenv.lib.licenses.mit;
      }) {};
 
   "webrtc-vad" = callPackage
@@ -201721,19 +202042,21 @@ self: {
 
   "yesod-raml-bin" = callPackage
     ({ mkDerivation, base, blaze-html, blaze-markup, bytestring
-     , containers, optparse-applicative, shakespeare, template-haskell
-     , text, yaml, yesod-markdown, yesod-raml, yesod-raml-docs
+     , containers, http-types, optparse-applicative, shakespeare
+     , template-haskell, text, wai, warp, yaml, yesod-core
+     , yesod-markdown, yesod-raml, yesod-raml-docs, yesod-raml-mock
      }:
      mkDerivation {
        pname = "yesod-raml-bin";
-       version = "0.1.1";
-       sha256 = "c839093460d674a0ef7e43d71df0207de8f26732398b188ebc420a4dbe200839";
+       version = "0.1.2";
+       sha256 = "ccfe7a183fb3be12ba73028f3bb4f022285d05ffa916ea10ee67976177f04278";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
-         base blaze-html blaze-markup bytestring containers
-         optparse-applicative shakespeare template-haskell text yaml
-         yesod-markdown yesod-raml yesod-raml-docs
+         base blaze-html blaze-markup bytestring containers http-types
+         optparse-applicative shakespeare template-haskell text wai warp
+         yaml yesod-core yesod-markdown yesod-raml yesod-raml-docs
+         yesod-raml-mock
        ];
        description = "The raml helper executable";
        license = stdenv.lib.licenses.mit;
@@ -201763,8 +202086,8 @@ self: {
      }:
      mkDerivation {
        pname = "yesod-raml-mock";
-       version = "0.1.0";
-       sha256 = "c5c3568a27fa02df0dd0f740cbd2ddb708d7193f8597e87ce4ec79a202842684";
+       version = "0.1.1";
+       sha256 = "9e69f82bea91a60fe81d7de039b8a697723a53c726d1f5cf49f053a39b0e2dd3";
        libraryHaskellDepends = [
          base bytestring containers template-haskell text yaml yesod-core
          yesod-raml