diff --git a/pkgs/JuicyPixels.nix b/pkgs/JuicyPixels.nix
index f231e89d0785ae947a41e4deeed8c8bf069c4773..b9bf1298399c9b83c774d8e18c9a34a2a0e67c24 100644
--- a/pkgs/JuicyPixels.nix
+++ b/pkgs/JuicyPixels.nix
@@ -5,6 +5,8 @@ mkDerivation {
   pname = "JuicyPixels";
   version = "3.3.8";
   sha256 = "d3a0f6ca3515a1b3d526cbf79f2e0b0aab57f208ab216f9c26437bbcd86fb63e";
+  revision = "1";
+  editedCabalFile = "1gbmls58qdlip8nsysy1qsnf7wrw8cgss7i7vmbxxnf9ni0iawn9";
   isLibrary = true;
   isExecutable = false;
   enableSeparateDataOutput = false;
@@ -14,7 +16,7 @@ mkDerivation {
   ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
-  doHaddock = false;
+  doHaddock = true;
   jailbreak = true;
   doCheck = false;
   doBenchmark = false;
diff --git a/pkgs/Only.nix b/pkgs/Only.nix
index 72002751c7fcfe708a4868c0bbd8cc88f1fb23bc..af852c2d99f0c90dee85e8dd91cff3f542e86a0b 100644
--- a/pkgs/Only.nix
+++ b/pkgs/Only.nix
@@ -11,7 +11,7 @@ mkDerivation {
   libraryHaskellDepends = [ base deepseq ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
-  doHaddock = false;
+  doHaddock = true;
   jailbreak = true;
   doCheck = false;
   doBenchmark = false;
diff --git a/pkgs/amqp.nix b/pkgs/amqp.nix
index 9ab3fdc1308e97e27cab71eefec8b9ccbbba1cd3..5b2de0a482f63bc0a1dc9b0ff3c11a3dfe5c6b07 100644
--- a/pkgs/amqp.nix
+++ b/pkgs/amqp.nix
@@ -23,7 +23,7 @@ mkDerivation {
   ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
-  doHaddock = false;
+  doHaddock = true;
   jailbreak = true;
   doCheck = false;
   doBenchmark = false;
diff --git a/pkgs/attoparsec-iso8601.nix b/pkgs/attoparsec-iso8601.nix
index c924c8da65ff13c6ac4288751d754494acaef7bc..792661d79774855e924fb25ec270fe4b66c6fb20 100644
--- a/pkgs/attoparsec-iso8601.nix
+++ b/pkgs/attoparsec-iso8601.nix
@@ -13,7 +13,7 @@ mkDerivation {
   ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
-  doHaddock = false;
+  doHaddock = true;
   jailbreak = true;
   doCheck = false;
   doBenchmark = false;
diff --git a/pkgs/bin.nix b/pkgs/bin.nix
index 8b7a11d7acf8198d1328ea6afbeefd25b858cf19..ab1d77a57be2f15af6ca9fc863d73b84e21b6543 100644
--- a/pkgs/bin.nix
+++ b/pkgs/bin.nix
@@ -5,6 +5,8 @@ mkDerivation {
   pname = "bin";
   version = "0.1.3";
   sha256 = "fb9cf773bd6e36802748c538696187fe66efbc817c52bfe2f6cfdeff75126d92";
+  revision = "1";
+  editedCabalFile = "0schv2ilmkd37wsw777lx44x4nfs5pn0d7n8wkamzi8m8h0qi5l9";
   isLibrary = true;
   isExecutable = false;
   enableSeparateDataOutput = false;
@@ -13,7 +15,7 @@ mkDerivation {
   ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
-  doHaddock = false;
+  doHaddock = true;
   jailbreak = true;
   doCheck = false;
   doBenchmark = false;
diff --git a/pkgs/binary-orphans.nix b/pkgs/binary-orphans.nix
index 3fea9ac1d1e3a75a3d38b897b9b5c1f16a640745..8d3af216788fca560209d22fa166dcb1a636ad4a 100644
--- a/pkgs/binary-orphans.nix
+++ b/pkgs/binary-orphans.nix
@@ -18,7 +18,7 @@ mkDerivation {
   ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
-  doHaddock = false;
+  doHaddock = true;
   jailbreak = true;
   doCheck = false;
   doBenchmark = false;
diff --git a/pkgs/bytes.nix b/pkgs/bytes.nix
index eaab0711454ee7e26d2df09b67aacdcbb54f85f9..f78ebe4f599ec4e5233885dee21fe2ae6da9e274 100644
--- a/pkgs/bytes.nix
+++ b/pkgs/bytes.nix
@@ -18,7 +18,7 @@ mkDerivation {
   ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
-  doHaddock = false;
+  doHaddock = true;
   jailbreak = true;
   doCheck = false;
   doBenchmark = false;
diff --git a/pkgs/cassava.nix b/pkgs/cassava.nix
index 0d208876ed5118a5e73374afb04ecac6706c4901..206b013528a767e51d518aaabfefc77115c6b719 100644
--- a/pkgs/cassava.nix
+++ b/pkgs/cassava.nix
@@ -25,7 +25,7 @@ mkDerivation {
   ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
-  doHaddock = false;
+  doHaddock = true;
   jailbreak = true;
   doCheck = false;
   doBenchmark = false;
diff --git a/pkgs/chell-quickcheck.nix b/pkgs/chell-quickcheck.nix
index d07ae6ae8b315064e6732dc42e05f7461066cc70..ce8d2c4ea40e8cd32b7f59359500223dc6860407 100644
--- a/pkgs/chell-quickcheck.nix
+++ b/pkgs/chell-quickcheck.nix
@@ -9,7 +9,7 @@ mkDerivation {
   libraryHaskellDepends = [ base chell QuickCheck random ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
-  doHaddock = false;
+  doHaddock = true;
   jailbreak = true;
   doCheck = false;
   doBenchmark = false;
diff --git a/pkgs/chell.nix b/pkgs/chell.nix
index 9602e4a766e64679339c3608eeed72137e937f71..5183c529d339876900622fe2e01843bf83a01ddb 100644
--- a/pkgs/chell.nix
+++ b/pkgs/chell.nix
@@ -14,7 +14,7 @@ mkDerivation {
   ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
-  doHaddock = false;
+  doHaddock = true;
   jailbreak = true;
   doCheck = false;
   doBenchmark = false;
diff --git a/pkgs/clientsession.nix b/pkgs/clientsession.nix
index 189cf56677580413672a6aa7413f23e6e812d992..ef7e0fea588c05d9e044b9c00d69c2fe305cc126 100644
--- a/pkgs/clientsession.nix
+++ b/pkgs/clientsession.nix
@@ -22,7 +22,7 @@ mkDerivation {
   ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
-  doHaddock = false;
+  doHaddock = true;
   jailbreak = true;
   doCheck = false;
   doBenchmark = false;
diff --git a/pkgs/composite-base.nix b/pkgs/composite-base.nix
index e5b96e6379273aa0bbe7d0a407fbabcb229cb8e9..daeb6e037d51d1b529a48454113147c1f54848b0 100644
--- a/pkgs/composite-base.nix
+++ b/pkgs/composite-base.nix
@@ -27,7 +27,7 @@ mkDerivation {
   ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
-  doHaddock = false;
+  doHaddock = true;
   jailbreak = true;
   doCheck = false;
   doBenchmark = false;
diff --git a/pkgs/constraints-extras.nix b/pkgs/constraints-extras.nix
index ace5e5b70986409eb705f0deb0c1390b10ab79d7..d90da0a26ed4bc6f7123f87181c8c9d05ac7b401 100644
--- a/pkgs/constraints-extras.nix
+++ b/pkgs/constraints-extras.nix
@@ -3,8 +3,8 @@ mkDerivation {
   pname = "constraints-extras";
   version = "0.4.0.0";
   sha256 = "f639594f340986e7647616194dec57a85490ca60e3b0f5197d011675da242ec7";
-  revision = "1";
-  editedCabalFile = "1fdabah3ilq9yf94916ml3c3rxgcgab1jhzl4mk1zgzsw78j53qf";
+  revision = "2";
+  editedCabalFile = "0q7kackfb5g9rin3lhccwsf33588f58a61zw7kbisfh6ygfpk6ww";
   isLibrary = true;
   isExecutable = true;
   enableSeparateDataOutput = false;
@@ -12,7 +12,7 @@ mkDerivation {
   executableHaskellDepends = [ aeson base constraints ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
-  doHaddock = false;
+  doHaddock = true;
   jailbreak = true;
   doCheck = false;
   doBenchmark = false;
diff --git a/pkgs/cpphs.nix b/pkgs/cpphs.nix
index 24efbc7df757d8b240d8fc5f3ff9ceacab5f0198..5522f545c1fe6b701ec5c0a5f4acf3b16157c7ec 100644
--- a/pkgs/cpphs.nix
+++ b/pkgs/cpphs.nix
@@ -12,7 +12,7 @@ mkDerivation {
   executableHaskellDepends = [ base directory polyparse time ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
-  doHaddock = false;
+  doHaddock = true;
   jailbreak = true;
   doCheck = false;
   doBenchmark = false;
diff --git a/pkgs/criterion.nix b/pkgs/criterion.nix
index c9168567cbf51a06d1ef2d992b45e5a443a93f0d..8668e4831c7a86937b42d121af16de2f7d000fc6 100644
--- a/pkgs/criterion.nix
+++ b/pkgs/criterion.nix
@@ -32,7 +32,7 @@ mkDerivation {
   ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
-  doHaddock = false;
+  doHaddock = true;
   jailbreak = true;
   doCheck = false;
   doBenchmark = false;
diff --git a/pkgs/cryptohash-md5.nix b/pkgs/cryptohash-md5.nix
index 6d3bc5cdf99dd91e68f11cc88971fb4d430bc985..0adadd0d675a756c296d7180f4ed696f1ea48fea 100644
--- a/pkgs/cryptohash-md5.nix
+++ b/pkgs/cryptohash-md5.nix
@@ -18,7 +18,7 @@ mkDerivation {
   benchmarkHaskellDepends = [ base bytestring criterion ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
-  doHaddock = false;
+  doHaddock = true;
   jailbreak = true;
   doCheck = false;
   doBenchmark = false;
diff --git a/pkgs/css-text.nix b/pkgs/css-text.nix
index 8ae586601cc0d6216cdf5e76626cfd7c81a605c5..8f20c36908c6eb7f2fb777693f9f828ed32ec2c3 100644
--- a/pkgs/css-text.nix
+++ b/pkgs/css-text.nix
@@ -10,7 +10,7 @@ mkDerivation {
   testHaskellDepends = [ attoparsec base hspec QuickCheck text ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
-  doHaddock = false;
+  doHaddock = true;
   jailbreak = true;
   doCheck = false;
   doBenchmark = false;
diff --git a/pkgs/data-binary-ieee754.nix b/pkgs/data-binary-ieee754.nix
index 6b05d68932f8ea40ae95cd880d7cfc365b74f3da..e7f9832a84e994cb39cc6de78f8c9c377afd3313 100644
--- a/pkgs/data-binary-ieee754.nix
+++ b/pkgs/data-binary-ieee754.nix
@@ -9,7 +9,7 @@ mkDerivation {
   libraryHaskellDepends = [ base binary ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
-  doHaddock = false;
+  doHaddock = true;
   jailbreak = true;
   doCheck = false;
   doBenchmark = false;
diff --git a/pkgs/deepseq-generics.nix b/pkgs/deepseq-generics.nix
index 1bf8504033ce8643ff29f46529fc375756eee896..e842982c00c7feb641446f622c08748c5b2b3065 100644
--- a/pkgs/deepseq-generics.nix
+++ b/pkgs/deepseq-generics.nix
@@ -16,7 +16,7 @@ mkDerivation {
   ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
-  doHaddock = false;
+  doHaddock = true;
   jailbreak = true;
   doCheck = false;
   doBenchmark = false;
diff --git a/pkgs/dense-linear-algebra.nix b/pkgs/dense-linear-algebra.nix
index f7459184c240f3389b7c3f9461d556f8c69091ee..7d850e60d93f125885cb2c3d252bf2c923ffe2c9 100644
--- a/pkgs/dense-linear-algebra.nix
+++ b/pkgs/dense-linear-algebra.nix
@@ -16,7 +16,7 @@ mkDerivation {
   testHaskellDepends = [ base hspec QuickCheck ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
-  doHaddock = false;
+  doHaddock = true;
   jailbreak = true;
   doCheck = false;
   doBenchmark = false;
diff --git a/pkgs/dependent-map.nix b/pkgs/dependent-map.nix
index 8906e94a043f530b4fee16a69a2a49aee7c98364..4a1181a50c629e7c982ef85794cfb01db425fc05 100644
--- a/pkgs/dependent-map.nix
+++ b/pkgs/dependent-map.nix
@@ -15,7 +15,7 @@ mkDerivation {
   ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
-  doHaddock = false;
+  doHaddock = true;
   jailbreak = true;
   doCheck = false;
   doBenchmark = false;
diff --git a/pkgs/dependent-sum.nix b/pkgs/dependent-sum.nix
index 5ada82b92adefe1976a560dd78d6c989343ab252..623f7b837fb93fd5ef5618be4b7de7130c05ece0 100644
--- a/pkgs/dependent-sum.nix
+++ b/pkgs/dependent-sum.nix
@@ -3,15 +3,15 @@ mkDerivation {
   pname = "dependent-sum";
   version = "0.7.2.0";
   sha256 = "826561ecf285abc857bde043e5aac50cb7a7157aaf24fd1aee26a25d4c2a3cbb";
-  revision = "1";
-  editedCabalFile = "0qybk8x6gyvg8pgf84mywlfajlcvg9pp4rs1wfn9fa7ns6sms88n";
+  revision = "2";
+  editedCabalFile = "09648zwf1wg42yk5ykbv1wvgz2bibjrwvcx6wpm4jscv8d2h61pi";
   isLibrary = true;
   isExecutable = false;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [ base constraints-extras some ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
-  doHaddock = false;
+  doHaddock = true;
   jailbreak = true;
   doCheck = false;
   doBenchmark = false;
diff --git a/pkgs/deriving-compat.nix b/pkgs/deriving-compat.nix
index d7aa759902dee28b833ac70bf9bdabbda95888e6..73a36888e97358a2670a1bd4e0229c36c1cd267b 100644
--- a/pkgs/deriving-compat.nix
+++ b/pkgs/deriving-compat.nix
@@ -23,7 +23,7 @@ mkDerivation {
   testToolDepends = [ hspec-discover ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
-  doHaddock = false;
+  doHaddock = true;
   jailbreak = true;
   doCheck = false;
   doBenchmark = false;
diff --git a/pkgs/directory-tree.nix b/pkgs/directory-tree.nix
index 1dc5feb6f6350538906410ea2ef7604372d07e52..d1c46b5d4899704109c24565ee363dccef59e7a6 100644
--- a/pkgs/directory-tree.nix
+++ b/pkgs/directory-tree.nix
@@ -10,7 +10,7 @@ mkDerivation {
   testHaskellDepends = [ base directory filepath process ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
-  doHaddock = false;
+  doHaddock = true;
   jailbreak = true;
   doCheck = false;
   doBenchmark = false;
diff --git a/pkgs/doctest.nix b/pkgs/doctest.nix
index 35d4e8a7125bf61e9ea19b87fe85159b87f007c7..e110551b397a787a5c9845edffc2de40cd67a7ae 100644
--- a/pkgs/doctest.nix
+++ b/pkgs/doctest.nix
@@ -26,7 +26,7 @@ mkDerivation {
   testToolDepends = [ hspec-discover ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
-  doHaddock = false;
+  doHaddock = true;
   jailbreak = true;
   doCheck = false;
   doBenchmark = false;
diff --git a/pkgs/email-validate.nix b/pkgs/email-validate.nix
index d1a7bebd01bd35b8e43ef179f26510b224142ce8..8b1a0a1e4df5e1deaedb332554ebe56e66bad12c 100644
--- a/pkgs/email-validate.nix
+++ b/pkgs/email-validate.nix
@@ -14,7 +14,7 @@ mkDerivation {
   testHaskellDepends = [ base bytestring hspec QuickCheck ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
-  doHaddock = false;
+  doHaddock = true;
   jailbreak = true;
   doCheck = false;
   doBenchmark = false;
diff --git a/pkgs/errors.nix b/pkgs/errors.nix
index 034df6510490abdaa1165ed3b8f1d1cceed7aa6b..1c830db6aa37fb230aaa8e84cfb1951de38782ae 100644
--- a/pkgs/errors.nix
+++ b/pkgs/errors.nix
@@ -15,7 +15,7 @@ mkDerivation {
   ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
-  doHaddock = false;
+  doHaddock = true;
   jailbreak = true;
   doCheck = false;
   doBenchmark = false;
diff --git a/pkgs/extensible-effects.nix b/pkgs/extensible-effects.nix
index 1fe24630406f08b95096f927f9424e1ec05b9dd3..f0ce324650fda269a702806b871676f6fd80a2a1 100644
--- a/pkgs/extensible-effects.nix
+++ b/pkgs/extensible-effects.nix
@@ -24,7 +24,7 @@ mkDerivation {
   ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
-  doHaddock = false;
+  doHaddock = true;
   jailbreak = true;
   doCheck = false;
   doBenchmark = false;
diff --git a/pkgs/file-embed.nix b/pkgs/file-embed.nix
index 2735548843c21d6ef5272a561dfea647e530738a..c5717eecce57252492447e8f88ebbafa002731c3 100644
--- a/pkgs/file-embed.nix
+++ b/pkgs/file-embed.nix
@@ -14,7 +14,7 @@ mkDerivation {
   testHaskellDepends = [ base bytestring filepath ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
-  doHaddock = false;
+  doHaddock = true;
   jailbreak = true;
   doCheck = false;
   doBenchmark = false;
diff --git a/pkgs/formatting.nix b/pkgs/formatting.nix
index 70ce6d9b03b6b668722d82008554226ac476cf6a..1cbf200891792da86fea917ead9edd2dc6781c44 100644
--- a/pkgs/formatting.nix
+++ b/pkgs/formatting.nix
@@ -17,7 +17,7 @@ mkDerivation {
   benchmarkHaskellDepends = [ base criterion QuickCheck text ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
-  doHaddock = false;
+  doHaddock = true;
   jailbreak = true;
   doCheck = false;
   doBenchmark = false;
diff --git a/pkgs/generic-monoid.nix b/pkgs/generic-monoid.nix
index f3bb2974ab9712589a773724be735658e9337d7b..04bff0b2de778ec308ea6ee84ee1a418fcd4d46f 100644
--- a/pkgs/generic-monoid.nix
+++ b/pkgs/generic-monoid.nix
@@ -3,15 +3,15 @@ mkDerivation {
   pname = "generic-monoid";
   version = "0.1.0.1";
   sha256 = "cfd072ad70af41c1b94ac24e42e2635f37ed2a54e8f4be871be78b18b66b2adf";
-  revision = "2";
-  editedCabalFile = "0p3hk9c6qn5kbgi3a4my3rq5cc43wcl93hx6axgzi5wkvimpv653";
+  revision = "3";
+  editedCabalFile = "0pyf3yr4haja32nkm3vb28dhdh47cf6h5vqkqih2l6zmbdc2f0lq";
   isLibrary = true;
   isExecutable = false;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [ base ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
-  doHaddock = false;
+  doHaddock = true;
   jailbreak = true;
   doCheck = false;
   doBenchmark = false;
diff --git a/pkgs/generics-sop.nix b/pkgs/generics-sop.nix
index 14b4dd16464007db64701e93fd5d6eeb67a992c8..b3ba7f1d23cf4468d193dff4e9244f1fe5ec032f 100644
--- a/pkgs/generics-sop.nix
+++ b/pkgs/generics-sop.nix
@@ -17,7 +17,7 @@ mkDerivation {
   ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
-  doHaddock = false;
+  doHaddock = true;
   jailbreak = true;
   doCheck = false;
   doBenchmark = false;
diff --git a/pkgs/ghc-tcplugins-extra.nix b/pkgs/ghc-tcplugins-extra.nix
index 46df968352eaee838ee8de3b3c5a0dc8d9623605..7e3559d0493cb2dca9f6a225c5e2b2d795fc2de4 100644
--- a/pkgs/ghc-tcplugins-extra.nix
+++ b/pkgs/ghc-tcplugins-extra.nix
@@ -9,7 +9,7 @@ mkDerivation {
   libraryHaskellDepends = [ base ghc ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
-  doHaddock = false;
+  doHaddock = true;
   jailbreak = true;
   doCheck = false;
   doBenchmark = false;
diff --git a/pkgs/haskell-src.nix b/pkgs/haskell-src.nix
index da6454316b5af73d75a3e539f6bf3d45e7317980..ad389573a0fa4e0b09fcf4453a5449b22959b9e9 100644
--- a/pkgs/haskell-src.nix
+++ b/pkgs/haskell-src.nix
@@ -12,7 +12,7 @@ mkDerivation {
   libraryToolDepends = [ happy ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
-  doHaddock = false;
+  doHaddock = true;
   jailbreak = true;
   doCheck = false;
   doBenchmark = false;
diff --git a/pkgs/hedis.nix b/pkgs/hedis.nix
index ee4d389544087a7218d2e5db9eb440b0f2d9e6c4..afe0588e18a4c15e6eae059e9953d8977e343470 100644
--- a/pkgs/hedis.nix
+++ b/pkgs/hedis.nix
@@ -23,7 +23,7 @@ mkDerivation {
   benchmarkHaskellDepends = [ base mtl time ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
-  doHaddock = false;
+  doHaddock = true;
   jailbreak = true;
   doCheck = false;
   doBenchmark = false;
diff --git a/pkgs/hspec-expectations-lifted.nix b/pkgs/hspec-expectations-lifted.nix
index 4610d069bea3e4d060b3af1e24f48caa03f4709f..b25e50d806401e165f30635843b4e7a5a234d33f 100644
--- a/pkgs/hspec-expectations-lifted.nix
+++ b/pkgs/hspec-expectations-lifted.nix
@@ -9,7 +9,7 @@ mkDerivation {
   libraryHaskellDepends = [ base hspec-expectations transformers ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
-  doHaddock = false;
+  doHaddock = true;
   jailbreak = true;
   doCheck = false;
   doBenchmark = false;
diff --git a/pkgs/hspec-wai.nix b/pkgs/hspec-wai.nix
index e698a05d30c6d65513b4f72bdeaebf4330c25c9c..4546e752ba84828ad4e1bac539c98931bc5a4623 100644
--- a/pkgs/hspec-wai.nix
+++ b/pkgs/hspec-wai.nix
@@ -21,7 +21,7 @@ mkDerivation {
   ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
-  doHaddock = false;
+  doHaddock = true;
   jailbreak = true;
   doCheck = false;
   doBenchmark = false;
diff --git a/pkgs/html-conduit.nix b/pkgs/html-conduit.nix
index 5850126ac3c6a7b3f7ca69e3a67696b1641255b0..2577ba271cf067d09be4034b83d391f21f157fb8 100644
--- a/pkgs/html-conduit.nix
+++ b/pkgs/html-conduit.nix
@@ -18,7 +18,7 @@ mkDerivation {
   ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
-  doHaddock = false;
+  doHaddock = true;
   jailbreak = true;
   doCheck = false;
   doBenchmark = false;
diff --git a/pkgs/http-api-data.nix b/pkgs/http-api-data.nix
index cb41e7acf18070e13283ef12a983a52cbc520a42..e1b9d340a1b5837dedfa1729204bdc33b31a0d56 100644
--- a/pkgs/http-api-data.nix
+++ b/pkgs/http-api-data.nix
@@ -24,7 +24,7 @@ mkDerivation {
   testToolDepends = [ hspec-discover ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
-  doHaddock = false;
+  doHaddock = true;
   jailbreak = true;
   doCheck = false;
   doBenchmark = false;
diff --git a/pkgs/http-media.nix b/pkgs/http-media.nix
index d0cc6f8090bad88af18375aa75d24ba31c9b3a54..02593c62643142019f16c8b4265dd7d068ff0211 100644
--- a/pkgs/http-media.nix
+++ b/pkgs/http-media.nix
@@ -5,6 +5,8 @@ mkDerivation {
   pname = "http-media";
   version = "0.8.1.1";
   sha256 = "1920adf31b15d167f60374fbfd0a53a1fbe7820fd7fd459beacf6eb00d03f183";
+  revision = "1";
+  editedCabalFile = "0vlaxmh1qqli981bwn3hw0hqfy6spkijdywycnhxi0z1qg5837fk";
   isLibrary = true;
   isExecutable = false;
   enableSeparateDataOutput = false;
@@ -17,7 +19,7 @@ mkDerivation {
   ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
-  doHaddock = false;
+  doHaddock = true;
   jailbreak = true;
   doCheck = false;
   doBenchmark = false;
diff --git a/pkgs/hxt-charproperties.nix b/pkgs/hxt-charproperties.nix
index 2f5f2085a6f89d70bb3426d3cfc7b796e3067fe9..cfe7a2206cc9930d60bf4a378b0adfec9c51d327 100644
--- a/pkgs/hxt-charproperties.nix
+++ b/pkgs/hxt-charproperties.nix
@@ -9,7 +9,7 @@ mkDerivation {
   libraryHaskellDepends = [ base ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
-  doHaddock = false;
+  doHaddock = true;
   jailbreak = true;
   doCheck = false;
   doBenchmark = false;
diff --git a/pkgs/hxt-regex-xmlschema.nix b/pkgs/hxt-regex-xmlschema.nix
index 54dd2e4c423b4080e4b7fc7445fd501735b50474..e386f1aff75db9eff851a303eeb51765dff1ec5f 100644
--- a/pkgs/hxt-regex-xmlschema.nix
+++ b/pkgs/hxt-regex-xmlschema.nix
@@ -17,7 +17,7 @@ mkDerivation {
   ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
-  doHaddock = false;
+  doHaddock = true;
   jailbreak = true;
   doCheck = false;
   doBenchmark = false;
diff --git a/pkgs/hxt-unicode.nix b/pkgs/hxt-unicode.nix
index 398d4c4fe3156ddc4e4b5a8a9f352d3db67af070..a98d138df15b3704be49a2eb84516a1a58d7eb0a 100644
--- a/pkgs/hxt-unicode.nix
+++ b/pkgs/hxt-unicode.nix
@@ -9,7 +9,7 @@ mkDerivation {
   libraryHaskellDepends = [ base hxt-charproperties ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
-  doHaddock = false;
+  doHaddock = true;
   jailbreak = true;
   doCheck = false;
   doBenchmark = false;
diff --git a/pkgs/hxt.nix b/pkgs/hxt.nix
index be0d7cb476b128605faffa7b9cc57aa9ec1ef534..d4d539a6000d33be30a148c4143048fe8d4eda64 100644
--- a/pkgs/hxt.nix
+++ b/pkgs/hxt.nix
@@ -16,7 +16,7 @@ mkDerivation {
   ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
-  doHaddock = false;
+  doHaddock = true;
   jailbreak = true;
   doCheck = false;
   doBenchmark = false;
diff --git a/pkgs/indexed-profunctors.nix b/pkgs/indexed-profunctors.nix
index be09ecb21abc946dbd8e25e6993aab3751dce543..6e368a3303b88e758f1319fd0bf4c8e44cd2269f 100644
--- a/pkgs/indexed-profunctors.nix
+++ b/pkgs/indexed-profunctors.nix
@@ -9,7 +9,7 @@ mkDerivation {
   libraryHaskellDepends = [ base ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
-  doHaddock = false;
+  doHaddock = true;
   jailbreak = true;
   doCheck = false;
   doBenchmark = false;
diff --git a/pkgs/insert-ordered-containers.nix b/pkgs/insert-ordered-containers.nix
index 8f044c63ce12209ac7473ce12bfee097a08f5ce3..7a084b1ecba00adfda2e337074490f05fb14e9c3 100644
--- a/pkgs/insert-ordered-containers.nix
+++ b/pkgs/insert-ordered-containers.nix
@@ -7,6 +7,8 @@ mkDerivation {
   pname = "insert-ordered-containers";
   version = "0.2.5.3";
   sha256 = "f04f6e59795d8e362d15422a62d7c7c48312c2d97d2bc4372002a8a9b9a2436c";
+  revision = "1";
+  editedCabalFile = "12fkswr70fw2av11yy45v189r6cb8fcg0l1r7mayvwha3gls0j3n";
   isLibrary = true;
   isExecutable = false;
   enableSeparateDataOutput = false;
@@ -20,7 +22,7 @@ mkDerivation {
   ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
-  doHaddock = false;
+  doHaddock = true;
   jailbreak = true;
   doCheck = false;
   doBenchmark = false;
diff --git a/pkgs/js-chart.nix b/pkgs/js-chart.nix
index 00670ec0f027a18af8acd74d29c7670377445ecc..b54f110315300f5ec548c7753ccf00a4faf1a811 100644
--- a/pkgs/js-chart.nix
+++ b/pkgs/js-chart.nix
@@ -10,7 +10,7 @@ mkDerivation {
   testHaskellDepends = [ base ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
-  doHaddock = false;
+  doHaddock = true;
   jailbreak = true;
   doCheck = false;
   doBenchmark = false;
diff --git a/pkgs/lift-type.nix b/pkgs/lift-type.nix
index 314d012a46605ab8329a58f08fd6615a1a7919bb..58c49521fd2f3989ac626747df6271eb207066ab 100644
--- a/pkgs/lift-type.nix
+++ b/pkgs/lift-type.nix
@@ -10,7 +10,7 @@ mkDerivation {
   testHaskellDepends = [ base template-haskell ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
-  doHaddock = false;
+  doHaddock = true;
   jailbreak = true;
   doCheck = false;
   doBenchmark = false;
diff --git a/pkgs/linear.nix b/pkgs/linear.nix
index a3a3c777143f4628645b6e020b0509abfd00265a..0013be748e74e9c845e30ab2d83ec423d64e0dd9 100644
--- a/pkgs/linear.nix
+++ b/pkgs/linear.nix
@@ -27,7 +27,7 @@ mkDerivation {
   ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
-  doHaddock = false;
+  doHaddock = true;
   jailbreak = true;
   doCheck = false;
   doBenchmark = false;
diff --git a/pkgs/markdown-unlit.nix b/pkgs/markdown-unlit.nix
index b44c123ab48d1159ae3716a80a5a6f933bb33dac..9e47f529877c5c5dac81e92eb3a395381cfbc0ef 100644
--- a/pkgs/markdown-unlit.nix
+++ b/pkgs/markdown-unlit.nix
@@ -17,7 +17,7 @@ mkDerivation {
   testToolDepends = [ hspec-discover ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
-  doHaddock = false;
+  doHaddock = true;
   jailbreak = true;
   doCheck = false;
   doBenchmark = false;
diff --git a/pkgs/microstache.nix b/pkgs/microstache.nix
index 7fe611989592da4932ed6cccfe55c2c956c5286e..29f1e878c65c2ebc78b4412a336cc664975dcab7 100644
--- a/pkgs/microstache.nix
+++ b/pkgs/microstache.nix
@@ -21,7 +21,7 @@ mkDerivation {
   ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
-  doHaddock = false;
+  doHaddock = true;
   jailbreak = true;
   doCheck = false;
   doBenchmark = false;
diff --git a/pkgs/monad-logger.nix b/pkgs/monad-logger.nix
index f88fb156aa64f029e1aec178fbbe8e2658b720fa..73020db2f1b1780b38f8311b5aaceaf831231022 100644
--- a/pkgs/monad-logger.nix
+++ b/pkgs/monad-logger.nix
@@ -19,7 +19,7 @@ mkDerivation {
   ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
-  doHaddock = false;
+  doHaddock = true;
   jailbreak = true;
   doCheck = false;
   doBenchmark = false;
diff --git a/pkgs/monad-loops.nix b/pkgs/monad-loops.nix
index aa45a2dc955dd599973560636ea6720c510d44ee..7c88bdf82763347833e89a5ece4b6c7c8686cf5b 100644
--- a/pkgs/monad-loops.nix
+++ b/pkgs/monad-loops.nix
@@ -10,7 +10,7 @@ mkDerivation {
   testHaskellDepends = [ base tasty tasty-hunit ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
-  doHaddock = false;
+  doHaddock = true;
   jailbreak = true;
   doCheck = false;
   doBenchmark = false;
diff --git a/pkgs/monads-tf.nix b/pkgs/monads-tf.nix
index 69ada2fdceb65669d52c784ddfae406f8a347252..5335e09411073b1cf6142a162e91bb183536b917 100644
--- a/pkgs/monads-tf.nix
+++ b/pkgs/monads-tf.nix
@@ -9,7 +9,7 @@ mkDerivation {
   libraryHaskellDepends = [ base transformers ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
-  doHaddock = false;
+  doHaddock = true;
   jailbreak = true;
   doCheck = false;
   doBenchmark = false;
diff --git a/pkgs/monoidal-containers.nix b/pkgs/monoidal-containers.nix
index 8d2361d5ec5c88c40c63339a0e18995c1ac8aff0..3d62b48b8aabc02f73de92140c8db1c40369f7ac 100644
--- a/pkgs/monoidal-containers.nix
+++ b/pkgs/monoidal-containers.nix
@@ -5,8 +5,8 @@ mkDerivation {
   pname = "monoidal-containers";
   version = "0.6.4.0";
   sha256 = "03019ebf5533dbebf70d5c60bdac52eb2409a8d057a78044f0dabe9df5234f27";
-  revision = "1";
-  editedCabalFile = "0dav6640nvxizgqqkwqmpi9z04n2swhxmyl68xm94c9np356q5iw";
+  revision = "2";
+  editedCabalFile = "0k0pi43km8v25rz61zqfw958djbxrrjb1a2idkpj92klbjsr49dd";
   isLibrary = true;
   isExecutable = false;
   enableSeparateDataOutput = false;
@@ -16,7 +16,7 @@ mkDerivation {
   ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
-  doHaddock = false;
+  doHaddock = true;
   jailbreak = true;
   doCheck = false;
   doBenchmark = false;
diff --git a/pkgs/network-info.nix b/pkgs/network-info.nix
index 26fd5d93db318fe98da9bb044831176a435e429a..e7235543a0928eff15e2475de66df4354f539f53 100644
--- a/pkgs/network-info.nix
+++ b/pkgs/network-info.nix
@@ -9,7 +9,7 @@ mkDerivation {
   libraryHaskellDepends = [ base ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
-  doHaddock = false;
+  doHaddock = true;
   jailbreak = true;
   doCheck = false;
   doBenchmark = false;
diff --git a/pkgs/newtype.nix b/pkgs/newtype.nix
index abe1b3f0fb264439045364828c0193d5a8edf22b..bab3233f88b9753544b224491367b65abbb91746 100644
--- a/pkgs/newtype.nix
+++ b/pkgs/newtype.nix
@@ -11,7 +11,7 @@ mkDerivation {
   libraryHaskellDepends = [ base ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
-  doHaddock = false;
+  doHaddock = true;
   jailbreak = true;
   doCheck = false;
   doBenchmark = false;
diff --git a/pkgs/optics-core.nix b/pkgs/optics-core.nix
index f3d6961268d6a05dd675559e3dde2b21d7248c4e..9cb17a7eed137a6bbba9fa825e9854f0df7e2778 100644
--- a/pkgs/optics-core.nix
+++ b/pkgs/optics-core.nix
@@ -14,7 +14,7 @@ mkDerivation {
   ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
-  doHaddock = false;
+  doHaddock = true;
   jailbreak = true;
   doCheck = false;
   doBenchmark = false;
diff --git a/pkgs/optics-extra.nix b/pkgs/optics-extra.nix
index 2337ee9916420edad4fa7b094229686eff6b49d7..d7006db1e4cf70d93f4f66911e99c711c14d3b64 100644
--- a/pkgs/optics-extra.nix
+++ b/pkgs/optics-extra.nix
@@ -6,8 +6,8 @@ mkDerivation {
   pname = "optics-extra";
   version = "0.4.2.1";
   sha256 = "7e23a7a325e3448354614d3d958279c9ac2fdd0831ceee2808830e7a962fca41";
-  revision = "1";
-  editedCabalFile = "0bpr1bkb7mmww028n8ikwa0qhdl7ybxpb9s887dlp3dvxr5iq8nq";
+  revision = "2";
+  editedCabalFile = "0w7am7pvwg4mx0nrksxgr2rvnk99nhqfpj80ig21m9xbpxsh22x4";
   isLibrary = true;
   isExecutable = false;
   enableSeparateDataOutput = false;
@@ -18,7 +18,7 @@ mkDerivation {
   ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
-  doHaddock = false;
+  doHaddock = true;
   jailbreak = true;
   doCheck = false;
   doBenchmark = false;
diff --git a/pkgs/optics-th.nix b/pkgs/optics-th.nix
index 2cfb3836b928dac8ade48d491b74729eaa9f554c..12c7203faeb308d3e33ca16f517880f2e8da0ace 100644
--- a/pkgs/optics-th.nix
+++ b/pkgs/optics-th.nix
@@ -5,8 +5,8 @@ mkDerivation {
   pname = "optics-th";
   version = "0.4.1";
   sha256 = "d73857b79dcd8f7c7e70fa4727f134145b62902e8d3e448f8b25c38a9da4fd17";
-  revision = "5";
-  editedCabalFile = "0a9h1bll1m9v40cv7ifv2sy3k6sfcq325s7cpk33wh65awf5zpl7";
+  revision = "6";
+  editedCabalFile = "03qm6q7gw97qlcgnqp097dyvqkqpq4ph95y5ra6k6da218rbl1nk";
   isLibrary = true;
   isExecutable = false;
   enableSeparateDataOutput = false;
@@ -17,7 +17,7 @@ mkDerivation {
   testHaskellDepends = [ base optics-core tagged ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
-  doHaddock = false;
+  doHaddock = true;
   jailbreak = true;
   doCheck = false;
   doBenchmark = false;
diff --git a/pkgs/optics.nix b/pkgs/optics.nix
index 46fd083e78886f0a1e8a1a06910fa28d2d079380..449fb744f96151d1ea3bf9fc028be8096b431f23 100644
--- a/pkgs/optics.nix
+++ b/pkgs/optics.nix
@@ -26,7 +26,7 @@ mkDerivation {
   ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
-  doHaddock = false;
+  doHaddock = true;
   jailbreak = true;
   doCheck = false;
   doBenchmark = false;
diff --git a/pkgs/path-pieces.nix b/pkgs/path-pieces.nix
index dc93c5252299b78f2b6970d7acfff93ee79d3cf4..f11bf43e45170fa3adec2fe6ad899c5bb1f58e24 100644
--- a/pkgs/path-pieces.nix
+++ b/pkgs/path-pieces.nix
@@ -12,7 +12,7 @@ mkDerivation {
   testHaskellDepends = [ base hspec HUnit QuickCheck text ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
-  doHaddock = false;
+  doHaddock = true;
   jailbreak = true;
   doCheck = false;
   doBenchmark = false;
diff --git a/pkgs/persistent-postgresql.nix b/pkgs/persistent-postgresql.nix
index 1a7e4c20bc1a45220461ceae779956f4cc8e9b6e..22904e603453c634ad512d5c50246c3f199f8992 100644
--- a/pkgs/persistent-postgresql.nix
+++ b/pkgs/persistent-postgresql.nix
@@ -29,7 +29,7 @@ mkDerivation {
   ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
-  doHaddock = false;
+  doHaddock = true;
   jailbreak = true;
   doCheck = false;
   doBenchmark = false;
diff --git a/pkgs/persistent-qq.nix b/pkgs/persistent-qq.nix
index e8c75176a972c3d4b62e3fb8556ff443cf8c5ac5..fdf4c6e94d0421bade4ef47e6b16c4cc9decf9b0 100644
--- a/pkgs/persistent-qq.nix
+++ b/pkgs/persistent-qq.nix
@@ -19,7 +19,7 @@ mkDerivation {
   ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
-  doHaddock = false;
+  doHaddock = true;
   jailbreak = true;
   doCheck = false;
   doBenchmark = false;
diff --git a/pkgs/persistent-test.nix b/pkgs/persistent-test.nix
index c42f71b5a9174bc9bfb8c9059f162649f2d6fba4..5372a49fa7b04e6e1d8454c99838c514e785da48 100644
--- a/pkgs/persistent-test.nix
+++ b/pkgs/persistent-test.nix
@@ -21,7 +21,7 @@ mkDerivation {
   ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
-  doHaddock = false;
+  doHaddock = true;
   jailbreak = true;
   doCheck = false;
   doBenchmark = false;
diff --git a/pkgs/persistent.nix b/pkgs/persistent.nix
index f99372dd186956560411eab89ac06cc12f909e35..f566889df01393edad0630f8da816ddb5c65d0d9 100644
--- a/pkgs/persistent.nix
+++ b/pkgs/persistent.nix
@@ -35,7 +35,7 @@ mkDerivation {
   ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
-  doHaddock = false;
+  doHaddock = true;
   jailbreak = true;
   doCheck = false;
   doBenchmark = false;
diff --git a/pkgs/polyparse.nix b/pkgs/polyparse.nix
index 448cdf161f21ad1489e289f6fc61aab3da7894ae..930e3d8e0204832193df3b657d31d7306aca65fb 100644
--- a/pkgs/polyparse.nix
+++ b/pkgs/polyparse.nix
@@ -11,7 +11,7 @@ mkDerivation {
   libraryHaskellDepends = [ base bytestring text ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
-  doHaddock = false;
+  doHaddock = true;
   jailbreak = true;
   doCheck = false;
   doBenchmark = false;
diff --git a/pkgs/polysemy.nix b/pkgs/polysemy.nix
index 4566fa993cf91858a6be133d1b6192da209de990..84a5dad06bafc2fbfcf176885998727aa9b9756a 100644
--- a/pkgs/polysemy.nix
+++ b/pkgs/polysemy.nix
@@ -23,7 +23,7 @@ mkDerivation {
   testToolDepends = [ hspec-discover ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
-  doHaddock = false;
+  doHaddock = true;
   jailbreak = true;
   doCheck = false;
   doBenchmark = false;
diff --git a/pkgs/port-utils.nix b/pkgs/port-utils.nix
index 463ee0a6e887e345a0e1832ff74a5ac2ed213926..4218b510372a0337cafd01895d1f346d365a159e 100644
--- a/pkgs/port-utils.nix
+++ b/pkgs/port-utils.nix
@@ -11,7 +11,7 @@ mkDerivation {
   testHaskellDepends = [ async base hspec network stm transformers ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
-  doHaddock = false;
+  doHaddock = true;
   jailbreak = true;
   doCheck = false;
   doBenchmark = false;
diff --git a/pkgs/postgres-options.nix b/pkgs/postgres-options.nix
index 4b8ea38643f842ef5c4c82948291b0b83311ed3a..0e4025feb20cfee909d27e6803ab4d2be3ae48cf 100644
--- a/pkgs/postgres-options.nix
+++ b/pkgs/postgres-options.nix
@@ -14,7 +14,7 @@ mkDerivation {
   testHaskellDepends = [ base hspec ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
-  doHaddock = false;
+  doHaddock = true;
   jailbreak = true;
   doCheck = false;
   doBenchmark = false;
diff --git a/pkgs/postgresql-libpq.nix b/pkgs/postgresql-libpq.nix
index daabc8d8f7b4ef18cdcfb750fca350c4b7d60824..6ee788428435499f92fb44c62054c4bdda5026e9 100644
--- a/pkgs/postgresql-libpq.nix
+++ b/pkgs/postgresql-libpq.nix
@@ -3,6 +3,8 @@ mkDerivation {
   pname = "postgresql-libpq";
   version = "0.10.0.0";
   sha256 = "54bca8926fafea05870437732a4d4a200558053b36f9f0867fd3689e035bdf62";
+  revision = "1";
+  editedCabalFile = "1xqf1mqbsq75iay8hv4d8ac5psaay6v106w0nqv00p1y5vfay72w";
   isLibrary = true;
   isExecutable = false;
   enableSeparateDataOutput = false;
@@ -12,7 +14,7 @@ mkDerivation {
   testHaskellDepends = [ base bytestring ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
-  doHaddock = false;
+  doHaddock = true;
   jailbreak = true;
   doCheck = false;
   doBenchmark = false;
diff --git a/pkgs/postgresql-simple.nix b/pkgs/postgresql-simple.nix
index 0cf9cf95a43b2e9c5dc1ff80320f1a465ddb53a4..9b4172ef3202f6e1e8911ccf660fdd88d0b9fd2a 100644
--- a/pkgs/postgresql-simple.nix
+++ b/pkgs/postgresql-simple.nix
@@ -9,6 +9,8 @@ mkDerivation {
   pname = "postgresql-simple";
   version = "0.7.0.0";
   sha256 = "8cb81bb55100715e590d3215d0f0eb6f6c39cc070c070ab621b00cfcc5e4a13e";
+  revision = "1";
+  editedCabalFile = "0yhggx06wbg57psqa8sswf85qfzy8ndssv13vwmxj0gc1ca1zv4l";
   isLibrary = true;
   isExecutable = false;
   enableSeparateDataOutput = false;
@@ -25,7 +27,7 @@ mkDerivation {
   benchmarkHaskellDepends = [ base vector ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
-  doHaddock = false;
+  doHaddock = true;
   jailbreak = true;
   doCheck = false;
   doBenchmark = false;
diff --git a/pkgs/protolude.nix b/pkgs/protolude.nix
index 99f309b1c618178e01d0f580f30982643930032c..6b2219591bcde28635074f129783e4ee5e2cd8e5 100644
--- a/pkgs/protolude.nix
+++ b/pkgs/protolude.nix
@@ -6,8 +6,8 @@ mkDerivation {
   pname = "protolude";
   version = "0.3.3";
   sha256 = "6c39ded2c7e9f7b1a508e4400f0151cb325f4d80e35010c1d5afa58b48971a46";
-  revision = "1";
-  editedCabalFile = "07hfs830nc1lvcmsw1hhmrmhzq0b8z25dc090wfn25ss2cvrjkjv";
+  revision = "2";
+  editedCabalFile = "0f949f93wml7h7na9d1n9lvignwphxr2r18jwmpy33g0dxgn21h1";
   isLibrary = true;
   isExecutable = false;
   enableSeparateDataOutput = false;
@@ -17,7 +17,7 @@ mkDerivation {
   ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
-  doHaddock = false;
+  doHaddock = true;
   jailbreak = true;
   doCheck = false;
   doBenchmark = false;
diff --git a/pkgs/quiet.nix b/pkgs/quiet.nix
index 8b6f72fc0deeda5fc78d252681d9392b98356a11..7213b252f89d27ee548d1827b8cc3c1c496339a2 100644
--- a/pkgs/quiet.nix
+++ b/pkgs/quiet.nix
@@ -10,7 +10,7 @@ mkDerivation {
   testHaskellDepends = [ base ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
-  doHaddock = false;
+  doHaddock = true;
   jailbreak = true;
   doCheck = false;
   doBenchmark = false;
diff --git a/pkgs/regex-compat.nix b/pkgs/regex-compat.nix
index faebfeb549b3eccd7a1bf9776ef866a0029f3995..459d1fc82976c528cf405aa3690c788538a492ba 100644
--- a/pkgs/regex-compat.nix
+++ b/pkgs/regex-compat.nix
@@ -11,7 +11,7 @@ mkDerivation {
   libraryHaskellDepends = [ array base regex-base regex-posix ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
-  doHaddock = false;
+  doHaddock = true;
   jailbreak = true;
   doCheck = false;
   doBenchmark = false;
diff --git a/pkgs/resource-pool.nix b/pkgs/resource-pool.nix
index 1d620cdf273d9087272adfc87db2a908b100ca2b..82544a86245c5a71448a0c82bebbe03b95bb3367 100644
--- a/pkgs/resource-pool.nix
+++ b/pkgs/resource-pool.nix
@@ -9,7 +9,7 @@ mkDerivation {
   libraryHaskellDepends = [ base hashable primitive time ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
-  doHaddock = false;
+  doHaddock = true;
   jailbreak = true;
   doCheck = false;
   doBenchmark = false;
diff --git a/pkgs/rio.nix b/pkgs/rio.nix
index f836a45cc463d9fb47febc1f6fdab3afc6ef1f2b..91e650264579c8a1af2511afb56ed255620ef655 100644
--- a/pkgs/rio.nix
+++ b/pkgs/rio.nix
@@ -26,7 +26,7 @@ mkDerivation {
   testToolDepends = [ hspec-discover ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
-  doHaddock = false;
+  doHaddock = true;
   jailbreak = true;
   doCheck = false;
   doBenchmark = false;
diff --git a/pkgs/scanner.nix b/pkgs/scanner.nix
index 63b9d9a67dd56744f2e7a918f01382713e6a6860..06ac66947d864123f54ef70b1692f6e9d3bc551e 100644
--- a/pkgs/scanner.nix
+++ b/pkgs/scanner.nix
@@ -15,7 +15,7 @@ mkDerivation {
   ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
-  doHaddock = false;
+  doHaddock = true;
   jailbreak = true;
   doCheck = false;
   doBenchmark = false;
diff --git a/pkgs/sdl2-gfx.nix b/pkgs/sdl2-gfx.nix
index ef9d9217faf3206577de4506002b65f9641fc068..34b12c6cd9f0b0bbcead31fb720d28de44e2aee5 100644
--- a/pkgs/sdl2-gfx.nix
+++ b/pkgs/sdl2-gfx.nix
@@ -18,7 +18,7 @@ mkDerivation {
   executablePkgconfigDepends = [ SDL2 SDL2_gfx ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
-  doHaddock = false;
+  doHaddock = true;
   jailbreak = true;
   doCheck = false;
   doBenchmark = false;
diff --git a/pkgs/sdl2-image.nix b/pkgs/sdl2-image.nix
index 45a4063ad09bed8a4d3cb4a287ffdeb93e93c64e..759f3f14ad63a327457713c35eb6fe721ef6debe 100644
--- a/pkgs/sdl2-image.nix
+++ b/pkgs/sdl2-image.nix
@@ -18,7 +18,7 @@ mkDerivation {
   executablePkgconfigDepends = [ SDL2 SDL2_image ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
-  doHaddock = false;
+  doHaddock = true;
   jailbreak = true;
   doCheck = false;
   doBenchmark = false;
diff --git a/pkgs/sdl2-mixer.nix b/pkgs/sdl2-mixer.nix
index d60edd127fad7023507c7c2a9cd83b8d6bbb4b99..fdece280e39bea63f7fbfa6fc9939330e836d8fa 100644
--- a/pkgs/sdl2-mixer.nix
+++ b/pkgs/sdl2-mixer.nix
@@ -19,7 +19,7 @@ mkDerivation {
   executablePkgconfigDepends = [ SDL2_mixer ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
-  doHaddock = false;
+  doHaddock = true;
   jailbreak = true;
   doCheck = false;
   doBenchmark = false;
diff --git a/pkgs/sdl2-ttf.nix b/pkgs/sdl2-ttf.nix
index 6756dc22263cec9fa8288804e61ec884e51c3e74..00079742297bb02b5e1fd20c1a71d6a475104e23 100644
--- a/pkgs/sdl2-ttf.nix
+++ b/pkgs/sdl2-ttf.nix
@@ -15,7 +15,7 @@ mkDerivation {
   libraryPkgconfigDepends = [ SDL2 SDL2_ttf ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
-  doHaddock = false;
+  doHaddock = true;
   jailbreak = true;
   doCheck = false;
   doBenchmark = false;
diff --git a/pkgs/sdl2.nix b/pkgs/sdl2.nix
index 94148abd2898fede6c8cbf701403cf94e2b8e7a7..9beaf1a492fae028c73c87136664f4695fb337eb 100644
--- a/pkgs/sdl2.nix
+++ b/pkgs/sdl2.nix
@@ -5,6 +5,8 @@ mkDerivation {
   pname = "sdl2";
   version = "2.5.5.0";
   sha256 = "23fdaa896e528620f31afeb763422d0c27d758e587215ff0c1387d6e6b3551cd";
+  revision = "1";
+  editedCabalFile = "0r0lzn3hyjvzwqsrqprdzb2c167g7ip2cf07jvm1h5b53qc2a4cx";
   isLibrary = true;
   isExecutable = true;
   enableSeparateDataOutput = true;
@@ -16,7 +18,7 @@ mkDerivation {
   testHaskellDepends = [ base deepseq linear vector weigh ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
-  doHaddock = false;
+  doHaddock = true;
   jailbreak = true;
   doCheck = false;
   doBenchmark = false;
diff --git a/pkgs/selda.nix b/pkgs/selda.nix
index b4b3e73ee74d91e59daca197c23d0ba00ea6eed9..4ce2717892157a125ee4ba6b11a3defd3ecfaca3 100644
--- a/pkgs/selda.nix
+++ b/pkgs/selda.nix
@@ -20,7 +20,7 @@ mkDerivation {
   ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
-  doHaddock = false;
+  doHaddock = true;
   jailbreak = true;
   doCheck = false;
   doBenchmark = false;
diff --git a/pkgs/servant-client-core.nix b/pkgs/servant-client-core.nix
index d604592dda62ce5ca25413dedfa9dd36b62b45b0..4a89d2cd2206201619f3de7f4d7a8f2f35cbbebb 100644
--- a/pkgs/servant-client-core.nix
+++ b/pkgs/servant-client-core.nix
@@ -8,8 +8,8 @@ mkDerivation {
   pname = "servant-client-core";
   version = "0.20";
   sha256 = "a6744916079ec769c248ff5f7a2cc62d7eb03abb445be6c1fa7811c2866b4b04";
-  revision = "1";
-  editedCabalFile = "0nkgan32s6v5s3sqk5wdw1m977gszwi8lnap5wrr3m47q7j4003l";
+  revision = "3";
+  editedCabalFile = "02q7fvmqvc1n5h0bh4q28vaphhnms34lr6ckxbxrmc5wwcz8qkgv";
   isLibrary = true;
   isExecutable = false;
   enableSeparateDataOutput = false;
@@ -23,7 +23,7 @@ mkDerivation {
   testToolDepends = [ hspec-discover ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
-  doHaddock = false;
+  doHaddock = true;
   jailbreak = true;
   doCheck = false;
   doBenchmark = false;
diff --git a/pkgs/servant-client.nix b/pkgs/servant-client.nix
index 1e3fda8e4bfcc09e3a06de90a94df5c6d2ad2086..a551221d57b8d9cb41c47a34c7c16b1cabf08875 100644
--- a/pkgs/servant-client.nix
+++ b/pkgs/servant-client.nix
@@ -10,8 +10,8 @@ mkDerivation {
   pname = "servant-client";
   version = "0.20";
   sha256 = "765d30f3579b74bebfe79f59a4aacfd9dec0c02c7d355f389caa604f0ac3b276";
-  revision = "1";
-  editedCabalFile = "1bvj0rnnyqw3h70b94k9j21np5h0acxn4cla2gsv9zclhd99f4q6";
+  revision = "3";
+  editedCabalFile = "0awk9s22228mm4ff3bc165djvykihbkk6vqvfak0mz1m7dypi7fq";
   isLibrary = true;
   isExecutable = false;
   enableSeparateDataOutput = false;
@@ -30,7 +30,7 @@ mkDerivation {
   testToolDepends = [ hspec-discover markdown-unlit ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
-  doHaddock = false;
+  doHaddock = true;
   jailbreak = true;
   doCheck = false;
   doBenchmark = false;
diff --git a/pkgs/servant-docs.nix b/pkgs/servant-docs.nix
index 90ab1e4c5195f36065c6936caa56dcc261cd5823..5369dafac876dd6024961691d6786dd7d86a86fd 100644
--- a/pkgs/servant-docs.nix
+++ b/pkgs/servant-docs.nix
@@ -7,6 +7,8 @@ mkDerivation {
   pname = "servant-docs";
   version = "0.13";
   sha256 = "c75ce9536f7568606a8c67a7920c476fb91fba77140b379904d6b26590af2145";
+  revision = "2";
+  editedCabalFile = "1awdlcvi24rqjzx01qff4an4srzqbyrcihxvazha0ypr2w94wz15";
   isLibrary = true;
   isExecutable = true;
   enableSeparateDataOutput = false;
@@ -24,7 +26,7 @@ mkDerivation {
   ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
-  doHaddock = false;
+  doHaddock = true;
   jailbreak = true;
   doCheck = false;
   doBenchmark = false;
diff --git a/pkgs/servant-foreign.nix b/pkgs/servant-foreign.nix
index 61821f8157bc744c1542ceef8c6732c6c6bc476f..19d046147deb663cdeb94dee17f3df01e77efc26 100644
--- a/pkgs/servant-foreign.nix
+++ b/pkgs/servant-foreign.nix
@@ -5,8 +5,8 @@ mkDerivation {
   pname = "servant-foreign";
   version = "0.16";
   sha256 = "bbaeb1e42a335fa5f65e837deee782db77b61f068093170eafd2b3763ac8f196";
-  revision = "1";
-  editedCabalFile = "17rnd7dnkj5p8jpbmlgysacrdxxhczd4ll8r5r3bpd56yhj8wm2c";
+  revision = "2";
+  editedCabalFile = "1mvp8r90kj0hnl95hzwdf5pja69h44vlwjypygzgjxn1j0lmrj2f";
   isLibrary = true;
   isExecutable = false;
   enableSeparateDataOutput = false;
@@ -17,7 +17,7 @@ mkDerivation {
   testToolDepends = [ hspec-discover ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
-  doHaddock = false;
+  doHaddock = true;
   jailbreak = true;
   doCheck = false;
   doBenchmark = false;
diff --git a/pkgs/servant-multipart-api.nix b/pkgs/servant-multipart-api.nix
index 78abfca700379e0197aa95f0083279d1e515da3b..b82f57c501ca3f64346f85ff8a8cc4a14592ddb8 100644
--- a/pkgs/servant-multipart-api.nix
+++ b/pkgs/servant-multipart-api.nix
@@ -4,8 +4,8 @@ mkDerivation {
   pname = "servant-multipart-api";
   version = "0.12.1";
   sha256 = "92d5c3b1ccbcde7abcff6eb639d7dbb836222452a965e73ebd40bf775e522ebe";
-  revision = "5";
-  editedCabalFile = "05243nl7sbc7p5rvqssiqha1qv38a0qp0ppb227pg0x748xh7ai4";
+  revision = "6";
+  editedCabalFile = "1x0vdhadnf7qqz5i8d2bj788farin2nap6fpg07fbcm97nz19mz0";
   isLibrary = true;
   isExecutable = false;
   enableSeparateDataOutput = false;
@@ -14,7 +14,7 @@ mkDerivation {
   ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
-  doHaddock = false;
+  doHaddock = true;
   jailbreak = true;
   doCheck = false;
   doBenchmark = false;
diff --git a/pkgs/servant-multipart.nix b/pkgs/servant-multipart.nix
index 490699dc735ed3d8cde6468b79fac8873cfcacf0..15f1cbb4c587748ed5b4bc50570cdc015f1a2bc0 100644
--- a/pkgs/servant-multipart.nix
+++ b/pkgs/servant-multipart.nix
@@ -7,8 +7,8 @@ mkDerivation {
   pname = "servant-multipart";
   version = "0.12.1";
   sha256 = "c5236fa4922a869947988d52ab9f5b0a19abf57bb0467e2eb34560f8c79aa5dc";
-  revision = "5";
-  editedCabalFile = "0pf761m9l6jnqhljjj4i6zr9il8r9ajpqfxzqjgjsnbsg6872ykg";
+  revision = "6";
+  editedCabalFile = "092n8hgzl90pqfd4faxbyy692ay92wc5s4c6vfa4zjf358zpkjgl";
   isLibrary = true;
   isExecutable = false;
   enableSeparateDataOutput = false;
@@ -23,7 +23,7 @@ mkDerivation {
   ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
-  doHaddock = false;
+  doHaddock = true;
   jailbreak = true;
   doCheck = false;
   doBenchmark = false;
diff --git a/pkgs/servant-server.nix b/pkgs/servant-server.nix
index 6a49c80865dda4057475431104ed210dbe431f50..d03412704ed0fbc8eb27635377febb9d727bee85 100644
--- a/pkgs/servant-server.nix
+++ b/pkgs/servant-server.nix
@@ -11,8 +11,8 @@ mkDerivation {
   pname = "servant-server";
   version = "0.20";
   sha256 = "13b2fe785be1aae07e15d139fa1f94c7c5db6c8d36d0fc7789576b31a9bee8be";
-  revision = "2";
-  editedCabalFile = "0x05ngrrgq4jqv5sfwsf35aziipvz64xajzh4a1b5cmh53q7kc8v";
+  revision = "4";
+  editedCabalFile = "1y1pilkixlm116cr4q7rsawfxkwv7iahq9cqq4nidc4py482ccbg";
   isLibrary = true;
   isExecutable = true;
   enableSeparateDataOutput = false;
@@ -35,7 +35,7 @@ mkDerivation {
   testToolDepends = [ hspec-discover ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
-  doHaddock = false;
+  doHaddock = true;
   jailbreak = true;
   doCheck = false;
   doBenchmark = false;
diff --git a/pkgs/servant.nix b/pkgs/servant.nix
index 4ed33a68ed0cc290056510fca1c6df9d5ff7b988..27ed50f658b24f8895356f2cb852512a0659b9b5 100644
--- a/pkgs/servant.nix
+++ b/pkgs/servant.nix
@@ -8,6 +8,8 @@ mkDerivation {
   pname = "servant";
   version = "0.20.1";
   sha256 = "94f773f9bdff67eb2d7aec9c67f80e8af79d531ba6f52fad2e142d8ce4551be9";
+  revision = "2";
+  editedCabalFile = "137yfr7mxfx2r3pkdfwsxv7xxch5l20yirj82186djyg36q5021z";
   isLibrary = true;
   isExecutable = false;
   enableSeparateDataOutput = false;
@@ -24,7 +26,7 @@ mkDerivation {
   testToolDepends = [ hspec-discover ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
-  doHaddock = false;
+  doHaddock = true;
   jailbreak = true;
   doCheck = false;
   doBenchmark = false;
diff --git a/pkgs/shakespeare.nix b/pkgs/shakespeare.nix
index 4ee81244ae9b6931edc34a6f38e0938cc482b7c4..c16805ccc597db6f6ac9580c32022b3aadbb098e 100644
--- a/pkgs/shakespeare.nix
+++ b/pkgs/shakespeare.nix
@@ -24,7 +24,7 @@ mkDerivation {
   ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
-  doHaddock = false;
+  doHaddock = true;
   jailbreak = true;
   doCheck = false;
   doBenchmark = false;
diff --git a/pkgs/should-not-typecheck.nix b/pkgs/should-not-typecheck.nix
index 610c491b02d6ba6a64d92fc29637d4d276d95816..01856bf333c3eb1eea2eb9c800f9677a614dfa12 100644
--- a/pkgs/should-not-typecheck.nix
+++ b/pkgs/should-not-typecheck.nix
@@ -14,7 +14,7 @@ mkDerivation {
   ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
-  doHaddock = false;
+  doHaddock = true;
   jailbreak = true;
   doCheck = false;
   doBenchmark = false;
diff --git a/pkgs/skein.nix b/pkgs/skein.nix
index 85d89d20e8d1ccd99162b18ea8b585889513c7be..6ec8a7f7b8c2d25ccac2397270f75e0f48f558e4 100644
--- a/pkgs/skein.nix
+++ b/pkgs/skein.nix
@@ -16,7 +16,7 @@ mkDerivation {
   ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
-  doHaddock = false;
+  doHaddock = true;
   jailbreak = true;
   doCheck = false;
   doBenchmark = false;
diff --git a/pkgs/sop-core.nix b/pkgs/sop-core.nix
index c96b779ce61d5077500fde5845ec6d78597ff4de..7a7e30a3083b2c2b88a39286cc8fdf2df6d2fbf3 100644
--- a/pkgs/sop-core.nix
+++ b/pkgs/sop-core.nix
@@ -11,7 +11,7 @@ mkDerivation {
   libraryHaskellDepends = [ base deepseq ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
-  doHaddock = false;
+  doHaddock = true;
   jailbreak = true;
   doCheck = false;
   doBenchmark = false;
diff --git a/pkgs/statistics.nix b/pkgs/statistics.nix
index 3615e76c181fa82ff9028f6fdbe842062f47bc68..a8c17e41942c3cd79dc944e7e29abcfb56ae9886 100644
--- a/pkgs/statistics.nix
+++ b/pkgs/statistics.nix
@@ -25,7 +25,7 @@ mkDerivation {
   ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
-  doHaddock = false;
+  doHaddock = true;
   jailbreak = true;
   doCheck = false;
   doBenchmark = false;
diff --git a/pkgs/stm-chans.nix b/pkgs/stm-chans.nix
index ff8dc589535ce3f5ae1adf2b4d67da3be10a6f13..506cceacfdd7ded7ddc972c20bc49fec14a8bc33 100644
--- a/pkgs/stm-chans.nix
+++ b/pkgs/stm-chans.nix
@@ -9,7 +9,7 @@ mkDerivation {
   libraryHaskellDepends = [ base stm ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
-  doHaddock = false;
+  doHaddock = true;
   jailbreak = true;
   doCheck = false;
   doBenchmark = false;
diff --git a/pkgs/string-conversions.nix b/pkgs/string-conversions.nix
index 67dfd03599b32699d010cffefe7a1d7b46ed7164..605b7175a5c5962cb9d42551a9c0d1849ac4ae30 100644
--- a/pkgs/string-conversions.nix
+++ b/pkgs/string-conversions.nix
@@ -17,7 +17,7 @@ mkDerivation {
   ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
-  doHaddock = false;
+  doHaddock = true;
   jailbreak = true;
   doCheck = false;
   doBenchmark = false;
diff --git a/pkgs/swagger2.nix b/pkgs/swagger2.nix
index 5066f8b08a086b15cec4a3adc1a5815eb1fa005b..d575c1f53c9258d46f54659e44a3fd79ffc378d7 100644
--- a/pkgs/swagger2.nix
+++ b/pkgs/swagger2.nix
@@ -30,7 +30,7 @@ mkDerivation {
   testToolDepends = [ hspec-discover ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
-  doHaddock = false;
+  doHaddock = true;
   jailbreak = true;
   doCheck = false;
   doBenchmark = false;
diff --git a/pkgs/system-fileio.nix b/pkgs/system-fileio.nix
index 1591f29318de94f08c2cfa57a38ddfac9b841395..d0d90250b9dd2d7e1577aaee3683b4b796abdbb4 100644
--- a/pkgs/system-fileio.nix
+++ b/pkgs/system-fileio.nix
@@ -17,7 +17,7 @@ mkDerivation {
   ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
-  doHaddock = false;
+  doHaddock = true;
   jailbreak = true;
   doCheck = false;
   doBenchmark = false;
diff --git a/pkgs/system-filepath.nix b/pkgs/system-filepath.nix
index 02e7d36a7988a6aaee247fa89b54d216243e3f77..90b709efc55b009fab72ae70e7114377e32ce238 100644
--- a/pkgs/system-filepath.nix
+++ b/pkgs/system-filepath.nix
@@ -5,8 +5,8 @@ mkDerivation {
   pname = "system-filepath";
   version = "0.4.14";
   sha256 = "1656ce3c0d585650784ceb3f794748286e19fb635f557e7b29b0897f8956d993";
-  revision = "1";
-  editedCabalFile = "18llfvisghrn9w9yfgacqn51gs50a0lngah3bmg852h0swj7vkp8";
+  revision = "2";
+  editedCabalFile = "0731bm8msw4gdaxy0dmya55w91yh9nk952ysf82n32c0nib1hdr4";
   isLibrary = true;
   isExecutable = false;
   enableSeparateDataOutput = false;
@@ -17,7 +17,7 @@ mkDerivation {
   ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
-  doHaddock = false;
+  doHaddock = true;
   jailbreak = true;
   doCheck = false;
   doBenchmark = false;
diff --git a/pkgs/tagsoup.nix b/pkgs/tagsoup.nix
index 2d4600857e98dadea9169099aab60ff77e94cb2c..75ebe330e20f68a9e5b87663946186641ac15ab9 100644
--- a/pkgs/tagsoup.nix
+++ b/pkgs/tagsoup.nix
@@ -14,7 +14,7 @@ mkDerivation {
   ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
-  doHaddock = false;
+  doHaddock = true;
   jailbreak = true;
   doCheck = false;
   doBenchmark = false;
diff --git a/pkgs/tasty-wai.nix b/pkgs/tasty-wai.nix
index 9d88b64fedfeeddcd8b7ad49a254542e7936d7bb..d7611fb77c0f6813156ef5d965d58283c3aa9456 100644
--- a/pkgs/tasty-wai.nix
+++ b/pkgs/tasty-wai.nix
@@ -5,8 +5,8 @@ mkDerivation {
   pname = "tasty-wai";
   version = "0.1.2.0";
   sha256 = "6f6f224d6dee893ce550f512832389a9ae0e490917a99b5362c9a4f73f16dca3";
-  revision = "1";
-  editedCabalFile = "14pz0mvpy2vwdhapn68pmwrpq7pvky87mkph44bc6vcbqy1jnk5c";
+  revision = "2";
+  editedCabalFile = "140kajnwrk614hswxyjymgpzy61m6riv5s25p4zkgv8aa1yhbk06";
   isLibrary = true;
   isExecutable = false;
   enableSeparateDataOutput = false;
@@ -16,7 +16,7 @@ mkDerivation {
   testHaskellDepends = [ base http-types tasty wai ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
-  doHaddock = false;
+  doHaddock = true;
   jailbreak = true;
   doCheck = false;
   doBenchmark = false;
diff --git a/pkgs/tmp-postgres.nix b/pkgs/tmp-postgres.nix
index 01992375e17dbb103e2f931f800d39182a8a81c9..5f12865c6974e4819f21276c87b0a3e8d89b5314 100644
--- a/pkgs/tmp-postgres.nix
+++ b/pkgs/tmp-postgres.nix
@@ -36,7 +36,7 @@ mkDerivation {
   ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
-  doHaddock = false;
+  doHaddock = true;
   jailbreak = true;
   doCheck = false;
   doBenchmark = false;
diff --git a/pkgs/type-errors.nix b/pkgs/type-errors.nix
index a46eb0e7618c3836e77075ec23d9502991dbca11..5bce175cbc26662111925314ef46960a5bb3c264 100644
--- a/pkgs/type-errors.nix
+++ b/pkgs/type-errors.nix
@@ -19,7 +19,7 @@ mkDerivation {
   ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
-  doHaddock = false;
+  doHaddock = true;
   jailbreak = true;
   doCheck = false;
   doBenchmark = false;
diff --git a/pkgs/unagi-chan.nix b/pkgs/unagi-chan.nix
index adf89f8d652e6c1c669e65592ecfcca9067cca5e..fd65ffd6a4d91c1b779a20e64c990a36d9664778 100644
--- a/pkgs/unagi-chan.nix
+++ b/pkgs/unagi-chan.nix
@@ -15,7 +15,7 @@ mkDerivation {
   benchmarkHaskellDepends = [ async base criterion ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
-  doHaddock = false;
+  doHaddock = true;
   jailbreak = true;
   doCheck = false;
   doBenchmark = false;
diff --git a/pkgs/uri-bytestring.nix b/pkgs/uri-bytestring.nix
index 8d2f661146b5ca8f00ec7872c69df72c316c9ebe..ad1f545be9123f7053848cdbc12153ab13505763 100644
--- a/pkgs/uri-bytestring.nix
+++ b/pkgs/uri-bytestring.nix
@@ -24,7 +24,7 @@ mkDerivation {
   ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
-  doHaddock = false;
+  doHaddock = true;
   jailbreak = true;
   doCheck = false;
   doBenchmark = false;
diff --git a/pkgs/uuid.nix b/pkgs/uuid.nix
index da38074af20574ca667410cf128ae7e2b182c849..ba3c8bdff7215d24a5c3bf9313eb391e49970bde 100644
--- a/pkgs/uuid.nix
+++ b/pkgs/uuid.nix
@@ -22,7 +22,7 @@ mkDerivation {
   ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
-  doHaddock = false;
+  doHaddock = true;
   jailbreak = true;
   doCheck = false;
   doBenchmark = false;
diff --git a/pkgs/vinyl.nix b/pkgs/vinyl.nix
index a494aeef1e859991dafbc5f315422c9b92121ad3..3bad9fbf6416c5596a501a5041ce04b49a2f7d9a 100644
--- a/pkgs/vinyl.nix
+++ b/pkgs/vinyl.nix
@@ -20,7 +20,7 @@ mkDerivation {
   ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
-  doHaddock = false;
+  doHaddock = true;
   jailbreak = true;
   doCheck = false;
   doBenchmark = false;
diff --git a/pkgs/wai-app-static.nix b/pkgs/wai-app-static.nix
index ae1a89ff3faf6af3f5f7d38bb60da4a8895b95b4..5baada8d18febfbb4ceb1828b9a40134fcb85d7a 100644
--- a/pkgs/wai-app-static.nix
+++ b/pkgs/wai-app-static.nix
@@ -26,7 +26,7 @@ mkDerivation {
   ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
-  doHaddock = false;
+  doHaddock = true;
   jailbreak = true;
   doCheck = false;
   doBenchmark = false;
diff --git a/pkgs/wai-extra.nix b/pkgs/wai-extra.nix
index ebb54852e2155ebe4ce663228cb57d6484b069db..2798ccac59a579fe664a16c06cb039e77fcc6b9e 100644
--- a/pkgs/wai-extra.nix
+++ b/pkgs/wai-extra.nix
@@ -29,7 +29,7 @@ mkDerivation {
   testToolDepends = [ hspec-discover ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
-  doHaddock = false;
+  doHaddock = true;
   jailbreak = true;
   doCheck = false;
   doBenchmark = false;
diff --git a/pkgs/xml-conduit.nix b/pkgs/xml-conduit.nix
index 844c28f833f6751f8d872dca2db4d3d4b28ad619..a90ee9ec2168fc1a342c66ff297d41abd955c870 100644
--- a/pkgs/xml-conduit.nix
+++ b/pkgs/xml-conduit.nix
@@ -22,7 +22,7 @@ mkDerivation {
   ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
-  doHaddock = false;
+  doHaddock = true;
   jailbreak = true;
   doCheck = false;
   doBenchmark = false;
diff --git a/pkgs/xml-types.nix b/pkgs/xml-types.nix
index 0ae1173a4134b2171e5f712a85a13cd704b69e40..b1007b57fa7cff6f16f7549d78241a69275677a0 100644
--- a/pkgs/xml-types.nix
+++ b/pkgs/xml-types.nix
@@ -9,7 +9,7 @@ mkDerivation {
   libraryHaskellDepends = [ base deepseq text ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
-  doHaddock = false;
+  doHaddock = true;
   jailbreak = true;
   doCheck = false;
   doBenchmark = false;
diff --git a/pkgs/xmlgen.nix b/pkgs/xmlgen.nix
index 25e39413e0219c43dcb92af635417b14164a2116..16bd487f50a3a55d7e258d4c034a4f56b06ca19e 100644
--- a/pkgs/xmlgen.nix
+++ b/pkgs/xmlgen.nix
@@ -21,7 +21,7 @@ mkDerivation {
   benchmarkHaskellDepends = [ base bytestring criterion text ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
-  doHaddock = false;
+  doHaddock = true;
   jailbreak = true;
   doCheck = false;
   doBenchmark = false;
diff --git a/pkgs/xss-sanitize.nix b/pkgs/xss-sanitize.nix
index dc3c6274054373b005f5edf0171f4c6e8fa7cae6..d846b410884415b6245f282e45f2f5308b63825b 100644
--- a/pkgs/xss-sanitize.nix
+++ b/pkgs/xss-sanitize.nix
@@ -20,7 +20,7 @@ mkDerivation {
   ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
-  doHaddock = false;
+  doHaddock = true;
   jailbreak = true;
   doCheck = false;
   doBenchmark = false;
diff --git a/pkgs/yesod-form.nix b/pkgs/yesod-form.nix
index 5f885fd5b664a26e220f4bdc89b3d2d3875d0cdf..d1d1fa625b007585b7f5c4ff0995f5758dd62250 100644
--- a/pkgs/yesod-form.nix
+++ b/pkgs/yesod-form.nix
@@ -20,7 +20,7 @@ mkDerivation {
   testHaskellDepends = [ base hspec text time ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
-  doHaddock = false;
+  doHaddock = true;
   jailbreak = true;
   doCheck = false;
   doBenchmark = false;
diff --git a/pkgs/yesod-persistent.nix b/pkgs/yesod-persistent.nix
index 1215c2334e7614fea3becb3a70be7c03cd951381..7bc10ad6edbe37968a5cc3f5e08c70f5121aee87 100644
--- a/pkgs/yesod-persistent.nix
+++ b/pkgs/yesod-persistent.nix
@@ -19,7 +19,7 @@ mkDerivation {
   ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
-  doHaddock = false;
+  doHaddock = true;
   jailbreak = true;
   doCheck = false;
   doBenchmark = false;
diff --git a/pkgs/yesod-test.nix b/pkgs/yesod-test.nix
index 5eb3da16261c7b84fc834a7c299ca3f14a690496..1102f6cc096903a078cf4b3b50be00cbafd14b3b 100644
--- a/pkgs/yesod-test.nix
+++ b/pkgs/yesod-test.nix
@@ -25,7 +25,7 @@ mkDerivation {
   ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
-  doHaddock = false;
+  doHaddock = true;
   jailbreak = true;
   doCheck = false;
   doBenchmark = false;
diff --git a/pkgs/yesod.nix b/pkgs/yesod.nix
index 01a14eff499e7dc85057b7daf27ca8d69af28c9a..5e63fe406621e9c03fa4d2d96a448e3701c13d30 100644
--- a/pkgs/yesod.nix
+++ b/pkgs/yesod.nix
@@ -19,7 +19,7 @@ mkDerivation {
   ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
-  doHaddock = false;
+  doHaddock = true;
   jailbreak = true;
   doCheck = false;
   doBenchmark = false;
diff --git a/pkgs/zip-archive.nix b/pkgs/zip-archive.nix
index 50369811a4f843748852fc0ef5fbe8deb0143b8f..30a0b2d865f6c7c55ea1998bc078e7c6d4dae4ce 100644
--- a/pkgs/zip-archive.nix
+++ b/pkgs/zip-archive.nix
@@ -20,7 +20,7 @@ mkDerivation {
   testToolDepends = [ which ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
-  doHaddock = false;
+  doHaddock = true;
   jailbreak = true;
   doCheck = false;
   doBenchmark = false;