diff --git a/README.md b/README.md
index cea5b947668ef18e4d75392e643e8ff305eb6141..455b9be11230790ecd0b05e6a692ea3d59776261 100644
--- a/README.md
+++ b/README.md
@@ -38,7 +38,7 @@ stable sources are used.
 The package set is generated from the `horizon.dhall` using the following command:
 
 ```
-nix run 'git+https://gitlab.horizon-haskell.net/haskell/horizon-gen-nix?ref=refs/tags/0.9.0'
+nix run 'git+https://gitlab.horizon-haskell.net/haskell/horizon-gen-nix?ref=refs/tags/0.10.0'
 ```
 
 This will generate both the packages folder and the package set file. If you
@@ -55,7 +55,7 @@ afterwards.
 To use `horizon-shell`.
 
 ```
-nix run 'git+https://gitlab.horizon-haskell.net/shells/horizon-shell?ref=refs/tags/0.0.3'
+nix run 'git+https://gitlab.horizon-haskell.net/shells/horizon-shell?ref=refs/tags/0.0.7'
 ```
 
 See the in-shell help for usage.
diff --git a/horizon.dhall b/horizon.dhall
index a962be11a3a608223fe13c8e28b1c1edade9fc12..a9e7b162a2b919ba99a540e54df30187a43f20dd 100644
--- a/horizon.dhall
+++ b/horizon.dhall
@@ -769,7 +769,7 @@ let packages =
           H.callGit
             "https://github.com/locallycompact/monad-par"
             "4f5b44fc85095e08cc159e4fc54a7d78dc41eccf"
-            (Some "monad-par")
+            (Some "monad-par/")
       , monad-par-extras = H.callHackage "monad-par-extras" "0.3.3"
       , monad-parallel = H.callHackage "monad-parallel" "0.8"
       , monad-peel = H.callHackage "monad-peel" "0.2.1.2"
@@ -993,7 +993,11 @@ let packages =
             (Some "servant/")
       , servant-auth = H.callHackage "servant-auth" "0.4.1.0"
       , servant-auth-client = H.callHackage "servant-auth-client" "0.4.1.0"
-      , servant-auth-server = H.callHackage "servant-auth-server" "0.4.7.0"
+      , servant-auth-server =
+          H.callGit
+            "https://github.com/haskell-servant/servant"
+            "0cda2d0ac87dc0dd47744134e44ab0b1647fe09a"
+            (Some "servant-auth/servant-auth-server/")
       , servant-blaze = H.callHackage "servant-blaze" "0.9.1"
       , servant-client =
           H.callGit
@@ -1106,7 +1110,7 @@ let packages =
           H.callGit
             "https://github.com/locallycompact/sydtest"
             "01c7d35b822c66a68e4d2ba5594858afbcc1cbf0"
-            (Some "sydtest")
+            (Some "sydtest/")
       , sydtest-discover = H.callHackage "sydtest-discover" "0.0.0.2"
       , system-fileio = H.callHackage "system-fileio" "0.3.16.4"
       , system-filepath = H.callHackage "system-filepath" "0.4.14"
diff --git a/horizon.lock b/horizon.lock
new file mode 100644
index 0000000000000000000000000000000000000000..ec65273b195d3b4ddb5956e5da8d10f5b56f7646
--- /dev/null
+++ b/horizon.lock
@@ -0,0 +1,4277 @@
+[ { mapKey = "BNFC"
+  , mapValue =
+      "cab767ab88f2ff9b4138a7e3ace73e5663a17717a6dbf2edfcc5fa31630d7666"
+  }
+, { mapKey = "Boolean"
+  , mapValue =
+      "4d64f43cf0f1ed7e293b8bf83c4e78a4d92da64ad34401f822799e02ab550478"
+  }
+, { mapKey = "Cabal"
+  , mapValue =
+      "7610138fc5224d5f482057419e0bb1e558b371a4ce0932ea1e865dc585daea4a"
+  }
+, { mapKey = "Cabal-QuickCheck"
+  , mapValue =
+      "c6aa86b294a7053b6a551e85f80cf92373d65677590734e21c09d26fcf8513dc"
+  }
+, { mapKey = "Cabal-described"
+  , mapValue =
+      "298318fd9310f80b6c1865c57d3d763c38ef26ad90cc333f91d02e5789bd9e7a"
+  }
+, { mapKey = "Cabal-syntax"
+  , mapValue =
+      "517a8e9f48af3b7dbb05cdbfb1bb42b694be7ca9245e2ce2e671aa9271deafed"
+  }
+, { mapKey = "Cabal-tree-diff"
+  , mapValue =
+      "6c4d8d270d0b433008f95e176bfbeef575cabf552989b199818cb2bbb9306610"
+  }
+, { mapKey = "Chart"
+  , mapValue =
+      "5e1378733326a628b9fcc4cc0cb5b93cedfb002ee80fbdb5ea2ceba1db01674c"
+  }
+, { mapKey = "Chart-diagrams"
+  , mapValue =
+      "8db7d5cd296b70a7082ef21e5478d5b0ad42f50a046a48ad01ae62f4e584f871"
+  }
+, { mapKey = "ChasingBottoms"
+  , mapValue =
+      "1231e9357bb81268ed38cf1a94f19f8a219e390c3727e44daae07507fbf8105a"
+  }
+, { mapKey = "Decimal"
+  , mapValue =
+      "947ae65c293be26ad673575d180cb9cecebad1d26098fad7698ce9e42c7e6c7b"
+  }
+, { mapKey = "Diff"
+  , mapValue =
+      "936fab85b5fc9ab6f841b990a50cdeb48420986ce3108aab300237ed6178cdcf"
+  }
+, { mapKey = "Glob"
+  , mapValue =
+      "b5336c36cb1886e5010fb5b5e4a313f6e14414de778063b7069188b518bc80eb"
+  }
+, { mapKey = "HTF"
+  , mapValue =
+      "aebd23f2c470b85d4c2fd227af490959e1dacb4ca20aec6666a570254d147415"
+  }
+, { mapKey = "HTTP"
+  , mapValue =
+      "ec56a281d338191dff44c66cd1014f0bfcce3c9732a79dbb58d2d5dd3c989549"
+  }
+, { mapKey = "HUnit"
+  , mapValue =
+      "240b283921dee8a1ae8f503ad7ec0c27e030b12a8f3f066691d4f8c3fc268db8"
+  }
+, { mapKey = "HaskellNet"
+  , mapValue =
+      "07f8ee31b5ef0319ed8241e7f1b4a4d2c945bd4d748fa93efe24601b5356c4bc"
+  }
+, { mapKey = "Hclip"
+  , mapValue =
+      "70e817087c5542f60461d56c78cdfdd1bf827f78c011f7cdeddd65abaa3e4c39"
+  }
+, { mapKey = "HsOpenSSL"
+  , mapValue =
+      "dcc28175539e673eaeb2909a32d319b36ca7ef0bf6b9cdaaecec247ee11cfbad"
+  }
+, { mapKey = "HsYAML"
+  , mapValue =
+      "362225c67dcd1fda099a8f8c8941e65de1e9c1fcab996b6dbb88112b268b1a26"
+  }
+, { mapKey = "JuicyPixels"
+  , mapValue =
+      "cc9bb942ef2b796756fd6c7fdedffe31fb3cdb8ee599b0f85da6242726ddb5eb"
+  }
+, { mapKey = "ListLike"
+  , mapValue =
+      "10f6bd60daf44656ab50fa3625eee506d7d7bb960c01c8f16ce86f5e79feff96"
+  }
+, { mapKey = "MemoTrie"
+  , mapValue =
+      "83da7a54b650a0e81c2121210dcd1c31b3747a22f26c1aa13c16e0d807afdd20"
+  }
+, { mapKey = "MonadPrompt"
+  , mapValue =
+      "21d10745d35c369d73d87d32810e6001091baf0b7a5aa8dab522af9b20d6aab7"
+  }
+, { mapKey = "MonadRandom"
+  , mapValue =
+      "4787309ed409e148de6c8a43a4d2fd7ee8c357a4cf508e41ec62d1c5b44eaa53"
+  }
+, { mapKey = "NumInstances"
+  , mapValue =
+      "c786436da8a459c9ab09184b4194c4f9faf5e1d69a6fb4b5eea4a6e4f1f90b45"
+  }
+, { mapKey = "OneTuple"
+  , mapValue =
+      "f06f01196f6eeb10a9322ae1c28b5bec018df9236991a9ce1d8f05475a74fc58"
+  }
+, { mapKey = "Only"
+  , mapValue =
+      "1de949c17ed264585d924ee79ab9553dbf140556b4bf91c5e95c59792b80b1a1"
+  }
+, { mapKey = "OpenGLRaw"
+  , mapValue =
+      "940b65e0bc5ff641d7c6be3255bde2df8768492ec94d11aeed358996abb6d582"
+  }
+, { mapKey = "PSQueue"
+  , mapValue =
+      "badfa00cfc0e01dd63a255b95af64598ea986b25635dedee551dda9e2c41b987"
+  }
+, { mapKey = "PyF"
+  , mapValue =
+      "b4831bcb0908692fc73ccc546ef504f0c5b1cbb84e78aebb2ab94f0419065c3d"
+  }
+, { mapKey = "QuickCheck"
+  , mapValue =
+      "34a54e303e38dc3bbacabee43cce6f994191834ee44b97b44ed6b7b736a7f962"
+  }
+, { mapKey = "RSA"
+  , mapValue =
+      "4698a5702c206752f95932416d86d0381e76c8058b4ba03115e3fbc4a348dd1c"
+  }
+, { mapKey = "SHA"
+  , mapValue =
+      "ddb3697d7a4560f4c71be42fe0ae98c26d7773c7deb6cc2fd02f0cb1d405de1a"
+  }
+, { mapKey = "SVGFonts"
+  , mapValue =
+      "cccb9541dbba3ce9d85ad885d89a8b74eb771e13b5a9b21b3f4837f84c6061ee"
+  }
+, { mapKey = "StateVar"
+  , mapValue =
+      "c5b79f7aac3e78633302161afbd6f1e4a7575505d98d7829c4bc49f84e826805"
+  }
+, { mapKey = "Stream"
+  , mapValue =
+      "a0c060e768a7e3eb6bca86515141f300bbc28e60e124f4bf324bc22885f1dfdc"
+  }
+, { mapKey = "Unique"
+  , mapValue =
+      "bcef2a0f7821af0e5604f7e867da64a655c68ee1837905f2a1b23b20bea12a33"
+  }
+, { mapKey = "X11"
+  , mapValue =
+      "82426357feed8067aec32d7f4bee9d4149d3045908cded43f974a69c2b2a5b9d"
+  }
+, { mapKey = "X11-xft"
+  , mapValue =
+      "85566905a60e41ec1ae27f28ef5c09d324330e7b545bea160e5adefe2a72fcff"
+  }
+, { mapKey = "abstract-deque"
+  , mapValue =
+      "9f67ebbc1befb87cd09259da5d0d1cbfa242bae7d77f03675c6cc3ad8d00a983"
+  }
+, { mapKey = "abstract-deque-tests"
+  , mapValue =
+      "b7a1041c8f104cbcade56e7ce80aba2f07bffbf93a55fb30c64b797c8524fc79"
+  }
+, { mapKey = "abstract-par"
+  , mapValue =
+      "3a698abbeaa636e7fad931826f8e52aaaba58ad87b7f1c471b107315e3e3470c"
+  }
+, { mapKey = "active"
+  , mapValue =
+      "802bcbbbedfd75751604be7dade104ad7564ee05a7e2b173d2144c62b5c82c29"
+  }
+, { mapKey = "adjunctions"
+  , mapValue =
+      "15ebf9263fea74e281e173fb3dd200571abe1b68ffdd3d80ebd9b0cd28f2adf6"
+  }
+, { mapKey = "aeson"
+  , mapValue =
+      "5e178472155adfef865e389a5fc154291f8c622162bfd6c1abc36ab110daa83c"
+  }
+, { mapKey = "aeson-pretty"
+  , mapValue =
+      "2a0d5c393b01ff8c5c359f73e384a7308eec3d4528d33764418e2e9f98a465bf"
+  }
+, { mapKey = "aeson-qq"
+  , mapValue =
+      "4bcb98c6d8122815cd4ad8485cce07fbbd0158bf6a11ff2342c1b072d7d90dd8"
+  }
+, { mapKey = "aeson-yaml"
+  , mapValue =
+      "0a1feb2d6f86cb044f509ffdf5c952d8eea1533c0f20bc01b1f1fd4518cdf612"
+  }
+, { mapKey = "alex"
+  , mapValue =
+      "9621863ee328b1d6bd4a44dc9eeb2a9df178eb98c6acc9a7770885c3bffbbcf8"
+  }
+, { mapKey = "algebraic-graphs"
+  , mapValue =
+      "e6ea7f13b8e067939860aa7048e9bd7568b5e6948edb9b971583468532f384b3"
+  }
+, { mapKey = "alsa-core"
+  , mapValue =
+      "9df4dc05a2145d4b0ae8f269123c719aadf2f413111ccf11542466c50bab6eec"
+  }
+, { mapKey = "alsa-mixer"
+  , mapValue =
+      "941279ce5fe4077d4942c428916a99d82f4e472db00159076680a2203d8aeb15"
+  }
+, { mapKey = "ansi-terminal"
+  , mapValue =
+      "50a2e741a4487dd2fe9af32cca399d678dfb617afa86ea33931c04fd465467f7"
+  }
+, { mapKey = "ansi-wl-pprint"
+  , mapValue =
+      "b330b4d2c66648eaa81604cae33f766f5bcbc5dda97d8d02019b3c761d3f6092"
+  }
+, { mapKey = "ap-normalize"
+  , mapValue =
+      "7b4be96a6c8053b78d7141ce8ebbdc50d64d71468e514f76b3d71d5ce89f90ad"
+  }
+, { mapKey = "apecs"
+  , mapValue =
+      "04f35b8b42e6ba4f5419cb511a56a2d9374b9f9d1c60935af30c676ff57ca30f"
+  }
+, { mapKey = "appar"
+  , mapValue =
+      "bd398af28ca8b574463621327730754b4362774f37b4bc5b6107416c53f8ae87"
+  }
+, { mapKey = "apply-refact"
+  , mapValue =
+      "5e295766b57f7b382bceb56f05f55655c7e7a8d00348e22676778d1c3389d041"
+  }
+, { mapKey = "asn1-encoding"
+  , mapValue =
+      "1b992c4a307cad9b9f0eef1951ae1f16c6cf2b64e1adc2d195c991310cd51025"
+  }
+, { mapKey = "asn1-parse"
+  , mapValue =
+      "95befbeefcb1cfc7adfdb379a421d7ff33b6a6ad7ea30aed6e67d6c881b396a7"
+  }
+, { mapKey = "asn1-types"
+  , mapValue =
+      "881ae02408f1cb78fac994a2f0be5974ab401ea727949cc7c30ddffab874328b"
+  }
+, { mapKey = "assoc"
+  , mapValue =
+      "77ef241da6f7ae45efba7870dab0486dd0475975f6d012d45315b1877fd533e3"
+  }
+, { mapKey = "async"
+  , mapValue =
+      "dbb353f9c1ebc74dedf19f63ff3af4c49017b7bd80181ffc5c174579a8ada547"
+  }
+, { mapKey = "async-timer"
+  , mapValue =
+      "7a5b18ff54270e73e6a8d656b5c39b15f0e3040ff55927d87243be3daff5c8b7"
+  }
+, { mapKey = "atomic-primops"
+  , mapValue =
+      "8ac7872ab79a9cf6e8c959647180d8f06445c3861aa1b2eadcf5e821ced1b700"
+  }
+, { mapKey = "atomic-write"
+  , mapValue =
+      "9f2be0ffadad1adfc0b0e9923e9b3d8fdc4684ae00cee8a07d5044635a822a38"
+  }
+, { mapKey = "attoparsec"
+  , mapValue =
+      "ca8be6d27b2a069dec4be8239cbca9e47c4d173ca5b6336e2b774ccea002c9ea"
+  }
+, { mapKey = "attoparsec-binary"
+  , mapValue =
+      "3a62a46b1425480fb3ea11297478cf5dc7cb1fb45551edc5fc935fe84d4c2ef4"
+  }
+, { mapKey = "attoparsec-iso8601"
+  , mapValue =
+      "2361cba62133bdd1e58b3054b3cc2a372e4985ae6d70553ae0e67daaa8cda80b"
+  }
+, { mapKey = "authenticate-oauth"
+  , mapValue =
+      "5420ef9bc0457ab354b083071cb47da9139e37431a1d4c2c71a4e2fe668972cf"
+  }
+, { mapKey = "auto-update"
+  , mapValue =
+      "ed25355575bb380ba33ee8ab27488e22170f94c1168c5574fb835895c860d8fd"
+  }
+, { mapKey = "autodocodec"
+  , mapValue =
+      "65a61057a62ee9681024fb1ebd6235a493222116e4d026db9d3e5fcc76e3ddb0"
+  }
+, { mapKey = "autodocodec-schema"
+  , mapValue =
+      "129a6e278995f367c731cfe1874c56a072d790e03d208e37d69e3bced25ed75b"
+  }
+, { mapKey = "autodocodec-servant-multipart"
+  , mapValue =
+      "199aac09191b045a29280de4374526dd68b66fcdd5ff4d0ae70a2e07fbb66ed3"
+  }
+, { mapKey = "autodocodec-yaml"
+  , mapValue =
+      "fd329fb9a3a857df7b3aaacc75d2616b8c5417aaf7354f27591a24d0e2e2f8fa"
+  }
+, { mapKey = "autoexporter"
+  , mapValue =
+      "df8e58ac468cce83afb31ad68c7ed86f7b02fb1dbe44c74004c884dd363cd148"
+  }
+, { mapKey = "barbies"
+  , mapValue =
+      "c3884fb22d6404935924a0a26526dc6bd0fc3881ceda9daecea1b8c3dd3bc4a0"
+  }
+, { mapKey = "base-compat"
+  , mapValue =
+      "27b2ef4dc5f3c0bc457c6fdb6b5fee296817e843624df9120874b8bde7b8fd7c"
+  }
+, { mapKey = "base-compat-batteries"
+  , mapValue =
+      "b91c66dc6a1f68163af56242e5c5b286bb838abf389de75f327b22930d5dd671"
+  }
+, { mapKey = "base-orphans"
+  , mapValue =
+      "0c3f7f6445975c757852b5742ddc9ea18fbff02dc3c83db38b11384f71e44004"
+  }
+, { mapKey = "base-prelude"
+  , mapValue =
+      "c87f5a4c745d1dc815c86011b1512cd9f9fed21975ef889fcf40e3b383979e21"
+  }
+, { mapKey = "base16-bytestring"
+  , mapValue =
+      "715ae985eb7e8118fd0fb7fed21e565e93f34005bd83bf7ee71e254a8d1d1936"
+  }
+, { mapKey = "base58-bytestring"
+  , mapValue =
+      "3dd259e34930b95b9d7027e08348e10e41fd976ae51db17d7bd53321b73b8af8"
+  }
+, { mapKey = "base64"
+  , mapValue =
+      "1969c36750987ac2e02dac99010986c66a132a550b868d232171ee8731b0fa03"
+  }
+, { mapKey = "base64-bytestring"
+  , mapValue =
+      "9af4b5d58ee5bea8f8b4198c59f5a6d5d2e0262c6557854f3ede0d4faa075da7"
+  }
+, { mapKey = "base64-bytestring-type"
+  , mapValue =
+      "cb23e719c39cc552d2dfdd5f92bfe959bc195d1ee570b6e263f2ca212bf4a3d5"
+  }
+, { mapKey = "basement"
+  , mapValue =
+      "67ab2fb875364fb77a49f4ca9bf6e023dc8538e9f4fb9e8509964b131d1d0c01"
+  }
+, { mapKey = "beam-core"
+  , mapValue =
+      "3fc1695a6825dbf37797f60a84d6d0c63e0f7cc2cf84cf0b6372b8bc3cf37911"
+  }
+, { mapKey = "beam-migrate"
+  , mapValue =
+      "ad8267ee94014a441298db7621d8d292be2360f7c8384180fbfa1c2715043e57"
+  }
+, { mapKey = "beam-postgres"
+  , mapValue =
+      "090e1ce168b639cb2251be8fa1c91110cb7e837e2760bfcda4424c8f00041da1"
+  }
+, { mapKey = "beam-sqlite"
+  , mapValue =
+      "bc652b62c1c69bc0bc9f6e77cf5154f7e1d25b2054fc2e7d511bdd09bd205258"
+  }
+, { mapKey = "bech32"
+  , mapValue =
+      "bfb515e7926b11f41797da2320a47d49c385ba432c8457688d4a2c1107ec619e"
+  }
+, { mapKey = "bech32-th"
+  , mapValue =
+      "362cac45966f7716dd7a315872517025e54d8cc7c24ad8bb1a219d534a166016"
+  }
+, { mapKey = "bifunctors"
+  , mapValue =
+      "a035b36004ea54e5b3640f7859d4f4ca95550e6b09077f3288631a113935b92e"
+  }
+, { mapKey = "bimap"
+  , mapValue =
+      "3fb72c2fd6ed07c102caa81b55978509ecff18b377222383bbf8a488b5f6ea1e"
+  }
+, { mapKey = "bin"
+  , mapValue =
+      "798f34e777c9080ea7d1a48a1a578fcd028164910f17ac40b25eb5d24b7f1999"
+  }
+, { mapKey = "binary-orphans"
+  , mapValue =
+      "8003e6d1f05038ea5f85f84284b62c536c3354eb04a66dc9636b1c4fbea76ece"
+  }
+, { mapKey = "bitvec"
+  , mapValue =
+      "f08181e1c7e7a0b210f985fa104f53d8cce02cb5bdc19db0ae59cc0111aa237c"
+  }
+, { mapKey = "blaze-builder"
+  , mapValue =
+      "88686b591705ea173f3dfe9b35923b4d8598f41b5c71d3b31e87b130985e4510"
+  }
+, { mapKey = "blaze-html"
+  , mapValue =
+      "e75c7d7b3df3fa97f1141033ee9f533dfd6984190f44ebfb184039a32275a52b"
+  }
+, { mapKey = "blaze-markup"
+  , mapValue =
+      "e9920ce5a4ded2ad5c78f90ac7af6f47a0fc19f25e836b00e91d146dfd38b5a8"
+  }
+, { mapKey = "blaze-svg"
+  , mapValue =
+      "7477a00e490ee1889486608a3e8b4a0ef1f5fe5c237beda9980a1ff2cdbd16a7"
+  }
+, { mapKey = "blaze-textual"
+  , mapValue =
+      "6b4bc7b9852f5ec050ff1da352e3ae4b71ea12c8911bb713ec2024dd140ad65e"
+  }
+, { mapKey = "boring"
+  , mapValue =
+      "3339da304fd96d7855b2d9109e5027a20ba31a7817c88d4cfbd32cd5c8ded1b1"
+  }
+, { mapKey = "breakpoint"
+  , mapValue =
+      "7b01240842924bb3bde1118255438bfff55c583443866c9fec33ce0f9e3b43f1"
+  }
+, { mapKey = "brick"
+  , mapValue =
+      "3884cb2104556cc5bbf8748ce757a8f0b6f764e3140abfcd1b1e85f4b6d372e4"
+  }
+, { mapKey = "bsb-http-chunked"
+  , mapValue =
+      "319dcf02278f2c3e9e709b8c8de4107d0d99b7df591a5c894dff7958c9bf3c96"
+  }
+, { mapKey = "byteable"
+  , mapValue =
+      "e86cd2844502667302896393beba8e7fefda14f4885455a87b9ce9235b8b1fde"
+  }
+, { mapKey = "byteorder"
+  , mapValue =
+      "2f14b0938eb87776ca002d5a35f3e59062099d1562f18cf7c8834d23d909a04e"
+  }
+, { mapKey = "bytes"
+  , mapValue =
+      "ac2beb8464ad1a567a3fd8e09c356bbb368f0e89148168ac7e9cf75ba1bb6da2"
+  }
+, { mapKey = "bytestring-builder"
+  , mapValue =
+      "1c25530fd269861f415ee36088f5b313ce7c2e37b2f6bb23ecdbe91901e15286"
+  }
+, { mapKey = "c2hs"
+  , mapValue =
+      "f19285c44849982666c0eedf6c3f5bae4f10c1464b3b400df94b43d7ed21b32b"
+  }
+, { mapKey = "cabal-doctest"
+  , mapValue =
+      "f5f0c8177bd2c5b485779e127f892e588203f80cb375ff8c18d0104fba70b029"
+  }
+, { mapKey = "cabal-install"
+  , mapValue =
+      "215b8c22799092efe4ac6e4f5d10ca77092d2e1f3538102268d0c813e9d9b23b"
+  }
+, { mapKey = "cabal-install-solver"
+  , mapValue =
+      "f138722054d7d68da200c26dd77d1b3a60bfe60b5f2b85ca18427e6e820c6282"
+  }
+, { mapKey = "cabal2nix"
+  , mapValue =
+      "d623efa4d20547ef1ae74385dc8cb217ce332f09199782a18be26e60afa26b0e"
+  }
+, { mapKey = "cache"
+  , mapValue =
+      "b06e914e2fc6eae6c8ad84de819d3130d294eb51c5131defc34864e1ab2d0ad0"
+  }
+, { mapKey = "call-stack"
+  , mapValue =
+      "d5fe66723e1bd19ea30657a765eff1679f023b7b685c3707cce659b5c0929409"
+  }
+, { mapKey = "canonical-json"
+  , mapValue =
+      "993a591db78eabd60397fcd8b07b32addb859f7ad09efad5dc30958815b86125"
+  }
+, { mapKey = "case-insensitive"
+  , mapValue =
+      "788a58262125b31ed70ea2a57a652c67d67faddadab9c078d5552078fe90cd06"
+  }
+, { mapKey = "casing"
+  , mapValue =
+      "f018a845ccb979d81c9177e8d807b57793754241e587106f0de9c096ff38b0c6"
+  }
+, { mapKey = "cassava"
+  , mapValue =
+      "69645f10aa5c577fe83ea966d7baba5d73f4ae5f4b78e120faa2b7430d03471f"
+  }
+, { mapKey = "cassava-megaparsec"
+  , mapValue =
+      "8703bbf085cd0dca931931434122162e836af53d92c8731c72b6b4baa06b72ad"
+  }
+, { mapKey = "cborg"
+  , mapValue =
+      "2bd76627f7453d86fb64ecba253fe724f6f4bd0ff0db7571e2c4c6808a09129d"
+  }
+, { mapKey = "cborg-json"
+  , mapValue =
+      "3c2559880199b4dfe6dfaaf46d4a9b85c002be69892a74bf23a912ae394a55d9"
+  }
+, { mapKey = "cereal"
+  , mapValue =
+      "d54651cc8c00849c02a2af4a6b756411eeea9fdc3fc5d8d60301c490edb41e4b"
+  }
+, { mapKey = "cereal-vector"
+  , mapValue =
+      "3509f3ee3c8dae699dbe59554e26cc70041a04a324d1bb97e0e3a07539174524"
+  }
+, { mapKey = "charset"
+  , mapValue =
+      "af29a8308e5ce959c7de2a6fb2bfdffe9e44329bbe2e167db7c8b33f9e6d6f8d"
+  }
+, { mapKey = "cheapskate"
+  , mapValue =
+      "3af7561dd8281f1841930daa3f29314489e14ec5bf1155ba8ec23e0a382be173"
+  }
+, { mapKey = "checkers"
+  , mapValue =
+      "c8c2639365ba0070330e659f3cb730e994706ce3b9baa072f2eea6b47e5e0a56"
+  }
+, { mapKey = "chell"
+  , mapValue =
+      "b3aff3070ae3f9cf768e36e6651d825f7389a5d98f62ba61f23e741336509740"
+  }
+, { mapKey = "chell-quickcheck"
+  , mapValue =
+      "d3f24d905fe71a57b8d8af33f805be261c5df0bf9a048a330fc7b0f6a7514da0"
+  }
+, { mapKey = "circle-packing"
+  , mapValue =
+      "263b4af31894324c95f57890231d7a2157ace5b513840eddfb3fc4c0d601046b"
+  }
+, { mapKey = "citeproc"
+  , mapValue =
+      "3434d229644f6e32cd98e1aa7d27fff83d4b10642222e74534ea7a4ec7c5a2b1"
+  }
+, { mapKey = "clock"
+  , mapValue =
+      "9312cf31548f7e09d399088921e7bf358867f83f2903c145218e85b014d036bd"
+  }
+, { mapKey = "cmark-gfm"
+  , mapValue =
+      "961379f95596ee64f50dec46ad48e88ebfa9ef3ab630e7579839034864dc17a8"
+  }
+, { mapKey = "cmdargs"
+  , mapValue =
+      "e71511e7c119c9bd3b5b9e8f03aa956207382448f62413ce681330b50780c053"
+  }
+, { mapKey = "co-log-core"
+  , mapValue =
+      "87fca30193990022339695faae5c8869e5075a477e61af0c2e3402a4de82444b"
+  }
+, { mapKey = "co-log-polysemy"
+  , mapValue =
+      "16821cf1acba2e758626eb195933ca5313301d54c7bac40cd4a67c5215840c64"
+  }
+, { mapKey = "code-page"
+  , mapValue =
+      "29f3719216028b586c1d7cacbc5fa8cdbd2b29a44374e058d368eb491836cd00"
+  }
+, { mapKey = "colour"
+  , mapValue =
+      "ca821e8b109f03fc04899e8dc355f19b63fe3661032850135b4708a683b61d67"
+  }
+, { mapKey = "colourista"
+  , mapValue =
+      "ed9cca68ef7149b0a5ed6bdc68f1c6e27e18e9c105b0766eb8395886f0b9ac6e"
+  }
+, { mapKey = "commonmark"
+  , mapValue =
+      "9dd14ca579a9729f7358f22bdd38d186c495f03cafe09fd3bc20d913956d0e52"
+  }
+, { mapKey = "commonmark-extensions"
+  , mapValue =
+      "e88a0459663c16c5ca09c8fc4b20b3c78a18ac1fc72764273ea58b5293e671b6"
+  }
+, { mapKey = "commonmark-pandoc"
+  , mapValue =
+      "f7494a36f7da112b5e5c9a76533b6657ae3bde26bfb65e500bf5df581fc97023"
+  }
+, { mapKey = "commutative-semigroups"
+  , mapValue =
+      "c023759b3f29769bf869a77ea12a84ee1983d89f548e807f9fbbefc8f55cfb96"
+  }
+, { mapKey = "comonad"
+  , mapValue =
+      "6573e1a509023b562f79e0d262cefda84df40a1ffd41bc0a5a9dc82f42c4c559"
+  }
+, { mapKey = "compact"
+  , mapValue =
+      "690bfdb28a88811f869fc6115dc9187fc41dc1f1a052e1f2541ec1bcc045f76e"
+  }
+, { mapKey = "compactable"
+  , mapValue =
+      "e037abdc61f2c39d3ff86448d6aa8cfd8053eba3a6fd54e1ca79a9196859c3cb"
+  }
+, { mapKey = "composite-base"
+  , mapValue =
+      "2e72add4788804f2eff0edb18051394da5e913ca3abc927de29dcb5e9c8881cc"
+  }
+, { mapKey = "composite-cassava"
+  , mapValue =
+      "fcb702ebbe39807a13c9dc2b7e76d58cb12401027b5d8b311a85da7e51f4b2da"
+  }
+, { mapKey = "composite-dhall"
+  , mapValue =
+      "8b7cd89888c30e1f5e4ad44bab77d5b2571de036ce94ecbd55a49aec8d695498"
+  }
+, { mapKey = "composite-lens-extra"
+  , mapValue =
+      "7c525349ac672ca3463dd780884b3819903a3214606ef017b096e644efcf62cd"
+  }
+, { mapKey = "composite-tuple"
+  , mapValue =
+      "d138de94f02710922cb2aaf314d1bf4dd393f21998cbfb13663c8a08dfb9eaa9"
+  }
+, { mapKey = "composition-prelude"
+  , mapValue =
+      "7945172754a50c8c5374b2b6b331d17003bcfb17eb8f3b9a8f9551b77bd3c53d"
+  }
+, { mapKey = "concise"
+  , mapValue =
+      "d96db763d6044a35b91fdabbf362f3a9fe8bc44ca266e6aec7464874f7134f8c"
+  }
+, { mapKey = "concurrent-extra"
+  , mapValue =
+      "8ddc93e2a0131ed1173b7af843dfd8ca0bb8f71ce7bea18ec06f85f8307dbdbc"
+  }
+, { mapKey = "concurrent-output"
+  , mapValue =
+      "faab8f114f12011f4307f15db48709686fcc5c0fbcf78e6dd05d64c7607732d2"
+  }
+, { mapKey = "conduit"
+  , mapValue =
+      "db68fd68c9d0573b638252ecc16e29ceb3c08b0edb1e7b8437570226e0794b46"
+  }
+, { mapKey = "conduit-combinators"
+  , mapValue =
+      "393f306f2032345b580304ae1fcac1a37c7a21070a26038a8ee340a12ab91dde"
+  }
+, { mapKey = "conduit-extra"
+  , mapValue =
+      "97aa8a3125b8c8dbe7f3fd9dae0961e98c2a52f8cb584d8794f1dff1fd0b189a"
+  }
+, { mapKey = "conduit-parse"
+  , mapValue =
+      "e9b6bd869546569d301629184482faeda706c57c651a14878c0d157ff7840950"
+  }
+, { mapKey = "config-ini"
+  , mapValue =
+      "7297397929d9009c2c37c4b74fd522c553b2c61e54da50b08b57c814a2e96113"
+  }
+, { mapKey = "connection"
+  , mapValue =
+      "8564970ce1a7e0fa46ca64f21bee39b42fbe406cc90ab056e36444e0eb49a20e"
+  }
+, { mapKey = "constraints"
+  , mapValue =
+      "ef671a1438780efb16d06da3aad028d9c1ec9c2c355f8d175cec42e3796cdcca"
+  }
+, { mapKey = "constraints-extras"
+  , mapValue =
+      "65c5019c71cd5534a9abee84a8d77f529407776f9622188889c2151ca68a91e4"
+  }
+, { mapKey = "contravariant"
+  , mapValue =
+      "8dacf6d3b17bb89c367e4c78fe6ee803c722741547a189dcbd5a872606cd1b6a"
+  }
+, { mapKey = "control-monad-free"
+  , mapValue =
+      "631dce64b8071fc190cff84c20dd03f1443a987f75f3cc77a0bcd3810749638e"
+  }
+, { mapKey = "cookie"
+  , mapValue =
+      "f2612cadc2e1dbbb15bb00949b06f490d121ee3b0c4fba2ba3c53f03e767dc85"
+  }
+, { mapKey = "cpphs"
+  , mapValue =
+      "87a1c97498c379dfa6db993c6dcd0f2630048bae023f636e57d64068297fbb89"
+  }
+, { mapKey = "criterion"
+  , mapValue =
+      "b86a0676ff47a5c89e2092cfe40bc4f1187670eb02b5e5f5947eba2629b2453c"
+  }
+, { mapKey = "criterion-measurement"
+  , mapValue =
+      "72b7fc928ba427656432a3812900a7ad40177fbc07ee6ef66f24419a03ceb3c8"
+  }
+, { mapKey = "crypto-api"
+  , mapValue =
+      "1bdfd2b5f183a193f89f99cfade171a1faf01002521b4c649850d9c0b4c95eb9"
+  }
+, { mapKey = "crypto-api-tests"
+  , mapValue =
+      "f98d856e24dd5fb00536a7f4b98db75b13fef10b6e4d429e269089edbb23d309"
+  }
+, { mapKey = "crypto-pubkey-types"
+  , mapValue =
+      "e1d3126b00bbab3b25b2b740d90bd7ffadcd30a230c451f279273baa2b5f6397"
+  }
+, { mapKey = "cryptohash"
+  , mapValue =
+      "b37746463dbf5d16270ab75a038d7a65534e22d36ac0c5a9e2ff3d4cc737065a"
+  }
+, { mapKey = "cryptohash-md5"
+  , mapValue =
+      "f51400db530a6cef4f10dce051dd43d05f01567ef7550f445300db2e7935914d"
+  }
+, { mapKey = "cryptohash-sha1"
+  , mapValue =
+      "9a59e80cac481e6a4a5988810d41683dae1c65b56974ecab4e0a2f54d2f7ca2e"
+  }
+, { mapKey = "cryptohash-sha256"
+  , mapValue =
+      "1f093edc8083742da3e6d15707cf28283ebe26fc6c482432a4e926a20ba8525e"
+  }
+, { mapKey = "cryptonite"
+  , mapValue =
+      "201b9e0e76823e905af587dfcdac2c3b930d24649fee4e9b3ed76ac0251bf5e4"
+  }
+, { mapKey = "cryptonite-conduit"
+  , mapValue =
+      "60bb3131eb52dace4db46cdb416b4f3f09e0928466ea0e6c218ed388a70f2b42"
+  }
+, { mapKey = "css-text"
+  , mapValue =
+      "3ce6e46df7723d23ef3aac1ff1ef10def3c1dda5e14d3f82b4f13ea5ea445a3f"
+  }
+, { mapKey = "csv"
+  , mapValue =
+      "0079b6751eaad78696c3c10d782cd50ca725f0c1730ece9fabcf7e91e02a3dd2"
+  }
+, { mapKey = "cubicbezier"
+  , mapValue =
+      "3e69cfe343c0810a091af55107ac17531c5ab2fed99b07a7f5c03c7abe98357e"
+  }
+, { mapKey = "cursor"
+  , mapValue =
+      "866928d41b03beee768f01d0b1e9e97d6930240180b680a53602edba83895c7c"
+  }
+, { mapKey = "cursor-brick"
+  , mapValue =
+      "45b87997f5e8dd78835659575abeeb92007828ed0851d5083fdfc0a569073050"
+  }
+, { mapKey = "cursor-dirforest"
+  , mapValue =
+      "2ba66219ab876f0a216b81667e6047dba337f2d7b165a2e6352cc619c01f835c"
+  }
+, { mapKey = "cursor-dirforest-brick"
+  , mapValue =
+      "3634eb8ef587b0bb8f20196d2c3f10124717da35c2f0364dc5413d5e9014fd17"
+  }
+, { mapKey = "cursor-dirforest-gen"
+  , mapValue =
+      "2e0bd5543ec09768647f63889aa67e6639780ebe241369074265c5dd85884804"
+  }
+, { mapKey = "cursor-fuzzy-time"
+  , mapValue =
+      "6ba5638d27b7da363383720d414504d66fc1f13f6f3d66ad311dce0e662d1aae"
+  }
+, { mapKey = "cursor-gen"
+  , mapValue =
+      "6d4594a3dfd41d11fbfd211e3ff4b292c1042911354661d5498f481364890fa4"
+  }
+, { mapKey = "daemons"
+  , mapValue =
+      "4b57f7fc518c20b321324f67b4b627f632c534aa635ee7cdaebdd1a43072dc5b"
+  }
+, { mapKey = "data-binary-ieee754"
+  , mapValue =
+      "5ca4c6caf66bbff6e350ec0f4986bf4b62e699813ea777192d28531e0db775e6"
+  }
+, { mapKey = "data-clist"
+  , mapValue =
+      "4dfd735f712db79c02734c2f28d3df6e197c6f1715921a751749994fbb732006"
+  }
+, { mapKey = "data-default"
+  , mapValue =
+      "8b473a670b717048039e6a91ac8624d5e4ff5f35638dfd17c7b79ae5b56f66d5"
+  }
+, { mapKey = "data-default-class"
+  , mapValue =
+      "9b35c6da1d73e13565c4351a5cc48574fe70fecfa533fe0c658a986faa9a8c6c"
+  }
+, { mapKey = "data-default-instances-containers"
+  , mapValue =
+      "7ba7f1d3d6eae208a7b1412ab842377056ab08a9904ef5e711166355116e483b"
+  }
+, { mapKey = "data-default-instances-dlist"
+  , mapValue =
+      "c5911506e2e6cf5cd77f9a070799da743657e8d2b1c576b884c28a0017a60884"
+  }
+, { mapKey = "data-default-instances-old-locale"
+  , mapValue =
+      "b1f81ea9e3b3d5b289efebfcfd9400c7843decb80e8fb12287ad1dc7c84af0bf"
+  }
+, { mapKey = "data-fix"
+  , mapValue =
+      "ae99b8fdc42436f734e2d1566b18cff3477beab50f04def7296b8d6d55408a6f"
+  }
+, { mapKey = "data-ordlist"
+  , mapValue =
+      "2017f25475ea72b308ef5f8d46fdff4119f78c71f6f4b433902fafdef809abbf"
+  }
+, { mapKey = "data-sketches"
+  , mapValue =
+      "87f44f9d1ef6edfc34c615321167bb582a01fcb9b1e83abaf828f3ec13e25087"
+  }
+, { mapKey = "data-sketches-core"
+  , mapValue =
+      "5c617ff95a73157164f5879ab7908c6179e845640052eef6e73d5c72d753bdc6"
+  }
+, { mapKey = "dbus"
+  , mapValue =
+      "45f4e720c0e8e33a381b4ac3b6170b62f5bfbbb3d8c85c9caba56e5ac4ae655d"
+  }
+, { mapKey = "dec"
+  , mapValue =
+      "1eba29ad2099f8514be791dd06f1857b22fc00738923a8cc1ea074276ac73570"
+  }
+, { mapKey = "deepseq-generics"
+  , mapValue =
+      "42bd34d5c01d517f1ab9c3de15545ea2f12130cb37bc6278d63926ca255386bc"
+  }
+, { mapKey = "deferred-folds"
+  , mapValue =
+      "327579b2841723028798c62b35a9099299529f42876ebc0fd916adba8242abc4"
+  }
+, { mapKey = "dense-linear-algebra"
+  , mapValue =
+      "7aa9716a49817e0e3e3814f5a1cf65cd0a2cce5f541f7bac3af777e044f9852b"
+  }
+, { mapKey = "dependent-map"
+  , mapValue =
+      "ff6744fba5ff3e828f75417e2450ff78b50f9f052cf8d786171b73f3ea562542"
+  }
+, { mapKey = "dependent-sum"
+  , mapValue =
+      "a74590aaf689a7e9bca4f1a227f39e637ccad55f493a709b61e18de479ff50f0"
+  }
+, { mapKey = "dependent-sum-template"
+  , mapValue =
+      "73a5b0911d1c33b0cf80e6ad3b2de34f1bbef48a8951bb94df39908bdd00c314"
+  }
+, { mapKey = "deque"
+  , mapValue =
+      "b31e821b2ff235f514a8592f11d904c0a16eec44f5ef14334ad7880f51d4eb6f"
+  }
+, { mapKey = "deriving-aeson"
+  , mapValue =
+      "ede934a8f2350ad962ddd8b5b2e4fb51872f7b089d0a8c18e18937aae16b9c51"
+  }
+, { mapKey = "deriving-compat"
+  , mapValue =
+      "36d395ab88d03845c90c83e17a9e6d44a93c53bb9d3e15628e5459a94514509a"
+  }
+, { mapKey = "derp"
+  , mapValue =
+      "cb87824ad6788583be8b2f00c8fc5cad352053a75999ee5bbc1d6f07bf652c29"
+  }
+, { mapKey = "dhall"
+  , mapValue =
+      "35b75b34ab591ce7bb22e0d5eec73fed05448ad71d500b04704cb9ae76bc290e"
+  }
+, { mapKey = "dhall-docs"
+  , mapValue =
+      "2399309c931db3512fbdc7af82d6beed6ef25c241bcc5948ed1d14ad87c38b13"
+  }
+, { mapKey = "dhall-json"
+  , mapValue =
+      "862d8601e11adc9bfb4f0e2c4aef2c4b941c0a4048569f9d416b5e366ed39874"
+  }
+, { mapKey = "dhall-nixpkgs"
+  , mapValue =
+      "265a8c31d6ececfb400d6d2c2d390b5c7c4dbd53830f0de7e957e53edcb0c7c4"
+  }
+, { mapKey = "diagrams-contrib"
+  , mapValue =
+      "94fef1833104023cf70027ad8202be0f3cdcc4e4ea21d6209f56741b9ed456e7"
+  }
+, { mapKey = "diagrams-core"
+  , mapValue =
+      "ff59d31b5fc76d42fe106f6099857e81b937bd3ee58ce5f2524817d9424b78f8"
+  }
+, { mapKey = "diagrams-lib"
+  , mapValue =
+      "b3e033e946e59f60abeb4baeb171bdb8eff7479f160ef3627e9d861804b78ab4"
+  }
+, { mapKey = "diagrams-postscript"
+  , mapValue =
+      "e652e187a23f14caf3f2389a50380494e3d036b4ef6f7f367ff58e6cb5aa9c0f"
+  }
+, { mapKey = "diagrams-solve"
+  , mapValue =
+      "1715ba5568caaec8074bb25bb3a97d804ea48455903d77a63a65e8adc920581c"
+  }
+, { mapKey = "diagrams-svg"
+  , mapValue =
+      "700ed442c77ca2ef215b40f66bb01d792aa3283a6eed6ee7dc1a52927324704b"
+  }
+, { mapKey = "dictionary-sharing"
+  , mapValue =
+      "74846201727758cd6007129ef7c4c62ef7df26a49bb780e53c1690b21e7bd248"
+  }
+, { mapKey = "digest"
+  , mapValue =
+      "ddf0045f285fde950a3fa1cf9e4521e1b70313771b55591b18b2c0283f6b7f8a"
+  }
+, { mapKey = "dimensional"
+  , mapValue =
+      "fb26067e74b36accc145f09600b20879208e48cfd97653b4a02601bb22aac2a5"
+  }
+, { mapKey = "direct-sqlite"
+  , mapValue =
+      "9b5084c925bdad1adb7d55f2cbe52788f3ce4a934e03ca8de9457d9ce4359537"
+  }
+, { mapKey = "dirforest"
+  , mapValue =
+      "8cf1df5b39cdd121900ef1ecc7406c3ebe337826a04ea149284a049037aa8632"
+  }
+, { mapKey = "distribution-nixpkgs"
+  , mapValue =
+      "635c25abf35e4ad01b97b93244c1d89fcb75be6e112d5065fdfa1b3addc868ba"
+  }
+, { mapKey = "distributive"
+  , mapValue =
+      "422ccda06e960ceb9cde5e53cd4ad02dd810efc8a0a816d5569382e7c82910ef"
+  }
+, { mapKey = "dlist"
+  , mapValue =
+      "02e01eaa6f8dd4e363c28b8bf50b44d85b63353658d815850d26425977212145"
+  }
+, { mapKey = "dns"
+  , mapValue =
+      "693239b4084d974e515e5c5a6c747c36aad08776f486bae2d45aab071b453e9a"
+  }
+, { mapKey = "doclayout"
+  , mapValue =
+      "f383baaadb71b0455910cc6618bc8e03577eab3da48931ef46b9e127c9e55a92"
+  }
+, { mapKey = "doctemplates"
+  , mapValue =
+      "74cdb889433a86e5e3b7fdfc01426a3dbf004fe9ef811652fe1bee1a47043171"
+  }
+, { mapKey = "doctest"
+  , mapValue =
+      "49ba06035ad9276db0859423c7edb255e2bb837709af67add10598b7ba2deb64"
+  }
+, { mapKey = "doctest-discover"
+  , mapValue =
+      "068fc899d42ef3dd7587ab7455c68d0f8f400f69a249a2b4b101d6b728554351"
+  }
+, { mapKey = "doctest-exitcode-stdio"
+  , mapValue =
+      "c05be65aa31c20af48beb16646dd71097ea13a0b4307d1c39101201142a30d8c"
+  }
+, { mapKey = "doctest-lib"
+  , mapValue =
+      "fd179d6a3bc615d4d7388d26b0e5382feececbd760531ea6b97ed57c56b0d8e3"
+  }
+, { mapKey = "doctest-parallel"
+  , mapValue =
+      "2523394a139cf71493da4c10ceda3c3d24731e0397d93f374a7031d7cbffe2a1"
+  }
+, { mapKey = "dom-lt"
+  , mapValue =
+      "129ad489bd792edfb9fa0f7b71cfe5088e04d966ded1c10a7888ab1917582c50"
+  }
+, { mapKey = "dotgen"
+  , mapValue =
+      "d4c8ae19a491712d30eeef1c0792900c4262dd751210edb526bc8b18b0afcbfa"
+  }
+, { mapKey = "double-conversion"
+  , mapValue =
+      "f018d41ec8ec77d9d10c097e1c7d968f3d9d3dbab8de36e4b7a06f7a67694cc0"
+  }
+, { mapKey = "dual-tree"
+  , mapValue =
+      "080a547ff91122381587b9796fbe612845c5f16724cee2f038cad4d4771fc05d"
+  }
+, { mapKey = "easy-file"
+  , mapValue =
+      "c5420b732db0cb49c0521ceef1d87c80f1e364bb22e6822aac0062ab0a227106"
+  }
+, { mapKey = "echo"
+  , mapValue =
+      "c1ad36d9644da9a7ae69e70174522fa8d1162684a337cc7eb595e8e20c0b100b"
+  }
+, { mapKey = "ed25519"
+  , mapValue =
+      "12aa84c1caef025290c0caa9b2eef0f8f9080b8ac8d28962cf76f7ecd15aa3fe"
+  }
+, { mapKey = "edit-distance"
+  , mapValue =
+      "04755222e8763eff9698bc623f51d506df445176d533078db5aeca3a0e03b89e"
+  }
+, { mapKey = "effectful"
+  , mapValue =
+      "063120000c6a667949b5533698c543db9f3b4d1b5ee52a811bfb376403a38ee0"
+  }
+, { mapKey = "effectful-cache"
+  , mapValue =
+      "a1ccb79071755b498d48f356a2300008c97e71e5bdcca6d845c3f1e2861a2791"
+  }
+, { mapKey = "effectful-core"
+  , mapValue =
+      "91c93422d69bf371be20d2c7a7cd239b31b22f6a5973bf2db1dac2f126886671"
+  }
+, { mapKey = "effectful-th"
+  , mapValue =
+      "14a2f51e36779cb5500913553afdb7dd7e8fbef430fdebf4fd0808b6f7285c32"
+  }
+, { mapKey = "either"
+  , mapValue =
+      "d5ad3685f2f39920c834ed8d995d4d6bf0fe8a30076e6c194bc4234b5ab7d3fd"
+  }
+, { mapKey = "ekg"
+  , mapValue =
+      "eb892ae2c2d058ea71fb9fb236358c79c3feff3bad908d1db901ddea2b723386"
+  }
+, { mapKey = "ekg-core"
+  , mapValue =
+      "aa8d7ee7190e9626f4a76203e1fd9e7088ae7ab12ce6d0b258cda5e459d08b4d"
+  }
+, { mapKey = "ekg-json"
+  , mapValue =
+      "72dbaad59cec7222b69dcad1f9df784350282c1b5117275536356fc808565597"
+  }
+, { mapKey = "ekg-statsd"
+  , mapValue =
+      "9c036632e1c43b0bfe206a8497bae657924aee877e01963a61e1fa48c5f57567"
+  }
+, { mapKey = "ekg-wai"
+  , mapValue =
+      "725f99877f095dd253d4483c10f1aa771266d39de2bea2cddf35f5c589628034"
+  }
+, { mapKey = "ema"
+  , mapValue =
+      "a026dc2f8a40d059132a56604f9167a5577892ab743cedfa55067b92b67f3595"
+  }
+, { mapKey = "email-validate"
+  , mapValue =
+      "16048b1fd567a3d56f4f38f9b1cb57df5462447462e0f4cdaa7f9d2f3249424f"
+  }
+, { mapKey = "emojis"
+  , mapValue =
+      "0acefd9399653d193352d7e7e50b98590f5941052c54e7644804fcafc03790a5"
+  }
+, { mapKey = "enclosed-exceptions"
+  , mapValue =
+      "68a9a21779cc042ca8d5cf6f5a4753f9b965954d39260cf298b781c430c4b48a"
+  }
+, { mapKey = "entropy"
+  , mapValue =
+      "5ac9e96a73f42ae169be219441f382b022157eae1e4247caf6c07546037ce643"
+  }
+, { mapKey = "enummapset"
+  , mapValue =
+      "6d49f6dffd71a7b59cf77d9298c6bde76d7bd3b74a56649264288d86f8fa97d6"
+  }
+, { mapKey = "envparse"
+  , mapValue =
+      "d3e07204ff96cd4353a720253fc1e9fbce11855cd309a9c1dbacc24f17ead21c"
+  }
+, { mapKey = "erf"
+  , mapValue =
+      "c861a0b8b891858842d55ba3912b7a74bb15b1eaf612f44642be8e953f47e2b9"
+  }
+, { mapKey = "errors"
+  , mapValue =
+      "1cf900784b3819caba9fec4dbf2e2c9b509d9a0532e1c8d32eaeea62665847b6"
+  }
+, { mapKey = "exact-combinatorics"
+  , mapValue =
+      "6ccbdb2972e10f8062b078abb5fafca6cf92e19f90d51db90dc52babbab527d4"
+  }
+, { mapKey = "exact-pi"
+  , mapValue =
+      "410ab8ec94db471c19aac39886181047ba7f179fe0761f3670336100712bd2fb"
+  }
+, { mapKey = "expiring-cache-map"
+  , mapValue =
+      "575470b982c9e7c60bda45b5878d6e1e1777d83978744bce0e260d70f922019a"
+  }
+, { mapKey = "extended-reals"
+  , mapValue =
+      "f61d674832955e005bcc52594ee4e2bda64fe3b0eec7e1b30cc24b7971db8ea2"
+  }
+, { mapKey = "extensible-effects"
+  , mapValue =
+      "f52dc895695197153b3e866674e5249cd2a97650a98b9d2c7c3fc0a5e2fda818"
+  }
+, { mapKey = "extensible-exceptions"
+  , mapValue =
+      "56e29834d7740d39df6bac217216d4e240d3d70c94038106ba41672fd9af8332"
+  }
+, { mapKey = "extra"
+  , mapValue =
+      "5a99ff0d848bc5ea62752b1a3d98507805e640b0614e036bb8e1470697edba3b"
+  }
+, { mapKey = "fail"
+  , mapValue =
+      "8526685373408c709cca9fbb394911b5cd456b8b11155d2e55deff92dd7a0c20"
+  }
+, { mapKey = "fast-logger"
+  , mapValue =
+      "73c96b28313a92480c4e0d031f8c3d6ecbd60a095b5d93a8726eb3197807ed18"
+  }
+, { mapKey = "fast-math"
+  , mapValue =
+      "47d944e40ad50c10e79921cec5378d28c351e281d767da98464722f55fef9fa2"
+  }
+, { mapKey = "fcf-containers"
+  , mapValue =
+      "1a2c6d93d05acc41ace6029524335f4af736832165d1db0f35362ec2b9fbbedd"
+  }
+, { mapKey = "feedback"
+  , mapValue =
+      "2cabde5ea9d475e760a13cc09c9695888415e0e18ef02c7d0f89d6fd3b210200"
+  }
+, { mapKey = "file-embed"
+  , mapValue =
+      "d8e9de90539350c483b5c0c877aa74d6617a0a0960fa0ddfc68a515a16f12dcc"
+  }
+, { mapKey = "file-embed-lzma"
+  , mapValue =
+      "13d4ee5e0e9bc5f3c21269d3d129b31e0764302fd2708a8dbee01c484077f8ba"
+  }
+, { mapKey = "filelock"
+  , mapValue =
+      "f7bcf57b14747da3b182c2a854706148041cd6ca197b1604da59efb66dd4b689"
+  }
+, { mapKey = "filemanip"
+  , mapValue =
+      "4ddc71ff0b694953ee8a7175fec8a990d45c1c916e84cf0de6fd019f731742f8"
+  }
+, { mapKey = "filepattern"
+  , mapValue =
+      "784b33e05774ae93c32edc7d3c7252fa754444f5a289bab060c490266bc8945f"
+  }
+, { mapKey = "filtrable"
+  , mapValue =
+      "ec26a3defb2ee79f2b80fdf9cf653d85fec4bc2ac361bea483df24d026deb38f"
+  }
+, { mapKey = "fin"
+  , mapValue =
+      "9fb90239c363ad8fc79f2fbcacf8dff5c5929f9d223cfc7ecb379053ccfe09f2"
+  }
+, { mapKey = "fingertree"
+  , mapValue =
+      "a41915ae16e90e902606f2177cd97ab3d0b114241abf46d9943116439765d056"
+  }
+, { mapKey = "fingertree-psqueue"
+  , mapValue =
+      "6567b3b7895289e919fcfee616441dead7e574e53b04970876db5b26289a3331"
+  }
+, { mapKey = "finite-field"
+  , mapValue =
+      "3c30d7a422846895d9dca90496509236c6b745b23443e15364118aa0abab1abe"
+  }
+, { mapKey = "finite-typelits"
+  , mapValue =
+      "859e21340a0a84a152509efa4a64fc3d45eab7899ddfeb6c388d76aa308054cd"
+  }
+, { mapKey = "first-class-families"
+  , mapValue =
+      "ed13503342cdac1dc8b34590fd67a42cc26a94c2a2338ab2604122aa91a68ee4"
+  }
+, { mapKey = "fixed"
+  , mapValue =
+      "123d9ab2235250ede2690c9854d9187c1eda0b8d06d73806071820f8981bd6b7"
+  }
+, { mapKey = "floatshow"
+  , mapValue =
+      "d8e8542f57ceb0917e2602f0a2a1985fd0242bc7a151e669b1cad2be713dde25"
+  }
+, { mapKey = "fmlist"
+  , mapValue =
+      "1b3f10252d1fef51bdc252cd1b1bcaec8aac612e48296ab0a16f0bc30e338278"
+  }
+, { mapKey = "fmt"
+  , mapValue =
+      "feed8faa17788ff471cf974a40774210a0ffbd2686d12e7f2ee28b652904cd1e"
+  }
+, { mapKey = "focus"
+  , mapValue =
+      "ce99be7426a9b48f62abfefbb33cb0e8b940124b7859a51d87e9b0b1d8faec2a"
+  }
+, { mapKey = "foldable1-classes-compat"
+  , mapValue =
+      "a05c77aefaf0ce680d9b203b3603fd3e7c1d422b3dd18b3209d9236292ff6931"
+  }
+, { mapKey = "foldl"
+  , mapValue =
+      "ef58c921985a91742c2a45ecfca33cc9681fb0ab7580b218505ce7b48ead5afe"
+  }
+, { mapKey = "force-layout"
+  , mapValue =
+      "be6830ab9a10e3bf5743755229c72b1329b220a75e8a7ac45dbdee128a8ae572"
+  }
+, { mapKey = "foreign-store"
+  , mapValue =
+      "32c5bc936fc3f9dd01dde2323b8376166d0b9806c21dc17455abc4045c279e03"
+  }
+, { mapKey = "formatting"
+  , mapValue =
+      "7364c7bc63149a995fb7d843497addf9366f997a95856b9a5a02859e6ab1c7dd"
+  }
+, { mapKey = "foundation"
+  , mapValue =
+      "2ea0d484c16d8c494f53f025f45bb02f531cf8e3b582ada43107eb3207840059"
+  }
+, { mapKey = "fourmolu"
+  , mapValue =
+      "2dceb9bd4526684fa0fd2a24cf01b656efcfb75894bd5b2a869eb61e65ee8611"
+  }
+, { mapKey = "free"
+  , mapValue =
+      "e3deaf5778fe9442f0137402f78faab2ced4c51fc08d809594846a1acf4c66f5"
+  }
+, { mapKey = "freer-simple"
+  , mapValue =
+      "3d972b731567104cd5f3a383f90b5398b348c908d44565074de3d52962e9dd0f"
+  }
+, { mapKey = "friendly-time"
+  , mapValue =
+      "96c7ca0aaee8815432d77e1a18f31479fb8d112fff3910bfefb291f0351dbec2"
+  }
+, { mapKey = "fsnotify"
+  , mapValue =
+      "e5eeaaeffccea99d19804c1903987a0725b91e527d704f270960192cedc1a9ad"
+  }
+, { mapKey = "fusion-plugin-types"
+  , mapValue =
+      "e7da79b0c1ee87b3027b3c92f7a8ac0f1eedbd1811ca91c82cc16b35290623c8"
+  }
+, { mapKey = "fuzzy"
+  , mapValue =
+      "e3ddb9fc20b33ba684723cb513a90e27e40fbd2f31126ac1a6b71c03e534e9e6"
+  }
+, { mapKey = "fuzzy-time"
+  , mapValue =
+      "8511d0eabfd24558ecba6df0666d86466a6da1b983f966e8d5534079a21f7d4d"
+  }
+, { mapKey = "fuzzy-time-gen"
+  , mapValue =
+      "2dfc77fede21068237e1afb23280f3d6e8c74888907bfbad3890790d6394a6e6"
+  }
+, { mapKey = "generic-arbitrary"
+  , mapValue =
+      "74f81e897f7c8847fbbb3fae39a90a705d324c84c0ae7bdb507287bb2980fba1"
+  }
+, { mapKey = "generic-data"
+  , mapValue =
+      "04d4140503bb5bd0f9023893061c10385fd29f8c20399db786ad3f4dca3c4ed8"
+  }
+, { mapKey = "generic-deriving"
+  , mapValue =
+      "05935192b6b56fdd4b320ec8e64cea82a63e04471d5f90c4a93bfef12d90e172"
+  }
+, { mapKey = "generic-lens"
+  , mapValue =
+      "b6c1b951379d6db6726c171792c622a62a4184a1d52ec063ddac5ed098febf36"
+  }
+, { mapKey = "generic-lens-core"
+  , mapValue =
+      "93a75501d6d011e496293d8b5c4a340a44b075e047eb1d34937443bca0b634c3"
+  }
+, { mapKey = "generic-lens-lite"
+  , mapValue =
+      "87affbdee1fbf648b8dfc1cb4550d2c59175a9ca88a2c053d0b10a4d01a38e2f"
+  }
+, { mapKey = "generic-monoid"
+  , mapValue =
+      "e2ed951e82b5eae4f41203882ef48362658c7641c1ff87bc718e661dbc8d0b3c"
+  }
+, { mapKey = "generic-optics"
+  , mapValue =
+      "14a6dfb3d98ad2651e600c0c05bb712a4385c498a66821ed54446e3e6211afe6"
+  }
+, { mapKey = "generic-optics-lite"
+  , mapValue =
+      "f0ab78edd438a20f9843786c1949577380f4320e64e777049d38589d349609c7"
+  }
+, { mapKey = "generic-random"
+  , mapValue =
+      "ff3019ef6ef694d6aeac09f73e81db404cb2f709d7dfbdb22f64944bb00ef897"
+  }
+, { mapKey = "generically"
+  , mapValue =
+      "aaa4bc7f0235eeef8d2088bdd2dacbbc3f9d569dd6fe95c394390599f7c82c1d"
+  }
+, { mapKey = "generics-sop"
+  , mapValue =
+      "076abb05ed92a1f02c87268c25b4310a909e5a444dcc4b866ef96047efc6e138"
+  }
+, { mapKey = "genvalidity"
+  , mapValue =
+      "85a6adba541d187358c539fb48076ce59f114de7d6f944ce2d16203e2466b666"
+  }
+, { mapKey = "genvalidity-aeson"
+  , mapValue =
+      "2f145e00e435aa98d10bc713cd5608aab88606a598636af914029b374db90af6"
+  }
+, { mapKey = "genvalidity-bytestring"
+  , mapValue =
+      "dd98d2eda0ffefb3ac31ea2edca6e21ad9187295faba28bf3f4f167c83aae76c"
+  }
+, { mapKey = "genvalidity-case-insensitive"
+  , mapValue =
+      "213a6fa1bf1b3d4a09b4d5bd685014a0d6a3faa58aae545ed068e3b42a2aaf33"
+  }
+, { mapKey = "genvalidity-containers"
+  , mapValue =
+      "404ae7ec0b87eda70000e31d8d76fd4869f0e9c4c7dfa384e17fa1bc10583b0a"
+  }
+, { mapKey = "genvalidity-criterion"
+  , mapValue =
+      "299503a3d3be74e62f2af996af47e243c1b8906bf0bf8adc87bfcb0fe6cca133"
+  }
+, { mapKey = "genvalidity-dirforest"
+  , mapValue =
+      "f8dc67a508ce0786f6185706cb31d324ef5fccc17e0cf6b37c18eb21522c4f4d"
+  }
+, { mapKey = "genvalidity-hspec"
+  , mapValue =
+      "262319479e1b148108f38fe3bd48c8dbba9c36e2e919d724258a721a9141711f"
+  }
+, { mapKey = "genvalidity-hspec-aeson"
+  , mapValue =
+      "f0ff309a12fa253ee01e14eedf9db03f6ba61b9c21413e9374aa6fa7b86daa10"
+  }
+, { mapKey = "genvalidity-hspec-optics"
+  , mapValue =
+      "d0cea9602cbd543be3b859f41fb0336e46ffc4a5ad5c4b7a7b19fdb41a3098cb"
+  }
+, { mapKey = "genvalidity-path"
+  , mapValue =
+      "da64ff607b3dd4fe801be1c8458a2e1c27f7c197a7cae805758e3c0639f68156"
+  }
+, { mapKey = "genvalidity-persistent"
+  , mapValue =
+      "6aafda8ce33f60a3aa4bc531d2fb20b76108e03e42fb0ff40da34d605ffb8d9d"
+  }
+, { mapKey = "genvalidity-property"
+  , mapValue =
+      "5a00c85ea97413075d4bc68e075462ddb3c5871415e5a2d7cffb1b34bd91c1ef"
+  }
+, { mapKey = "genvalidity-scientific"
+  , mapValue =
+      "a97ab27aeda2b913b67c9c4987a6ce6a382eb5713dd35c9bf79dc5c1b70d56da"
+  }
+, { mapKey = "genvalidity-sydtest"
+  , mapValue =
+      "9184df528242b4c153d45ae7a55a24efa4dab3deaccdac73c56217c2f20a3a0f"
+  }
+, { mapKey = "genvalidity-sydtest-aeson"
+  , mapValue =
+      "c5340cce3a3e0457241fd18e609fa921ac7d3ba43d0fbf51abce13fe00904f38"
+  }
+, { mapKey = "genvalidity-sydtest-hashable"
+  , mapValue =
+      "0a3c9844ba1a4b7716b046ed3872538dcf43ca077dbdc602c044cf06f76f444a"
+  }
+, { mapKey = "genvalidity-sydtest-lens"
+  , mapValue =
+      "7c8dce331468c24466e269c90de7bf91503327eb33ba7325279e24751cd18bbd"
+  }
+, { mapKey = "genvalidity-sydtest-persistent"
+  , mapValue =
+      "a5b3f23cb92431b78e0083b700bb800c814a9a87b7a8e6549539750135c31cc0"
+  }
+, { mapKey = "genvalidity-text"
+  , mapValue =
+      "1445adcacd80ce4a5a38f530a5f09fdb2d0ce8ab5be08f00c4228415f88835fe"
+  }
+, { mapKey = "genvalidity-time"
+  , mapValue =
+      "5931257ed6e0279193fc8c6cbc7e08f17553e960c1c2b1476ba1e9c62d54e29a"
+  }
+, { mapKey = "genvalidity-unordered-containers"
+  , mapValue =
+      "7c32d9f3922703657a51457d6f1d31fa0196721431446ecfbffb84173dd600c6"
+  }
+, { mapKey = "genvalidity-uuid"
+  , mapValue =
+      "ab09ccad95c6938035ed479368e183f2acb9490985eee6b1a1208a52e5a04daf"
+  }
+, { mapKey = "genvalidity-vector"
+  , mapValue =
+      "386ac22736120fd33542c7528fcf13f252af5098ce585e9529fa142fb82a3560"
+  }
+, { mapKey = "ghc-byteorder"
+  , mapValue =
+      "e5c62037b4399c24f1d2b87d7e668e84f4004abe173a355baaa6d36555ffa0fc"
+  }
+, { mapKey = "ghc-check"
+  , mapValue =
+      "215e33bd15065a7589832282b7f609b197840ada56849519fcbb3f3ce203f418"
+  }
+, { mapKey = "ghc-exactprint"
+  , mapValue =
+      "fb87b0ff3e423822569a31178fb6ae534986930d8b6a4f6e2efebd0173f67c58"
+  }
+, { mapKey = "ghc-lib-parser"
+  , mapValue =
+      "54a486916e43e7ce8e1183d82a30d16206b113189f95a5c72bce6d82fb8363ef"
+  }
+, { mapKey = "ghc-lib-parser-ex"
+  , mapValue =
+      "b0a0bf5ed301e2e8964123ad8525522cd583177197dd8de9c5e5e0d64a57e8b1"
+  }
+, { mapKey = "ghc-paths"
+  , mapValue =
+      "8869d02c6060f2f7e2f370921205cd2776ac0734737b387bc7c35bd86cc4b937"
+  }
+, { mapKey = "ghc-tcplugins-extra"
+  , mapValue =
+      "6d462932c75ad730780e4c5a713154ce2b03e822638a4c5a66043c336090b75d"
+  }
+, { mapKey = "ghc-trace-events"
+  , mapValue =
+      "0371539454e30a818de949291d7159035665dd144fb3fb8ab15e2adcc27905f6"
+  }
+, { mapKey = "ghc-typelits-knownnat"
+  , mapValue =
+      "fb3ed392d01b12233d06ee2ec7ee8ac1148e14f0640c5de7ba607bc9e4e11ac4"
+  }
+, { mapKey = "ghc-typelits-natnormalise"
+  , mapValue =
+      "76e6d7d16e0656cde872f1357488cf7cf97fc4b82ca6ccb57ef8f1a743588e32"
+  }
+, { mapKey = "ghcid"
+  , mapValue =
+      "2e4c8aea7e421f1a59ac8e7bd18027f57d47672abc18c276fd7e9638ed8f0c9c"
+  }
+, { mapKey = "ghcide"
+  , mapValue =
+      "619ff39de40b7eca82666a0eac63f711e3c9efabf28838ae73e2f7076f410d33"
+  }
+, { mapKey = "ghcide-bench"
+  , mapValue =
+      "c1d17c694522efb14df78565367aa55445df1f4099becd847abd4bb1966ecaad"
+  }
+, { mapKey = "ghcide-test-utils"
+  , mapValue =
+      "42871432c697b2a96a43136996907ddead7db2fdf6fddf9da3a685b1e59d028b"
+  }
+, { mapKey = "githash"
+  , mapValue =
+      "2e4efbcb9ba3526c5e3eef79be14d0fc6f3b944dddc81283ccf0b4696ed1ebe5"
+  }
+, { mapKey = "gitrev"
+  , mapValue =
+      "e0df9933b7ca607164c374fd4b9deffbac36f8204cb06d658c395b2cc651b03e"
+  }
+, { mapKey = "gridtables"
+  , mapValue =
+      "8c43814952de85e9c3d7f071709e77648a17f1327dd7a0a86185b3f31748ae32"
+  }
+, { mapKey = "groups"
+  , mapValue =
+      "c463130ab7b8bf1a45a30967bf955607c9268923977b103efd9703bf62932410"
+  }
+, { mapKey = "gtk2hs-buildtools"
+  , mapValue =
+      "c329746f6df6a18804dc1365d77fea64c93369b0f3a47e3e3abd7901e41c4244"
+  }
+, { mapKey = "hackage-db"
+  , mapValue =
+      "7737cf497e30996452f10c609092fad86b8670e3467c526042a4443bd4541b6e"
+  }
+, { mapKey = "hackage-security"
+  , mapValue =
+      "d075bf6c935316ac8d9e7a8df50838c8bba85f9de0152dc2befd247e0e0a26bf"
+  }
+, { mapKey = "haddock-library"
+  , mapValue =
+      "d61b94eb45e2489a1bb01977bea9921d99e76e85dda78a1fd23ab2fc518bdd58"
+  }
+, { mapKey = "half"
+  , mapValue =
+      "33e22adf49061b9c3c5cbfda41548d22fc9b19faf6913ac65c068c4d3c16f2e0"
+  }
+, { mapKey = "happy"
+  , mapValue =
+      "524997336c3fe0af81f98ae991514822257d6ffa92717b0db5c06e5b0ae60397"
+  }
+, { mapKey = "hashable"
+  , mapValue =
+      "9ec5eac470d565aaae5adedef7073edffdb371c191c6f52a34743044a78c96fd"
+  }
+, { mapKey = "hashing"
+  , mapValue =
+      "c8e678787548f8300448377066b77796e56fb0c8cca5f4fd8ac876d1fce71a78"
+  }
+, { mapKey = "hashmap"
+  , mapValue =
+      "acc5fc36051ace519a203f9238f7b45bac1515e4ff23e457078fb810824eecbd"
+  }
+, { mapKey = "hashtables"
+  , mapValue =
+      "a41c3ea572bcad6c7f310e9a5fcbbad98a5a3495c48fe1b4f7c6322395947795"
+  }
+, { mapKey = "haskell-language-server"
+  , mapValue =
+      "cc399ee65b071e412a346e4228731a687c4efa43a7ffc0ee673ab3c9723011bf"
+  }
+, { mapKey = "haskell-lexer"
+  , mapValue =
+      "5cfed738d3edf0787960dc9adf265ef2c67d55fc4ee6ccefba9ff0b09aa5d16e"
+  }
+, { mapKey = "haskell-src"
+  , mapValue =
+      "6f37d9fec0705ff6a18b5cefc4a8a7727e9868938ccc16372e43dfc0cecfd193"
+  }
+, { mapKey = "haskell-src-exts"
+  , mapValue =
+      "e9f05ed7fe0ca842707a9d34e10da6c767a8dfba64dbf8f0492d38156466cd3d"
+  }
+, { mapKey = "haskell-src-meta"
+  , mapValue =
+      "fc904f6c002b5bad113e4432c583b0b00be19d4aa4864bc01508e322ec367a96"
+  }
+, { mapKey = "heaps"
+  , mapValue =
+      "323bf29be6e1852fa7ce2f8f079446dcecdbe092f0d43b7c94fd9a510f76ef63"
+  }
+, { mapKey = "hedgehog"
+  , mapValue =
+      "0a8d6d647eb02cc3afbdb87884d4b31e6cd94506ebedcbbec5e0584b9f1db076"
+  }
+, { mapKey = "hedgehog-extras"
+  , mapValue =
+      "ea792ed8413aa8b6d31c2d3042bc64c079f24f645991b8f4605e95cd7ce933f6"
+  }
+, { mapKey = "hedgehog-fn"
+  , mapValue =
+      "af21eea7ed945ca9e4ac1ecd37f74867104589e84028284bf16a30ab2e49dcfe"
+  }
+, { mapKey = "hedgehog-golden"
+  , mapValue =
+      "0bac2f6541086a81e50a09679d3e40beba23c2b2a1e05cde6ed719a18ba05359"
+  }
+, { mapKey = "hedgehog-quickcheck"
+  , mapValue =
+      "0ccb3f1ecbd4591514a6b3fee719b318c11841c26a1eca802ffd83db0114a38b"
+  }
+, { mapKey = "heredoc"
+  , mapValue =
+      "4b32094537606434d0e28c127453a35160fa476a17866031ad5f95b94d08d442"
+  }
+, { mapKey = "hex-text"
+  , mapValue =
+      "14c09eaeeb576fe431c9e2f48b8396f9bfc345794bb06e3297187ac95b535715"
+  }
+, { mapKey = "hie-bios"
+  , mapValue =
+      "c620666cab08cb7cc8dbe8c3fcc6858c8dc36ab790ebc162d14da25442e4cd45"
+  }
+, { mapKey = "hie-compat"
+  , mapValue =
+      "56dc1802d10aca4e750c1f66f30773085f6004c550d412043491aa613158a6b4"
+  }
+, { mapKey = "hiedb"
+  , mapValue =
+      "a5a9992671f0d0bd55a9a7f770aad884a6e9bfe7e0ed73ec06cd35e638b48065"
+  }
+, { mapKey = "hinotify"
+  , mapValue =
+      "9f3f233ef3a527bebf9971292abb7d4caf3ad61fdf8078a2970c4bc8a3237663"
+  }
+, { mapKey = "hledger"
+  , mapValue =
+      "ffdf0a681d39c0507f7af82be53f9a7b85263762fe4377521f76a3635c8ce018"
+  }
+, { mapKey = "hledger-lib"
+  , mapValue =
+      "c4ad3fbcdaa63a1258f7023a90081296a196a086284aa8899ae7ce2098a4d5cb"
+  }
+, { mapKey = "hlint"
+  , mapValue =
+      "5904877fa63ac775140995337e68ead75bd979ee917e0a0c2fddd51b2913c737"
+  }
+, { mapKey = "hls-alternate-number-format-plugin"
+  , mapValue =
+      "005aaa239d2b2c8ea6fad100f041a1c0e378db0f2594b90cd061e87d8ebeb188"
+  }
+, { mapKey = "hls-cabal-fmt-plugin"
+  , mapValue =
+      "7d42b0e3d194ee52025121ca913630c3cd01fab744b424ac75294a39bb252c3f"
+  }
+, { mapKey = "hls-cabal-plugin"
+  , mapValue =
+      "a1ba65db35710a26949a8e70586cac5670338918580be8edcc5528fa785573b6"
+  }
+, { mapKey = "hls-call-hierarchy-plugin"
+  , mapValue =
+      "f8ea27345f2a86fd06fa635d5f7df9f81bb389a0570472a59068d8a291924a81"
+  }
+, { mapKey = "hls-change-type-signature-plugin"
+  , mapValue =
+      "230e83e186b133a14afb97550a839bcac6489e9a8d27d10ac04ba615be3e150a"
+  }
+, { mapKey = "hls-class-plugin"
+  , mapValue =
+      "85d15a59edcad5556b9aa6efb1efb73cc478cd6e08e10d2afa3d3e3e2e668d96"
+  }
+, { mapKey = "hls-code-range-plugin"
+  , mapValue =
+      "d5e090bb874506ea8b71e77bcab1c2b8be7966c8c3019aa54a7e4dfcfc5a417e"
+  }
+, { mapKey = "hls-explicit-fixity-plugin"
+  , mapValue =
+      "fdcf98004cb736bad4e6fa2074d6e6df972b1223eab4383d6887bca0f4af1b2a"
+  }
+, { mapKey = "hls-explicit-imports-plugin"
+  , mapValue =
+      "dfe01afcc529ae64c7cba6ff2d36aefdb245702890859c023652bfdc27ebc0fe"
+  }
+, { mapKey = "hls-explicit-record-fields-plugin"
+  , mapValue =
+      "c825b2b13e2b137dd6f64da194aa0be982ed6c05e6d30cd7040cfc563015a18f"
+  }
+, { mapKey = "hls-fourmolu-plugin"
+  , mapValue =
+      "e52ad477b6213a06ce8d7225339994718afee08c88fa8cd62f63cb1343d26b73"
+  }
+, { mapKey = "hls-gadt-plugin"
+  , mapValue =
+      "065b63ddb04e14d408c0b0c7f801b0be98492c208dcd0c609babfa1c22cab5bf"
+  }
+, { mapKey = "hls-graph"
+  , mapValue =
+      "8c2569f3dd93f9189a9463fca0e40915126d874df955f9e118bf663678b2178c"
+  }
+, { mapKey = "hls-hlint-plugin"
+  , mapValue =
+      "22ae990a2d0c46b6208998aee87185326e2eb37c3cb1ceb7dafe04bf173ee2a5"
+  }
+, { mapKey = "hls-module-name-plugin"
+  , mapValue =
+      "0c95dadc688bc765dfd7263719304c6333f4b1708e383a9fbf1b11871dd404d1"
+  }
+, { mapKey = "hls-plugin-api"
+  , mapValue =
+      "0434d75c67d18cb339a8517fd3a9bf951a42c8b685fb7122df1ba4f4cf99d05c"
+  }
+, { mapKey = "hls-pragmas-plugin"
+  , mapValue =
+      "3d98033640acda5635c6dffb5da4a530ab8209b6d1ad22df95d4cbb297ed154e"
+  }
+, { mapKey = "hls-qualify-imported-names-plugin"
+  , mapValue =
+      "e0c494f68e4783e86a5c4ef6a68ebef3abf87ff3ca481d4d12f30e2192f92ed0"
+  }
+, { mapKey = "hls-refactor-plugin"
+  , mapValue =
+      "b565617496eee76b69d2c1340e61d68eab5bb8af173ccf99325a2903e9e5b8a2"
+  }
+, { mapKey = "hls-refine-imports-plugin"
+  , mapValue =
+      "29eaf0702503a20e66e9b5e7db25a5546cd75ee6c30bf1505292a1285868afcc"
+  }
+, { mapKey = "hls-retrie-plugin"
+  , mapValue =
+      "7b0d7a771c8e79beb70f6ed557cd6a5fbe5270b79e32bdc27d8c3906a7adac3f"
+  }
+, { mapKey = "hls-splice-plugin"
+  , mapValue =
+      "ef4c7236734fc8b72c20485b64e3c5d07ecc791d5198ed13826b79eba2ac8004"
+  }
+, { mapKey = "hls-test-utils"
+  , mapValue =
+      "ccd7dc968db971079ae3f1ff06d13d71b4e4641178158b86261e274d794e3171"
+  }
+, { mapKey = "hnix"
+  , mapValue =
+      "af228708ca6761b56018f5a86f965b185c96283a7b0fc7fc8a6df4e6ddc0ecf1"
+  }
+, { mapKey = "hnix-store-core"
+  , mapValue =
+      "329e9c03d3122b92a8c50666a0b11200d1ef3ec79683bac10a57887ed6b67415"
+  }
+, { mapKey = "hnix-store-remote"
+  , mapValue =
+      "65337f51b558af4c6736e7d45e073585798d0dabd2485f5c72eabf8c4fae0096"
+  }
+, { mapKey = "hopenssl"
+  , mapValue =
+      "db8dfc299721ae2d80a9efdf4e90ab78a413ad4a54af0181fc3a594eb63dc98d"
+  }
+, { mapKey = "horizon-gen-nix"
+  , mapValue =
+      "c470fc11ab7d11d31e6504cc3bc79bb9fe546005de69e1aef864153109d62cf1"
+  }
+, { mapKey = "horizon-spec"
+  , mapValue =
+      "f12ecc81da62b500ddfe1908ee959c0f0148848139943b2894ecbfc6149b0de4"
+  }
+, { mapKey = "horizon-spec-lens"
+  , mapValue =
+      "5ec75a4014b7fda1fa3c3095b43654d56faedc31a5228150cabae10dc434216a"
+  }
+, { mapKey = "horizon-spec-pretty"
+  , mapValue =
+      "8e517f6da7a227d44f7bfc3e9c43735e431abdb9863cdb1132e091698d947e49"
+  }
+, { mapKey = "hosc"
+  , mapValue =
+      "f4f225672ff5068dbd5ce1372410aeecb14a268502c60df511392f35c2899fc5"
+  }
+, { mapKey = "hostname"
+  , mapValue =
+      "6933d6121e1458d6bc73921413764a20749cdf2a250054ad413baf41620e9d01"
+  }
+, { mapKey = "hourglass"
+  , mapValue =
+      "13ab3d97b0d13b639e47df02d9bb0ccd3ea59f4785fd5b5b4cd2a6994a7aa99f"
+  }
+, { mapKey = "hp2pretty"
+  , mapValue =
+      "d0c7cf7a21ae635962e25e4e98db9a0026e8daeb70cd5ebce21bc404e77f0ded"
+  }
+, { mapKey = "hpack"
+  , mapValue =
+      "ac0de2f38b984263036b8b58b1d42c917499a61ab23fe6f0934b288a5be09bd1"
+  }
+, { mapKey = "hpack-dhall"
+  , mapValue =
+      "43fbf0c31167af40b744e07c407f637a473be762ba8cfd6c0e00fc8d340a92b5"
+  }
+, { mapKey = "hscolour"
+  , mapValue =
+      "f5e64baa414796939354a8ca55353954d064acec77d6925fb4fae13ee77a6396"
+  }
+, { mapKey = "hslogger"
+  , mapValue =
+      "6344531d68b3ad0f6c496afd2c6012115ed0fbff93a2b53c66ae78d46d9ee584"
+  }
+, { mapKey = "hslua"
+  , mapValue =
+      "e44ce5a531a637814d7605c398734ba51aeb41371b1eb89c5ec77492b754c3ec"
+  }
+, { mapKey = "hslua-aeson"
+  , mapValue =
+      "fef853b81e42761be01cade83c3fcdba1cab9132da689f3fba1831c476b66c58"
+  }
+, { mapKey = "hslua-classes"
+  , mapValue =
+      "8783e2b2eda4e7779d392f5b7eca32882f3cb1646eb1857041b47f895116b9c2"
+  }
+, { mapKey = "hslua-core"
+  , mapValue =
+      "c31d49a9f406e6752c5f83dbaaa7efb67f7a0ee5b7e44d4989153ced8afd6189"
+  }
+, { mapKey = "hslua-list"
+  , mapValue =
+      "7e76ac4d06fd65475914b765b5205ff94dcf05291a3c90aad0bd4608b7aec661"
+  }
+, { mapKey = "hslua-marshalling"
+  , mapValue =
+      "557ca83325c69739005bf1d9608712c2f4491e96d5c1d66a618e060771e1b7b1"
+  }
+, { mapKey = "hslua-module-doclayout"
+  , mapValue =
+      "e2f3eea6798ca8bc7a33d0dc94e29489bf6098ac950813a9abf803b2bf6637fe"
+  }
+, { mapKey = "hslua-module-path"
+  , mapValue =
+      "092da775bb316c6f224c3bf10b5d9b7e03e7cde1e30ee1518cc22bda72fb0e18"
+  }
+, { mapKey = "hslua-module-system"
+  , mapValue =
+      "f90aab0bb10ddc82a178a4dba8e2bbe6e995d556edb24e8c6c2fcc26caabc867"
+  }
+, { mapKey = "hslua-module-text"
+  , mapValue =
+      "ee3deaecba7d228e00b24f31c9f831d39e24455b01885eb91e31c2a3348919f8"
+  }
+, { mapKey = "hslua-module-version"
+  , mapValue =
+      "ce277ec1afc7947ca56747948c949942f4b6b8c9b2bc9929ef18557baed7168e"
+  }
+, { mapKey = "hslua-objectorientation"
+  , mapValue =
+      "653e7f27336992a323b075e3c60c8336204143fc88d943c9b2b5b3bd39c1285c"
+  }
+, { mapKey = "hslua-packaging"
+  , mapValue =
+      "ba115e3ed7cb822fe801dda9b33307382cedbb1b5719d97428293bac909742c2"
+  }
+, { mapKey = "hslua-typing"
+  , mapValue =
+      "5f6a4227c3cc2f2945939f36e4daad4c75f7c873ce7cadc2c933e5928619977e"
+  }
+, { mapKey = "hspec"
+  , mapValue =
+      "1929b9815b9f110b93f5f52152904ab5a3b9c3e43069bb9f7cd657f9dab01e4a"
+  }
+, { mapKey = "hspec-attoparsec"
+  , mapValue =
+      "bf574737c8e774db63ac0c504bd00af3334464f2caa5b6cd07301bc09f5360d9"
+  }
+, { mapKey = "hspec-contrib"
+  , mapValue =
+      "7ea06f502aa6abefefe77dca85c97a86bafdb95b2ea0726d9f65d02863c51ade"
+  }
+, { mapKey = "hspec-core"
+  , mapValue =
+      "ccfe6d0ed7339890dfcd879902faa2902ef55b1f1fc53611ec65b20a002aa216"
+  }
+, { mapKey = "hspec-discover"
+  , mapValue =
+      "d2098729fbd852d894fb28546b00d9170a56e250453068ab36d6696ce0c833b1"
+  }
+, { mapKey = "hspec-expectations"
+  , mapValue =
+      "89e3c6a22dd8427de51d30185d1998085cfe8a73f5dc4ebcb4e055788b408bc5"
+  }
+, { mapKey = "hspec-expectations-lifted"
+  , mapValue =
+      "726ff3df178e7b852bfd36a70ada5ed19c4842f7bac148ae2daea817a81fdfe2"
+  }
+, { mapKey = "hspec-golden"
+  , mapValue =
+      "38aad3572193ef7fac6678a9141ee04048c47184a3421a87056c29738a9b1768"
+  }
+, { mapKey = "hspec-golden-aeson"
+  , mapValue =
+      "7e4b9f9101758fe8265dfd782d07526e01f280cb91cfe57d927d26eb49789cc1"
+  }
+, { mapKey = "hspec-hedgehog"
+  , mapValue =
+      "b6b6df8780f9d9815837e5806c21a5fdcca9596e23ba536d2034a920497ce8a1"
+  }
+, { mapKey = "hspec-megaparsec"
+  , mapValue =
+      "589a9462b13c7e62052584949ce39da782748c0afe49f98878431d38d121a317"
+  }
+, { mapKey = "hspec-meta"
+  , mapValue =
+      "44b2d8154110526ab32271786a1c117d2d6767fb8d170994f9fb65569c81ce24"
+  }
+, { mapKey = "hspec-smallcheck"
+  , mapValue =
+      "d32fb62a5bf773f00992776368250d58736b68fe6ba1f1fd16be17d42f854a74"
+  }
+, { mapKey = "hspec-wai"
+  , mapValue =
+      "fc368c04578fd5b231c26382626cd67e3d0350f63351f8767a7bd1ed1222a9ed"
+  }
+, { mapKey = "hsyslog"
+  , mapValue =
+      "09acefe24f7ad646503018e004d54e11add722efb349d8d7ccd51f3aa80b1138"
+  }
+, { mapKey = "html"
+  , mapValue =
+      "4e1227db66a8b00b1de32bcdf3dd6d8b5180f79964bb1afb4721fbf2c404ec74"
+  }
+, { mapKey = "html-entities"
+  , mapValue =
+      "5166a7a6f265171f87d54f3fa89bfaea7dedd60d51e90cb09f90aa701977368b"
+  }
+, { mapKey = "html-entity-map"
+  , mapValue =
+      "af9f4ee51747ce0d700fa6971d7dd86335a9524a9d8a4378a23499950b20f827"
+  }
+, { mapKey = "http-api-data"
+  , mapValue =
+      "c6429b9f32e82ee82da0cd35f7d6f5fbba579a98aae101fc94285d55fbe4eac2"
+  }
+, { mapKey = "http-client"
+  , mapValue =
+      "e6f8fbca50967a85878158278ea8473c1a23dac49dc0c1b46f20ef5b86c2bada"
+  }
+, { mapKey = "http-client-tls"
+  , mapValue =
+      "463efe918ca4755a248160ba1948c637f45b153b6d077371c03d429be4e1dc93"
+  }
+, { mapKey = "http-common"
+  , mapValue =
+      "ad0c58fd7a1160b05659eb0866f5edb377e8c6f8846df57189920955aea128ba"
+  }
+, { mapKey = "http-conduit"
+  , mapValue =
+      "2c57e12db8bc5ec1d4d96e8719a94e2ee1b6c0cb93485e8d07a94a5808975253"
+  }
+, { mapKey = "http-date"
+  , mapValue =
+      "fb1b12ba8d4bd39e958aac1329eb39dbcd312663e4f53a552780c645e22a8c1a"
+  }
+, { mapKey = "http-media"
+  , mapValue =
+      "21b3b806192d9295af9f7cc95731952485bd5102f2d7ebd1d0d4ff46be08085e"
+  }
+, { mapKey = "http-streams"
+  , mapValue =
+      "295097ff7a1b1a5fae68677533f1c323b8cccb6f1bb69d2ba7ad527ca010c9fb"
+  }
+, { mapKey = "http-types"
+  , mapValue =
+      "e5da59ef23281ad753e74ff00be97415da91d77ca6eab51a6c054c6601f67bee"
+  }
+, { mapKey = "http2"
+  , mapValue =
+      "21d3e216ba83c49a7b9eec5256dd20a1db424619d393c9f7ebadad570fef55da"
+  }
+, { mapKey = "httpd-shed"
+  , mapValue =
+      "a14bd38afae810020d6f4428a733bbd6a89dfa4a0827f95ab6076ad1659f5572"
+  }
+, { mapKey = "hw-aeson"
+  , mapValue =
+      "aa888be5685e8e7721e702a59d553741ff8a847a35b28a8a2583f9a9535dbdfb"
+  }
+, { mapKey = "hw-fingertree"
+  , mapValue =
+      "fa2adf1575bc9114d3a6f93e9be3f262480a041fc606d78722e90be7984fff72"
+  }
+, { mapKey = "hw-hedgehog"
+  , mapValue =
+      "a4a4d43e7a1fec4f965b2ad7842e385834b299e869d1b1016446e327d5aa6b92"
+  }
+, { mapKey = "hw-hspec-hedgehog"
+  , mapValue =
+      "26115b93a1f3d8622075efc9f7dc22661805c673efea71d016d6a41125934f55"
+  }
+, { mapKey = "hw-prim"
+  , mapValue =
+      "9217bd1683a22c10a5dce531a4d768f2480fd56b8f72f69cd08d87a23fae059f"
+  }
+, { mapKey = "hxt"
+  , mapValue =
+      "f473c725e3f00bcbf547d8846c5bef478fe1196e425ec4435af5212e448ec020"
+  }
+, { mapKey = "hxt-charproperties"
+  , mapValue =
+      "6e9aed6aee94890a9b0d16778eabd78760edc758fdab3192f1c6c574be50ec23"
+  }
+, { mapKey = "hxt-regex-xmlschema"
+  , mapValue =
+      "f726bff34653d5fadda23c1a873b3b7e1d858534703f957c2a6b6f1ebc5beeb7"
+  }
+, { mapKey = "hxt-unicode"
+  , mapValue =
+      "33fd97b814b9a1122e0f1a6cf79c9c5a753d48e4a8c37f59d14c9203ae4fddb2"
+  }
+, { mapKey = "ieee754"
+  , mapValue =
+      "366f317e4d53e162ecbe2702815d647e0e3cc79b11ad169707023fb48b9df343"
+  }
+, { mapKey = "implicit-hie"
+  , mapValue =
+      "d7991222ffc2e4cc0479f38cb3a895102ccc7c2db502e9d550cfc053d5da8ff3"
+  }
+, { mapKey = "implicit-hie-cradle"
+  , mapValue =
+      "19b73bc7d8c83182a3a80025c6d61baeb9187008a2661b62920f3cd3070467c1"
+  }
+, { mapKey = "incipit-base"
+  , mapValue =
+      "066a954d48d8935ecbf64012d8535d3d7144fa348c76ffb810ca3b08e6da31ed"
+  }
+, { mapKey = "incipit-core"
+  , mapValue =
+      "bdfea15bb0a7435bd3b19e8b10b08df49900aab2cc2b745434d50061ce6a8408"
+  }
+, { mapKey = "indexed-list-literals"
+  , mapValue =
+      "b900a55e487955a139bb1a1c0dfb43fb33e8d206f0f4266a0563788fe455580b"
+  }
+, { mapKey = "indexed-profunctors"
+  , mapValue =
+      "0f55139a6bf718727826810a38705d46a25bebc5d6dd9cdd94a32a98f6afc436"
+  }
+, { mapKey = "indexed-traversable"
+  , mapValue =
+      "2975c6d5173dc4c0f184c10da4085232b83b2f7d04a55f3c09827c1ca9c5090f"
+  }
+, { mapKey = "indexed-traversable-instances"
+  , mapValue =
+      "b146a6f5f0fe5d0fada89d6e3bfd897764344b81f2aff1d1c403d15e6f199795"
+  }
+, { mapKey = "infer-license"
+  , mapValue =
+      "e484895e24c91509efff09b63f3364f7f0d555d24b0251fc5e24e5dcdcdf3d16"
+  }
+, { mapKey = "ini"
+  , mapValue =
+      "6396340fd9c83e5732a63719ab0ceb746266e10a5b70a65f3101cbd22d21928d"
+  }
+, { mapKey = "inline-c"
+  , mapValue =
+      "57ad155e7fb569ec1c7767fedee85b0235de996190d61592fb8e27db7bb467ad"
+  }
+, { mapKey = "insert-ordered-containers"
+  , mapValue =
+      "aa053a354da1bcc06693c13a97980cc67ed3bee98a3524fced740c694c3a0131"
+  }
+, { mapKey = "inspection-testing"
+  , mapValue =
+      "0ca6cb3a2dd39687849e504f058cea61f5c561f9eda679d8b078700596c823bd"
+  }
+, { mapKey = "int-cast"
+  , mapValue =
+      "1c5036101edff5617fed123ad634b58c0dfb3b15ff84f91efb04363aa1db1dd5"
+  }
+, { mapKey = "integer-logarithms"
+  , mapValue =
+      "f4f609be4c247d7761159159a57bb4c636021ec525e150875a21152b7734a1b8"
+  }
+, { mapKey = "integration"
+  , mapValue =
+      "6efa78bb745fd785c554e2b2adab7eff702d011fc758e5cd2a2b48320431ecfe"
+  }
+, { mapKey = "interpolate"
+  , mapValue =
+      "c3a3d88ac095fe5a480832a9f9b1f2c87e335d5bee5bcd0f33f45361a65a2dc0"
+  }
+, { mapKey = "intervals"
+  , mapValue =
+      "dc88c4bf4c572ebf6f3bf6b207f5c4b5260d932e9996788cd54998065eecae93"
+  }
+, { mapKey = "invariant"
+  , mapValue =
+      "224d180beccc82626b0eaa65e22c438003f5b32fba002c8a6041f56de5a26fc7"
+  }
+, { mapKey = "io-streams"
+  , mapValue =
+      "9017fe14abee4e249c7e5cf2a252cc53515024c467ccdfa62e57568bddc8fafd"
+  }
+, { mapKey = "io-streams-haproxy"
+  , mapValue =
+      "944873f7a9f57edeb16832c02f9c661f1546b246a6f925d1adf5b4b07db58495"
+  }
+, { mapKey = "iproute"
+  , mapValue =
+      "e2b75d062ec1a20a8e0340604285fae16f07a8dcbc46c9b7a4170c565eb93ea9"
+  }
+, { mapKey = "ipynb"
+  , mapValue =
+      "46eb28c253e7a398343864d1fb2d6795f368e68974de7f60ca04723d1d83f96b"
+  }
+, { mapKey = "iso8601-time"
+  , mapValue =
+      "f20e4a20dc267e4e658acef045653a1640ff4c3b6b88b96d1ab2402756a7125c"
+  }
+, { mapKey = "isomorphism-class"
+  , mapValue =
+      "dd75a9404024a3a0125fd09c5485480d2a0a5b2e2d2b93c330c5d3fb46f699b0"
+  }
+, { mapKey = "iwlib"
+  , mapValue =
+      "c85be201d96c1d1519928b889d7876a0df5153b43c1f8139089d544377a34515"
+  }
+, { mapKey = "jailbreak-cabal"
+  , mapValue =
+      "646780ae681fe32018aa7103273d824e5f7b9bd863e8ea8e7f19dc2f8fb0a3b4"
+  }
+, { mapKey = "jira-wiki-markup"
+  , mapValue =
+      "214fa887e950fb8cccf3dd3fc7a641433422c3ff9c262c7a879f96d420f35604"
+  }
+, { mapKey = "jose"
+  , mapValue =
+      "927fb4ddd3669412570100156533fc00b5d250b32d40cf22329a3a42f7573abd"
+  }
+, { mapKey = "js-chart"
+  , mapValue =
+      "088628a3063054a7084b0eb2d576c59bfa94332c545818ae99b34c3d67f873fc"
+  }
+, { mapKey = "js-dgtable"
+  , mapValue =
+      "4dd5bf5ec4d20746477cff192d8062c9eb7447a90dcbc236e15472981a323987"
+  }
+, { mapKey = "js-flot"
+  , mapValue =
+      "0719af0e2c4aeb8a07331bf6edb0c40504c66dab3c90b276a649f71d6cd86d3f"
+  }
+, { mapKey = "js-jquery"
+  , mapValue =
+      "7944a59d153bc57421bd660872cc273408773b19d758fd9985d9ca6b50d24da9"
+  }
+, { mapKey = "kan-extensions"
+  , mapValue =
+      "41b97af95f4b5f70ea4e1777a926a8ddd07193c2dfeb5251861e24368e9b4390"
+  }
+, { mapKey = "katip"
+  , mapValue =
+      "f4157a668098f111f624f503a5a36acefac0e75c721b17b988801c0e0c281d2e"
+  }
+, { mapKey = "keys"
+  , mapValue =
+      "f3c3e90a82b87aeaff8bddfedb742dc661b7e21642e16ee18282609a3ff59cf6"
+  }
+, { mapKey = "kvstore-effectful"
+  , mapValue =
+      "38df02ce46bf8160f8cb156cff3839827f5e994c3af3e9df9279b33dc289abeb"
+  }
+, { mapKey = "kvstore-effectful-cache"
+  , mapValue =
+      "ef1dc2b73b7faa108d5c78f4c1e710da96b55920ebac955a10fdb121352cc86c"
+  }
+, { mapKey = "kvstore-effectful-spec"
+  , mapValue =
+      "7113650d30f1201b793969911ef1de9415a5652da4192e9d5db97bc0711e2a4a"
+  }
+, { mapKey = "kvstore-effectful-statemap"
+  , mapValue =
+      "5f17aca6b408820ea15b733b9c1ad11483d049364aba334d305ced06ce683747"
+  }
+, { mapKey = "language-c"
+  , mapValue =
+      "44c88654502959af9b1b695a38736a1d27d6a44f600d3700bdb702ae30b84065"
+  }
+, { mapKey = "language-haskell-extract"
+  , mapValue =
+      "207b7e1c89166b3869c69069b3dc969ae7c1c9b30b8519764b443fc436199a51"
+  }
+, { mapKey = "language-nix"
+  , mapValue =
+      "f417f513eddbe2204a63a0e0d61a7b5906716a3641b3aae9adde75427f9ac2dd"
+  }
+, { mapKey = "lazy-search"
+  , mapValue =
+      "ab95bda95b6aad78ad3b13448ed0a3963f581a4dc96a39942dd965f516784e48"
+  }
+, { mapKey = "lazysmallcheck"
+  , mapValue =
+      "252c2af46e1ac5f769c0447819c66b5996062487d85ef650133806e3c3b6590c"
+  }
+, { mapKey = "lens"
+  , mapValue =
+      "cae8ea62047b0c74fba9ef7f8a7fec4dbfa7fed82690e29206cd7aedae2b11c2"
+  }
+, { mapKey = "lens-aeson"
+  , mapValue =
+      "43d02024b8a69e1b37b78bae40a8ffbeb7863323eaf9d7b01d93fe2eba937b63"
+  }
+, { mapKey = "lens-family"
+  , mapValue =
+      "c1cafb7b8a9ce49ec26626a3ac478fe051f81cf54e625b8bdb4361755d97085c"
+  }
+, { mapKey = "lens-family-core"
+  , mapValue =
+      "1a7c30a869836379020f01324c10aba85e218a12c557e0df1cbe10d0b3da1d88"
+  }
+, { mapKey = "lens-family-th"
+  , mapValue =
+      "f7cf54e76c04ed55778023684093bd977b6def3f9cc4350e748c342a12cc0b7e"
+  }
+, { mapKey = "libsodium"
+  , mapValue =
+      "04ccf34cf67c01a9ec8d73f831326a0ed7dc03f886933a7c86e3f8d98400d1fe"
+  }
+, { mapKey = "libsystemd-journal"
+  , mapValue =
+      "d7bfbd32f214b616a4be37d5345f8f8457df79f503da13401b0e08df92024a67"
+  }
+, { mapKey = "libxml"
+  , mapValue =
+      "cc0b2a93b8b35a4936152e5fac47a4076118f4c3998021ac349c741a7015a5fc"
+  }
+, { mapKey = "libyaml"
+  , mapValue =
+      "15145d5414d2bd820da0143491b16ac64861f7d1f9acece3a62b0283a4f37143"
+  }
+, { mapKey = "lift-type"
+  , mapValue =
+      "3bf8bec5370a8456be0a49565072dfa69be9a79804cf94ea5c2be2ebfffa44b8"
+  }
+, { mapKey = "lifted-async"
+  , mapValue =
+      "ab062ebceab4f730c4ce25e0c18c8952e432c2e72e7bf48160377776e6cc3fb8"
+  }
+, { mapKey = "lifted-base"
+  , mapValue =
+      "3959fc9a8279e85769dbc312a33d614db7371f732025246da73a0f2eabd04bee"
+  }
+, { mapKey = "linear"
+  , mapValue =
+      "a3654d90a786d4c39b0c0033b80aceef47e169577dc5b444d6ab343a98f3c5c0"
+  }
+, { mapKey = "linear-base"
+  , mapValue =
+      "a6ee7c771597f8ca0e89646ac5c0f349d3560f970586eda97a2d27c374e6a335"
+  }
+, { mapKey = "linear-generics"
+  , mapValue =
+      "abfdffa0236e5ace6885e201f367ddb976d5187b9da408fc97567a476856b607"
+  }
+, { mapKey = "list-t"
+  , mapValue =
+      "0b88d730c166193a8c8e109aff8162fb6579073ffd7e2f2dc7d9cd366af63784"
+  }
+, { mapKey = "list-transformer"
+  , mapValue =
+      "2e595a451cf9ad2b439b98eb3d64fa97412a7e0cff0fcf2b3e45e4c08e7f9f8f"
+  }
+, { mapKey = "lockfree-queue"
+  , mapValue =
+      "78c5193c8bc97b8bc5ef73a15273bce1899795f0aeda69ae7cd3f804b2da009f"
+  }
+, { mapKey = "log-base"
+  , mapValue =
+      "578fc37564cf92179678a81c8080b5646b3aa4e599fb88291c1415062ef3a69e"
+  }
+, { mapKey = "log-effectful"
+  , mapValue =
+      "dfbba3a13f3f4665636c60c99d038fb13c146df4c15d1b67c13ef735e183c5f8"
+  }
+, { mapKey = "logging-facade"
+  , mapValue =
+      "ea9b4eb7f017a9d2a2db57d84c633c23607e03f48102762e26c2155b46b4bfa0"
+  }
+, { mapKey = "logict"
+  , mapValue =
+      "c3dc8ab6ff7a4995ae0a9c59954e9ce630af2a4a2025f20ae11096e0e2c44643"
+  }
+, { mapKey = "loop"
+  , mapValue =
+      "551857e2ed7d9880b5f27091d792b0061e2a318057344a077c302695e35ab4f1"
+  }
+, { mapKey = "lpeg"
+  , mapValue =
+      "3f6ccf18d8c1c6233f9b301b445595cdab54950958b59871ccb4f557a0f2c90d"
+  }
+, { mapKey = "lrucache"
+  , mapValue =
+      "60384a545ea3f3097ee2d69a261f56a20cc893d48954225eba4b14b83e17873b"
+  }
+, { mapKey = "lsp"
+  , mapValue =
+      "e8a98c7263ce8c18ac799045aede244736d301d28188b084aa921be161474572"
+  }
+, { mapKey = "lsp-test"
+  , mapValue =
+      "3eb661e7f25d4487b7c164e4d76bbd32072c4c82f68bb4c69223d428616969c8"
+  }
+, { mapKey = "lsp-types"
+  , mapValue =
+      "d803f241be95ffff268c58e03f7b94f2479686c030723500b183a57179aaaa53"
+  }
+, { mapKey = "lua"
+  , mapValue =
+      "b42f35e62062cfe3eec63722d6898588134fcab11da6af95ca5fc04072b0eb9e"
+  }
+, { mapKey = "lua-arbitrary"
+  , mapValue =
+      "90314c27d12e69f9f7bc79fdb9fda0f0b133e53df5b0689c90f96853847fd594"
+  }
+, { mapKey = "lucid"
+  , mapValue =
+      "1ab8bf756bca78c472d5e9c637bb661a3bcc7516e7fccb1a502983302add2142"
+  }
+, { mapKey = "lucid-alpine"
+  , mapValue =
+      "1c2761fd5ef2579980a9c0e7ba1bf47b9603f82a47bf7339f0e81f2a20161ec0"
+  }
+, { mapKey = "lucid-aria"
+  , mapValue =
+      "84b80b17cacea7630521a2b0d68f531a2232a91853a4c0b38cc83d2e473b4caa"
+  }
+, { mapKey = "lucid-svg"
+  , mapValue =
+      "47f578dd5f6a6c27cd1cbb0e14d1912c3a886f0a199108d505eb99331554f0f6"
+  }
+, { mapKey = "lukko"
+  , mapValue =
+      "fb8bd1de5cf236726bdfac132db3614f87d061029ddd748c4d4f1e3364412216"
+  }
+, { mapKey = "lvar"
+  , mapValue =
+      "5ec7e0ed7bcb4e9506f4c09fd55f9b32d556c38bfe8e85a4b73e3e9ef9c99a41"
+  }
+, { mapKey = "lzma"
+  , mapValue =
+      "3f7ed56699d3f4730212b6e764d5d8291a0b14c6332f73267f601a845a9e950d"
+  }
+, { mapKey = "managed"
+  , mapValue =
+      "a58a60b854a97809ddecdc2c6472cabb94dbc068412a1c2fbfcca9959728b2bc"
+  }
+, { mapKey = "markdown"
+  , mapValue =
+      "2dd6d5ee31c870545b7b84c12e5a0d2f81f4ca5230925321d91c3cec8fc4f9ae"
+  }
+, { mapKey = "markdown-unlit"
+  , mapValue =
+      "a3b8981389301ab32eb9516c3fdc3dd0e2c64bd3038b9c4254c2f758d399c53a"
+  }
+, { mapKey = "markov-chain-usage-model"
+  , mapValue =
+      "42931f5d53d5a044b3ad8a225e30cf75175c10940d0f3f22941fc35e5a1f85a4"
+  }
+, { mapKey = "math-functions"
+  , mapValue =
+      "81a098c9dae6c2241e65e90204d54f34f2b49e45746f838210ce1c0f0e10ca8a"
+  }
+, { mapKey = "matrices"
+  , mapValue =
+      "a6d46dfa8f4dc8ecc551c60de673918f21b2dd9d8e3d9383ec0f326b08a1e393"
+  }
+, { mapKey = "matrix"
+  , mapValue =
+      "302ecf041aca3e15d678e2bff586b9284a46644be542f46651a31c2a0ede6e74"
+  }
+, { mapKey = "megaparsec"
+  , mapValue =
+      "459b1a5c3095fe1b3855219e8794b2b690578826f0e9742e5dc6767b6eb0b661"
+  }
+, { mapKey = "memory"
+  , mapValue =
+      "1e522395ed7e7b51a6ca67550cc1bf4a5490205e395bd3ac635044cd5e2e3770"
+  }
+, { mapKey = "mersenne-random"
+  , mapValue =
+      "93a20538588e290d63f08e573a03d5018d737ef0a8133bdff2d8a009f544690d"
+  }
+, { mapKey = "mersenne-random-pure64"
+  , mapValue =
+      "a766db2fe66b1ab0cd4fad78a37156766c6e0582ef9dbed62d9ad2374d4ff439"
+  }
+, { mapKey = "mfsolve"
+  , mapValue =
+      "10feb06fbe3194e72afcc37c5bed90a99a9f58100816d26203a223161a88aaa4"
+  }
+, { mapKey = "microlens"
+  , mapValue =
+      "8d65f1f98b2d31db31a7a4d41748f3c47042e6e795258b645bd98872c2772a5a"
+  }
+, { mapKey = "microlens-aeson"
+  , mapValue =
+      "5bb1cdfae79759b48c7727218bb1cf8d725a165376db33e69e6ac53b8aa6558d"
+  }
+, { mapKey = "microlens-ghc"
+  , mapValue =
+      "83b4d15bff08a752ed47931940b40280112044802e95c12f045692366848112b"
+  }
+, { mapKey = "microlens-mtl"
+  , mapValue =
+      "aa63104519a195984d0836102135c73363e2e7aaf4b5ecde969dbe2ad468a557"
+  }
+, { mapKey = "microlens-platform"
+  , mapValue =
+      "b055e675dc0f5defb5e39e1e7adff5ea60be719f99ac0574df0317e6a24ce1f1"
+  }
+, { mapKey = "microlens-th"
+  , mapValue =
+      "c41b427b45fa2af04cfa0ca0e592a7c4937898935bf8bd68425b076875d5e2c0"
+  }
+, { mapKey = "microspec"
+  , mapValue =
+      "993993b0cfd648a2c4b54ba77ba6e34ebfb0f46856c256004fa94e37dd932ef9"
+  }
+, { mapKey = "microstache"
+  , mapValue =
+      "011ec705407a37447238133d16ad5c705ac304ce4bd398967037458f258ef8d7"
+  }
+, { mapKey = "mime-mail"
+  , mapValue =
+      "f966140aa4755f849da43ba7d12a4db24a85b06747194b38d6110f2eda7d1688"
+  }
+, { mapKey = "mime-types"
+  , mapValue =
+      "a1f3e947a2023e3d7544ff2938bcceaa519cea3199a133d41f3ff3e2dbf77b16"
+  }
+, { mapKey = "mmap"
+  , mapValue =
+      "2aab92c741a6c906eed2817a308fc7eae18972cae21ef0a942b3f1554070c557"
+  }
+, { mapKey = "mmark"
+  , mapValue =
+      "a1094fd475a383df2854127d48888fed9cae7acf68df7427b3b122b6cdb069e8"
+  }
+, { mapKey = "mmorph"
+  , mapValue =
+      "55f95b73de4229c0bc76376dd4746e5239a9aa470b869585ace61584c7ded76e"
+  }
+, { mapKey = "mockery"
+  , mapValue =
+      "9cf5e6f69e0558a9e4770aa47d9ffa5a5c9f5aa9a31d752e0f74216690a1c608"
+  }
+, { mapKey = "mod"
+  , mapValue =
+      "370d80f83988d9884dbf3a002ae10ea7c10e15e4974aa07b202b2b7a48a0d5c4"
+  }
+, { mapKey = "modern-uri"
+  , mapValue =
+      "7d99e977398ee5d11579c572506d2ad2b043ec3976a37240512624664cdf85c9"
+  }
+, { mapKey = "monad-control"
+  , mapValue =
+      "4e1005914ca094b2225ea8b9b29d5ae0c680b17d8892fdd6a49ed485bed73a5e"
+  }
+, { mapKey = "monad-logger"
+  , mapValue =
+      "75b92aa4988c84792481cd9487a1121c75ed8baa80b970a4ca7efa65e98b0023"
+  }
+, { mapKey = "monad-logger-extras"
+  , mapValue =
+      "1b52b78fa24964adda653cc066c9a12a496549fdbe9f8dfbc4881c390e3bb62b"
+  }
+, { mapKey = "monad-loops"
+  , mapValue =
+      "1b56fd6dcadb22b2b7fbaf92cc44c8839651d0b77d7af46b05a3fcde924a6561"
+  }
+, { mapKey = "monad-par"
+  , mapValue =
+      "9baba0952bcb76db096913099048834eaecda23b9da427515d7f8cbbb61048b8"
+  }
+, { mapKey = "monad-par-extras"
+  , mapValue =
+      "3def7342b5591f2098639edd93146cfee846661b423c095ed5e9166fffc97763"
+  }
+, { mapKey = "monad-parallel"
+  , mapValue =
+      "2188930007cd0de0476cbf7004d12c5f4dc53bdb5f4158c335c517532da6381e"
+  }
+, { mapKey = "monad-peel"
+  , mapValue =
+      "aa99f13fd8f9cb05b370f4f7ddb13062c0ac23f64b279d319ee5b355cc787d22"
+  }
+, { mapKey = "monad-primitive"
+  , mapValue =
+      "f8f6a67526733db4cb5de6d3bb5d5609b6ea0eb8916c7e222f40dae42990d875"
+  }
+, { mapKey = "monad-time"
+  , mapValue =
+      "75bb10f8171dc829a45720fd6b046181c4711a95435ca1d0678b26089cad7b35"
+  }
+, { mapKey = "monadlist"
+  , mapValue =
+      "88705f6def8cce95dbff682ddc2dfbcca09b5bddc737f7bbcbfb91ebea0d4eab"
+  }
+, { mapKey = "monads-tf"
+  , mapValue =
+      "839157ebb572c643da116aa8204614a3a114e6ce2a058b0aee07eba0c4e3c560"
+  }
+, { mapKey = "mono-traversable"
+  , mapValue =
+      "00ca0bc4147e5786ad5685a3fdc4eb84e20c5853a2f5f45260521f37a52bf245"
+  }
+, { mapKey = "monoid-extras"
+  , mapValue =
+      "c978bc7c0d155f176af54da8de03349576d961a8b0b5dff1de48270fa882f0fa"
+  }
+, { mapKey = "monoid-subclasses"
+  , mapValue =
+      "a6d4bafdf7bf11e1664bc0eb96b2a6c9da8ef94aadf7f15af2178865a57dabae"
+  }
+, { mapKey = "mtl-compat"
+  , mapValue =
+      "c4ef8e2fa6c45fe96b2f80739beba3c95f402c0bf236ede1e260fcafa99d71e2"
+  }
+, { mapKey = "mtl-prelude"
+  , mapValue =
+      "b526682aa59b1b0189932e6522c07f09536b0e7e164ac01d91c2ad24e0c7e338"
+  }
+, { mapKey = "multiset"
+  , mapValue =
+      "27f841eeddac60d9da67398b386b426c5f40c3f2eb84faffed2922c83ee577ff"
+  }
+, { mapKey = "mwc-random"
+  , mapValue =
+      "01bc7368a5a52d5eee21eddda02656d65b2ee5a78d5cf51433cf46464483e0e1"
+  }
+, { mapKey = "mwc-random-monad"
+  , mapValue =
+      "33c5ccb5a6811bf91536cc31a849d5be0c40929d5b6e5ab5c92ed1da8a248544"
+  }
+, { mapKey = "nanospec"
+  , mapValue =
+      "9cb503d796b82bc702cb0bc892bcf1226fadf514b9b1fd0006af12749440cd03"
+  }
+, { mapKey = "nats"
+  , mapValue =
+      "e8eb5d5edd92cb93f804df87a7da931e70cd282e8d94c46469acc3c500794316"
+  }
+, { mapKey = "natural-arithmetic"
+  , mapValue =
+      "af31e5b9267b75b394dcbc017fb7ab54967a65e9b2c275eeae85acf14fb575d7"
+  }
+, { mapKey = "natural-transformation"
+  , mapValue =
+      "ad7c39ec8d4fa2fee6e4ef0c7598bf8e142b4323df4f8149131c38ff2f7c0ace"
+  }
+, { mapKey = "neat-interpolation"
+  , mapValue =
+      "7345fc793662ad9414aa94976c3769f5647467f334429a90d40f12a543436696"
+  }
+, { mapKey = "net-mqtt"
+  , mapValue =
+      "1c5ce342aa31c512403cf9e6b0acd770d78be394c260b02b28cf19ed60db1e7a"
+  }
+, { mapKey = "network"
+  , mapValue =
+      "e8c1a46a0c74867494bbec59497578256bf4d99932c858cc64ce101f8c62e105"
+  }
+, { mapKey = "network-bsd"
+  , mapValue =
+      "73f67385930f87af18ea1e0a1d6a5d0af0378edacb125d493df89d10837fcfc5"
+  }
+, { mapKey = "network-byte-order"
+  , mapValue =
+      "ba66ef124755ae14d764ab2ff62bddbe4841e13c4c4cf0a5586868ffa57693ae"
+  }
+, { mapKey = "network-conduit-tls"
+  , mapValue =
+      "54a29ff428ed17096c55cbaec8926029ef23682b846f27c9cdd74bb2f3fed8f5"
+  }
+, { mapKey = "network-info"
+  , mapValue =
+      "23ece815767ee2b59c2650043bedd9bd2ea5b21722edb2dbb0ac47d08fe2fdcf"
+  }
+, { mapKey = "network-run"
+  , mapValue =
+      "63ca4eff165027949a1297d9ea441f6f21e6458417596736d3ab6ec29ada4aa0"
+  }
+, { mapKey = "network-uri"
+  , mapValue =
+      "0519bd3d79da1441a07ba78e0293b6962d7132995dee82605c8055a73c461b2a"
+  }
+, { mapKey = "newtype"
+  , mapValue =
+      "21267ea5e24e86ba4328680d57dec06b1bf30d0a8f45a1ba31bd89e42b45835f"
+  }
+, { mapKey = "newtype-generics"
+  , mapValue =
+      "2aa842ac5f7494397fa38bf1b3d44bb1a1ce4fc774ad48394cee67bae2499153"
+  }
+, { mapKey = "nix-derivation"
+  , mapValue =
+      "c990917dd51cd5bae7f30310465e2d33fc69f3c0324be259ba7fb6cc15677d95"
+  }
+, { mapKey = "non-negative"
+  , mapValue =
+      "5e63bbd8e398599f08b4da5f7cae3b594d81b3ed49570051f55e4723ead30bd9"
+  }
+, { mapKey = "nonempty-vector"
+  , mapValue =
+      "38928b4a19677d941ae08a7f488d806adf9d35c3c2211e028149f59af1f90723"
+  }
+, { mapKey = "nothunks"
+  , mapValue =
+      "5c68572cf69757fe31cda7a4ee7b2e8164065f3c116f267ef6b607db862fce2a"
+  }
+, { mapKey = "numeric-extras"
+  , mapValue =
+      "11d4053a20a72be374d535a88d4912d1e09485549f26d5b8632cc3dfd9b4e2af"
+  }
+, { mapKey = "numeric-prelude"
+  , mapValue =
+      "e32950302a154f250efe4aa6c13ba0f6c3ada4e2400c3ae3d65649bd5c1d36e2"
+  }
+, { mapKey = "numtype-dk"
+  , mapValue =
+      "b92848539e5d6453a9c6c039af949a1881139ab162f0d70f3b5f1a3e54caac30"
+  }
+, { mapKey = "odd-jobs"
+  , mapValue =
+      "b0695d766438e15a84d05b6d93a0a6af182e2e6a20983ed861454f17a7b3963a"
+  }
+, { mapKey = "old-locale"
+  , mapValue =
+      "b5a796de3bb53055aab49b2d1e473abbff42c44b4a07d2ce334d9e5d5dd2aa44"
+  }
+, { mapKey = "old-time"
+  , mapValue =
+      "67001547c659f9ef4859635dc025c3348481dccaecedfbc7320d074804495730"
+  }
+, { mapKey = "one-liner"
+  , mapValue =
+      "9b49ed90a2ebd6b60fdcfa451ac0d6dd5f72cb806db20d79c57d8f0897519979"
+  }
+, { mapKey = "openapi3"
+  , mapValue =
+      "5b7840cf2dab95461d30235e910d1632ed1049e55a0a8adf3371ffd5f19a8edb"
+  }
+, { mapKey = "openssl-streams"
+  , mapValue =
+      "b2b8c84bbe5944242c3778f55b1e410f532e889357f8fa3296bf7490bc838316"
+  }
+, { mapKey = "opentelemetry"
+  , mapValue =
+      "f76b441769b3adac5f359856dd3decee3953f94a9a1ff9260f52d02a33e7280c"
+  }
+, { mapKey = "operational"
+  , mapValue =
+      "f0df747a98f2d1dc8cc453a6b7dda30cc6a5a619185231aa6e7f7fcd4f6d13e7"
+  }
+, { mapKey = "optics"
+  , mapValue =
+      "1d8f495e0b82a4476b985b1a6a5f65c3c5e1626ce2d4adccd617ca10bf3785de"
+  }
+, { mapKey = "optics-core"
+  , mapValue =
+      "c2c03d97484d787ecce84f44f565d19c8a725e7a93992261a698d641a780442b"
+  }
+, { mapKey = "optics-extra"
+  , mapValue =
+      "eb312657820e95a044e7c1fcf4241c544949f0f3714e201f55618d517451f8e0"
+  }
+, { mapKey = "optics-th"
+  , mapValue =
+      "27aea914ef997fe2cb1a2339084bc9d0d491f73aafebe43d622bce146e900ac6"
+  }
+, { mapKey = "optional-args"
+  , mapValue =
+      "f40ffd01ac391e5e8c8266b92ece34eadb819a3b7fae04ab9af52619327e19d8"
+  }
+, { mapKey = "options"
+  , mapValue =
+      "858cacebdeabe35aef6866bf4fa3a687738969b495de688765c83ae770e5f72f"
+  }
+, { mapKey = "optparse-applicative"
+  , mapValue =
+      "80ad031d5780cbe09ee9b274c5e2f6ce5f13c1deceb4db078b726ecd2cc0c682"
+  }
+, { mapKey = "optparse-generic"
+  , mapValue =
+      "b06683734ca67765e81d2f6330f80fe9acad4d04959dd9e9708b773419857e50"
+  }
+, { mapKey = "optparse-simple"
+  , mapValue =
+      "50c1730fd15ffb801d544593b6335c6ff7a59789d3c5f1cca9cf1de1e0d83fd4"
+  }
+, { mapKey = "ordered-containers"
+  , mapValue =
+      "31b5162f7b4036e773b600dc6b00e026cbfd880d5d9e9619ddb4c9bf5c22dc42"
+  }
+, { mapKey = "pager"
+  , mapValue =
+      "1d1571d5de2a9deafeb3295a78a50d472f57ba11298aab49b782c847a428ee58"
+  }
+, { mapKey = "pandoc"
+  , mapValue =
+      "f0e84342d5c133ecc3eaea32cc4305c45ba6767c15bf73a3d8936c86a54c66fb"
+  }
+, { mapKey = "pandoc-lua-marshal"
+  , mapValue =
+      "40de82fd675799bd9bf4bde693878d93c4599f4f419ba0d5ee596766eb1aecf3"
+  }
+, { mapKey = "pandoc-types"
+  , mapValue =
+      "43375c2cc6eac1687b3f5167d2bf957ffab08cfd251acd36f076af1b14382088"
+  }
+, { mapKey = "parallel"
+  , mapValue =
+      "776002c044554016c6c11ebc7828a0df6067d573f68b03f4b385396657228de1"
+  }
+, { mapKey = "parsec"
+  , mapValue =
+      "2f10c83b9d2a38ec65eb928a535513556de68bc39678cbf508b8ea160cad0ea2"
+  }
+, { mapKey = "parsec-class"
+  , mapValue =
+      "56a445ab748960ce55070a3267225930c9992f32de876d91b139ff2b064f3c79"
+  }
+, { mapKey = "parsec-numbers"
+  , mapValue =
+      "ea645ace3250da77eef04dd0cbc6f8ad3e9fdfefa9c607bb9d6c1a8d9988001c"
+  }
+, { mapKey = "parsec1"
+  , mapValue =
+      "9e11d99eb7d426cfc416cd47afec748dd99a1bde5e99a4cd2a081ebc57a430ed"
+  }
+, { mapKey = "parser-combinators"
+  , mapValue =
+      "227bb8f9764e70ca153c7b1ca60421ad66f6037d08e1ca801c5f0c5284bba059"
+  }
+, { mapKey = "parsers"
+  , mapValue =
+      "9ee119c1d29705c1040b838ba4d2c32fd533ba12d3e3df0d47444c9a2d9d44a3"
+  }
+, { mapKey = "parsers-megaparsec"
+  , mapValue =
+      "f8499faba06da1de44f5429f66d2d7210ec467a087f9622c5b153395972d5af9"
+  }
+, { mapKey = "partial-order"
+  , mapValue =
+      "2bd07cc019204fcddbb19934ba7db944e45e875ee55edbebbe58f26128905501"
+  }
+, { mapKey = "password"
+  , mapValue =
+      "1dac330268a76c5caabf50edd7a2c24f9f8ee92ff529c6de11e4404530af317b"
+  }
+, { mapKey = "password-types"
+  , mapValue =
+      "2b6a566cc275f888f245419966fa52ea6d3457553c6b9384547d38fdb8debaf0"
+  }
+, { mapKey = "path"
+  , mapValue =
+      "0ed2ef3343b9f5ddbc369fb6c4f5e8ab5f57e2d5eaff07749429155d3464ccfd"
+  }
+, { mapKey = "path-dhall-instance"
+  , mapValue =
+      "5b3fcd4f7964aea82a75166b465ce5de71e65852b7ede61bbd689017370e502d"
+  }
+, { mapKey = "path-io"
+  , mapValue =
+      "f842c6b731cb9a33131ea440183bc43db10ae61a80105350565f4a4e2a4eb169"
+  }
+, { mapKey = "path-pieces"
+  , mapValue =
+      "03a160be3168bb35592f7a28b2f6a7fbd958bf1c59502809fa643f62f46e5e00"
+  }
+, { mapKey = "patience"
+  , mapValue =
+      "3ab724a2f1cc362891bd5df89bf36977f81ce8d2129f66d7fbcf553e617ac102"
+  }
+, { mapKey = "pcg-random"
+  , mapValue =
+      "ca0bfd090f2dbe4770f16f8a18ec31ca43d3b101bffddcc45d9a2dd0b9c066cc"
+  }
+, { mapKey = "pcre-heavy"
+  , mapValue =
+      "2645e327eac462ac92c93bf6b8b42ccc4c466d6938fdbc6bd7aa65d4fb3043f6"
+  }
+, { mapKey = "pcre-light"
+  , mapValue =
+      "62773b8a9ef36019164fbf1d6042fb4453f6ce15ba36cba4de3d4290e2e533a6"
+  }
+, { mapKey = "pcre2"
+  , mapValue =
+      "c67a458b81cfe6c9f2e6c754c3db322900df2fee72afc9f52dc965c9619037da"
+  }
+, { mapKey = "pem"
+  , mapValue =
+      "267b88723cf6c8c47e73fcab12f43b9113ee6d33cbb7cde4415e883d83f4ee3c"
+  }
+, { mapKey = "persistent"
+  , mapValue =
+      "179c5c720541c9aa0938aa304e2ed247e1f97038e4d70dec68e20a32506c220d"
+  }
+, { mapKey = "persistent-postgresql"
+  , mapValue =
+      "4073534cafa1ce0b0fbfbf24b07dd603908bddefa66e1dd0bf6c6d5b6e1e7c9f"
+  }
+, { mapKey = "persistent-qq"
+  , mapValue =
+      "3eb4ad8215b8d2ac77c0e980b62af803a2d911f228f0d88564e047eebf12662d"
+  }
+, { mapKey = "persistent-sqlite"
+  , mapValue =
+      "189a1529e47861eb2d9f7fe28f09e2fdbcbb5ef6c2e5b53a50849a80cdd528d1"
+  }
+, { mapKey = "persistent-template"
+  , mapValue =
+      "b94030a69762b98226abe1470834ae46451bbb4df60f16500deb134515d66bcf"
+  }
+, { mapKey = "persistent-test"
+  , mapValue =
+      "1fd6972b07f9383352171256c8c843d55c17587af1003075841bf938890172d2"
+  }
+, { mapKey = "pg-entity"
+  , mapValue =
+      "b9372f9a9622db717fe18bd1efc90c6dd0bea19aeb117f82471515a9cdd4e384"
+  }
+, { mapKey = "pg-transact"
+  , mapValue =
+      "ac2aeeeb7739158e708a32bba33a9c86f8c04cf699a52d75b4b70e873e02deee"
+  }
+, { mapKey = "pg-transact-effectful"
+  , mapValue =
+      "668e70e536414fdb36cfd4d09be2b698b7ce9ebc4c2c5915e9409d84c96ab71c"
+  }
+, { mapKey = "pgp-wordlist"
+  , mapValue =
+      "0e723b5087f8ad89bbdbdde361ffb2754013a8e9701c8a5e1a38b50298ab473a"
+  }
+, { mapKey = "pipes"
+  , mapValue =
+      "1696ebd68e5936d7dc7f39a16d8325617048dbd0a1076d5f33f5f0ce32cc92c5"
+  }
+, { mapKey = "pipes-safe"
+  , mapValue =
+      "291ee3b82685ce4abde35493ebcd996b907387431866095dc3d0f880e1dbcaad"
+  }
+, { mapKey = "pointed"
+  , mapValue =
+      "ff4339cc0eaffcb7fa5483fecbf681bf34d219ddd470f5f55e9732c8259a5ecf"
+  }
+, { mapKey = "polyparse"
+  , mapValue =
+      "1e61fdc70cd8005acc0a11d0d64e13c7495728d0408e6c6610deaca21121bd8d"
+  }
+, { mapKey = "polysemy"
+  , mapValue =
+      "bf80a9865f39003f899217fac7f7d795e4acc8e9c6d922e5e371a5e2c18d1942"
+  }
+, { mapKey = "polysemy-extra"
+  , mapValue =
+      "894cb303a38fe3190b5ff05e5ea368fae4b2cb2eee51d1cf006b773af46ff19b"
+  }
+, { mapKey = "polysemy-kvstore"
+  , mapValue =
+      "cd0fcc34492424bd2c789d47381744b41625fd0c74d61b787671f4a09a0aee57"
+  }
+, { mapKey = "polysemy-methodology"
+  , mapValue =
+      "1c676d0ff23c2ff8b9bb3bbef53822fe309dd384eaf9d7872a06bf779dc484e5"
+  }
+, { mapKey = "polysemy-path"
+  , mapValue =
+      "b758ea6ab2a4e91b57453619f79fe39812747099f29a651bd93f84174757ce6a"
+  }
+, { mapKey = "polysemy-plugin"
+  , mapValue =
+      "1e8ab06852d4dde94daffcdcb4ad2ef90e90411d8b26883b4ac3a28af2c34029"
+  }
+, { mapKey = "polysemy-several"
+  , mapValue =
+      "47e4b8734373af90c496614d8e172e12f03ca6db2641931b097cbf6f60e716ac"
+  }
+, { mapKey = "polysemy-test"
+  , mapValue =
+      "084627a0d5adac3a211ff93cbbdbc216fda1f7db9a6f96716e3eab0211071b11"
+  }
+, { mapKey = "polysemy-time"
+  , mapValue =
+      "020f2785f76a27979924fed56ea54c85244e83fd64f6fa26cc8ac8e3a526e626"
+  }
+, { mapKey = "polysemy-vinyl"
+  , mapValue =
+      "8af98a6bb5927ed4cd7a5261e9d370e03be2d1e92dba431df129cb4754990aba"
+  }
+, { mapKey = "polysemy-zoo"
+  , mapValue =
+      "51714c59f3b1308335e62e317a1ea1c9977036565338f8f4ee78f80a343ab8a1"
+  }
+, { mapKey = "port-utils"
+  , mapValue =
+      "c0124bedd61dbccfc7961350f7776c82a31114e8253ed64b6ab2e64df6032fb4"
+  }
+, { mapKey = "postgres-options"
+  , mapValue =
+      "28a47b438344234f9890de29ae2c6941c3112cac5857671613513720f88fee0d"
+  }
+, { mapKey = "postgresql-libpq"
+  , mapValue =
+      "3f8697b4dfaffd4f852f174b9a111b580aed2df360a0af31b8bb1abec4dd7fad"
+  }
+, { mapKey = "postgresql-migration"
+  , mapValue =
+      "000df1cc18ffddb01bb7b8f9e0ba1585ae65fdb01d376a59bc297eb48c2ceb70"
+  }
+, { mapKey = "postgresql-simple"
+  , mapValue =
+      "07a3d5f22e0e5304431c5b0c4671d1851c4b03be34487f10bf89b27dde80ee7e"
+  }
+, { mapKey = "postgresql-simple-migration"
+  , mapValue =
+      "07dd1671697e36fbe7fcdce06abd39ade98acfb0adeab0c8adeb7837f78939b6"
+  }
+, { mapKey = "pqueue"
+  , mapValue =
+      "ce41b45e194ddef11137afc197e9484ef5de371fbbdbd884bd0d2ec2cef7c312"
+  }
+, { mapKey = "pretty-hex"
+  , mapValue =
+      "de7a89e43f52c1416263f9d3c6bfaebb1a73ee73abd41fa7bbd2d604d994fc22"
+  }
+, { mapKey = "pretty-relative-time"
+  , mapValue =
+      "05a9c677d05b8a3317bd3aaffdfc038208f4a8c1627fb745beedbab20dfc23af"
+  }
+, { mapKey = "pretty-show"
+  , mapValue =
+      "823b92ad9c05272712097d222a8607f092309cc9fdc860fa94275c620dd6d60f"
+  }
+, { mapKey = "pretty-simple"
+  , mapValue =
+      "6582d7d6d2de7c8fdf97f640b9a373b4ea06b2f21d1a86498ae26f743a002ec1"
+  }
+, { mapKey = "prettyprinter"
+  , mapValue =
+      "1d8a6c1e8a2c399467ed3516b13317a678ba52d1b175cc508166af0e8968eda6"
+  }
+, { mapKey = "prettyprinter-ansi-terminal"
+  , mapValue =
+      "1f10556442845127aa605cc03d77e42cff93c164c7e8bb92cb11b484da4b686c"
+  }
+, { mapKey = "primes"
+  , mapValue =
+      "0e57b6f0fffed0055031b9de84bd2df106de146889b4bd9e29b2183d7d00b077"
+  }
+, { mapKey = "primitive"
+  , mapValue =
+      "536d013231777e02e618826c1978052af430b76b12d171609471b7f613fed3d0"
+  }
+, { mapKey = "primitive-addr"
+  , mapValue =
+      "5865d5d1f7139c6eeb543c51a6dcbfc5be1c4b5ffbb510d9fb68b65fc1594fd3"
+  }
+, { mapKey = "primitive-extras"
+  , mapValue =
+      "6deae0520c51cfe647d85d271d4d5700315033ffe696083b61d1b7d5ca1b1076"
+  }
+, { mapKey = "primitive-offset"
+  , mapValue =
+      "01cc6110d9d306ad5e8cf5a4c6b209bbccdfd6dc9e4a5cc85b3262967c965def"
+  }
+, { mapKey = "primitive-unlifted"
+  , mapValue =
+      "e35d097f87ceedbbea5eb01f340db41ee0797462e48a4becef8a2fe49e0526a1"
+  }
+, { mapKey = "process-extras"
+  , mapValue =
+      "8fdc9c03c349ced558f7f6bb2ec1102effb868b850c2be9ac42ea5caf6f83181"
+  }
+, { mapKey = "procex"
+  , mapValue =
+      "bcbd180ceacc2013c0d1eeabb240e1a4a5059f9c37a3250d93fa1838fd29ae71"
+  }
+, { mapKey = "profunctors"
+  , mapValue =
+      "6113c29e530e9c414259137a99d7f3ab5a89b9b7e6524e62433c6bf8523929ac"
+  }
+, { mapKey = "prometheus-client"
+  , mapValue =
+      "fc3cd99d9afc218784fa294e8c89d06921abe9ba7a7f670ffde96e32b888c852"
+  }
+, { mapKey = "prometheus-metrics-ghc"
+  , mapValue =
+      "803a33fdb2a2fa4d4a936b198bd0aca34797bd695d99d6d0a840363a471bd73f"
+  }
+, { mapKey = "prometheus-proc"
+  , mapValue =
+      "c0b5d6020c83a3f80eaa3779549239bcc515718bcfab87d92ca7e1adbdc9cabe"
+  }
+, { mapKey = "proteaaudio-sdl"
+  , mapValue =
+      "6bac12744d2df163f4a7cbcdf51431d42d115fa06cf780e5ac064fee04c30a08"
+  }
+, { mapKey = "protolude"
+  , mapValue =
+      "ee3f230c71d16d00c6144727f8949ed703d9a80f73a5c54fc2f6ae260569531d"
+  }
+, { mapKey = "psqueues"
+  , mapValue =
+      "05bf7016b2f38d9789c10667b610685a19f9f20f0b9f9c762939124335fb6c2a"
+  }
+, { mapKey = "pureMD5"
+  , mapValue =
+      "a92a82628721f367a57fd19c038a46e9a4976487c98e3ed75479ca334b12c018"
+  }
+, { mapKey = "quickcheck-arbitrary-adt"
+  , mapValue =
+      "177ed33ea8272fe60b4f9a9a6ee62cd8ca978a0490a590f02001d34753c03315"
+  }
+, { mapKey = "quickcheck-assertions"
+  , mapValue =
+      "072583872787193560c816f12a899773d7b16a5d34c454cb744ccd1882361241"
+  }
+, { mapKey = "quickcheck-classes"
+  , mapValue =
+      "afad8692720e1539ee28ae202bfed9def949cb058668b835c4a45a8bb15ecf3e"
+  }
+, { mapKey = "quickcheck-classes-base"
+  , mapValue =
+      "913434f2be2cab6c9d0fc894827140419d52a05600a71cc5b078360592d4d435"
+  }
+, { mapKey = "quickcheck-instances"
+  , mapValue =
+      "e269371d3064ab6215e24a7c095e8a5d64d5b28ec98fe74be7e577d646a6da9c"
+  }
+, { mapKey = "quickcheck-io"
+  , mapValue =
+      "c97b58006959e067da378b05e71d1fbc1c5870a032815f3e5ff2eb9d199712e3"
+  }
+, { mapKey = "quickcheck-text"
+  , mapValue =
+      "896f9363eb292438892fccb6e79a10aef144a2ea6e5cb66dea8f82e3d4e01770"
+  }
+, { mapKey = "quickcheck-unicode"
+  , mapValue =
+      "8ba18e7ee6ada3e379bd504e7f9dd9b6c5c5625103c70f50fe10881a32a59e7a"
+  }
+, { mapKey = "quiet"
+  , mapValue =
+      "25c6b4269395dea162137837c0a9de6b623641b783fc8e5625d53d02738ea0b9"
+  }
+, { mapKey = "ral"
+  , mapValue =
+      "1120d2e05253c5f9e89f064066476a4b1e67202a29a99f275e9bebe8e87defc3"
+  }
+, { mapKey = "random"
+  , mapValue =
+      "8b0172f7852c34be680efd1e020c2e645cbc7165b5be64222ddd179e3d8cf0e0"
+  }
+, { mapKey = "random-bytestring"
+  , mapValue =
+      "4838d0efb0be7a279ababf8a48370a50ad1eef93f28ac2880a51b2a4d16032a3"
+  }
+, { mapKey = "random-fu"
+  , mapValue =
+      "f9cfcad389c21f6a83b7065a182c9d08edaa613979f60ca8068b8627e81b3c50"
+  }
+, { mapKey = "random-shuffle"
+  , mapValue =
+      "608b49a51c8f623fd9affffe2c4efc7522c6443fcf3ccf87c1d9892a0fd95d57"
+  }
+, { mapKey = "raven-haskell"
+  , mapValue =
+      "ef3ef8ab995cfd67535d64bc56b2d3083ed1497af2dba96ff0bf654c4235a7ce"
+  }
+, { mapKey = "raw-strings-qq"
+  , mapValue =
+      "f9cd391d7b429ed8b8152843952815e34f063640210e8337a5b5fe5159be7b62"
+  }
+, { mapKey = "rdtsc"
+  , mapValue =
+      "df07a8f63ab009c9967609ecf5d0a4c4227068278292434da98907f900a5ac83"
+  }
+, { mapKey = "readable"
+  , mapValue =
+      "ff89b5f8ac943020b4b5a6f0619e61a76c3aa2fd2efdd625dce296b142004f7e"
+  }
+, { mapKey = "rebase"
+  , mapValue =
+      "ed56d3f47181be90c39ff7c3a4a89b31720ddfea78887658119c367bd4cde749"
+  }
+, { mapKey = "recursion-schemes"
+  , mapValue =
+      "71725325cddf547d4ccfe1f116ece7158ad6cab157adec7ed9b160f8658fc117"
+  }
+, { mapKey = "recv"
+  , mapValue =
+      "c2e3be2d49ad529ac6d51a7cebdc311910476a43bb0f181153d4b4487fc03daa"
+  }
+, { mapKey = "reducers"
+  , mapValue =
+      "9eea331669df2a652380b7386d18cf0516e4293895aec69c2c4f0de3bb7d9132"
+  }
+, { mapKey = "ref-tf"
+  , mapValue =
+      "ff121952841709c7da824fac0027bda325bda1c81f1e9877c752ee7d1a263281"
+  }
+, { mapKey = "refact"
+  , mapValue =
+      "ae513ebd7c966d10f0d0b16832ebcfb2b33699e26c5e10de8446334f44ced9d5"
+  }
+, { mapKey = "refined"
+  , mapValue =
+      "2d2cac522c87491349aafca4d61493e6f3215b5b2af61a7ca8d02c7068650774"
+  }
+, { mapKey = "reflection"
+  , mapValue =
+      "b6485e2126bef4174d4366d9ff0b5eba8ca779a4e19e2b828a4a9d87d7f36088"
+  }
+, { mapKey = "regex-applicative"
+  , mapValue =
+      "0b654aa3c66f89b16e7051853f5acc86f0bd120137112bb927d939a37401b18d"
+  }
+, { mapKey = "regex-base"
+  , mapValue =
+      "87db2c0810b4c04b1bcc3dfbfd2dfa33793b0e1b5c46107574bb378bcd90084a"
+  }
+, { mapKey = "regex-compat"
+  , mapValue =
+      "d36e3a5d91f4c01bf4888068f86931dd005421b07114bd661ad66ede1e9678b9"
+  }
+, { mapKey = "regex-pcre-builtin"
+  , mapValue =
+      "a3e0a57dfa00f6a7498382450db5924192c60bf2cfb7cb81f96ec2c7e219ebd8"
+  }
+, { mapKey = "regex-posix"
+  , mapValue =
+      "553f5e4e9db8189d4c2c163292daa459dbf1a0d7145b9ac20538daa72cfa552a"
+  }
+, { mapKey = "regex-tdfa"
+  , mapValue =
+      "1c5239f3c81f27d76bef16191e1d867c49054fbcacf49ab6613a3c3cf88feff1"
+  }
+, { mapKey = "relude"
+  , mapValue =
+      "0b452ec32fc069173191f4e900026a2814cf338d516a71c5d27ac12120620fff"
+  }
+, { mapKey = "replace-megaparsec"
+  , mapValue =
+      "f7aea771035cd84017f2216f36cb5080750633b5968a971676b9fb256dffb119"
+  }
+, { mapKey = "repline"
+  , mapValue =
+      "c33bb5d28b711a949e19a75dc40b040e22d96c366fa7f71d64c2103d47f6c791"
+  }
+, { mapKey = "rere"
+  , mapValue =
+      "a45439cc83c19a95a47c35a46a40d6ea1e37636fae8f50c775e082db557bf9dc"
+  }
+, { mapKey = "rerebase"
+  , mapValue =
+      "7b66e85a9d5207701653a17fc4dd671836a90e58e86c78d750f407e19944aec8"
+  }
+, { mapKey = "resolv"
+  , mapValue =
+      "1cc503e83064e7077167b2f496342fbc4c2fb359f596721ca67f762c0c850757"
+  }
+, { mapKey = "resource-pool"
+  , mapValue =
+      "0abca2709b4890df4abb17e33cc6d695041a88f43a1087ea90ffeda7c204b9a2"
+  }
+, { mapKey = "resourcet"
+  , mapValue =
+      "0373b3f07d4e88c2ff0695b3dcd09813c22d035976c45fb21e99037bd96b1bd4"
+  }
+, { mapKey = "retrie"
+  , mapValue =
+      "9bf3de3718f7c5a9d91dc99593bc483f95fdb73e3743d22753a8e314a65236b0"
+  }
+, { mapKey = "retry"
+  , mapValue =
+      "ea735f76e08fdf7df6f9bd000e30d07f8d99bd6662c53b65fd58fdd012423478"
+  }
+, { mapKey = "rope-utf16-splay"
+  , mapValue =
+      "26ed2de2422df9ec948aac4f16a2ab3830b3ecaedd04750fec1525858fc6d30b"
+  }
+, { mapKey = "row-types"
+  , mapValue =
+      "30d58f10e7c3aedc92f95fbac026ccec8fbb32c5992eba2439a2b68e1a462f0f"
+  }
+, { mapKey = "rvar"
+  , mapValue =
+      "9007bc2aee89b2042ba2ae983932e2e3b23f8c90c938fccdde589568de2175e6"
+  }
+, { mapKey = "safe"
+  , mapValue =
+      "5dbf71d75dac7f32f691845f0ada56c78a783de9c61fcc5b7bc62c494ad75c6b"
+  }
+, { mapKey = "safe-coloured-text"
+  , mapValue =
+      "ceffd4c1bf34b0228fa3b157088cef22e5fd279264baf4dc32dc9796616be862"
+  }
+, { mapKey = "safe-coloured-text-layout"
+  , mapValue =
+      "f51ecf3ae3dcc82026fc3cfc9b1b67e7467e7e3a944ce1ae6ed0f1550912615b"
+  }
+, { mapKey = "safe-coloured-text-terminfo"
+  , mapValue =
+      "107807b1e57da84c57c0e7cc2ef58d0223f56ea1a65dd34d694a9e333897f56b"
+  }
+, { mapKey = "safe-exceptions"
+  , mapValue =
+      "56473479bbeeb745c50c444653307945a4002469fd8137f382636c3b9471ae6d"
+  }
+, { mapKey = "saltine"
+  , mapValue =
+      "47981447d4563ba6cd73cac902ff7d39ff70903745c18b20582bf9a9e4acfaaa"
+  }
+, { mapKey = "sandwich"
+  , mapValue =
+      "26a930e2fcab6953a23bc0346f41a438121c00fd729d893ae84d2ed380f0e8f0"
+  }
+, { mapKey = "say"
+  , mapValue =
+      "dbfa4c84fda8b5c6d611dfc161269c13ccdcf4038a3e985a35b21c3b70e5406e"
+  }
+, { mapKey = "scientific"
+  , mapValue =
+      "000439df6964476a4f67d6a294cc7d61dcf9f0b9fada48d491ce8d3e9f1fd56a"
+  }
+, { mapKey = "scotty"
+  , mapValue =
+      "ba4dda49cafd204966d7b7dbf2223e7984c37181d0d41ae3a4e1a89b5db75bd4"
+  }
+, { mapKey = "sdl2"
+  , mapValue =
+      "e53b9bb800a5365635444ae32828b9e8f8dd01f462fc3de437ba6f8247842f48"
+  }
+, { mapKey = "sdl2-gfx"
+  , mapValue =
+      "e12137dab7ddcf9aa2204d1cff5aa330ddcebf6225df965b0cf42bd5b5a9dfdb"
+  }
+, { mapKey = "sdl2-image"
+  , mapValue =
+      "070fab8da67804491bf3d86412903eeb10cbd3f001bdf108ba44138ed1abf25d"
+  }
+, { mapKey = "sdl2-mixer"
+  , mapValue =
+      "3e299c4dbac9a4d1a3bfd39433319d325a33be99f204bebe40131e24a6aa5bf6"
+  }
+, { mapKey = "sdl2-ttf"
+  , mapValue =
+      "5534afb29ac4dc9b70497ee316e80e23e9ff28d6234fe52b4619650c433d6d6e"
+  }
+, { mapKey = "selective"
+  , mapValue =
+      "835c9378f9d8562d1052d5ac82a1a091e4452c2db6f359b012807815f24fbf4b"
+  }
+, { mapKey = "semialign"
+  , mapValue =
+      "cf24fddbf4303a3324de22ad74fea6d8473ffbd9504a4af8cd70159b23366c64"
+  }
+, { mapKey = "semigroupoids"
+  , mapValue =
+      "e51b000db876e405ef6a98896e45e8bdd788bda2562f0a8064dd3b5fa74239af"
+  }
+, { mapKey = "semigroups"
+  , mapValue =
+      "bd56b70de1ed1d19621386738bf62153b3b36cc6012b0904159096ca50c639f9"
+  }
+, { mapKey = "semirings"
+  , mapValue =
+      "ce45b4e0ab5f15878d59ddf656fc8a3cc1e277b1cbb01da96fb5e4c77a10066f"
+  }
+, { mapKey = "semver"
+  , mapValue =
+      "6d0e71e2112d77fca7564d46bd2c3758ba451d40aa3f319cedf6d775b8fc8328"
+  }
+, { mapKey = "serialise"
+  , mapValue =
+      "691449a82b352a7181ae14ffeb25d19bc15cb8f539a39389c5782a7deda629f2"
+  }
+, { mapKey = "servant"
+  , mapValue =
+      "0d9b9fd3c7dad87590d8c2a5bee1f2f8b2e1a02815edbd238ce194951dd829a5"
+  }
+, { mapKey = "servant-auth"
+  , mapValue =
+      "2794e317774b4a32c890bd600fa8c33e5bc151fcfdd03946bbd17433b67baacd"
+  }
+, { mapKey = "servant-auth-client"
+  , mapValue =
+      "09437cacb9b5f0c30a36687de014ad55e6ef70eb5bc6c4987f542866452cb5fd"
+  }
+, { mapKey = "servant-auth-server"
+  , mapValue =
+      "12661e3f795b50af9cbf92092b4a15335a8766bfe9ed5629c73aeefd941071a9"
+  }
+, { mapKey = "servant-blaze"
+  , mapValue =
+      "2f6905fb3bcac788177a21e4846110082adfea02a25f15c2c4104843b9708d58"
+  }
+, { mapKey = "servant-client"
+  , mapValue =
+      "cb115c85423a092d4ebecd30ea879f50df1f1e16eee95e47a644a6fc57fd412a"
+  }
+, { mapKey = "servant-client-core"
+  , mapValue =
+      "d18463f13f2cb38ad49c576ef20dea98ca952484e825ec7638a5a37b638f8c75"
+  }
+, { mapKey = "servant-docs"
+  , mapValue =
+      "57c18e9454a9b68e1977820b3760dbc6bc594ab022ddacc698be274ecf7f64f4"
+  }
+, { mapKey = "servant-effectful"
+  , mapValue =
+      "4525c0bce51f3e83a949b870d9e2a9bd648a270e14ed4525422276dec813fcb4"
+  }
+, { mapKey = "servant-foreign"
+  , mapValue =
+      "adfd9a22e2eda6df507a38820063046d0d8aabfd15774193e2db40f591e2e1ea"
+  }
+, { mapKey = "servant-lucid"
+  , mapValue =
+      "5f28b33d0ffdebb3d9f5dfe6af1ab0dfd508770f7b96a5d724999943907c22c1"
+  }
+, { mapKey = "servant-multipart"
+  , mapValue =
+      "1fa9312939a11aa798255e93c249423944223f4895cee3156771c0534f5ecba8"
+  }
+, { mapKey = "servant-multipart-api"
+  , mapValue =
+      "620c0c65fa161df68d704cb23281ba0b23bf885438af784c473f7e7cbc27e996"
+  }
+, { mapKey = "servant-openapi3"
+  , mapValue =
+      "e985828ae373148f31f17b72eba84f979950a98f20ef27f9f2059d3b6b3646f3"
+  }
+, { mapKey = "servant-server"
+  , mapValue =
+      "1286a1b3abfc99fe31ff5aa179c52d396d78c82ccbd6ca2b5151628e024bb7ff"
+  }
+, { mapKey = "servant-static-th"
+  , mapValue =
+      "7efa33dfb317416d7a1b48495addf0056581c7875999b4537197b3c4db833ec0"
+  }
+, { mapKey = "servant-swagger"
+  , mapValue =
+      "0e451b7b42609bd095b9d882ef8754b99735e1f11d768efd9f4f88e4ee68eee3"
+  }
+, { mapKey = "servant-swagger-ui"
+  , mapValue =
+      "e56f596211a5fa3208009db19e5a4e2ff9920ff08a00863984e99434129606c6"
+  }
+, { mapKey = "servant-swagger-ui-core"
+  , mapValue =
+      "bcf6acda36b56682f597d49b27f6e1f596f8cd68404ef99edf0f3abf551fe357"
+  }
+, { mapKey = "servant-websockets"
+  , mapValue =
+      "55710614fc223a4b93dd749f59d0e08aa736a5d519afe8b9c2f06c53bb89ad1d"
+  }
+, { mapKey = "setenv"
+  , mapValue =
+      "742ea5e4c5e7aa4b50cb70c9d144c76b1dd3388492c496a1996c987df6c37bcf"
+  }
+, { mapKey = "setlocale"
+  , mapValue =
+      "b3d142c965ae316738dcf5ce4bba38c2096533888f900a2ddc12f701d8218ee5"
+  }
+, { mapKey = "shake"
+  , mapValue =
+      "b575cd58c2e84884b67cb90cd6191a9fde0222ad15b46ee0eeea4ec375b177ea"
+  }
+, { mapKey = "shake-bench"
+  , mapValue =
+      "80fce8edd1986caeeadfb704c504668b56d40c74cd02d198e34a4251642c224c"
+  }
+, { mapKey = "shakespeare"
+  , mapValue =
+      "b768eb09028c239bc10da0f4b75b2293d5a43e8efd8c420e9ebd5ffd1406b737"
+  }
+, { mapKey = "shelly"
+  , mapValue =
+      "3ef8a8484f1701aa554a69fd2ef3e7d76ebad17a2f40104c536ffa811866da26"
+  }
+, { mapKey = "shh"
+  , mapValue =
+      "92300974d66e49f1e28fd1b1f63d18f7fd4e60c351d37b5989aa387eb4bbe58b"
+  }
+, { mapKey = "should-not-typecheck"
+  , mapValue =
+      "6cb9461498db9030b3a13f2f3b993dd196f45e9db43d9f957888d50825098221"
+  }
+, { mapKey = "show-combinators"
+  , mapValue =
+      "380a81d3b52d30a3b522e7cbe05062d7e824e0ba2d0c724db3c4ef34761aa291"
+  }
+, { mapKey = "silently"
+  , mapValue =
+      "a84f0b9560b3ab8a242c69db7e61e2e365c16ce7a1afef6d4fe4ccb6a3a5d344"
+  }
+, { mapKey = "simple-reflect"
+  , mapValue =
+      "a173e883d26129501422a820b1200f5f06b728f7cf5707f5f2b73d88473d5d6f"
+  }
+, { mapKey = "simple-sendfile"
+  , mapValue =
+      "1567d976b3369f97df661d24878d1e5c9097f58fb501aad82c17f1df3a0496f4"
+  }
+, { mapKey = "singleton-bool"
+  , mapValue =
+      "bdcab4fac6c69de5eb8fb0d141dbe7d1610471a06ab6d0bfc4845337a0c21449"
+  }
+, { mapKey = "singletons"
+  , mapValue =
+      "b407af9922ef71930d49b8038685769befa3bd75a9ec085494a619fa1d02a0f3"
+  }
+, { mapKey = "size-based"
+  , mapValue =
+      "c1e60e51f53721c5b795e39465a06fe4f6827e42967ce6e3d27fdfcfff6b9113"
+  }
+, { mapKey = "skylighting"
+  , mapValue =
+      "5c7111003dc4a68dc27b073f4c55889bf124d2c4aa00879fd30d9a56999dc96d"
+  }
+, { mapKey = "skylighting-core"
+  , mapValue =
+      "6f3facde2ee4b9973b834a2368b53dd302bdb8b78fef0bb556b58ca206697f62"
+  }
+, { mapKey = "skylighting-format-ansi"
+  , mapValue =
+      "410fae62a54faf7753a862ca820f5213b5c387572edc1ad1ea56185dad4b1693"
+  }
+, { mapKey = "skylighting-format-blaze-html"
+  , mapValue =
+      "edaafd74827358cc34486d8da6e4f1fee45729efa9c36821bd429e404e908672"
+  }
+, { mapKey = "skylighting-format-context"
+  , mapValue =
+      "a8736aa422b7bd2b1c29a3c5b0f550e27290cc42756ee3b64d60919bbe5e740c"
+  }
+, { mapKey = "skylighting-format-latex"
+  , mapValue =
+      "e41d1f7f3f30f068b66971ad60c793f93274ab8fce345ae0f100cfa0d310bde5"
+  }
+, { mapKey = "slugify"
+  , mapValue =
+      "01d25b6a3f4f7a854009f8264c5e3767f82b6a4c3302e572660dc5651db7c106"
+  }
+, { mapKey = "smallcheck"
+  , mapValue =
+      "42100e20ceadfb6697b188c85a0997b955f49ccc9ba945d68cbc95778327d15a"
+  }
+, { mapKey = "snap-core"
+  , mapValue =
+      "3a8f37fa784c6b48cb10cc01b570f93412369ec00f6fb75dc4ff9732fadc1b5c"
+  }
+, { mapKey = "snap-server"
+  , mapValue =
+      "dc52cb47711c15dc5ef64f84d5695e02c7de483d92f2211954e15dc630051fe2"
+  }
+, { mapKey = "socks"
+  , mapValue =
+      "add6f62c6a875c34d312639f5da73608b26d230940532524ed176802b4045c35"
+  }
+, { mapKey = "some"
+  , mapValue =
+      "1bc38cd2e020eb5845eada481351741e4526be96506cb9d6c2ce02c97c6d5517"
+  }
+, { mapKey = "sop-core"
+  , mapValue =
+      "01a9ba79d120651533e7e28e6798591c05f788febc262b716c28d426cf579ad6"
+  }
+, { mapKey = "sort"
+  , mapValue =
+      "4f0be9a8993d2873e096fc9ee4411061b44fe5df4996a006a00f7a015832ce17"
+  }
+, { mapKey = "sorted-list"
+  , mapValue =
+      "40d0f873bddad724169113a4b99a8af96ee8db2bdb365815972c1d79bd40102a"
+  }
+, { mapKey = "souffle-haskell"
+  , mapValue =
+      "e8b739da7eb67d4e5e75a25f9875e297cd9418005409d6a81b7f7ba89464d294"
+  }
+, { mapKey = "special-values"
+  , mapValue =
+      "63025ed1d6321ea9145d53c71ac54aaec4472b2019f1a293d610992ddb90b52e"
+  }
+, { mapKey = "split"
+  , mapValue =
+      "05ef5c4e5865d0fb928857ff24e355ac9bcab6a24c6a51147cb57b1e5aa53e1c"
+  }
+, { mapKey = "splitmix"
+  , mapValue =
+      "747e64c7b42d0e3b342551c838dec9df6ca6ba1f0b3cb17ee8ab6067fb5d2eec"
+  }
+, { mapKey = "spoon"
+  , mapValue =
+      "1c09ab33194f0509d34d8f8e2d03a156b20e639d05510d2f45b878a8cd7ccc75"
+  }
+, { mapKey = "sqlite-simple"
+  , mapValue =
+      "738bd9f7118850805ae7822b30d6b0a2210be0094953797d4a6de25f1f085d71"
+  }
+, { mapKey = "statestack"
+  , mapValue =
+      "6068d5b5eb7100fd87019386424a9d7c119947bf2c2037fabd70fdcdbc38693e"
+  }
+, { mapKey = "statistics"
+  , mapValue =
+      "b85a7919ebca5b76538d81c521ef95bbdfeb7c4a3160e845973fa33c938e1bd8"
+  }
+, { mapKey = "statistics-linreg"
+  , mapValue =
+      "d3d6f5121bddd1b748e607f2ff1c559886d41710c3629cf90740040130e87149"
+  }
+, { mapKey = "stm-chans"
+  , mapValue =
+      "00290cce7e04a785a7fe3610b4baf87a78a2ec3bda683caa35bec9fae545fdea"
+  }
+, { mapKey = "stm-containers"
+  , mapValue =
+      "eb8360ac958865533eb205ab378c5fcd249b2ecd394e7293a1572a89d2e372c3"
+  }
+, { mapKey = "stm-hamt"
+  , mapValue =
+      "c50f0e3abf45e7a061bbfc38e2887eca4b244ef460dafcabcf70f2448a0f6877"
+  }
+, { mapKey = "storable-record"
+  , mapValue =
+      "ec4fdb87313e229993ea6a77c2866c9710367a2733bac007f9948bbeff61429e"
+  }
+, { mapKey = "storable-tuple"
+  , mapValue =
+      "6c94b5ab88e47d5c34e4dba9d9dcef141b1ec9eb9cc5d8bd776ca1bf136e9b01"
+  }
+, { mapKey = "store"
+  , mapValue =
+      "86e1c02e1f7430b32d49a09ee6931172d5b3a2c8a81d74fd242f8afb69eab304"
+  }
+, { mapKey = "store-core"
+  , mapValue =
+      "1c375206cb8788a29f64fccf31e81a52ebe49d25063e01f8fe54eb45de7dfb98"
+  }
+, { mapKey = "streaming"
+  , mapValue =
+      "51456e180dc81c4a883b5adfd89452ccbff8a5adc3b7783699bb013c65cc651b"
+  }
+, { mapKey = "streaming-binary"
+  , mapValue =
+      "4217ec7fdbde0db73afa8a7f2e80942c8fbf91d2b266cb7bda919fd7de3dbadd"
+  }
+, { mapKey = "streaming-bytestring"
+  , mapValue =
+      "52f75295fc38370c80ba9b8c50a7f1a5fe25e6f3523326a138e88848f39242b5"
+  }
+, { mapKey = "streaming-commons"
+  , mapValue =
+      "9a8e4fc5b96d3323736c8d34db5ccbb6f8a21317bd53cbc84e021a9856e09d89"
+  }
+, { mapKey = "streamly"
+  , mapValue =
+      "a692232fa9b7ed514069ed13231952f3e0ca130ce93ad919c48af61cebc01d45"
+  }
+, { mapKey = "streamly-core"
+  , mapValue =
+      "da2697b4922403413f319c49e723f389e6cf4db301a1f9a70dc59a6bfd87d2f6"
+  }
+, { mapKey = "strict"
+  , mapValue =
+      "246499f3b4c1556dec3e6d26d2d799740a4513775a73ed583551e8be2eb042e9"
+  }
+, { mapKey = "strict-list"
+  , mapValue =
+      "027dd966db3b9f23be446a5edc2880a0db43cd78b819ea9516565c4788ad4b1c"
+  }
+, { mapKey = "string-conv"
+  , mapValue =
+      "308cc0a29343ae37ecc415be902a75f06d51dd76715dd5360b639fc11d220833"
+  }
+, { mapKey = "string-conversions"
+  , mapValue =
+      "0d3fbec5131762e256624b87e437f09df55f5e97c92ed34caa2ef5a6e627a0c8"
+  }
+, { mapKey = "string-interpolate"
+  , mapValue =
+      "e2679ac3a81560c2b882e0a69389dff8d61b3de8f1be67896b13b5b923347a14"
+  }
+, { mapKey = "string-qq"
+  , mapValue =
+      "d7c85c59792cc6798b0c60d3b3770dd0d2ec79b2d2e58eb4c95b451def75cd76"
+  }
+, { mapKey = "stringbuilder"
+  , mapValue =
+      "5d1377a189e16b2402defc257df72d790ba77c910542fc939ac8a4ac7b70b966"
+  }
+, { mapKey = "stringsearch"
+  , mapValue =
+      "dea7372cda438de0b31f89a8ec55e0a7522479d3bdf22926220ea944b1457d1d"
+  }
+, { mapKey = "sundown"
+  , mapValue =
+      "b957e49faf9f098841416f52f0c1100d2dd3e775c980f1e701e626621a3378c5"
+  }
+, { mapKey = "svg-builder"
+  , mapValue =
+      "93870fa12c23879cd5b9ee6ca429a856c0cfcd64ae2ff81cb777d6f50ca91ee2"
+  }
+, { mapKey = "swagger2"
+  , mapValue =
+      "03ae528c5bdc4a2bd1b4b091708fcdff749f4f882799aabf8f7c603659166e64"
+  }
+, { mapKey = "syb"
+  , mapValue =
+      "274554ec36968db8aacf96a60c051fc7ea13c2090fc9622238a536fd2d02844e"
+  }
+, { mapKey = "sydtest"
+  , mapValue =
+      "cac13fcc9e2bb3db218a7d09e5f13858edff189757128211161fa93112ff6f02"
+  }
+, { mapKey = "sydtest-discover"
+  , mapValue =
+      "42133eb8cf11a59b3edf50015b22c076fab9e4e7e0d877e682b507cf8d5ea85a"
+  }
+, { mapKey = "system-fileio"
+  , mapValue =
+      "573feda13f33ef60a37c06ffbf2dfe03c679d6ae570967462162fa2a505f61ef"
+  }
+, { mapKey = "system-filepath"
+  , mapValue =
+      "56762209e2da8441cbca331d6467c1a1a3cf572b3a2353e3e2be4cf15ae3d536"
+  }
+, { mapKey = "tabular"
+  , mapValue =
+      "ce27e6ad12e2df14b6c43106c6523db2d87ca7692bd5a9fdacae424e7bd6a0c4"
+  }
+, { mapKey = "tagged"
+  , mapValue =
+      "1274ceb7221d0303f7429436161df965b8a84e509d07d6692ee3067ee8fc4e45"
+  }
+, { mapKey = "tagsoup"
+  , mapValue =
+      "5577c068c7048a861687be0381dd413afa6b649460e0d5ad868eb25db3f90f0c"
+  }
+, { mapKey = "tar"
+  , mapValue =
+      "0850f22b364a7de0b7599e90fbcb7352b749e0b90f1f532effa45c8327ab2079"
+  }
+, { mapKey = "tasty"
+  , mapValue =
+      "e009b49bc74bc0fb37c4ef6a4852d1f61021956107fe09615338d0063ecd85bc"
+  }
+, { mapKey = "tasty-bench"
+  , mapValue =
+      "7a08ed2bab7da8c3059e264b83de72bf193ae01c9661e0742ba4c97ede08d8e1"
+  }
+, { mapKey = "tasty-discover"
+  , mapValue =
+      "ccfc13b8d6616ea0f99c04c12c896fe47d9e2710b4a8fbc52e57fb67ec3f495b"
+  }
+, { mapKey = "tasty-expected-failure"
+  , mapValue =
+      "521c40c5a8eceeb7f0d8700983232af9b5b3d6f4940b0de12163bf24faec25ae"
+  }
+, { mapKey = "tasty-golden"
+  , mapValue =
+      "bfb4cf5b6998b3796d6893a8e757343074a819f96669f5e5f6a7887f4b4f2018"
+  }
+, { mapKey = "tasty-hedgehog"
+  , mapValue =
+      "e2a27c436a52643d5f7092ec2ceee450bb191b0f6a9c6cf8db55583529539db7"
+  }
+, { mapKey = "tasty-hslua"
+  , mapValue =
+      "ccf6127783a3985408bd9ec532b7330ec56e8576e63c85693fc31b25463cd63c"
+  }
+, { mapKey = "tasty-hspec"
+  , mapValue =
+      "c019aedd1b713f099caeab0e8e75d254bfa1d80dde973c4f9b2d9237199faecf"
+  }
+, { mapKey = "tasty-hunit"
+  , mapValue =
+      "8b13410ff664c4c7b20f81912ab97e105e68efe2cb43ff44125494498a5ea2f2"
+  }
+, { mapKey = "tasty-inspection-testing"
+  , mapValue =
+      "f9d298e2013debfbab583f8cd0b920238b2b1d98a8e220af85e7711eb731b8c5"
+  }
+, { mapKey = "tasty-kat"
+  , mapValue =
+      "4bc38a5eec142110163a90f62255e2cdbd4ae6a4ad197b2e9a8163225f68d129"
+  }
+, { mapKey = "tasty-lua"
+  , mapValue =
+      "288c4e0eea1d76053bc251e7648ee319a6f18d719288fc3eb00b74c23b2a5b35"
+  }
+, { mapKey = "tasty-quickcheck"
+  , mapValue =
+      "31c147dd96ae392c7a2c0cbd313076bfbb03296579b1060eee073635074f7974"
+  }
+, { mapKey = "tasty-rerun"
+  , mapValue =
+      "b0b641e1db8b8244aacd16772268a7a3b7865b4e4610ca415610b6b6027ca9a0"
+  }
+, { mapKey = "tasty-silver"
+  , mapValue =
+      "7bcafc1581060cb52c835ea9b35862ea8ce530ccabaabf4149f0a8dda727c46b"
+  }
+, { mapKey = "tasty-smallcheck"
+  , mapValue =
+      "f2adc381ed2d89260cfaf519b91cbdee9fd605131b17dade9303e015bc9f8b70"
+  }
+, { mapKey = "tasty-th"
+  , mapValue =
+      "c09e1e1af4f452a2c7081053ebfa68cf2df3b82b6ca73abcfa92c7515c2fa652"
+  }
+, { mapKey = "tasty-wai"
+  , mapValue =
+      "beadaef854bd9c3f68b1fad86fc4ea3087bde1e65391d7a346f6f4c607be7c8b"
+  }
+, { mapKey = "tdigest"
+  , mapValue =
+      "dff104047900786da44d0f91e1e528f3a1a877900b8b9ab16edfd28ac5748a04"
+  }
+, { mapKey = "temporary"
+  , mapValue =
+      "5b7fb1d4e018d3806db3c05b45be05954ce75b10edca041e55e96f272807d9b0"
+  }
+, { mapKey = "terminal-size"
+  , mapValue =
+      "1e92b61d3c4a9942635ad8259f4149ffdb4228c5df386a93bc18236ac6a0f0a0"
+  }
+, { mapKey = "test-framework"
+  , mapValue =
+      "90e67709fa7fd0d688dbc81c5f84dd7221c730686e07dafba547b03a7276312d"
+  }
+, { mapKey = "test-framework-hunit"
+  , mapValue =
+      "296074027ba725084a7edcf79340011a4238a6e0546ace24c671a0cf0ffb054d"
+  }
+, { mapKey = "test-framework-quickcheck2"
+  , mapValue =
+      "a12f3cec5f8f8b84e8fe8c3ebf9968c55f1ae909d867ca7a4e1f220b095d24b8"
+  }
+, { mapKey = "test-framework-smallcheck"
+  , mapValue =
+      "bfc751f9417a4d8722ef7f47676684861efb353fc7c902f24b227a67bf7e2574"
+  }
+, { mapKey = "test-framework-th"
+  , mapValue =
+      "7c564de8e1441bb5d9a997108d24aeefaba208bc1f14684a4c0e3150a2ba1576"
+  }
+, { mapKey = "testing-feat"
+  , mapValue =
+      "94379edb2096b1485ceab3a4567b5beabba9db12f9a8f1a534d47ef00f217580"
+  }
+, { mapKey = "testing-type-modifiers"
+  , mapValue =
+      "18b156762f2943475d188542e1a766945cd032c353894ace136966978a724673"
+  }
+, { mapKey = "texmath"
+  , mapValue =
+      "2c164e8dad60094a742818e03bcd8fba36aad53518384ef06b7604c2795677be"
+  }
+, { mapKey = "text-ansi"
+  , mapValue =
+      "69af33fbbb82878760e291151ce9fa0834080f11d604295baeb9be8a14cf02df"
+  }
+, { mapKey = "text-builder"
+  , mapValue =
+      "ed4a6415c74f4e208e4f5dd674aad037943710bc33586c8130fccc90c509b7e1"
+  }
+, { mapKey = "text-builder-dev"
+  , mapValue =
+      "eb083f9d3394c2ff59cfa13cadd4833dfbaadc20a338706bca9047dc6d263510"
+  }
+, { mapKey = "text-conversions"
+  , mapValue =
+      "79693ad1e605f55deab09bedeb9e265dcb09886769c88f3a4f99c43c673b5daa"
+  }
+, { mapKey = "text-display"
+  , mapValue =
+      "aa11ed4bee94927014c333f5b4888b62882d5250b7f23343814fbc0c49b0d6a1"
+  }
+, { mapKey = "text-icu"
+  , mapValue =
+      "a863ec5408343fcac9b231d6eef0718d835875fb363e25f553b6e819414690bb"
+  }
+, { mapKey = "text-manipulate"
+  , mapValue =
+      "40b40c84d3cdbb6471ef693aad4790ad03704ffbde19447de4f4e721a400781f"
+  }
+, { mapKey = "text-metrics"
+  , mapValue =
+      "76a21cd02750e644fb23d4d767ade2185a594047a53f3bf101c3a3eb17e04794"
+  }
+, { mapKey = "text-rope"
+  , mapValue =
+      "699730c3a740736bfeb2b9db53100a93cf402877b3f9028e90847da31d95da40"
+  }
+, { mapKey = "text-short"
+  , mapValue =
+      "3881c3d377db679565a8616ab499e20decc28c851d55910ee8fa432b7336d89d"
+  }
+, { mapKey = "text-zipper"
+  , mapValue =
+      "4911c397d554d86f9eea42ff7de6abd373daa13ec1086df4173060bcce1d33a1"
+  }
+, { mapKey = "tf-random"
+  , mapValue =
+      "870db5ed282fb0251ae2d61cff4a9f43b7ecb6c0f8e4a2f5d82d9919adc6c924"
+  }
+, { mapKey = "th-abstraction"
+  , mapValue =
+      "5caa77d04143f86a121eeb1eb1513bd2d62d4e2a65b5a51de0976632299fe278"
+  }
+, { mapKey = "th-compat"
+  , mapValue =
+      "29b53b09aa5fdcfcef57c52517d45c465500be1346a89d252bd95bc43343c118"
+  }
+, { mapKey = "th-desugar"
+  , mapValue =
+      "53c2fe40ba1c266af284ad07d8a93bed4f7375b86356f9aafbd01032f3b77149"
+  }
+, { mapKey = "th-env"
+  , mapValue =
+      "e7ce90fa754366f84b873927f392b5cca73341c3a78818d264d775987e6b2b6b"
+  }
+, { mapKey = "th-expand-syns"
+  , mapValue =
+      "02c4e5bd5129277586e41fb234c38466db131a6395df6a7b37be73268b8f0701"
+  }
+, { mapKey = "th-extras"
+  , mapValue =
+      "d459fd984a777c13fa87cabf2f276120a35ad3c17c5c0fc31ef26a9b0c6fe5f2"
+  }
+, { mapKey = "th-lift"
+  , mapValue =
+      "d16233f00807d74e0a559f3553f0d8cd5c3711f493b13dcd167848ca87ef5ae8"
+  }
+, { mapKey = "th-lift-instances"
+  , mapValue =
+      "c138e0549e56889d80a705453e5d0092f391ac938270b7a83814792006322e3f"
+  }
+, { mapKey = "th-orphans"
+  , mapValue =
+      "d1c4af1b947ec29c48487053cbfc4eebe7502bbe46410bc1fb3b60d3f9c3b645"
+  }
+, { mapKey = "th-reify-many"
+  , mapValue =
+      "b0d21c71eb5e3bbe4e3450c80bbc0cb3615b4efc4ea9eb9a52169ec60508541d"
+  }
+, { mapKey = "th-utilities"
+  , mapValue =
+      "05a1aaa6d555921f7d4a6af2cbcae71467b7b1d206a95aded70047aaf9f45320"
+  }
+, { mapKey = "these"
+  , mapValue =
+      "7cca3a1da91100a878dd3d687dd6beff57e649feb00e5046aebea7ed3036df1e"
+  }
+, { mapKey = "these-skinny"
+  , mapValue =
+      "ffb11ea68b266f67a22bbec499aeaea0d9ad507ac20760230e5fad29bab8dcbf"
+  }
+, { mapKey = "threads"
+  , mapValue =
+      "55ddff543b600cc98c5182261dfe5bf2563844fb1ae598558b81a37e93136460"
+  }
+, { mapKey = "tidal"
+  , mapValue =
+      "a9279f3918dfb11d075c0b2ba652693317fbbfe8afa7976cece9a47c4072bdb7"
+  }
+, { mapKey = "tidal-link"
+  , mapValue =
+      "ee29403ebed5dac32bfe72b3024b0b87624a6faef1e45caac4f063270ac7103c"
+  }
+, { mapKey = "time-compat"
+  , mapValue =
+      "523dc24bc2b34fba2e0fe124884bc7508ed1d71c4eea1710d70936b25aad013c"
+  }
+, { mapKey = "time-effectful"
+  , mapValue =
+      "0f5efbf81f1f2560d87c913be1db6b75eba6a8b7899f7f8ac3d641fe9e1906f5"
+  }
+, { mapKey = "time-locale-compat"
+  , mapValue =
+      "ad393a7e2e5a2b7222489632b9fe50cea6fcf5568467b4f8804dff3b9eedab36"
+  }
+, { mapKey = "time-manager"
+  , mapValue =
+      "3e40fa1d6762884550aedbb772214e2227dd0b894e6d33ef358d8c2fa3a4c402"
+  }
+, { mapKey = "time-units"
+  , mapValue =
+      "37ff6387fbab2877f28b837d2abf8db47915929b8b739fd8c6a3132d25203180"
+  }
+, { mapKey = "timeit"
+  , mapValue =
+      "8855af2f1e2f2ef9fb51a3255d944901b900b3c789caf9d4b4317e43d4b33e15"
+  }
+, { mapKey = "timing-convenience"
+  , mapValue =
+      "ceb94b9f0c55f71127167ed9df95152e0d559c0dff10fc6098581e5a8fa3f8d3"
+  }
+, { mapKey = "tls"
+  , mapValue =
+      "25868b5739249dfd13f2ca1945895505f2790098d49310c4571ec5f6fbd49ec8"
+  }
+, { mapKey = "tls-session-manager"
+  , mapValue =
+      "da7c25ce1ce1edefc8f66cf5e9043427097eb10cef90dd72d36fecb322322347"
+  }
+, { mapKey = "tmp-postgres"
+  , mapValue =
+      "25b811fd33e7dc9d592be23f8122909cece01b71ec7c2797dcb7a3ca8e8c5ad3"
+  }
+, { mapKey = "torsor"
+  , mapValue =
+      "4ca7823902cc15fb48a7806a1cd98fa23b6d1ee2d7bba4163477090f04b29ba4"
+  }
+, { mapKey = "transformers-base"
+  , mapValue =
+      "a2119d789c4909d1235b9afee5299e4c865a555c0414469f2b1bfc74d9161f52"
+  }
+, { mapKey = "transformers-compat"
+  , mapValue =
+      "f17d064c5c296f7df8e38c42eb58933d2ab78f1bb069c49b1356d9cc35a7312a"
+  }
+, { mapKey = "transformers-except"
+  , mapValue =
+      "e725f49704e230e7a92dc47d32c57f517cdd7e7a69c4fdf0abd3d621728c0300"
+  }
+, { mapKey = "tree-diff"
+  , mapValue =
+      "869711ec6929ff387078367b779a76d35e4b58433ae55966ba80bf6fb5d79924"
+  }
+, { mapKey = "trifecta"
+  , mapValue =
+      "7650e7cd262165367ccbebd1c45f06ad9d75d44483448537564bff7793501c02"
+  }
+, { mapKey = "tuple"
+  , mapValue =
+      "624cf540263d4dcba483f3e7ab7b5233dd5d984e13524913803bc7f973897c29"
+  }
+, { mapKey = "turtle"
+  , mapValue =
+      "19f7058d22cc7db64942464eb2fbf9c12fd36b03ee7abbf973408a851c376013"
+  }
+, { mapKey = "type-equality"
+  , mapValue =
+      "b912c0f9a2fce3351c4edd0232baf9f06f3cb94e37b42a77e0cce24d4610d801"
+  }
+, { mapKey = "type-errors"
+  , mapValue =
+      "8faa9c64d1ecd6b5ce75c6bd09bf1db2b5855bfd259c01b7eac06b7b1c3a19c0"
+  }
+, { mapKey = "type-errors-pretty"
+  , mapValue =
+      "0f200e3c36bbf4fa05a257dd9511824fede8dfd4a57f40ed86265761d2957a35"
+  }
+, { mapKey = "typed-process"
+  , mapValue =
+      "e049e4f9d09ceec633d1942348dd2f1d2dba6bdaa8aa477b26bb35c8c36477c0"
+  }
+, { mapKey = "typerep-map"
+  , mapValue =
+      "4dff28d5f19a557e2d5bedbd24c159089b37eb1ab3a09945f2976dc97f3191b8"
+  }
+, { mapKey = "uglymemo"
+  , mapValue =
+      "8c83e2578b5f4c9bc38df0de0b28f6fe4c7c6c81009198c5e9fcb7ca6c9e3e54"
+  }
+, { mapKey = "unagi-chan"
+  , mapValue =
+      "e737d31d2f9f088ee2584c5a4bcae4e8fb26160e2174e0cd9cf597f23534efcd"
+  }
+, { mapKey = "unbounded-delays"
+  , mapValue =
+      "096d9e8589d905baf45354b7fffcac00dd63d5807bbb74490297781552ac8bc7"
+  }
+, { mapKey = "unicode-collation"
+  , mapValue =
+      "96f39322d02bc4f0e6284a725cb164918a20dcbe350bc58c226af21cfe5f0774"
+  }
+, { mapKey = "unicode-data"
+  , mapValue =
+      "89c7b27cd839c334896686322663072b9253a60a344834de13d193cac05c79c2"
+  }
+, { mapKey = "unicode-transforms"
+  , mapValue =
+      "45a921b08318a1eddaad1633288cc7e2d88c6b47f7225c333d8a3403b9f39558"
+  }
+, { mapKey = "uniplate"
+  , mapValue =
+      "4aa53a85e9e20063ca697e8b13d73bc92659b8f4f00571e6ac2b4ddce87beab4"
+  }
+, { mapKey = "universe-base"
+  , mapValue =
+      "e60b8776da2d184900a56d085bfdf3cea541a017c15c80c86e594d9ae2f86d7a"
+  }
+, { mapKey = "universe-reverse-instances"
+  , mapValue =
+      "f340827d01e769f40eecf664f1cdbb2fb9a1afe410cea841dd0d6aecacc7af5d"
+  }
+, { mapKey = "unix-bytestring"
+  , mapValue =
+      "099cc48a4f7b41a73249c9521fa696ee044a442f30ed3377f6c3389ee2783273"
+  }
+, { mapKey = "unix-compat"
+  , mapValue =
+      "df0ceaa04777879e92e813cc660e51bec7fdfc72c970f1776fd7125b0bb052d2"
+  }
+, { mapKey = "unix-memory"
+  , mapValue =
+      "5cefb95f4a9d3e1d2407ad7837bd28e131aeed10d03a586180349d312ab52e58"
+  }
+, { mapKey = "unix-time"
+  , mapValue =
+      "9d9337244c889f436736fc1077943da82c1b7f39dd950372044eaeda0d01ee4b"
+  }
+, { mapKey = "unliftio"
+  , mapValue =
+      "94492cb74745316122cec01578c455894c5ff31a5994caffed76929943607b80"
+  }
+, { mapKey = "unliftio-core"
+  , mapValue =
+      "96d62a44d8ac64b0ef7739edb09119e6c03e5fda1ebcf34780e3d4f4d4c9509a"
+  }
+, { mapKey = "unordered-containers"
+  , mapValue =
+      "fba878d44c42db6d367b46b20edbc36f02993f8141482287ba7e6950847998cc"
+  }
+, { mapKey = "uri-bytestring"
+  , mapValue =
+      "9639e64f02ffbc750efe7fbcc4c1350cb137c559954ff86f570913b3c7c4ab90"
+  }
+, { mapKey = "uri-encode"
+  , mapValue =
+      "2c9e13945a89dd4b4fa16bb2418d132be244caa26b5fa6d22002b4e7c1da765e"
+  }
+, { mapKey = "url-slug"
+  , mapValue =
+      "ac31e8a9b993b191ba9a51040461d757ebf7ba5b43434b09058401f46d264e4f"
+  }
+, { mapKey = "utf8-string"
+  , mapValue =
+      "9a3126fab0c368fc2b97026d35b2e4e136829ef1f5daca1230c064db982a1ce5"
+  }
+, { mapKey = "utility-ht"
+  , mapValue =
+      "c9cefee26af5937fd056abf86dc6546dacf56278e53e01212394699e0fe9dae4"
+  }
+, { mapKey = "uuid"
+  , mapValue =
+      "e014a97a878aebf5362d7f962792d54ef68fe7e100027a8e17c45e827fb02a23"
+  }
+, { mapKey = "uuid-types"
+  , mapValue =
+      "33bef2ef92313bedf9220b3318b89b70ede5beded2b323572cb698593cd2f76e"
+  }
+, { mapKey = "validation"
+  , mapValue =
+      "2a1519080e044c06fbb9f2a59e21d6ce53926ddf38dee0f486bdff689aca4031"
+  }
+, { mapKey = "validation-selective"
+  , mapValue =
+      "2828643bc85f7d7e3dd1dc501000ae2e21805cdabb505de2ad9c5400add121a9"
+  }
+, { mapKey = "validity"
+  , mapValue =
+      "1c87e87501d043f7a6c6271fcdd68677de41354651576570c3c8673d1cce7406"
+  }
+, { mapKey = "validity-aeson"
+  , mapValue =
+      "1d5b05ea7d6e975ef630ed7cac94a4325e38a60bd8ea4d8c7970954918bf1a70"
+  }
+, { mapKey = "validity-bytestring"
+  , mapValue =
+      "4fa3c4987308ba55cb6166acd8d3509c0040849b432043ffcf2efbf35c88c8aa"
+  }
+, { mapKey = "validity-case-insensitive"
+  , mapValue =
+      "8974d3084995a2752d998c48cc18cb604c085a8c81df8772ae561e491d4f2ba1"
+  }
+, { mapKey = "validity-containers"
+  , mapValue =
+      "c9cada9667666733a0ec005d2e9ee86236cdb624a8e366db50940f068a1ba2c7"
+  }
+, { mapKey = "validity-path"
+  , mapValue =
+      "a7e01f2eab86518f17e8df017d97522f688a7d619fc31584abe8b41b98abfe7f"
+  }
+, { mapKey = "validity-persistent"
+  , mapValue =
+      "c9567c8d66ffcc948839afcba91feec8a9891bee5c0003f864c5f361aba1454a"
+  }
+, { mapKey = "validity-primitive"
+  , mapValue =
+      "0bd9ea54a97c4b60368443435c16d15891ed8df10a591678b1b3bb15a96c4d28"
+  }
+, { mapKey = "validity-scientific"
+  , mapValue =
+      "02d6e51501bb293bd5d08fee7734d80552d3268f6c6537a0e868e9f3089bd774"
+  }
+, { mapKey = "validity-text"
+  , mapValue =
+      "78dc02d8377d746efb4cda437fac35c4109a60bd2e3e1e161c34dfa4e2fb1275"
+  }
+, { mapKey = "validity-time"
+  , mapValue =
+      "85cb32a2ebf07fe0597601ef4609123d74ee93a0adfe9add8063911233db9c95"
+  }
+, { mapKey = "validity-unordered-containers"
+  , mapValue =
+      "1bd624bd9a1078fc4867fbeafc37946b8e4a27dbcc3eebbf033ac0e536c10c40"
+  }
+, { mapKey = "validity-uuid"
+  , mapValue =
+      "f62a292da7139ad0b062ecb8308a337c546eb8bc6d6719f372152fff68464399"
+  }
+, { mapKey = "validity-vector"
+  , mapValue =
+      "87b3a3c1e102ba1267f87a830fa9675d581e6f3286bb0d7c05b6b51afb1e7ce4"
+  }
+, { mapKey = "vault"
+  , mapValue =
+      "5b825fd643e3001c42c1af16ce2864c9f977a0e3481d9bc689b7c79c08e58bd9"
+  }
+, { mapKey = "vec"
+  , mapValue =
+      "60a9f1de1744ea30716bbe269bc0d81bdaf5781be08fc3e1f119ad0f181d0244"
+  }
+, { mapKey = "vector"
+  , mapValue =
+      "c4fe838d5623a17d9314059c111ac13b824bef45c50af51f6704c81600975bf3"
+  }
+, { mapKey = "vector-algorithms"
+  , mapValue =
+      "26716fec8262a411d024a806b8ff64a812d35ae2c5608214666d84318d200426"
+  }
+, { mapKey = "vector-binary-instances"
+  , mapValue =
+      "3ded8896b1360c0fb6a78a7385389b4430d61fdc071ce19f250c04c5f4cf4d85"
+  }
+, { mapKey = "vector-instances"
+  , mapValue =
+      "bcc018252b6e0ce005aa30aab4b9448578731bfbe27d23e7e73bfba092e6a924"
+  }
+, { mapKey = "vector-sized"
+  , mapValue =
+      "36b343a5d2c51f051cfe97321ef0170e9b8c3c1cccf86655ab2d49f0b1ee5982"
+  }
+, { mapKey = "vector-space"
+  , mapValue =
+      "f64ecf792820a656dd2e0921cdb685ac3143b4f976d43ade91fec02d42ff211d"
+  }
+, { mapKey = "vector-stream"
+  , mapValue =
+      "32d66a9561c02b44b6a9f999637e3e558fcb4f6510f289cb313809b03376feea"
+  }
+, { mapKey = "vector-th-unbox"
+  , mapValue =
+      "dbd9e053265d94f2ebe7126b3e0faa011ffd4388a697754f5da0ead8b38dc8f6"
+  }
+, { mapKey = "vinyl"
+  , mapValue =
+      "9f4f91c398ef61abb3500f1a392011b6fb6c3e980141eecaea35f453ca07ded1"
+  }
+, { mapKey = "void"
+  , mapValue =
+      "499751c6e8c81fa5867705dae7a6d9e322b49b6bb2a9ffa67a9fec49aabc0275"
+  }
+, { mapKey = "vty"
+  , mapValue =
+      "9dfb761c3575a479ac585bfd76f463e004005cc4c881753e0f6027fe48104bcd"
+  }
+, { mapKey = "wai"
+  , mapValue =
+      "e9cd90ec819d94dee1295173548601c7ca62d4625382a6f74aa82b04ed43c671"
+  }
+, { mapKey = "wai-app-static"
+  , mapValue =
+      "2d15f7892e38c738f0f561ae8b7a7b63db01c0ab57536bb232c37985a1f75009"
+  }
+, { mapKey = "wai-conduit"
+  , mapValue =
+      "9c41c4a6e2a699ecea3a7178ed5c823926bf859bb4c4b313761282a2d12ba152"
+  }
+, { mapKey = "wai-extra"
+  , mapValue =
+      "6d49478928e76e0e1ba256dfc7acb510cd4cfb1ddb95d28cc66da542e2d71ae2"
+  }
+, { mapKey = "wai-log"
+  , mapValue =
+      "53a9c6e7014df03d9301a55c60434f578a378fc7a239fbd5ec5161c943e71c1f"
+  }
+, { mapKey = "wai-logger"
+  , mapValue =
+      "1c6751fd1aabdfa0ca8a3a99b437a664243a4caf6a839d9f07027b7ab95d7c1e"
+  }
+, { mapKey = "wai-middleware-heartbeat"
+  , mapValue =
+      "e1e027ea93e4109473997c879737ab4acbc82c7b4ab11286195a6d3b13e61124"
+  }
+, { mapKey = "wai-middleware-prometheus"
+  , mapValue =
+      "4d1938721546476b059a41a2e89af5b3c5d9c04973e56af2af40bdc985066d2b"
+  }
+, { mapKey = "wai-middleware-static"
+  , mapValue =
+      "89c0936d26b3cf80412c6ff33ed7d2525fa8c10adb68e21c5a5735b8d2dda837"
+  }
+, { mapKey = "wai-websockets"
+  , mapValue =
+      "9bf5e017c6db8673e7b54e52255bb4437e98ad3adf516f1abeb6afdcb9950f6f"
+  }
+, { mapKey = "warp"
+  , mapValue =
+      "7bf1a679bb8362126f7a00e19ddbcb837246d1f0851df005ee614fd38e7d6af9"
+  }
+, { mapKey = "warp-tls"
+  , mapValue =
+      "fc3fa47b5f84048d481e2d063ac545a922f29240a36f2b99efb8e58f96653ee0"
+  }
+, { mapKey = "websockets"
+  , mapValue =
+      "74981d692b3c309d241557380fb1ecfcdd8e78b47bfa70a6402e0d85d7fa6f51"
+  }
+, { mapKey = "weigh"
+  , mapValue =
+      "101ef1a12cfbc7e4d9a00b81304fddf2528e753b51befcd17282cd4e74edf2c2"
+  }
+, { mapKey = "wide-word"
+  , mapValue =
+      "8dce7330dcd13b396c46a6aaca8ec190b14c8810e05dc703626c7b3e5f141ece"
+  }
+, { mapKey = "with-utf8"
+  , mapValue =
+      "13676695a3edf418ae8d8d548c7b5627adb37c69d055420663054a5114b7f5e9"
+  }
+, { mapKey = "witherable"
+  , mapValue =
+      "d88b992e872bd34c48dfade7b9325c874c33f797003687d1e9c572b87d9aef59"
+  }
+, { mapKey = "wizards"
+  , mapValue =
+      "3a87a2c6f4ff2069d381892a7e21ffb63b2a9f0ba9c6838b3edb0f9d44631ba4"
+  }
+, { mapKey = "wl-pprint-annotated"
+  , mapValue =
+      "9952d72ba0e20dd519574f5c996a2990b5d4c85fbe7217cf982943cc835544c2"
+  }
+, { mapKey = "word-compat"
+  , mapValue =
+      "84294caea8c0692f87692d304fdb5592eaf5c595cd421f80bc3b64bcacabf72e"
+  }
+, { mapKey = "word-wrap"
+  , mapValue =
+      "d6b5e3f4880c21017ac6d25047cca9dba6abaca4b5132b7a3e849ec5741b08a6"
+  }
+, { mapKey = "word8"
+  , mapValue =
+      "31c4246d99c0395c4868dcc60db32d5a3d0475c725de251a371e05ea9488e23c"
+  }
+, { mapKey = "wreq"
+  , mapValue =
+      "6aaeb451dd60bab5b5a2d6bd9fe227eb98717078aee225b239980ad0cf9f543f"
+  }
+, { mapKey = "wuss"
+  , mapValue =
+      "a4f5be121a2fde852dc93a0c25d72b189960447e51f602f6f078b460e7eb6fb3"
+  }
+, { mapKey = "x509"
+  , mapValue =
+      "4b697ec9d17ac9c9383282f3c590d15e6f36e30129d7df9931bb43931b1944dd"
+  }
+, { mapKey = "x509-store"
+  , mapValue =
+      "8b28f6f7d8a36aa94b9e7de5fa603519043e8ce546eadfa106d63a49d891bf44"
+  }
+, { mapKey = "x509-system"
+  , mapValue =
+      "58f38363beef8df26fb15c0b30acb0100d9b61e803922c565eb8d2eb329ace62"
+  }
+, { mapKey = "x509-validation"
+  , mapValue =
+      "8155333885f876a40d3f0439a2f1a1e9b6c568c06bc89cca45ab909f27edb250"
+  }
+, { mapKey = "xml"
+  , mapValue =
+      "edca370db6680bd682886059972a87f0c48fcfc9dd782bc760a62b8b766a5917"
+  }
+, { mapKey = "xml-conduit"
+  , mapValue =
+      "c4d3ef9ea39c8c64ea79f8935ab2e52c8cb8f2acf3b6f6a1e9a2b81339964748"
+  }
+, { mapKey = "xml-conduit-writer"
+  , mapValue =
+      "0f4e2b0ace3ac7fbdb8e2f3c625d1e89b1d4905b00f659397c06f57d5147f0d2"
+  }
+, { mapKey = "xml-types"
+  , mapValue =
+      "3398636867a901c1b9a7548f36c9a9c8a640bee6c0d728f4fab2de1338f93792"
+  }
+, { mapKey = "xmlgen"
+  , mapValue =
+      "aeac0e76759cb8619684b88819ac5a77adebf5ab31ff742f70b53065d36622fc"
+  }
+, { mapKey = "xmonad"
+  , mapValue =
+      "bd06ce3270b688e30225ab533fa0cbbed2ffc80226529b83ceeca899e7a8ebb7"
+  }
+, { mapKey = "xmonad-contrib"
+  , mapValue =
+      "331d6b1fcb6ee755bee39c1073d53ffedb768d226cb8acfededc6fd09f514fe0"
+  }
+, { mapKey = "xss-sanitize"
+  , mapValue =
+      "e4c3bfb0cabee974da9e5d0ee58dedb23f836ba2f41472f737e79ce84524845e"
+  }
+, { mapKey = "yaml"
+  , mapValue =
+      "21303441e0d3ea59fd30a05eefcb1d3f07e5af2d0dbc3e84af995a3740c51f9c"
+  }
+, { mapKey = "zip-archive"
+  , mapValue =
+      "ef6bec1e902424c42d3c2eb8ec134af184fdeb6b7958ee1ab5fa1f72cbe22c0a"
+  }
+, { mapKey = "zlib"
+  , mapValue =
+      "c9ee459526ab515fd3b62fec0d60c3eca5c21de54e94fe19c97ea26260688b7f"
+  }
+, { mapKey = "zlib-bindings"
+  , mapValue =
+      "c66421802ac5157933440be89b07e832b9f3e7f4038ad1f92ea92c2679fa9e38"
+  }
+]
\ No newline at end of file
diff --git a/pkgs/BNFC.nix b/pkgs/BNFC.nix
index 4fac7769810cffa63a1b17898ed0c62ad1864ba3..7fc7926ed58b31ad7cde62e7a25b4c0c1c75acad 100644
--- a/pkgs/BNFC.nix
+++ b/pkgs/BNFC.nix
@@ -1,24 +1,6 @@
-{ mkDerivation
-, HUnit
-, QuickCheck
-, alex
-, array
-, base
-, containers
-, deepseq
-, directory
-, filepath
-, happy
-, hspec
-, hspec-discover
-, lib
-, mtl
-, pretty
-, process
-, string-qq
-, temporary
-, time
-, transformers
+{ mkDerivation, HUnit, QuickCheck, alex, array, base, containers
+, deepseq, directory, filepath, happy, hspec, hspec-discover, lib
+, mtl, pretty, process, string-qq, temporary, time, transformers
 }:
 mkDerivation {
   pname = "BNFC";
@@ -28,37 +10,14 @@ mkDerivation {
   isExecutable = true;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    array
-    base
-    containers
-    deepseq
-    directory
-    filepath
-    mtl
-    pretty
-    process
-    string-qq
-    time
-    transformers
+    array base containers deepseq directory filepath mtl pretty process
+    string-qq time transformers
   ];
   libraryToolDepends = [ alex happy ];
   executableHaskellDepends = [ base ];
   testHaskellDepends = [
-    array
-    base
-    containers
-    deepseq
-    directory
-    filepath
-    hspec
-    HUnit
-    mtl
-    pretty
-    process
-    QuickCheck
-    string-qq
-    temporary
-    time
+    array base containers deepseq directory filepath hspec HUnit mtl
+    pretty process QuickCheck string-qq temporary time
   ];
   testToolDepends = [ alex happy hspec-discover ];
   enableLibraryProfiling = true;
@@ -72,4 +31,4 @@ mkDerivation {
   description = "A compiler front-end generator";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/Boolean.nix b/pkgs/Boolean.nix
index f3c861d0d352209d741309e0f27f400842de07e2..02dc96118946f7906059dbd7a30577dc9d1822da 100644
--- a/pkgs/Boolean.nix
+++ b/pkgs/Boolean.nix
@@ -17,4 +17,4 @@ mkDerivation {
   description = "Generalized booleans and numbers";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/Chart-diagrams.nix b/pkgs/Chart-diagrams.nix
index a715b65c02b6a79b74a46bf3df70e90c5d377cfb..adfdedf79014d1902dbb64940f18fedc78474420 100644
--- a/pkgs/Chart-diagrams.nix
+++ b/pkgs/Chart-diagrams.nix
@@ -1,24 +1,7 @@
-{ mkDerivation
-, Chart
-, SVGFonts
-, base
-, blaze-markup
-, bytestring
-, colour
-, containers
-, data-default-class
-, diagrams-core
-, diagrams-lib
-, diagrams-postscript
-, diagrams-svg
-, lens
-, lib
-, mtl
-, old-locale
-, operational
-, svg-builder
-, text
-, time
+{ mkDerivation, Chart, SVGFonts, base, blaze-markup, bytestring
+, colour, containers, data-default-class, diagrams-core
+, diagrams-lib, diagrams-postscript, diagrams-svg, lens, lib, mtl
+, old-locale, operational, svg-builder, text, time
 }:
 mkDerivation {
   pname = "Chart-diagrams";
@@ -28,25 +11,10 @@ mkDerivation {
   isExecutable = false;
   enableSeparateDataOutput = true;
   libraryHaskellDepends = [
-    base
-    blaze-markup
-    bytestring
-    Chart
-    colour
-    containers
-    data-default-class
-    diagrams-core
-    diagrams-lib
-    diagrams-postscript
-    diagrams-svg
-    lens
-    mtl
-    old-locale
-    operational
-    svg-builder
-    SVGFonts
-    text
-    time
+    base blaze-markup bytestring Chart colour containers
+    data-default-class diagrams-core diagrams-lib diagrams-postscript
+    diagrams-svg lens mtl old-locale operational svg-builder SVGFonts
+    text time
   ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
@@ -59,4 +27,4 @@ mkDerivation {
   description = "Diagrams backend for Charts";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/Chart.nix b/pkgs/Chart.nix
index 7a559ce2b5591a9010f73e1e5b8b8fa46cce6e11..d2632f3c7c9e5d727b13f8735ff0fd8504a3d846 100644
--- a/pkgs/Chart.nix
+++ b/pkgs/Chart.nix
@@ -1,15 +1,5 @@
-{ mkDerivation
-, array
-, base
-, colour
-, data-default-class
-, lens
-, lib
-, mtl
-, old-locale
-, operational
-, time
-, vector
+{ mkDerivation, array, base, colour, data-default-class, lens, lib
+, mtl, old-locale, operational, time, vector
 }:
 mkDerivation {
   pname = "Chart";
@@ -19,16 +9,8 @@ mkDerivation {
   isExecutable = false;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    array
-    base
-    colour
-    data-default-class
-    lens
-    mtl
-    old-locale
-    operational
-    time
-    vector
+    array base colour data-default-class lens mtl old-locale
+    operational time vector
   ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
@@ -41,4 +23,4 @@ mkDerivation {
   description = "A library for generating 2D Charts and Plots";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/ChasingBottoms.nix b/pkgs/ChasingBottoms.nix
index da9de97fe22ea8dbecbd355660d2b2f5fbb8f396..087d77dbaf01710568659e627bc9990561000f09 100644
--- a/pkgs/ChasingBottoms.nix
+++ b/pkgs/ChasingBottoms.nix
@@ -1,36 +1,20 @@
-{ mkDerivation
-, QuickCheck
-, array
-, base
-, containers
-, lib
-, mtl
-, random
-, syb
+{ mkDerivation, QuickCheck, array, base, containers, lib, mtl
+, random, syb
 }:
 mkDerivation {
   pname = "ChasingBottoms";
   version = "1.3.1.12";
   sha256 = "a018538c0196390c7ebb5c677ff5b81bd760d75ae2b21bae8ab8a47b00f6c9ef";
+  revision = "1";
+  editedCabalFile = "0ra041bg2m04niqzi0y468cfmv2bkjh8ckix2i8xf2shw7v2zn4r";
   isLibrary = true;
   isExecutable = false;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    base
-    containers
-    mtl
-    QuickCheck
-    random
-    syb
+    base containers mtl QuickCheck random syb
   ];
   testHaskellDepends = [
-    array
-    base
-    containers
-    mtl
-    QuickCheck
-    random
-    syb
+    array base containers mtl QuickCheck random syb
   ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
@@ -42,4 +26,4 @@ mkDerivation {
   description = "For testing partial and infinite values";
   license = lib.licenses.mit;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/Decimal.nix b/pkgs/Decimal.nix
index a02511b85e9de5fb14e3fd957ad92910c9a7dcc3..5d1e10e7e2e82706dd1c9173ae19bef3d2c5d44c 100644
--- a/pkgs/Decimal.nix
+++ b/pkgs/Decimal.nix
@@ -1,12 +1,5 @@
-{ mkDerivation
-, HUnit
-, QuickCheck
-, base
-, deepseq
-, lib
-, test-framework
-, test-framework-hunit
-, test-framework-quickcheck2
+{ mkDerivation, HUnit, QuickCheck, base, deepseq, lib
+, test-framework, test-framework-hunit, test-framework-quickcheck2
 }:
 mkDerivation {
   pname = "Decimal";
@@ -17,12 +10,7 @@ mkDerivation {
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [ base deepseq ];
   testHaskellDepends = [
-    base
-    deepseq
-    HUnit
-    QuickCheck
-    test-framework
-    test-framework-hunit
+    base deepseq HUnit QuickCheck test-framework test-framework-hunit
     test-framework-quickcheck2
   ];
   enableLibraryProfiling = true;
@@ -36,4 +24,4 @@ mkDerivation {
   description = "Decimal numbers with variable precision";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/Diff.nix b/pkgs/Diff.nix
index d665719d94c4e045967200e20d5007dca85c396b..c7e4d173caa9893e1fe6a5de5d73bad5056d0b37 100644
--- a/pkgs/Diff.nix
+++ b/pkgs/Diff.nix
@@ -1,13 +1,5 @@
-{ mkDerivation
-, QuickCheck
-, array
-, base
-, directory
-, lib
-, pretty
-, process
-, test-framework
-, test-framework-quickcheck2
+{ mkDerivation, QuickCheck, array, base, directory, lib, pretty
+, process, test-framework, test-framework-quickcheck2
 }:
 mkDerivation {
   pname = "Diff";
@@ -18,13 +10,7 @@ mkDerivation {
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [ array base pretty ];
   testHaskellDepends = [
-    array
-    base
-    directory
-    pretty
-    process
-    QuickCheck
-    test-framework
+    array base directory pretty process QuickCheck test-framework
     test-framework-quickcheck2
   ];
   enableLibraryProfiling = true;
@@ -37,4 +23,4 @@ mkDerivation {
   description = "O(ND) diff algorithm in haskell";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/Glob.nix b/pkgs/Glob.nix
index 40f870ce0d337760660b3cdc04e4ece7244702e5..6f3ef6f6d1c0248018e9bb0c232a5bbfc805ef27 100644
--- a/pkgs/Glob.nix
+++ b/pkgs/Glob.nix
@@ -1,17 +1,6 @@
-{ mkDerivation
-, HUnit
-, QuickCheck
-, base
-, containers
-, directory
-, dlist
-, filepath
-, lib
-, test-framework
-, test-framework-hunit
-, test-framework-quickcheck2
-, transformers
-, transformers-compat
+{ mkDerivation, HUnit, QuickCheck, base, containers, directory
+, dlist, filepath, lib, test-framework, test-framework-hunit
+, test-framework-quickcheck2, transformers, transformers-compat
 }:
 mkDerivation {
   pname = "Glob";
@@ -23,27 +12,13 @@ mkDerivation {
   isExecutable = false;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    base
-    containers
-    directory
-    dlist
-    filepath
-    transformers
+    base containers directory dlist filepath transformers
     transformers-compat
   ];
   testHaskellDepends = [
-    base
-    containers
-    directory
-    dlist
-    filepath
-    HUnit
-    QuickCheck
-    test-framework
-    test-framework-hunit
-    test-framework-quickcheck2
-    transformers
-    transformers-compat
+    base containers directory dlist filepath HUnit QuickCheck
+    test-framework test-framework-hunit test-framework-quickcheck2
+    transformers transformers-compat
   ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
@@ -56,4 +31,4 @@ mkDerivation {
   description = "Globbing library";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/HTTP.nix b/pkgs/HTTP.nix
index f234878c5abf3ac7d4528328369d7c057029e585..9b2acc570542a1eb5b7f71914b40c6163826d9ef 100644
--- a/pkgs/HTTP.nix
+++ b/pkgs/HTTP.nix
@@ -1,55 +1,23 @@
-{ mkDerivation
-, HUnit
-, array
-, base
-, bytestring
-, deepseq
-, httpd-shed
-, lib
-, mtl
-, network
-, network-uri
-, parsec
-, pureMD5
-, split
-, test-framework
-, test-framework-hunit
-, time
-, transformers
+{ mkDerivation, HUnit, array, base, bytestring, deepseq, httpd-shed
+, lib, mtl, network, network-uri, parsec, pureMD5, split
+, test-framework, test-framework-hunit, time, transformers
 }:
 mkDerivation {
   pname = "HTTP";
   version = "4000.4.1";
   sha256 = "df31d8efec775124dab856d7177ddcba31be9f9e0836ebdab03d94392f2dd453";
-  revision = "1";
-  editedCabalFile = "04y04vbxbnblpmqqmpl8km4bkcjaj96nbxkssdr1zgbhqisxay5q";
+  revision = "2";
+  editedCabalFile = "1bpq8xjyrgcxs6yf6wh7ada2xrln1dqi02b5ilj8gwn1p30hq8nr";
   isLibrary = true;
   isExecutable = false;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    array
-    base
-    bytestring
-    mtl
-    network
-    network-uri
-    parsec
-    time
+    array base bytestring mtl network network-uri parsec time
     transformers
   ];
   testHaskellDepends = [
-    base
-    bytestring
-    deepseq
-    httpd-shed
-    HUnit
-    mtl
-    network
-    network-uri
-    pureMD5
-    split
-    test-framework
-    test-framework-hunit
+    base bytestring deepseq httpd-shed HUnit mtl network network-uri
+    pureMD5 split test-framework test-framework-hunit
   ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
@@ -62,4 +30,4 @@ mkDerivation {
   description = "A library for client-side HTTP";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/HUnit.nix b/pkgs/HUnit.nix
index a8992874088e79c486d0ef4fae429dbc7f6257c1..48893c792b7aab3f878318d4057a7d126517d14d 100644
--- a/pkgs/HUnit.nix
+++ b/pkgs/HUnit.nix
@@ -19,4 +19,4 @@ mkDerivation {
   description = "A unit testing framework for Haskell";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/HaskellNet.nix b/pkgs/HaskellNet.nix
index 3799347a80e7f167b0c2a94632f2d62b62bbc9c7..64024e88218f03585af44adce11f4a64fb4e87f0 100644
--- a/pkgs/HaskellNet.nix
+++ b/pkgs/HaskellNet.nix
@@ -1,17 +1,5 @@
-{ mkDerivation
-, array
-, base
-, base64
-, bytestring
-, cryptohash-md5
-, lib
-, mime-mail
-, mtl
-, network
-, network-bsd
-, old-time
-, pretty
-, text
+{ mkDerivation, array, base, base64, bytestring, cryptohash-md5
+, lib, mime-mail, mtl, network, network-bsd, old-time, pretty, text
 }:
 mkDerivation {
   pname = "HaskellNet";
@@ -21,18 +9,8 @@ mkDerivation {
   isExecutable = false;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    array
-    base
-    base64
-    bytestring
-    cryptohash-md5
-    mime-mail
-    mtl
-    network
-    network-bsd
-    old-time
-    pretty
-    text
+    array base base64 bytestring cryptohash-md5 mime-mail mtl network
+    network-bsd old-time pretty text
   ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
@@ -45,4 +23,4 @@ mkDerivation {
   description = "Client support for POP3, SMTP, and IMAP";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/Hclip.nix b/pkgs/Hclip.nix
index 905b6646acba806f437095802f0b0942231ac0a6..7b26050bf73a5a5f159842803c8fa25cce6454e5 100644
--- a/pkgs/Hclip.nix
+++ b/pkgs/Hclip.nix
@@ -18,4 +18,4 @@ mkDerivation {
   description = "A small cross-platform library for reading and modifying the system clipboard";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/HsYAML.nix b/pkgs/HsYAML.nix
index cf6e58ebe3168c56e7c84d1e0625a8380796d886..ce7182a6c6288e51e4f61494a5421344e06ff198 100644
--- a/pkgs/HsYAML.nix
+++ b/pkgs/HsYAML.nix
@@ -1,44 +1,20 @@
-{ mkDerivation
-, QuickCheck
-, base
-, bytestring
-, containers
-, deepseq
-, lib
-, mtl
-, parsec
-, tasty
-, tasty-quickcheck
-, text
-, transformers
+{ mkDerivation, QuickCheck, base, bytestring, containers, deepseq
+, lib, mtl, parsec, tasty, tasty-quickcheck, text, transformers
 }:
 mkDerivation {
   pname = "HsYAML";
   version = "0.2.1.1";
   sha256 = "465bb4fc90979c19bedf6db2053f9ac54537b4912d5827d7e2135d42ef5ef628";
-  revision = "1";
-  editedCabalFile = "0jmbgrjywcblrd8k6zzv2b5givdz83f479y15v5gs0r93z25xpmv";
+  revision = "2";
+  editedCabalFile = "0r2yh96nhmlfy2vj2c7i5703brv4lp9cw5v044j7s8487jvv70d6";
   isLibrary = true;
   isExecutable = true;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    base
-    bytestring
-    containers
-    deepseq
-    mtl
-    parsec
-    text
-    transformers
+    base bytestring containers deepseq mtl parsec text transformers
   ];
   testHaskellDepends = [
-    base
-    bytestring
-    containers
-    mtl
-    QuickCheck
-    tasty
-    tasty-quickcheck
+    base bytestring containers mtl QuickCheck tasty tasty-quickcheck
     text
   ];
   enableLibraryProfiling = true;
@@ -52,4 +28,4 @@ mkDerivation {
   description = "Pure Haskell YAML 1.2 processor";
   license = lib.licenses.gpl2Only;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/JuicyPixels.nix b/pkgs/JuicyPixels.nix
index fc786e3670f6678581d21c288805376833e2f5e3..f231e89d0785ae947a41e4deeed8c8bf069c4773 100644
--- a/pkgs/JuicyPixels.nix
+++ b/pkgs/JuicyPixels.nix
@@ -1,15 +1,5 @@
-{ mkDerivation
-, base
-, binary
-, bytestring
-, containers
-, deepseq
-, lib
-, mtl
-, primitive
-, transformers
-, vector
-, zlib
+{ mkDerivation, base, binary, bytestring, containers, deepseq, lib
+, mtl, primitive, transformers, vector, zlib
 }:
 mkDerivation {
   pname = "JuicyPixels";
@@ -19,16 +9,8 @@ mkDerivation {
   isExecutable = false;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    base
-    binary
-    bytestring
-    containers
-    deepseq
-    mtl
-    primitive
-    transformers
-    vector
-    zlib
+    base binary bytestring containers deepseq mtl primitive
+    transformers vector zlib
   ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
@@ -41,4 +23,4 @@ mkDerivation {
   description = "Picture loading/serialization (in png, jpeg, bitmap, gif, tga, tiff and radiance)";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/MemoTrie.nix b/pkgs/MemoTrie.nix
index e46258e73b025ac9d31d67b8b60c850399ba146a..a3d57c454eb376930e7ae05aed7df969701a9651 100644
--- a/pkgs/MemoTrie.nix
+++ b/pkgs/MemoTrie.nix
@@ -18,4 +18,4 @@ mkDerivation {
   description = "Trie-based memo functions";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/MonadPrompt.nix b/pkgs/MonadPrompt.nix
index ddda9a6cdd9b2aa1d08bdfff55286a282542335b..8c97c65eec8ef36c2434a8d4944ebb83cb89f215 100644
--- a/pkgs/MonadPrompt.nix
+++ b/pkgs/MonadPrompt.nix
@@ -17,4 +17,4 @@ mkDerivation {
   description = "MonadPrompt, implementation & examples";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/NumInstances.nix b/pkgs/NumInstances.nix
index e43097322cbf3b749f19fd3815a1695590bbfd19..8f981fe276f88a73354385556984d335f40effd4 100644
--- a/pkgs/NumInstances.nix
+++ b/pkgs/NumInstances.nix
@@ -18,4 +18,4 @@ mkDerivation {
   description = "Instances of numeric classes for functions and tuples";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/Only.nix b/pkgs/Only.nix
index 860ae950c2a307ac61b558605da18b3999fe3620..564ca6f66e07f24942e0e69e2165eeeabf93e62e 100644
--- a/pkgs/Only.nix
+++ b/pkgs/Only.nix
@@ -19,4 +19,4 @@ mkDerivation {
   description = "The 1-tuple type or single-value \"collection\"";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/OpenGLRaw.nix b/pkgs/OpenGLRaw.nix
index 60a67bb4777557c574924915211cff4b676b67ce..12d3b9fdf7159ade0408cb447d795a5c35451cdf 100644
--- a/pkgs/OpenGLRaw.nix
+++ b/pkgs/OpenGLRaw.nix
@@ -1,29 +1,17 @@
-{ mkDerivation
-, base
-, bytestring
-, containers
-, fixed
-, half
-, lib
-, libGL
-, text
-, transformers
+{ mkDerivation, base, bytestring, containers, fixed, half, lib
+, libGL, text, transformers
 }:
 mkDerivation {
   pname = "OpenGLRaw";
   version = "3.3.4.1";
   sha256 = "121abdea149ac74514efb2c1c1c319466757242d1b72a8bdf99d49535f06d31e";
+  revision = "1";
+  editedCabalFile = "15abvqkxc08lx9d44323izccfp7bqfiljnd587zn80vdvmkzs6zc";
   isLibrary = true;
   isExecutable = false;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    base
-    bytestring
-    containers
-    fixed
-    half
-    text
-    transformers
+    base bytestring containers fixed half text transformers
   ];
   librarySystemDepends = [ libGL ];
   enableLibraryProfiling = true;
@@ -37,4 +25,4 @@ mkDerivation {
   description = "A raw binding for the OpenGL graphics system";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/PSQueue.nix b/pkgs/PSQueue.nix
index 542b8dd3e97d196c2cfa5c38a6aa0786467aa110..15eade7ccb2e4d0ec57b4070f7fd8a59f86ecbad 100644
--- a/pkgs/PSQueue.nix
+++ b/pkgs/PSQueue.nix
@@ -20,4 +20,4 @@ mkDerivation {
   description = "Priority Search Queue";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/QuickCheck.nix b/pkgs/QuickCheck.nix
index f4d3b587e0b7b63839508b7574d509fc08b5fbac..d83e375dcbd231508d7f67d9d2029c174318f45e 100644
--- a/pkgs/QuickCheck.nix
+++ b/pkgs/QuickCheck.nix
@@ -1,13 +1,5 @@
-{ mkDerivation
-, base
-, containers
-, deepseq
-, lib
-, process
-, random
-, splitmix
-, template-haskell
-, transformers
+{ mkDerivation, base, containers, deepseq, lib, process, random
+, splitmix, template-haskell, transformers
 }:
 mkDerivation {
   pname = "QuickCheck";
@@ -17,12 +9,7 @@ mkDerivation {
   isExecutable = false;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    base
-    containers
-    deepseq
-    random
-    splitmix
-    template-haskell
+    base containers deepseq random splitmix template-haskell
     transformers
   ];
   testHaskellDepends = [ base deepseq process ];
@@ -37,4 +24,4 @@ mkDerivation {
   description = "Automatic testing of Haskell programs";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/RSA.nix b/pkgs/RSA.nix
index 0a91233e81eaaaa33a4475d2576e91775b7bffbc..3f7359142a0246d05fed92ce1b7d1a0a6bd402b7 100644
--- a/pkgs/RSA.nix
+++ b/pkgs/RSA.nix
@@ -1,14 +1,5 @@
-{ mkDerivation
-, QuickCheck
-, SHA
-, base
-, binary
-, bytestring
-, crypto-api
-, crypto-pubkey-types
-, lib
-, tagged
-, test-framework
+{ mkDerivation, QuickCheck, SHA, base, binary, bytestring
+, crypto-api, crypto-pubkey-types, lib, tagged, test-framework
 , test-framework-quickcheck2
 }:
 mkDerivation {
@@ -19,24 +10,11 @@ mkDerivation {
   isExecutable = false;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    base
-    binary
-    bytestring
-    crypto-api
-    crypto-pubkey-types
-    SHA
+    base binary bytestring crypto-api crypto-pubkey-types SHA
   ];
   testHaskellDepends = [
-    base
-    binary
-    bytestring
-    crypto-api
-    crypto-pubkey-types
-    QuickCheck
-    SHA
-    tagged
-    test-framework
-    test-framework-quickcheck2
+    base binary bytestring crypto-api crypto-pubkey-types QuickCheck
+    SHA tagged test-framework test-framework-quickcheck2
   ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
@@ -48,4 +26,4 @@ mkDerivation {
   description = "Implementation of RSA, using the padding schemes of PKCS#1 v2.1.";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/SHA.nix b/pkgs/SHA.nix
index f48c8b24121e89dd8c64aa208966046f7eccc994..b535a0492dced50e114e29d945ecc7f8e6d9ff3b 100644
--- a/pkgs/SHA.nix
+++ b/pkgs/SHA.nix
@@ -1,12 +1,5 @@
-{ mkDerivation
-, QuickCheck
-, array
-, base
-, binary
-, bytestring
-, lib
-, test-framework
-, test-framework-quickcheck2
+{ mkDerivation, QuickCheck, array, base, binary, bytestring, lib
+, test-framework, test-framework-quickcheck2
 }:
 mkDerivation {
   pname = "SHA";
@@ -17,12 +10,7 @@ mkDerivation {
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [ array base binary bytestring ];
   testHaskellDepends = [
-    array
-    base
-    binary
-    bytestring
-    QuickCheck
-    test-framework
+    array base binary bytestring QuickCheck test-framework
     test-framework-quickcheck2
   ];
   enableLibraryProfiling = true;
@@ -35,4 +23,4 @@ mkDerivation {
   description = "Implementations of the SHA suite of message digest functions";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/SVGFonts.nix b/pkgs/SVGFonts.nix
index 7b593a4caf94c3772830822f04f6ad474f8dace2..9e5fc6df8392c824e65b1fa68d83b5f3ae2b6407 100644
--- a/pkgs/SVGFonts.nix
+++ b/pkgs/SVGFonts.nix
@@ -1,22 +1,7 @@
-{ mkDerivation
-, attoparsec
-, base
-, blaze-markup
-, blaze-svg
-, bytestring
-, cereal
-, cereal-vector
-, containers
-, data-default-class
-, diagrams-core
-, diagrams-lib
-, directory
-, lib
-, parsec
-, split
-, text
-, vector
-, xml
+{ mkDerivation, attoparsec, base, blaze-markup, blaze-svg
+, bytestring, cereal, cereal-vector, containers, data-default-class
+, diagrams-core, diagrams-lib, directory, lib, parsec, split, text
+, vector, xml
 }:
 mkDerivation {
   pname = "SVGFonts";
@@ -26,23 +11,9 @@ mkDerivation {
   isExecutable = false;
   enableSeparateDataOutput = true;
   libraryHaskellDepends = [
-    attoparsec
-    base
-    blaze-markup
-    blaze-svg
-    bytestring
-    cereal
-    cereal-vector
-    containers
-    data-default-class
-    diagrams-core
-    diagrams-lib
-    directory
-    parsec
-    split
-    text
-    vector
-    xml
+    attoparsec base blaze-markup blaze-svg bytestring cereal
+    cereal-vector containers data-default-class diagrams-core
+    diagrams-lib directory parsec split text vector xml
   ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
@@ -54,4 +25,4 @@ mkDerivation {
   description = "Fonts from the SVG-Font format";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/StateVar.nix b/pkgs/StateVar.nix
index 456b2b234813e65e762e45b1aea41c992090be6c..21200a0247164c7ca4ec7e26b8f43fc6becbf8db 100644
--- a/pkgs/StateVar.nix
+++ b/pkgs/StateVar.nix
@@ -18,4 +18,4 @@ mkDerivation {
   description = "State variables";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/Stream.nix b/pkgs/Stream.nix
index 78b79108ff19a802501d4196cde935523ff006dd..7da4354e861434554e20f8a1a64bac399b5386f9 100644
--- a/pkgs/Stream.nix
+++ b/pkgs/Stream.nix
@@ -17,4 +17,4 @@ mkDerivation {
   description = "A library for manipulating infinite lists";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/Unique.nix b/pkgs/Unique.nix
index 71abd4699e6d8ccc12d858ceee888d8f797810c7..9c19ef26ad7187e4dc00f161e437520a3c8dfa1b 100644
--- a/pkgs/Unique.nix
+++ b/pkgs/Unique.nix
@@ -1,14 +1,5 @@
-{ mkDerivation
-, QuickCheck
-, base
-, bytestring
-, containers
-, criterion
-, extra
-, hashable
-, hspec
-, lib
-, quickcheck-instances
+{ mkDerivation, QuickCheck, base, bytestring, containers, criterion
+, extra, hashable, hspec, lib, quickcheck-instances
 , unordered-containers
 }:
 mkDerivation {
@@ -21,20 +12,11 @@ mkDerivation {
   isExecutable = false;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    base
-    containers
-    extra
-    hashable
-    unordered-containers
+    base containers extra hashable unordered-containers
   ];
   testHaskellDepends = [ base containers hspec QuickCheck ];
   benchmarkHaskellDepends = [
-    base
-    bytestring
-    criterion
-    hashable
-    QuickCheck
-    quickcheck-instances
+    base bytestring criterion hashable QuickCheck quickcheck-instances
   ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
@@ -46,4 +28,4 @@ mkDerivation {
   description = "It provides the functionality like unix \"uniq\" utility";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/X11-xft.nix b/pkgs/X11-xft.nix
index 584196b3314853f40526545485ab0da3bcdd7cde..d247cddd9b8cb7acc127fed4a80786125d260819 100644
--- a/pkgs/X11-xft.nix
+++ b/pkgs/X11-xft.nix
@@ -18,4 +18,4 @@ mkDerivation {
   description = "Bindings to the Xft and some Xrender parts";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/X11.nix b/pkgs/X11.nix
index a188124bef2130a8a299f34c53d2c0da8bd63da4..0c5695fc476a80c3bcd79fa8413351346e133839 100644
--- a/pkgs/X11.nix
+++ b/pkgs/X11.nix
@@ -1,13 +1,5 @@
-{ mkDerivation
-, base
-, data-default-class
-, lib
-, libX11
-, libXScrnSaver
-, libXext
-, libXinerama
-, libXrandr
-, libXrender
+{ mkDerivation, base, data-default-class, lib, libX11
+, libXScrnSaver, libXext, libXinerama, libXrandr, libXrender
 }:
 mkDerivation {
   pname = "X11";
@@ -18,12 +10,7 @@ mkDerivation {
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [ base data-default-class ];
   librarySystemDepends = [
-    libX11
-    libXext
-    libXinerama
-    libXrandr
-    libXrender
-    libXScrnSaver
+    libX11 libXext libXinerama libXrandr libXrender libXScrnSaver
   ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
@@ -36,4 +23,4 @@ mkDerivation {
   description = "A binding to the X11 graphics library";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/abstract-deque-tests.nix b/pkgs/abstract-deque-tests.nix
index 1f4a847b5fca1dbf19ae338ccb151ecb8a25351f..6a10aed4f0cf46c269a461154c6a68ab6fa493ad 100644
--- a/pkgs/abstract-deque-tests.nix
+++ b/pkgs/abstract-deque-tests.nix
@@ -1,14 +1,5 @@
-{ mkDerivation
-, HUnit
-, abstract-deque
-, array
-, base
-, containers
-, lib
-, random
-, test-framework
-, test-framework-hunit
-, time
+{ mkDerivation, HUnit, abstract-deque, array, base, containers, lib
+, random, test-framework, test-framework-hunit, time
 }:
 mkDerivation {
   pname = "abstract-deque-tests";
@@ -18,26 +9,12 @@ mkDerivation {
   isExecutable = false;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    abstract-deque
-    array
-    base
-    containers
-    HUnit
-    random
-    test-framework
-    test-framework-hunit
-    time
+    abstract-deque array base containers HUnit random test-framework
+    test-framework-hunit time
   ];
   testHaskellDepends = [
-    abstract-deque
-    array
-    base
-    containers
-    HUnit
-    random
-    test-framework
-    test-framework-hunit
-    time
+    abstract-deque array base containers HUnit random test-framework
+    test-framework-hunit time
   ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
@@ -50,4 +27,4 @@ mkDerivation {
   description = "A test-suite for any queue or double-ended queue satisfying an interface";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/abstract-deque.nix b/pkgs/abstract-deque.nix
index 8c6c4abaeff651452144944d9c8ae3393a34716f..bcb3e0807e0e0a56b1aeb2fa82b92fd41b37856c 100644
--- a/pkgs/abstract-deque.nix
+++ b/pkgs/abstract-deque.nix
@@ -18,4 +18,4 @@ mkDerivation {
   description = "Abstract, parameterized interface to mutable Deques";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/abstract-par.nix b/pkgs/abstract-par.nix
index 56cb8ec233b51cbe17c1d60ba580762a454c9417..27a233f106de9ba74933899a6727d53e298d8788 100644
--- a/pkgs/abstract-par.nix
+++ b/pkgs/abstract-par.nix
@@ -18,4 +18,4 @@ mkDerivation {
   description = "Type classes generalizing the functionality of the 'monad-par' library";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/active.nix b/pkgs/active.nix
index 9379f7f26e5247d265398d1808af13b180f2ffda..5610fd354dfd74696acb0d0e3480a6bca4cd7f9f 100644
--- a/pkgs/active.nix
+++ b/pkgs/active.nix
@@ -1,12 +1,5 @@
-{ mkDerivation
-, QuickCheck
-, base
-, lens
-, lib
-, linear
-, semigroupoids
-, semigroups
-, vector
+{ mkDerivation, QuickCheck, base, lens, lib, linear, semigroupoids
+, semigroups, vector
 }:
 mkDerivation {
   pname = "active";
@@ -18,21 +11,10 @@ mkDerivation {
   isExecutable = false;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    base
-    lens
-    linear
-    semigroupoids
-    semigroups
-    vector
+    base lens linear semigroupoids semigroups vector
   ];
   testHaskellDepends = [
-    base
-    lens
-    linear
-    QuickCheck
-    semigroupoids
-    semigroups
-    vector
+    base lens linear QuickCheck semigroupoids semigroups vector
   ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
@@ -44,4 +26,4 @@ mkDerivation {
   description = "Abstractions for animation";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/adjunctions.nix b/pkgs/adjunctions.nix
index 699c7e219c7290f690ce70c29fc5771ff24e7ea2..696d3efd4c835a3e09dc6551661441af3691e355 100644
--- a/pkgs/adjunctions.nix
+++ b/pkgs/adjunctions.nix
@@ -1,47 +1,21 @@
-{ mkDerivation
-, array
-, base
-, comonad
-, containers
-, contravariant
-, distributive
-, free
-, generic-deriving
-, hspec
-, hspec-discover
-, lib
-, mtl
-, profunctors
-, semigroupoids
-, semigroups
-, tagged
-, transformers
-, transformers-compat
-, void
+{ mkDerivation, array, base, comonad, containers, contravariant
+, distributive, free, generic-deriving, hspec, hspec-discover, lib
+, mtl, profunctors, semigroupoids, semigroups, tagged, transformers
+, transformers-compat, void
 }:
 mkDerivation {
   pname = "adjunctions";
   version = "4.4.2";
   sha256 = "147b5f8db810bca0ea8952ef974982ffc447cecd21f01e1ea1121df77e276518";
+  revision = "1";
+  editedCabalFile = "0ii8818fr1h3wpyaqwa44gn1kv7lafbw9b4qdj7r86w5k5q00ypp";
   isLibrary = true;
   isExecutable = false;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    array
-    base
-    comonad
-    containers
-    contravariant
-    distributive
-    free
-    mtl
-    profunctors
-    semigroupoids
-    semigroups
-    tagged
-    transformers
-    transformers-compat
-    void
+    array base comonad containers contravariant distributive free mtl
+    profunctors semigroupoids semigroups tagged transformers
+    transformers-compat void
   ];
   testHaskellDepends = [ base distributive generic-deriving hspec ];
   testToolDepends = [ hspec-discover ];
@@ -56,4 +30,4 @@ mkDerivation {
   description = "Adjunctions and representable functors";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/aeson-pretty.nix b/pkgs/aeson-pretty.nix
index 38b7bbfabf0d3340d7f1e013cab5bf1e77d725b6..eb7edd5a10cff37af473a422e1e0d41a731d672b 100644
--- a/pkgs/aeson-pretty.nix
+++ b/pkgs/aeson-pretty.nix
@@ -1,15 +1,5 @@
-{ mkDerivation
-, aeson
-, attoparsec
-, base
-, base-compat
-, bytestring
-, cmdargs
-, lib
-, scientific
-, text
-, unordered-containers
-, vector
+{ mkDerivation, aeson, attoparsec, base, base-compat, bytestring
+, cmdargs, lib, scientific, text, unordered-containers, vector
 }:
 mkDerivation {
   pname = "aeson-pretty";
@@ -21,21 +11,11 @@ mkDerivation {
   isExecutable = true;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    aeson
-    base
-    base-compat
-    bytestring
-    scientific
-    text
-    unordered-containers
-    vector
+    aeson base base-compat bytestring scientific text
+    unordered-containers vector
   ];
   executableHaskellDepends = [
-    aeson
-    attoparsec
-    base
-    bytestring
-    cmdargs
+    aeson attoparsec base bytestring cmdargs
   ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
@@ -48,4 +28,4 @@ mkDerivation {
   description = "JSON pretty-printing library and command-line tool";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/aeson-qq.nix b/pkgs/aeson-qq.nix
index 1c85fabd6ba8492d42df683847a5ccab5cfa00a1..1d16d4698624e1f29e3452f91137d3fdc2a92465 100644
--- a/pkgs/aeson-qq.nix
+++ b/pkgs/aeson-qq.nix
@@ -1,18 +1,6 @@
-{ mkDerivation
-, aeson
-, attoparsec
-, base
-, base-compat
-, ghc-prim
-, haskell-src-meta
-, hspec
-, hspec-discover
-, lib
-, parsec
-, scientific
-, template-haskell
-, text
-, vector
+{ mkDerivation, aeson, attoparsec, base, base-compat, ghc-prim
+, haskell-src-meta, hspec, hspec-discover, lib, parsec, scientific
+, template-haskell, text, vector
 }:
 mkDerivation {
   pname = "aeson-qq";
@@ -22,30 +10,12 @@ mkDerivation {
   isExecutable = false;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    aeson
-    attoparsec
-    base
-    base-compat
-    haskell-src-meta
-    parsec
-    scientific
-    template-haskell
-    text
-    vector
+    aeson attoparsec base base-compat haskell-src-meta parsec
+    scientific template-haskell text vector
   ];
   testHaskellDepends = [
-    aeson
-    attoparsec
-    base
-    base-compat
-    ghc-prim
-    haskell-src-meta
-    hspec
-    parsec
-    scientific
-    template-haskell
-    text
-    vector
+    aeson attoparsec base base-compat ghc-prim haskell-src-meta hspec
+    parsec scientific template-haskell text vector
   ];
   testToolDepends = [ hspec-discover ];
   enableLibraryProfiling = true;
@@ -59,4 +29,4 @@ mkDerivation {
   description = "JSON quasiquoter for Haskell";
   license = lib.licenses.mit;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/aeson-yaml.nix b/pkgs/aeson-yaml.nix
index ac2e81777d1e51b8a44828eb6b661474ba0ea091..8f2c4cc4c6e7e45c15490022c82ecfc17c2e8134 100644
--- a/pkgs/aeson-yaml.nix
+++ b/pkgs/aeson-yaml.nix
@@ -1,15 +1,5 @@
-{ mkDerivation
-, aeson
-, base
-, bytestring
-, lib
-, string-qq
-, tasty
-, tasty-discover
-, tasty-hunit
-, text
-, unordered-containers
-, vector
+{ mkDerivation, aeson, base, bytestring, lib, string-qq, tasty
+, tasty-discover, tasty-hunit, text, unordered-containers, vector
 , yaml
 }:
 mkDerivation {
@@ -22,22 +12,11 @@ mkDerivation {
   isExecutable = true;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    aeson
-    base
-    bytestring
-    text
-    unordered-containers
-    vector
+    aeson base bytestring text unordered-containers vector
   ];
   testHaskellDepends = [
-    aeson
-    base
-    bytestring
-    string-qq
-    tasty
-    tasty-hunit
-    unordered-containers
-    yaml
+    aeson base bytestring string-qq tasty tasty-hunit
+    unordered-containers yaml
   ];
   testToolDepends = [ tasty-discover ];
   enableLibraryProfiling = true;
@@ -51,4 +30,4 @@ mkDerivation {
   description = "Output any Aeson value as YAML (pure Haskell library)";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/aeson.nix b/pkgs/aeson.nix
index 24ce8de9b651df405364bd99265f0ba4efaff1a9..a20c5b7fb9843f35b410efdc5ab6194b03740259 100644
--- a/pkgs/aeson.nix
+++ b/pkgs/aeson.nix
@@ -13,8 +13,8 @@ mkDerivation {
   pname = "aeson";
   version = "2.1.2.1";
   sha256 = "5d4042b903ce181ee023bbf908f37a3f55e820c5f0df102683b87f963e3522c6";
-  revision = "2";
-  editedCabalFile = "16ykqg5051pbqrqx0gp3zb3gvfgl5sm3wdnym9y6gv7mg525jkn8";
+  revision = "3";
+  editedCabalFile = "19qj4s625b34kw8ryb2ji0hs6dg2m116x913s722bab316k653av";
   isLibrary = true;
   isExecutable = false;
   enableSeparateDataOutput = false;
diff --git a/pkgs/alex.nix b/pkgs/alex.nix
index 5f895bdf7f0ea28e639f3709464c4b65b4f8afc0..9cc48accad5aafa08c35e118e07214626b444fc6 100644
--- a/pkgs/alex.nix
+++ b/pkgs/alex.nix
@@ -1,10 +1,4 @@
-{ mkDerivation
-, array
-, base
-, containers
-, directory
-, happy
-, lib
+{ mkDerivation, array, base, containers, directory, happy, lib
 , process
 }:
 mkDerivation {
@@ -28,4 +22,4 @@ mkDerivation {
   description = "Alex is a tool for generating lexical analysers in Haskell";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/alsa-core.nix b/pkgs/alsa-core.nix
index 97a61666f52107b03ee0d85777fe8e23ce62b315..b8a5124877d916a00611a4e063e09799e3b62592 100644
--- a/pkgs/alsa-core.nix
+++ b/pkgs/alsa-core.nix
@@ -19,4 +19,4 @@ mkDerivation {
   description = "Binding to the ALSA Library API (Exceptions)";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/alsa-mixer.nix b/pkgs/alsa-mixer.nix
index 955d3fce5e497d973d1046cf07450e4fc1928efb..d91f64f2a0eaff0b1b51b7ccfa444163a76c8bcc 100644
--- a/pkgs/alsa-mixer.nix
+++ b/pkgs/alsa-mixer.nix
@@ -20,4 +20,4 @@ mkDerivation {
   description = "Bindings to the ALSA simple mixer API";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/ansi-wl-pprint.nix b/pkgs/ansi-wl-pprint.nix
index 7b12c119ce0b0268375edff8a42a62f6572b8724..a2659b035fbd498c87d6eb5b3d4e92554608eef6 100644
--- a/pkgs/ansi-wl-pprint.nix
+++ b/pkgs/ansi-wl-pprint.nix
@@ -20,4 +20,4 @@ mkDerivation {
   description = "The Wadler/Leijen Pretty Printer for colored ANSI terminal output";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/ap-normalize.nix b/pkgs/ap-normalize.nix
index 3fec846cddb940789fe8fd0f1da1c79b71b3dd89..7ff47aa4330120a6afa34d6ce39f3112322411ac 100644
--- a/pkgs/ap-normalize.nix
+++ b/pkgs/ap-normalize.nix
@@ -18,4 +18,4 @@ mkDerivation {
   description = "Self-normalizing applicative expressions";
   license = lib.licenses.mit;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/apecs.nix b/pkgs/apecs.nix
index 00e0f46eb7e95d05602e893f79ca6e0a57d5a169..781cacfc44066626b37420964532306261a772ef 100644
--- a/pkgs/apecs.nix
+++ b/pkgs/apecs.nix
@@ -1,15 +1,5 @@
-{ mkDerivation
-, QuickCheck
-, array
-, base
-, containers
-, criterion
-, exceptions
-, lib
-, linear
-, mtl
-, template-haskell
-, vector
+{ mkDerivation, QuickCheck, array, base, containers, criterion
+, exceptions, lib, linear, mtl, template-haskell, vector
 }:
 mkDerivation {
   pname = "apecs";
@@ -21,13 +11,7 @@ mkDerivation {
   isExecutable = false;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    array
-    base
-    containers
-    exceptions
-    mtl
-    template-haskell
-    vector
+    array base containers exceptions mtl template-haskell vector
   ];
   testHaskellDepends = [ base containers linear QuickCheck vector ];
   benchmarkHaskellDepends = [ base criterion linear ];
@@ -42,4 +26,4 @@ mkDerivation {
   description = "Fast Entity-Component-System library for game programming";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/appar.nix b/pkgs/appar.nix
index 093da49a5cb82a33cb34ba5aee1c4ec47f1bcba8..7d661ca8eaec14df7551fb7f46daa5816009f0e2 100644
--- a/pkgs/appar.nix
+++ b/pkgs/appar.nix
@@ -17,4 +17,4 @@ mkDerivation {
   description = "A simple applicative parser";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/asn1-encoding.nix b/pkgs/asn1-encoding.nix
index 91acd89b175ea5d3a450ac771fdb09c0d9b5ece3..e040564bf0cd3768c22750864133b823fd93af43 100644
--- a/pkgs/asn1-encoding.nix
+++ b/pkgs/asn1-encoding.nix
@@ -1,12 +1,5 @@
-{ mkDerivation
-, asn1-types
-, base
-, bytestring
-, hourglass
-, lib
-, mtl
-, tasty
-, tasty-quickcheck
+{ mkDerivation, asn1-types, base, bytestring, hourglass, lib, mtl
+, tasty, tasty-quickcheck
 }:
 mkDerivation {
   pname = "asn1-encoding";
@@ -19,13 +12,7 @@ mkDerivation {
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [ asn1-types base bytestring hourglass ];
   testHaskellDepends = [
-    asn1-types
-    base
-    bytestring
-    hourglass
-    mtl
-    tasty
-    tasty-quickcheck
+    asn1-types base bytestring hourglass mtl tasty tasty-quickcheck
   ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
@@ -38,4 +25,4 @@ mkDerivation {
   description = "ASN1 data reader and writer in RAW, BER and DER forms";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/asn1-parse.nix b/pkgs/asn1-parse.nix
index 993cc46f01379c12e0e68925358a4b115f0ea77a..1d24b63b547b46e2317fe85a79d542e8f1280faf 100644
--- a/pkgs/asn1-parse.nix
+++ b/pkgs/asn1-parse.nix
@@ -7,10 +7,7 @@ mkDerivation {
   isExecutable = false;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    asn1-encoding
-    asn1-types
-    base
-    bytestring
+    asn1-encoding asn1-types base bytestring
   ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
@@ -23,4 +20,4 @@ mkDerivation {
   description = "Simple monadic parser for ASN1 stream types";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/asn1-types.nix b/pkgs/asn1-types.nix
index 234223288bdfb84aa286877da5032c5764bf98a8..1a1ecc20bdacfb2876459b0cdd08bfab628f5e5d 100644
--- a/pkgs/asn1-types.nix
+++ b/pkgs/asn1-types.nix
@@ -18,4 +18,4 @@ mkDerivation {
   description = "ASN.1 types";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/assoc.nix b/pkgs/assoc.nix
index 63bbd1c6b91a4e13be81eae7b04a1e462c9c8692..744355c33779af0c3188b154fea1f3f1b60e03d2 100644
--- a/pkgs/assoc.nix
+++ b/pkgs/assoc.nix
@@ -17,4 +17,4 @@ mkDerivation {
   description = "swap and assoc: Symmetric and Semigroupy Bifunctors";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/async-timer.nix b/pkgs/async-timer.nix
index 6bae66d0f718c1e42acd027712968accf68097e4..cf39ecc3bf027182a3c39730fbfd17e448ba90db 100644
--- a/pkgs/async-timer.nix
+++ b/pkgs/async-timer.nix
@@ -1,14 +1,5 @@
-{ mkDerivation
-, async
-, base
-, containers
-, criterion
-, lib
-, safe-exceptions
-, tasty
-, tasty-hunit
-, unliftio
-, unliftio-core
+{ mkDerivation, async, base, containers, criterion, lib
+, safe-exceptions, tasty, tasty-hunit, unliftio, unliftio-core
 }:
 mkDerivation {
   pname = "async-timer";
@@ -18,19 +9,10 @@ mkDerivation {
   isExecutable = false;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    async
-    base
-    safe-exceptions
-    unliftio
-    unliftio-core
+    async base safe-exceptions unliftio unliftio-core
   ];
   testHaskellDepends = [
-    async
-    base
-    containers
-    criterion
-    tasty
-    tasty-hunit
+    async base containers criterion tasty tasty-hunit
   ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
@@ -43,4 +25,4 @@ mkDerivation {
   description = "Provides API for timer based execution of IO actions";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/async.nix b/pkgs/async.nix
index ffeabeeae67b57675fe070291b4a98bf7b8f3374..3904b4c003a64ed2fdca3c91d77196719bdc6a0b 100644
--- a/pkgs/async.nix
+++ b/pkgs/async.nix
@@ -1,28 +1,18 @@
-{ mkDerivation
-, HUnit
-, base
-, hashable
-, lib
-, stm
-, test-framework
+{ mkDerivation, HUnit, base, hashable, lib, stm, test-framework
 , test-framework-hunit
 }:
 mkDerivation {
   pname = "async";
   version = "2.2.4";
   sha256 = "484df85be0e76c4fed9376451e48e1d0c6e97952ce79735b72d54297e7e0a725";
-  revision = "2";
-  editedCabalFile = "1j93w1krkadqijn59yjiws1366yhcn2mad1irqrk50in6l10k51b";
+  revision = "3";
+  editedCabalFile = "023y75hfcvmjicmq5kxw55h2y729cysh1wlkggmwnv9jr307sdj6";
   isLibrary = true;
   isExecutable = true;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [ base hashable stm ];
   testHaskellDepends = [
-    base
-    HUnit
-    stm
-    test-framework
-    test-framework-hunit
+    base HUnit stm test-framework test-framework-hunit
   ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
@@ -35,4 +25,4 @@ mkDerivation {
   description = "Run IO operations asynchronously and wait for their results";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/atomic-primops.nix b/pkgs/atomic-primops.nix
index 357ef8816f0cfb3b30da80745b387db61161edd0..1efb8eee9382f1b910981dd1ccd856bf05682847 100644
--- a/pkgs/atomic-primops.nix
+++ b/pkgs/atomic-primops.nix
@@ -18,4 +18,4 @@ mkDerivation {
   description = "A safe approach to CAS and other atomic ops in Haskell";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/atomic-write.nix b/pkgs/atomic-write.nix
index 0a95f8eddcf4a380b7d80f66b3283dbbf1e67fba..0752dfb40691fc7e30498a71e912ba190690bac2 100644
--- a/pkgs/atomic-write.nix
+++ b/pkgs/atomic-write.nix
@@ -1,13 +1,5 @@
-{ mkDerivation
-, base
-, bytestring
-, directory
-, filepath
-, hspec
-, lib
-, temporary
-, text
-, unix-compat
+{ mkDerivation, base, bytestring, directory, filepath, hspec, lib
+, temporary, text, unix-compat
 }:
 mkDerivation {
   pname = "atomic-write";
@@ -17,22 +9,10 @@ mkDerivation {
   isExecutable = false;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    base
-    bytestring
-    directory
-    filepath
-    temporary
-    text
-    unix-compat
+    base bytestring directory filepath temporary text unix-compat
   ];
   testHaskellDepends = [
-    base
-    bytestring
-    filepath
-    hspec
-    temporary
-    text
-    unix-compat
+    base bytestring filepath hspec temporary text unix-compat
   ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
@@ -45,4 +25,4 @@ mkDerivation {
   description = "Atomically write to a file";
   license = lib.licenses.mit;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/attoparsec-binary.nix b/pkgs/attoparsec-binary.nix
index 65033afeb7a14d2635fbb0514baa9f0f86f914eb..3a91861f00399b6dc4f3c77564e05c20c929ee82 100644
--- a/pkgs/attoparsec-binary.nix
+++ b/pkgs/attoparsec-binary.nix
@@ -17,4 +17,4 @@ mkDerivation {
   description = "Binary processing extensions to Attoparsec";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/attoparsec-iso8601.nix b/pkgs/attoparsec-iso8601.nix
index 4f525be631db655310d76b8366828746f2abf2d1..7961afa714138ce5287ff8fb10e3e9cf52a45fbe 100644
--- a/pkgs/attoparsec-iso8601.nix
+++ b/pkgs/attoparsec-iso8601.nix
@@ -1,11 +1,5 @@
-{ mkDerivation
-, attoparsec
-, base
-, base-compat-batteries
-, lib
-, text
-, time
-, time-compat
+{ mkDerivation, attoparsec, base, base-compat-batteries, lib, text
+, time, time-compat
 }:
 mkDerivation {
   pname = "attoparsec-iso8601";
@@ -15,12 +9,7 @@ mkDerivation {
   isExecutable = false;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    attoparsec
-    base
-    base-compat-batteries
-    text
-    time
-    time-compat
+    attoparsec base base-compat-batteries text time time-compat
   ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
@@ -33,4 +22,4 @@ mkDerivation {
   description = "Parsing of ISO 8601 dates, originally from aeson";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/attoparsec.nix b/pkgs/attoparsec.nix
index ddfbdf223b11bb114125f53fc40b2130500b34c6..ac5033af82fa2c4c2d9d1e66a73c00e64d4507df 100644
--- a/pkgs/attoparsec.nix
+++ b/pkgs/attoparsec.nix
@@ -1,79 +1,30 @@
-{ mkDerivation
-, QuickCheck
-, array
-, base
-, bytestring
-, case-insensitive
-, containers
-, deepseq
-, directory
-, filepath
-, ghc-prim
-, http-types
-, lib
-, parsec
-, quickcheck-unicode
-, scientific
-, tasty
-, tasty-bench
-, tasty-quickcheck
-, text
-, transformers
-, unordered-containers
-, vector
+{ mkDerivation, QuickCheck, array, base, bytestring
+, case-insensitive, containers, deepseq, directory, filepath
+, ghc-prim, http-types, lib, parsec, quickcheck-unicode, scientific
+, tasty, tasty-bench, tasty-quickcheck, text, transformers
+, unordered-containers, vector
 }:
 mkDerivation {
   pname = "attoparsec";
   version = "0.14.4";
   sha256 = "3f337fe58624565de12426f607c23e60c7b09c86b4e3adfc827ca188c9979e6c";
-  revision = "2";
-  editedCabalFile = "00jyrn2asz1kp698l3fyh19xxxz4npf1993y041x9b9cq239smn0";
+  revision = "3";
+  editedCabalFile = "1ciz49yg6zcaf5dvh5wp3kv92jxa23pblggfldbmy5q54dr5nish";
   isLibrary = true;
   isExecutable = false;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    array
-    base
-    bytestring
-    containers
-    deepseq
-    ghc-prim
-    scientific
-    text
+    array base bytestring containers deepseq ghc-prim scientific text
     transformers
   ];
   testHaskellDepends = [
-    array
-    base
-    bytestring
-    deepseq
-    QuickCheck
-    quickcheck-unicode
-    scientific
-    tasty
-    tasty-quickcheck
-    text
-    transformers
-    vector
+    array base bytestring deepseq QuickCheck quickcheck-unicode
+    scientific tasty tasty-quickcheck text transformers vector
   ];
   benchmarkHaskellDepends = [
-    array
-    base
-    bytestring
-    case-insensitive
-    containers
-    deepseq
-    directory
-    filepath
-    ghc-prim
-    http-types
-    parsec
-    scientific
-    tasty-bench
-    text
-    transformers
-    unordered-containers
-    vector
+    array base bytestring case-insensitive containers deepseq directory
+    filepath ghc-prim http-types parsec scientific tasty-bench text
+    transformers unordered-containers vector
   ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
@@ -82,8 +33,8 @@ mkDerivation {
   doCheck = false;
   doBenchmark = false;
   hyperlinkSource = false;
-  homepage = "https://github.com/bgamari/attoparsec";
+  homepage = "https://github.com/haskell/attoparsec";
   description = "Fast combinator parsing for bytestrings and text";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/authenticate-oauth.nix b/pkgs/authenticate-oauth.nix
index 8575a50d44b538221e988619b0cf024a4c6685c8..0c7aa7ee6856320d3c5358c0d75b497c6089126c 100644
--- a/pkgs/authenticate-oauth.nix
+++ b/pkgs/authenticate-oauth.nix
@@ -1,19 +1,6 @@
-{ mkDerivation
-, RSA
-, SHA
-, base
-, base64-bytestring
-, blaze-builder
-, bytestring
-, crypto-pubkey-types
-, data-default
-, http-client
-, http-types
-, lib
-, random
-, time
-, transformers
-, transformers-compat
+{ mkDerivation, RSA, SHA, base, base64-bytestring, blaze-builder
+, bytestring, crypto-pubkey-types, data-default, http-client
+, http-types, lib, random, time, transformers, transformers-compat
 }:
 mkDerivation {
   pname = "authenticate-oauth";
@@ -25,20 +12,9 @@ mkDerivation {
   isExecutable = false;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    base
-    base64-bytestring
-    blaze-builder
-    bytestring
-    crypto-pubkey-types
-    data-default
-    http-client
-    http-types
-    random
-    RSA
-    SHA
-    time
-    transformers
-    transformers-compat
+    base base64-bytestring blaze-builder bytestring crypto-pubkey-types
+    data-default http-client http-types random RSA SHA time
+    transformers transformers-compat
   ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
@@ -51,4 +27,4 @@ mkDerivation {
   description = "Library to authenticate with OAuth for Haskell web applications";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/auto-update.nix b/pkgs/auto-update.nix
index e12910ba53ac9897605932321518e962784ace38..a119835df2ec99266815ee2001e2c0cb3662135e 100644
--- a/pkgs/auto-update.nix
+++ b/pkgs/auto-update.nix
@@ -19,4 +19,4 @@ mkDerivation {
   description = "Efficiently run periodic, on-demand actions";
   license = lib.licenses.mit;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/autodocodec-servant-multipart.nix b/pkgs/autodocodec-servant-multipart.nix
index 77e54983c207ae9055ef7b457911be8cd3e710be..3eca80dde2d50ee23a7529d065444bce7e1c6ccf 100644
--- a/pkgs/autodocodec-servant-multipart.nix
+++ b/pkgs/autodocodec-servant-multipart.nix
@@ -1,14 +1,6 @@
-{ mkDerivation
-, aeson
-, autodocodec
-, base
-, bytestring
-, lib
-, servant-multipart
-, servant-multipart-api
-, text
-, unordered-containers
-, vector
+{ mkDerivation, aeson, autodocodec, base, bytestring, lib
+, servant-multipart, servant-multipart-api, text
+, unordered-containers, vector
 }:
 mkDerivation {
   pname = "autodocodec-servant-multipart";
@@ -18,15 +10,8 @@ mkDerivation {
   isExecutable = false;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    aeson
-    autodocodec
-    base
-    bytestring
-    servant-multipart
-    servant-multipart-api
-    text
-    unordered-containers
-    vector
+    aeson autodocodec base bytestring servant-multipart
+    servant-multipart-api text unordered-containers vector
   ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
@@ -39,4 +24,4 @@ mkDerivation {
   description = "Autodocodec interpreters for Servant Multipart";
   license = lib.licenses.mit;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/autodocodec-yaml.nix b/pkgs/autodocodec-yaml.nix
index 254c365159813c714dd2651fd68a7aea87df02b1..12fc016ab49e4d5c3c0461270076438f916ed739 100644
--- a/pkgs/autodocodec-yaml.nix
+++ b/pkgs/autodocodec-yaml.nix
@@ -1,40 +1,18 @@
-{ mkDerivation
-, autodocodec
-, autodocodec-schema
-, base
-, bytestring
-, containers
-, lib
-, path
-, path-io
-, safe-coloured-text
-, scientific
-, text
-, unordered-containers
-, vector
-, yaml
+{ mkDerivation, autodocodec, autodocodec-schema, base, bytestring
+, containers, lib, path, path-io, safe-coloured-text, scientific
+, text, unordered-containers, vector, yaml
 }:
 mkDerivation {
   pname = "autodocodec-yaml";
-  version = "0.2.0.2";
-  sha256 = "3d5f811541866f95f44842227bc5d643e7dfa316f1b3075c22d9f3dc6fcd9698";
+  version = "0.2.0.3";
+  sha256 = "6ea45746fafee0e7c286cd96c0dccb26e8466552c5dd990bc1d83e09fe1f8e01";
   isLibrary = true;
   isExecutable = false;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    autodocodec
-    autodocodec-schema
-    base
-    bytestring
-    containers
-    path
-    path-io
-    safe-coloured-text
-    scientific
-    text
-    unordered-containers
-    vector
-    yaml
+    autodocodec autodocodec-schema base bytestring containers path
+    path-io safe-coloured-text scientific text unordered-containers
+    vector yaml
   ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
@@ -47,4 +25,4 @@ mkDerivation {
   description = "Autodocodec interpreters for yaml";
   license = lib.licenses.mit;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/autoexporter.nix b/pkgs/autoexporter.nix
index 72a6486bc90295ca7079d92adc333ee94b0314eb..c8c301f91a139d7e00ab8909eb999736eeec598c 100644
--- a/pkgs/autoexporter.nix
+++ b/pkgs/autoexporter.nix
@@ -1,8 +1,8 @@
 { mkDerivation, Cabal, base, directory, filepath, lib }:
 mkDerivation {
   pname = "autoexporter";
-  version = "2.0.0.2";
-  sha256 = "f1de55da144f0bfaf1e1d9194684d61cd0a7ff825b3a7aae687631daa5a3a880";
+  version = "2.0.0.8";
+  sha256 = "d36e930ff1ad4365efbd62d24dbbb3ed80919e2774973a29a2f74b00e72186a8";
   isLibrary = true;
   isExecutable = true;
   enableSeparateDataOutput = false;
@@ -18,4 +18,4 @@ mkDerivation {
   description = "Automatically re-export modules";
   license = lib.licenses.mit;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/base-prelude.nix b/pkgs/base-prelude.nix
index d49683bd5a9d8d9f6a325b2ccf2b5f9e5fe38cca..3e7ecc2d71aa3accd935c36bd5c8ff53fd3d2a65 100644
--- a/pkgs/base-prelude.nix
+++ b/pkgs/base-prelude.nix
@@ -18,4 +18,4 @@ mkDerivation {
   description = "Featureful preludes formed solely from the \"base\" package";
   license = lib.licenses.mit;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/base16-bytestring.nix b/pkgs/base16-bytestring.nix
index fc36dda01174ce99707b27ecdc0fdab0af83c2b4..c6d243c97f80412da5580cfdece0c848ae729dcb 100644
--- a/pkgs/base16-bytestring.nix
+++ b/pkgs/base16-bytestring.nix
@@ -1,13 +1,5 @@
-{ mkDerivation
-, HUnit
-, QuickCheck
-, base
-, bytestring
-, criterion
-, deepseq
-, lib
-, test-framework
-, test-framework-hunit
+{ mkDerivation, HUnit, QuickCheck, base, bytestring, criterion
+, deepseq, lib, test-framework, test-framework-hunit
 , test-framework-quickcheck2
 }:
 mkDerivation {
@@ -19,13 +11,8 @@ mkDerivation {
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [ base bytestring ];
   testHaskellDepends = [
-    base
-    bytestring
-    HUnit
-    QuickCheck
-    test-framework
-    test-framework-hunit
-    test-framework-quickcheck2
+    base bytestring HUnit QuickCheck test-framework
+    test-framework-hunit test-framework-quickcheck2
   ];
   benchmarkHaskellDepends = [ base bytestring criterion deepseq ];
   enableLibraryProfiling = true;
@@ -39,4 +26,4 @@ mkDerivation {
   description = "RFC 4648-compliant Base16 encodings for ByteStrings";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/base58-bytestring.nix b/pkgs/base58-bytestring.nix
index 21317c857b8aff2d466076f06ff179821773bab9..779a4d5661eff78c62e31e7e75a456bd735fcae4 100644
--- a/pkgs/base58-bytestring.nix
+++ b/pkgs/base58-bytestring.nix
@@ -1,11 +1,5 @@
-{ mkDerivation
-, base
-, bytestring
-, criterion
-, lib
-, quickcheck-assertions
-, quickcheck-instances
-, tasty
+{ mkDerivation, base, bytestring, criterion, lib
+, quickcheck-assertions, quickcheck-instances, tasty
 , tasty-quickcheck
 }:
 mkDerivation {
@@ -17,11 +11,7 @@ mkDerivation {
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [ base bytestring ];
   testHaskellDepends = [
-    base
-    bytestring
-    quickcheck-assertions
-    quickcheck-instances
-    tasty
+    base bytestring quickcheck-assertions quickcheck-instances tasty
     tasty-quickcheck
   ];
   benchmarkHaskellDepends = [ base bytestring criterion ];
@@ -36,4 +26,4 @@ mkDerivation {
   description = "Implementation of BASE58 transcoding for ByteStrings";
   license = lib.licenses.publicDomain;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/base64-bytestring-type.nix b/pkgs/base64-bytestring-type.nix
index 910adc89e9ded3c13bcb1e39c9dfd79e07925001..7f159976bd14a4836bda85e3fbb8f43ccd52d7e1 100644
--- a/pkgs/base64-bytestring-type.nix
+++ b/pkgs/base64-bytestring-type.nix
@@ -1,20 +1,6 @@
-{ mkDerivation
-, QuickCheck
-, aeson
-, base
-, base-compat
-, base64-bytestring
-, binary
-, bytestring
-, cereal
-, deepseq
-, hashable
-, http-api-data
-, lib
-, serialise
-, tasty
-, tasty-quickcheck
-, text
+{ mkDerivation, QuickCheck, aeson, base, base-compat
+, base64-bytestring, binary, bytestring, cereal, deepseq, hashable
+, http-api-data, lib, serialise, tasty, tasty-quickcheck, text
 }:
 mkDerivation {
   pname = "base64-bytestring-type";
@@ -26,29 +12,11 @@ mkDerivation {
   isExecutable = false;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    aeson
-    base
-    base-compat
-    base64-bytestring
-    binary
-    bytestring
-    cereal
-    deepseq
-    hashable
-    http-api-data
-    QuickCheck
-    serialise
-    text
+    aeson base base-compat base64-bytestring binary bytestring cereal
+    deepseq hashable http-api-data QuickCheck serialise text
   ];
   testHaskellDepends = [
-    aeson
-    base
-    binary
-    bytestring
-    cereal
-    http-api-data
-    serialise
-    tasty
+    aeson base binary bytestring cereal http-api-data serialise tasty
     tasty-quickcheck
   ];
   enableLibraryProfiling = true;
@@ -62,4 +30,4 @@ mkDerivation {
   description = "A newtype around ByteString, for base64 encoding";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/base64-bytestring.nix b/pkgs/base64-bytestring.nix
index c3fbc76db64d756225a1b18dd617262839094035..a8dae78999e7ac006eb49254c0bed3fa93815e91 100644
--- a/pkgs/base64-bytestring.nix
+++ b/pkgs/base64-bytestring.nix
@@ -1,13 +1,5 @@
-{ mkDerivation
-, HUnit
-, QuickCheck
-, base
-, bytestring
-, criterion
-, deepseq
-, lib
-, test-framework
-, test-framework-hunit
+{ mkDerivation, HUnit, QuickCheck, base, bytestring, criterion
+, deepseq, lib, test-framework, test-framework-hunit
 , test-framework-quickcheck2
 }:
 mkDerivation {
@@ -19,13 +11,8 @@ mkDerivation {
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [ base bytestring ];
   testHaskellDepends = [
-    base
-    bytestring
-    HUnit
-    QuickCheck
-    test-framework
-    test-framework-hunit
-    test-framework-quickcheck2
+    base bytestring HUnit QuickCheck test-framework
+    test-framework-hunit test-framework-quickcheck2
   ];
   benchmarkHaskellDepends = [ base bytestring criterion deepseq ];
   enableLibraryProfiling = true;
@@ -39,4 +26,4 @@ mkDerivation {
   description = "Fast base64 encoding and decoding for ByteStrings";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/base64.nix b/pkgs/base64.nix
index e87f5e87f147b656729ee70f33cc98fc68793ae0..25ec03d20ddc84b628947b080c737005cdaee90f 100644
--- a/pkgs/base64.nix
+++ b/pkgs/base64.nix
@@ -1,54 +1,26 @@
-{ mkDerivation
-, QuickCheck
-, base
-, base64-bytestring
-, bytestring
-, criterion
-, deepseq
-, lib
-, random-bytestring
-, tasty
-, tasty-hunit
-, tasty-quickcheck
-, text
-, text-short
+{ mkDerivation, QuickCheck, base, base64-bytestring, bytestring
+, criterion, deepseq, lib, random-bytestring, tasty, tasty-hunit
+, tasty-quickcheck, text, text-short
 }:
 mkDerivation {
   pname = "base64";
   version = "0.4.2.4";
   sha256 = "640a2d0afcb07e1de2e0a13a5e942b0265781c5942bd642a8793e7b019be3585";
-  revision = "2";
-  editedCabalFile = "0cz3zzz9k490w9nfn4hpgdw4zx4w70fwqrwsfx8svcwqssqibqw3";
+  revision = "3";
+  editedCabalFile = "1mcr0pp5b7xnj68m8d42pw9pgjj6p5v1p0g93s78n0nm605kl40h";
   isLibrary = true;
   isExecutable = false;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    base
-    bytestring
-    deepseq
-    text
-    text-short
+    base bytestring deepseq text text-short
   ];
   testHaskellDepends = [
-    base
-    base64-bytestring
-    bytestring
-    QuickCheck
-    random-bytestring
-    tasty
-    tasty-hunit
-    tasty-quickcheck
-    text
-    text-short
+    base base64-bytestring bytestring QuickCheck random-bytestring
+    tasty tasty-hunit tasty-quickcheck text text-short
   ];
   benchmarkHaskellDepends = [
-    base
-    base64-bytestring
-    bytestring
-    criterion
-    deepseq
-    random-bytestring
-    text
+    base base64-bytestring bytestring criterion deepseq
+    random-bytestring text
   ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
@@ -61,4 +33,4 @@ mkDerivation {
   description = "A modern RFC 4648-compliant Base64 library";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/basement.nix b/pkgs/basement.nix
index 492c81594ab36e8463900788be301633a4a44856..6da0a31c1f6cd25f71a8357c262b9a6f6d63686e 100644
--- a/pkgs/basement.nix
+++ b/pkgs/basement.nix
@@ -18,4 +18,4 @@ mkDerivation {
   description = "Foundation scrap box of array & string";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/beam-core.nix b/pkgs/beam-core.nix
index 716a1f8193e0bf425acbabffc0c5e1e7efca4c39..609fa5fcbf1dd4637a8f0f666ce170abd0a53111 100644
--- a/pkgs/beam-core.nix
+++ b/pkgs/beam-core.nix
@@ -1,25 +1,7 @@
-{ mkDerivation
-, aeson
-, base
-, bytestring
-, containers
-, dlist
-, fetchgit
-, free
-, ghc-prim
-, hashable
-, lib
-, microlens
-, mtl
-, network-uri
-, scientific
-, tagged
-, tasty
-, tasty-hunit
-, text
-, time
-, vector
-, vector-sized
+{ mkDerivation, aeson, base, bytestring, containers, dlist
+, fetchgit, free, ghc-prim, hashable, lib, microlens, mtl
+, network-uri, scientific, tagged, tasty, tasty-hunit, text, time
+, vector, vector-sized
 }:
 mkDerivation {
   pname = "beam-core";
@@ -35,31 +17,12 @@ mkDerivation {
   isExecutable = false;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    aeson
-    base
-    bytestring
-    containers
-    dlist
-    free
-    ghc-prim
-    hashable
-    microlens
-    mtl
-    network-uri
-    scientific
-    tagged
-    text
-    time
-    vector
+    aeson base bytestring containers dlist free ghc-prim hashable
+    microlens mtl network-uri scientific tagged text time vector
     vector-sized
   ];
   testHaskellDepends = [
-    base
-    bytestring
-    tasty
-    tasty-hunit
-    text
-    time
+    base bytestring tasty tasty-hunit text time
   ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
@@ -72,4 +35,4 @@ mkDerivation {
   description = "Type-safe, feature-complete SQL query and manipulation interface for Haskell";
   license = lib.licenses.mit;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/beam-migrate.nix b/pkgs/beam-migrate.nix
index 5c84ae45b2c76cee71b51104047b5316f949c4bf..81f250774c17eb1ea5c60eb6835b44da694fb94f 100644
--- a/pkgs/beam-migrate.nix
+++ b/pkgs/beam-migrate.nix
@@ -1,28 +1,7 @@
-{ mkDerivation
-, aeson
-, base
-, beam-core
-, bytestring
-, containers
-, deepseq
-, dependent-map
-, dependent-sum
-, fetchgit
-, free
-, ghc-prim
-, hashable
-, haskell-src-exts
-, lib
-, microlens
-, mtl
-, parallel
-, pqueue
-, pretty
-, scientific
-, text
-, time
-, unordered-containers
-, uuid-types
+{ mkDerivation, aeson, base, beam-core, bytestring, containers
+, deepseq, dependent-map, dependent-sum, fetchgit, free, ghc-prim
+, hashable, haskell-src-exts, lib, microlens, mtl, parallel, pqueue
+, pretty, scientific, text, time, unordered-containers, uuid-types
 , vector
 }:
 mkDerivation {
@@ -39,29 +18,10 @@ mkDerivation {
   isExecutable = false;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    aeson
-    base
-    beam-core
-    bytestring
-    containers
-    deepseq
-    dependent-map
-    dependent-sum
-    free
-    ghc-prim
-    hashable
-    haskell-src-exts
-    microlens
-    mtl
-    parallel
-    pqueue
-    pretty
-    scientific
-    text
-    time
-    unordered-containers
-    uuid-types
-    vector
+    aeson base beam-core bytestring containers deepseq dependent-map
+    dependent-sum free ghc-prim hashable haskell-src-exts microlens mtl
+    parallel pqueue pretty scientific text time unordered-containers
+    uuid-types vector
   ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
@@ -74,4 +34,4 @@ mkDerivation {
   description = "SQL DDL support and migrations support library for Beam";
   license = lib.licenses.mit;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/beam-postgres.nix b/pkgs/beam-postgres.nix
index 4afa4708d696eddc3804eeb9ed8e4b3e0307392f..c7454d84aa4c2af7212abc5ddfd34564c46ba47c 100644
--- a/pkgs/beam-postgres.nix
+++ b/pkgs/beam-postgres.nix
@@ -1,36 +1,9 @@
-{ mkDerivation
-, aeson
-, attoparsec
-, base
-, beam-core
-, beam-migrate
-, bytestring
-, case-insensitive
-, conduit
-, fetchgit
-, free
-, hashable
-, haskell-src-exts
-, hedgehog
-, lib
-, lifted-base
-, monad-control
-, mtl
-, network-uri
-, postgresql-libpq
-, postgresql-simple
-, scientific
-, tagged
-, tasty
-, tasty-hunit
-, text
-, time
-, tmp-postgres
-, transformers-base
-, unordered-containers
-, uuid
-, uuid-types
-, vector
+{ mkDerivation, aeson, attoparsec, base, beam-core, beam-migrate
+, bytestring, case-insensitive, conduit, fetchgit, free, hashable
+, haskell-src-exts, hedgehog, lib, lifted-base, monad-control, mtl
+, network-uri, postgresql-libpq, postgresql-simple, scientific
+, tagged, tasty, tasty-hunit, text, time, tmp-postgres
+, transformers-base, unordered-containers, uuid, uuid-types, vector
 }:
 mkDerivation {
   pname = "beam-postgres";
@@ -46,46 +19,15 @@ mkDerivation {
   isExecutable = false;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    aeson
-    attoparsec
-    base
-    beam-core
-    beam-migrate
-    bytestring
-    case-insensitive
-    conduit
-    free
-    hashable
-    haskell-src-exts
-    lifted-base
-    monad-control
-    mtl
-    network-uri
-    postgresql-libpq
-    postgresql-simple
-    scientific
-    tagged
-    text
-    time
-    transformers-base
-    unordered-containers
-    uuid-types
-    vector
+    aeson attoparsec base beam-core beam-migrate bytestring
+    case-insensitive conduit free hashable haskell-src-exts lifted-base
+    monad-control mtl network-uri postgresql-libpq postgresql-simple
+    scientific tagged text time transformers-base unordered-containers
+    uuid-types vector
   ];
   testHaskellDepends = [
-    aeson
-    base
-    beam-core
-    beam-migrate
-    bytestring
-    hedgehog
-    postgresql-simple
-    tasty
-    tasty-hunit
-    text
-    tmp-postgres
-    uuid
-    vector
+    aeson base beam-core beam-migrate bytestring hedgehog
+    postgresql-simple tasty tasty-hunit text tmp-postgres uuid vector
   ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
@@ -98,4 +40,4 @@ mkDerivation {
   description = "Connection layer between beam and postgres";
   license = lib.licenses.mit;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/beam-sqlite.nix b/pkgs/beam-sqlite.nix
index 96553036b57e82af579d9b8fac8b8a57613569c3..e643539534b90a9b467dd4bea30d5d7ad374e397 100644
--- a/pkgs/beam-sqlite.nix
+++ b/pkgs/beam-sqlite.nix
@@ -1,27 +1,8 @@
-{ mkDerivation
-, aeson
-, attoparsec
-, base
-, beam-core
-, beam-migrate
-, bytestring
-, dlist
-, fetchgit
-, free
-, hashable
-, lib
-, monad-control
-, mtl
-, network-uri
-, scientific
-, sqlite-simple
-, tasty
-, tasty-expected-failure
-, tasty-hunit
-, text
-, time
-, transformers-base
-, unix
+{ mkDerivation, aeson, attoparsec, base, beam-core, beam-migrate
+, bytestring, dlist, fetchgit, free, hashable, lib, monad-control
+, mtl, network-uri, scientific, sqlite-simple, tasty
+, tasty-expected-failure, tasty-hunit, text, time
+, transformers-base, unix
 }:
 mkDerivation {
   pname = "beam-sqlite";
@@ -37,35 +18,13 @@ mkDerivation {
   isExecutable = false;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    aeson
-    attoparsec
-    base
-    beam-core
-    beam-migrate
-    bytestring
-    dlist
-    free
-    hashable
-    monad-control
-    mtl
-    network-uri
-    scientific
-    sqlite-simple
-    text
-    time
-    transformers-base
-    unix
+    aeson attoparsec base beam-core beam-migrate bytestring dlist free
+    hashable monad-control mtl network-uri scientific sqlite-simple
+    text time transformers-base unix
   ];
   testHaskellDepends = [
-    base
-    beam-core
-    beam-migrate
-    sqlite-simple
-    tasty
-    tasty-expected-failure
-    tasty-hunit
-    text
-    time
+    base beam-core beam-migrate sqlite-simple tasty
+    tasty-expected-failure tasty-hunit text time
   ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
@@ -78,4 +37,4 @@ mkDerivation {
   description = "Beam driver for SQLite";
   license = lib.licenses.mit;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/bech32-th.nix b/pkgs/bech32-th.nix
index 4a2bbf5fb18146a358924116f12f724f2b512d37..9bbec035069c9f0b9a1f9fa84a7b64e326d67496 100644
--- a/pkgs/bech32-th.nix
+++ b/pkgs/bech32-th.nix
@@ -1,11 +1,5 @@
-{ mkDerivation
-, base
-, bech32
-, hspec
-, hspec-discover
-, lib
-, template-haskell
-, text
+{ mkDerivation, base, bech32, hspec, hspec-discover, lib
+, template-haskell, text
 }:
 mkDerivation {
   pname = "bech32-th";
@@ -28,4 +22,4 @@ mkDerivation {
   description = "Template Haskell extensions to the Bech32 library";
   license = lib.licenses.asl20;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/bech32.nix b/pkgs/bech32.nix
index 527a84e49f8106b41364fdad6da4f10d6abe7450..c0d3905afb7a3af3384d2d4a2ca3a48777a87308 100644
--- a/pkgs/bech32.nix
+++ b/pkgs/bech32.nix
@@ -1,20 +1,6 @@
-{ mkDerivation
-, QuickCheck
-, array
-, base
-, base58-bytestring
-, bytestring
-, containers
-, deepseq
-, extra
-, hspec
-, hspec-discover
-, lib
-, memory
-, optparse-applicative
-, process
-, text
-, vector
+{ mkDerivation, QuickCheck, array, base, base58-bytestring
+, bytestring, containers, deepseq, extra, hspec, hspec-discover
+, lib, memory, optparse-applicative, process, text, vector
 }:
 mkDerivation {
   pname = "bech32";
@@ -24,35 +10,15 @@ mkDerivation {
   isExecutable = true;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    array
-    base
-    bytestring
-    containers
-    extra
-    text
+    array base bytestring containers extra text
   ];
   executableHaskellDepends = [
-    base
-    base58-bytestring
-    bytestring
-    extra
-    memory
-    optparse-applicative
+    base base58-bytestring bytestring extra memory optparse-applicative
     text
   ];
   testHaskellDepends = [
-    base
-    base58-bytestring
-    bytestring
-    containers
-    deepseq
-    extra
-    hspec
-    memory
-    process
-    QuickCheck
-    text
-    vector
+    base base58-bytestring bytestring containers deepseq extra hspec
+    memory process QuickCheck text vector
   ];
   testToolDepends = [ hspec-discover ];
   enableLibraryProfiling = true;
@@ -66,4 +32,4 @@ mkDerivation {
   description = "Implementation of the Bech32 cryptocurrency address format (BIP 0173)";
   license = lib.licenses.asl20;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/bifunctors.nix b/pkgs/bifunctors.nix
index 4b07406b37d4c6588b2d87194784d838173543a4..8e5651ff1db8b6e86323ed2159b4ffe1ff3fbe52 100644
--- a/pkgs/bifunctors.nix
+++ b/pkgs/bifunctors.nix
@@ -1,17 +1,6 @@
-{ mkDerivation
-, QuickCheck
-, assoc
-, base
-, comonad
-, containers
-, foldable1-classes-compat
-, hspec
-, hspec-discover
-, lib
-, tagged
-, template-haskell
-, th-abstraction
-, transformers
+{ mkDerivation, QuickCheck, assoc, base, comonad, containers
+, foldable1-classes-compat, hspec, hspec-discover, lib, tagged
+, template-haskell, th-abstraction, transformers
 , transformers-compat
 }:
 mkDerivation {
@@ -22,22 +11,11 @@ mkDerivation {
   isExecutable = false;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    assoc
-    base
-    comonad
-    containers
-    foldable1-classes-compat
-    tagged
-    template-haskell
-    th-abstraction
-    transformers
+    assoc base comonad containers foldable1-classes-compat tagged
+    template-haskell th-abstraction transformers
   ];
   testHaskellDepends = [
-    base
-    hspec
-    QuickCheck
-    template-haskell
-    transformers
+    base hspec QuickCheck template-haskell transformers
     transformers-compat
   ];
   testToolDepends = [ hspec-discover ];
@@ -52,4 +30,4 @@ mkDerivation {
   description = "Bifunctors";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/bimap.nix b/pkgs/bimap.nix
index 48b5d33ff4246e63a2875afbbfd2fcdddf770cf0..458bc537b70539993365a124077b010e01273c9e 100644
--- a/pkgs/bimap.nix
+++ b/pkgs/bimap.nix
@@ -1,11 +1,5 @@
-{ mkDerivation
-, QuickCheck
-, base
-, containers
-, deepseq
-, exceptions
-, lib
-, template-haskell
+{ mkDerivation, QuickCheck, base, containers, deepseq, exceptions
+, lib, template-haskell
 }:
 mkDerivation {
   pname = "bimap";
@@ -16,12 +10,7 @@ mkDerivation {
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [ base containers deepseq exceptions ];
   testHaskellDepends = [
-    base
-    containers
-    deepseq
-    exceptions
-    QuickCheck
-    template-haskell
+    base containers deepseq exceptions QuickCheck template-haskell
   ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
@@ -34,4 +23,4 @@ mkDerivation {
   description = "Bidirectional mapping between two key types";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/bin.nix b/pkgs/bin.nix
index 970912df6d18a3c8b4b0d22d87de31d2b8e51688..4e99548533b471951c530d021a567dfe3cfc4d63 100644
--- a/pkgs/bin.nix
+++ b/pkgs/bin.nix
@@ -1,13 +1,5 @@
-{ mkDerivation
-, QuickCheck
-, base
-, boring
-, dec
-, deepseq
-, fin
-, hashable
-, lib
-, some
+{ mkDerivation, QuickCheck, base, boring, dec, deepseq, fin
+, hashable, lib, some
 }:
 mkDerivation {
   pname = "bin";
@@ -19,14 +11,7 @@ mkDerivation {
   isExecutable = false;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    base
-    boring
-    dec
-    deepseq
-    fin
-    hashable
-    QuickCheck
-    some
+    base boring dec deepseq fin hashable QuickCheck some
   ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
@@ -39,4 +24,4 @@ mkDerivation {
   description = "Bin: binary natural numbers";
   license = lib.licenses.gpl2Plus;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/bitvec.nix b/pkgs/bitvec.nix
index dfe3e0cd35ee7b47552741ba6b620b785867f890..be08100aba57e8e492d9de8749172717d11e07b5 100644
--- a/pkgs/bitvec.nix
+++ b/pkgs/bitvec.nix
@@ -1,18 +1,6 @@
-{ mkDerivation
-, base
-, bytestring
-, containers
-, deepseq
-, ghc-bignum
-, lib
-, primitive
-, quickcheck-classes
-, quickcheck-classes-base
-, random
-, tasty
-, tasty-bench
-, tasty-quickcheck
-, vector
+{ mkDerivation, base, bytestring, containers, deepseq, ghc-bignum
+, lib, primitive, quickcheck-classes, quickcheck-classes-base
+, random, tasty, tasty-bench, tasty-quickcheck, vector
 }:
 mkDerivation {
   pname = "bitvec";
@@ -22,30 +10,14 @@ mkDerivation {
   isExecutable = false;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    base
-    bytestring
-    deepseq
-    ghc-bignum
-    primitive
-    vector
+    base bytestring deepseq ghc-bignum primitive vector
   ];
   testHaskellDepends = [
-    base
-    ghc-bignum
-    primitive
-    quickcheck-classes
-    quickcheck-classes-base
-    tasty
-    tasty-quickcheck
-    vector
+    base ghc-bignum primitive quickcheck-classes
+    quickcheck-classes-base tasty tasty-quickcheck vector
   ];
   benchmarkHaskellDepends = [
-    base
-    containers
-    ghc-bignum
-    random
-    tasty-bench
-    vector
+    base containers ghc-bignum random tasty-bench vector
   ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
@@ -58,4 +30,4 @@ mkDerivation {
   description = "Space-efficient bit vectors";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/blaze-builder.nix b/pkgs/blaze-builder.nix
index 4322af96ae2e1d2474e46a2673bb3297ff302d47..029f8fc4e5e2bf69059ca7f7741d47ae9159c849 100644
--- a/pkgs/blaze-builder.nix
+++ b/pkgs/blaze-builder.nix
@@ -1,16 +1,6 @@
-{ mkDerivation
-, HUnit
-, QuickCheck
-, base
-, bytestring
-, deepseq
-, ghc-prim
-, lib
-, test-framework
-, test-framework-hunit
-, test-framework-quickcheck2
-, text
-, utf8-string
+{ mkDerivation, HUnit, QuickCheck, base, bytestring, deepseq
+, ghc-prim, lib, test-framework, test-framework-hunit
+, test-framework-quickcheck2, text, utf8-string
 }:
 mkDerivation {
   pname = "blaze-builder";
@@ -23,15 +13,8 @@ mkDerivation {
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [ base bytestring deepseq ghc-prim text ];
   testHaskellDepends = [
-    base
-    bytestring
-    HUnit
-    QuickCheck
-    test-framework
-    test-framework-hunit
-    test-framework-quickcheck2
-    text
-    utf8-string
+    base bytestring HUnit QuickCheck test-framework
+    test-framework-hunit test-framework-quickcheck2 text utf8-string
   ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
@@ -44,4 +27,4 @@ mkDerivation {
   description = "Efficient buffered output";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/blaze-html.nix b/pkgs/blaze-html.nix
index ddf408a80d74e41f03e50db15e6f8dba759e631f..e9bd3636ee9796facafc305f48d94160801c059f 100644
--- a/pkgs/blaze-html.nix
+++ b/pkgs/blaze-html.nix
@@ -1,16 +1,6 @@
-{ mkDerivation
-, HUnit
-, QuickCheck
-, base
-, blaze-builder
-, blaze-markup
-, bytestring
-, containers
-, lib
-, test-framework
-, test-framework-hunit
-, test-framework-quickcheck2
-, text
+{ mkDerivation, HUnit, QuickCheck, base, blaze-builder
+, blaze-markup, bytestring, containers, lib, test-framework
+, test-framework-hunit, test-framework-quickcheck2, text
 }:
 mkDerivation {
   pname = "blaze-html";
@@ -22,24 +12,12 @@ mkDerivation {
   isExecutable = false;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    base
-    blaze-builder
-    blaze-markup
-    bytestring
-    text
+    base blaze-builder blaze-markup bytestring text
   ];
   testHaskellDepends = [
-    base
-    blaze-builder
-    blaze-markup
-    bytestring
-    containers
-    HUnit
-    QuickCheck
-    test-framework
-    test-framework-hunit
-    test-framework-quickcheck2
-    text
+    base blaze-builder blaze-markup bytestring containers HUnit
+    QuickCheck test-framework test-framework-hunit
+    test-framework-quickcheck2 text
   ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
@@ -52,4 +30,4 @@ mkDerivation {
   description = "A blazingly fast HTML combinator library for Haskell";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/blaze-markup.nix b/pkgs/blaze-markup.nix
index aa929fa510bc091fb75728dbfff0ddedd4aa88d8..9a4fd0000528a5d37adb2beeecabb541206b4ba9 100644
--- a/pkgs/blaze-markup.nix
+++ b/pkgs/blaze-markup.nix
@@ -1,37 +1,19 @@
-{ mkDerivation
-, HUnit
-, QuickCheck
-, base
-, blaze-builder
-, bytestring
-, containers
-, lib
-, tasty
-, tasty-hunit
-, tasty-quickcheck
-, text
+{ mkDerivation, HUnit, QuickCheck, base, blaze-builder, bytestring
+, containers, lib, tasty, tasty-hunit, tasty-quickcheck, text
 }:
 mkDerivation {
   pname = "blaze-markup";
   version = "0.8.2.8";
   sha256 = "43fc3f6872dc8d1be8d0fe091bd4775139b42179987f33d6490a7c5f1e07a349";
-  revision = "3";
-  editedCabalFile = "1hn694kk615prqdn7bfzl0wvbw8bksxk4cxwmx8yhwpl0cq3fiwa";
+  revision = "4";
+  editedCabalFile = "1vlyk6nw2i9bbrvzdq42cd2583lfc8i9rcgmqcvdz5rkp47hbzm8";
   isLibrary = true;
   isExecutable = false;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [ base blaze-builder bytestring text ];
   testHaskellDepends = [
-    base
-    blaze-builder
-    bytestring
-    containers
-    HUnit
-    QuickCheck
-    tasty
-    tasty-hunit
-    tasty-quickcheck
-    text
+    base blaze-builder bytestring containers HUnit QuickCheck tasty
+    tasty-hunit tasty-quickcheck text
   ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
@@ -44,4 +26,4 @@ mkDerivation {
   description = "A blazingly fast markup combinator library for Haskell";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/blaze-svg.nix b/pkgs/blaze-svg.nix
index 2d0cd2183aa40c1382a0b51f7a46e5a154b0f816..d489e7e53b0d820dce967ea42eb3d14832721200 100644
--- a/pkgs/blaze-svg.nix
+++ b/pkgs/blaze-svg.nix
@@ -20,4 +20,4 @@ mkDerivation {
   description = "SVG combinator library";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/bsb-http-chunked.nix b/pkgs/bsb-http-chunked.nix
index a2e5a4bae4b164fe728e664d34465ebb14e842a1..4293145ece5173b642c79ce9941d913b159b2c4c 100644
--- a/pkgs/bsb-http-chunked.nix
+++ b/pkgs/bsb-http-chunked.nix
@@ -1,17 +1,6 @@
-{ mkDerivation
-, attoparsec
-, base
-, blaze-builder
-, bytestring
-, deepseq
-, doctest
-, gauge
-, hedgehog
-, lib
-, semigroups
-, tasty
-, tasty-hedgehog
-, tasty-hunit
+{ mkDerivation, attoparsec, base, blaze-builder, bytestring
+, deepseq, doctest, gauge, hedgehog, lib, semigroups, tasty
+, tasty-hedgehog, tasty-hunit
 }:
 mkDerivation {
   pname = "bsb-http-chunked";
@@ -24,23 +13,11 @@ mkDerivation {
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [ base bytestring ];
   testHaskellDepends = [
-    attoparsec
-    base
-    blaze-builder
-    bytestring
-    doctest
-    hedgehog
-    tasty
-    tasty-hedgehog
-    tasty-hunit
+    attoparsec base blaze-builder bytestring doctest hedgehog tasty
+    tasty-hedgehog tasty-hunit
   ];
   benchmarkHaskellDepends = [
-    base
-    blaze-builder
-    bytestring
-    deepseq
-    gauge
-    semigroups
+    base blaze-builder bytestring deepseq gauge semigroups
   ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
@@ -53,4 +30,4 @@ mkDerivation {
   description = "Chunked HTTP transfer encoding for bytestring builders";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/byteable.nix b/pkgs/byteable.nix
index b49ba3bc3b7ea455d07f16fd6bbb0db99f82b5da..aba669f79c85be4d03d3e019779bfd14410e2666 100644
--- a/pkgs/byteable.nix
+++ b/pkgs/byteable.nix
@@ -18,4 +18,4 @@ mkDerivation {
   description = "Type class for sequence of bytes";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/byteorder.nix b/pkgs/byteorder.nix
index e0f604a7012c2200e926dfe6f7948b9852ded0ef..82aa6e0ae8b452339a3e4264e0b86b18149f84b6 100644
--- a/pkgs/byteorder.nix
+++ b/pkgs/byteorder.nix
@@ -18,4 +18,4 @@ mkDerivation {
   description = "Exposes the native endianness or byte ordering of the system";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/bytes.nix b/pkgs/bytes.nix
index 75ef1bfa22df812cb9b95460d85bc9639ceac185..5bbe9720d11b2444e466bdf83d017d4da474bca8 100644
--- a/pkgs/bytes.nix
+++ b/pkgs/bytes.nix
@@ -1,20 +1,6 @@
-{ mkDerivation
-, base
-, binary
-, binary-orphans
-, bytestring
-, cereal
-, containers
-, hashable
-, lib
-, mtl
-, scientific
-, text
-, time
-, transformers
-, transformers-compat
-, unordered-containers
-, void
+{ mkDerivation, base, binary, binary-orphans, bytestring, cereal
+, containers, hashable, lib, mtl, scientific, text, time
+, transformers, transformers-compat, unordered-containers, void
 }:
 mkDerivation {
   pname = "bytes";
@@ -26,21 +12,9 @@ mkDerivation {
   isExecutable = false;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    base
-    binary
-    binary-orphans
-    bytestring
-    cereal
-    containers
-    hashable
-    mtl
-    scientific
-    text
-    time
-    transformers
-    transformers-compat
-    unordered-containers
-    void
+    base binary binary-orphans bytestring cereal containers hashable
+    mtl scientific text time transformers transformers-compat
+    unordered-containers void
   ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
@@ -53,4 +27,4 @@ mkDerivation {
   description = "Sharing code for serialization between binary and cereal";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/bytestring-builder.nix b/pkgs/bytestring-builder.nix
index 19bf70ba6b933cd6b0118208e1698665a8592b18..3d1093f16f28eed473597a6b8c19190d384291ff 100644
--- a/pkgs/bytestring-builder.nix
+++ b/pkgs/bytestring-builder.nix
@@ -17,4 +17,4 @@ mkDerivation {
   description = "The new bytestring builder, packaged outside of GHC";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/c2hs.nix b/pkgs/c2hs.nix
index 2c53299cd1625179509067eb62ee9247e2ed972c..ceb0d2ff16a60406c89b34dc638a28fd67ade9ea 100644
--- a/pkgs/c2hs.nix
+++ b/pkgs/c2hs.nix
@@ -1,51 +1,22 @@
-{ mkDerivation
-, HUnit
-, array
-, base
-, bytestring
-, containers
-, directory
-, dlist
-, filepath
-, language-c
-, lib
-, pretty
-, process
-, shelly
-, test-framework
-, test-framework-hunit
-, text
-, transformers
+{ mkDerivation, HUnit, array, base, bytestring, containers
+, directory, dlist, filepath, language-c, lib, pretty, process
+, shelly, test-framework, test-framework-hunit, text, transformers
 }:
 mkDerivation {
   pname = "c2hs";
   version = "0.28.8";
   sha256 = "390632cffc561c32483af474aac50168a68f0fa382096552e37749923617884c";
-  revision = "1";
-  editedCabalFile = "0hbv1j9b04gm617c5xqndr4iqidabwdpcn2dcrnaacc04ylchvl2";
+  revision = "2";
+  editedCabalFile = "14j3sjxvwhj32zpz0iyigc6wdn6pjm3vlgs0prq0grvk48p176f3";
   isLibrary = false;
   isExecutable = true;
   enableSeparateDataOutput = true;
   executableHaskellDepends = [
-    array
-    base
-    bytestring
-    containers
-    directory
-    dlist
-    filepath
-    language-c
-    pretty
-    process
+    array base bytestring containers directory dlist filepath
+    language-c pretty process
   ];
   testHaskellDepends = [
-    base
-    filepath
-    HUnit
-    shelly
-    test-framework
-    test-framework-hunit
-    text
+    base filepath HUnit shelly test-framework test-framework-hunit text
     transformers
   ];
   enableLibraryProfiling = true;
@@ -59,4 +30,4 @@ mkDerivation {
   description = "C->Haskell FFI tool that gives some cross-language type safety";
   license = lib.licenses.gpl2Only;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/cabal-doctest.nix b/pkgs/cabal-doctest.nix
index 4189014eda266e7db679ae612bf7c07657f954b0..fd3eddae402b8495faa05ebbf397ca9a35c232e1 100644
--- a/pkgs/cabal-doctest.nix
+++ b/pkgs/cabal-doctest.nix
@@ -3,8 +3,8 @@ mkDerivation {
   pname = "cabal-doctest";
   version = "1.0.9";
   sha256 = "5556088496111d33810c4ae6c4a065bb37fa3315e9e8891e8000b1ab6707ba73";
-  revision = "2";
-  editedCabalFile = "0868js0qgfhvmyw4hjzrvmlzyqsm8dfsbmqhybxb90x44xi3r0i1";
+  revision = "3";
+  editedCabalFile = "0mh64vifcy5dbbx2n3llhbxx8mczifmipyqwrsb3vx2p2jyhvskd";
   isLibrary = true;
   isExecutable = false;
   enableSeparateDataOutput = false;
@@ -20,4 +20,4 @@ mkDerivation {
   description = "A Setup.hs helper for running doctests";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/cabal-install-solver.nix b/pkgs/cabal-install-solver.nix
index bd9c82e1889815975cc29fe832ae0f6f42b28018..ed39aad2e78d9ab77421ccec08dd2811543964db 100644
--- a/pkgs/cabal-install-solver.nix
+++ b/pkgs/cabal-install-solver.nix
@@ -1,19 +1,6 @@
-{ mkDerivation
-, Cabal
-, Cabal-syntax
-, array
-, base
-, bytestring
-, containers
-, edit-distance
-, filepath
-, lib
-, mtl
-, pretty
-, tasty
-, tasty-hunit
-, tasty-quickcheck
-, transformers
+{ mkDerivation, Cabal, Cabal-syntax, array, base, bytestring
+, containers, edit-distance, filepath, lib, mtl, pretty, tasty
+, tasty-hunit, tasty-quickcheck, transformers
 }:
 mkDerivation {
   pname = "cabal-install-solver";
@@ -23,25 +10,11 @@ mkDerivation {
   isExecutable = false;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    array
-    base
-    bytestring
-    Cabal
-    Cabal-syntax
-    containers
-    edit-distance
-    filepath
-    mtl
-    pretty
-    transformers
+    array base bytestring Cabal Cabal-syntax containers edit-distance
+    filepath mtl pretty transformers
   ];
   testHaskellDepends = [
-    base
-    Cabal
-    Cabal-syntax
-    tasty
-    tasty-hunit
-    tasty-quickcheck
+    base Cabal Cabal-syntax tasty tasty-hunit tasty-quickcheck
   ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
@@ -54,4 +27,4 @@ mkDerivation {
   description = "The command-line interface for Cabal and Hackage";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/cabal-install.nix b/pkgs/cabal-install.nix
index 6e59fed316181ed93259e171910e662914a7c337..eb57c04d07e6671b840184cf7d666aaeb5b8d354 100644
--- a/pkgs/cabal-install.nix
+++ b/pkgs/cabal-install.nix
@@ -1,53 +1,12 @@
-{ mkDerivation
-, Cabal
-, Cabal-QuickCheck
-, Cabal-described
-, Cabal-syntax
-, Cabal-tree-diff
-, HTTP
-, QuickCheck
-, array
-, async
-, base
-, base16-bytestring
-, binary
-, bytestring
-, cabal-install-solver
-, containers
-, cryptohash-sha256
-, directory
-, echo
-, edit-distance
-, exceptions
-, filepath
-, hackage-security
-, hashable
-, lib
-, lukko
-, mtl
-, network-uri
-, parsec
-, pretty
-, pretty-show
-, process
-, random
-, regex-base
-, regex-posix
-, resolv
-, safe-exceptions
-, stm
-, tagged
-, tar
-, tasty
-, tasty-expected-failure
-, tasty-golden
-, tasty-hunit
-, tasty-quickcheck
-, text
-, time
-, tree-diff
-, unix
-, zlib
+{ mkDerivation, Cabal, Cabal-QuickCheck, Cabal-described
+, Cabal-syntax, Cabal-tree-diff, HTTP, QuickCheck, array, async
+, base, base16-bytestring, binary, bytestring, cabal-install-solver
+, containers, cryptohash-sha256, directory, echo, edit-distance
+, exceptions, filepath, hackage-security, hashable, lib, lukko, mtl
+, network-uri, parsec, pretty, pretty-show, process, random
+, regex-base, regex-posix, resolv, safe-exceptions, stm, tagged
+, tar, tasty, tasty-expected-failure, tasty-golden, tasty-hunit
+, tasty-quickcheck, text, time, tree-diff, unix, zlib
 }:
 mkDerivation {
   pname = "cabal-install";
@@ -57,79 +16,22 @@ mkDerivation {
   isExecutable = true;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    array
-    async
-    base
-    base16-bytestring
-    binary
-    bytestring
-    Cabal
-    cabal-install-solver
-    Cabal-syntax
-    containers
-    cryptohash-sha256
-    directory
-    echo
-    edit-distance
-    exceptions
-    filepath
-    hackage-security
-    hashable
-    HTTP
-    lukko
-    mtl
-    network-uri
-    parsec
-    pretty
-    process
-    random
-    regex-base
-    regex-posix
-    resolv
-    safe-exceptions
-    stm
-    tar
-    text
-    time
-    unix
-    zlib
+    array async base base16-bytestring binary bytestring Cabal
+    cabal-install-solver Cabal-syntax containers cryptohash-sha256
+    directory echo edit-distance exceptions filepath hackage-security
+    hashable HTTP lukko mtl network-uri parsec pretty process random
+    regex-base regex-posix resolv safe-exceptions stm tar text time
+    unix zlib
   ];
   executableHaskellDepends = [
-    base
-    Cabal
-    Cabal-syntax
-    directory
-    filepath
+    base Cabal Cabal-syntax directory filepath
   ];
   testHaskellDepends = [
-    array
-    base
-    bytestring
-    Cabal
-    Cabal-described
-    cabal-install-solver
-    Cabal-QuickCheck
-    Cabal-syntax
-    Cabal-tree-diff
-    containers
-    directory
-    filepath
-    hashable
-    mtl
-    network-uri
-    pretty-show
-    QuickCheck
-    random
-    tagged
-    tar
-    tasty
-    tasty-expected-failure
-    tasty-golden
-    tasty-hunit
-    tasty-quickcheck
-    time
-    tree-diff
-    zlib
+    array base bytestring Cabal Cabal-described cabal-install-solver
+    Cabal-QuickCheck Cabal-syntax Cabal-tree-diff containers directory
+    filepath hashable mtl network-uri pretty-show QuickCheck random
+    tagged tar tasty tasty-expected-failure tasty-golden tasty-hunit
+    tasty-quickcheck time tree-diff zlib
   ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
@@ -146,4 +48,4 @@ mkDerivation {
   description = "The command-line interface for Cabal and Hackage";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/cabal2nix.nix b/pkgs/cabal2nix.nix
index 940ceaf50fbeb750f83479935c17edf99628933d..c0c5e232968b537034cc07060fcef2b7bbe4320b 100644
--- a/pkgs/cabal2nix.nix
+++ b/pkgs/cabal2nix.nix
@@ -1,33 +1,8 @@
-{ mkDerivation
-, Cabal
-, aeson
-, ansi-wl-pprint
-, base
-, bytestring
-, containers
-, deepseq
-, directory
-, distribution-nixpkgs
-, filepath
-, hackage-db
-, hopenssl
-, hpack
-, language-nix
-, lens
-, lib
-, monad-par
-, monad-par-extras
-, mtl
-, optparse-applicative
-, pretty
-, process
-, split
-, tasty
-, tasty-golden
-, text
-, time
-, transformers
-, yaml
+{ mkDerivation, Cabal, aeson, ansi-wl-pprint, base, bytestring
+, containers, deepseq, directory, distribution-nixpkgs, filepath
+, hackage-db, hopenssl, hpack, language-nix, lens, lib, monad-par
+, monad-par-extras, mtl, optparse-applicative, pretty, process
+, split, tasty, tasty-golden, text, time, transformers, yaml
 }:
 mkDerivation {
   pname = "cabal2nix";
@@ -37,60 +12,19 @@ mkDerivation {
   isExecutable = true;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    aeson
-    ansi-wl-pprint
-    base
-    bytestring
-    Cabal
-    containers
-    deepseq
-    directory
-    distribution-nixpkgs
-    filepath
-    hackage-db
-    hopenssl
-    hpack
-    language-nix
-    lens
-    optparse-applicative
-    pretty
-    process
-    split
-    text
-    time
-    transformers
-    yaml
+    aeson ansi-wl-pprint base bytestring Cabal containers deepseq
+    directory distribution-nixpkgs filepath hackage-db hopenssl hpack
+    language-nix lens optparse-applicative pretty process split text
+    time transformers yaml
   ];
   executableHaskellDepends = [
-    aeson
-    base
-    bytestring
-    Cabal
-    containers
-    directory
-    distribution-nixpkgs
-    filepath
-    hopenssl
-    language-nix
-    lens
-    monad-par
-    monad-par-extras
-    mtl
-    optparse-applicative
-    pretty
+    aeson base bytestring Cabal containers directory
+    distribution-nixpkgs filepath hopenssl language-nix lens monad-par
+    monad-par-extras mtl optparse-applicative pretty
   ];
   testHaskellDepends = [
-    base
-    Cabal
-    containers
-    directory
-    filepath
-    language-nix
-    lens
-    pretty
-    process
-    tasty
-    tasty-golden
+    base Cabal containers directory filepath language-nix lens pretty
+    process tasty tasty-golden
   ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
@@ -107,4 +41,4 @@ mkDerivation {
   description = "Convert Cabal files into Nix build instructions";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/cache.nix b/pkgs/cache.nix
index 9ee88ea6776e28cbb3cf1323de57c81814b6ede3..1147e9417148918e0ea1011750a21f393484a4f5 100644
--- a/pkgs/cache.nix
+++ b/pkgs/cache.nix
@@ -1,12 +1,5 @@
-{ mkDerivation
-, base
-, clock
-, hashable
-, hspec
-, lib
-, stm
-, transformers
-, unordered-containers
+{ mkDerivation, base, clock, hashable, hspec, lib, stm
+, transformers, unordered-containers
 }:
 mkDerivation {
   pname = "cache";
@@ -16,12 +9,7 @@ mkDerivation {
   isExecutable = false;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    base
-    clock
-    hashable
-    stm
-    transformers
-    unordered-containers
+    base clock hashable stm transformers unordered-containers
   ];
   testHaskellDepends = [ base clock hspec stm transformers ];
   enableLibraryProfiling = true;
@@ -35,4 +23,4 @@ mkDerivation {
   description = "An in-memory key/value store with expiration support";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/call-stack.nix b/pkgs/call-stack.nix
index eab63ebe34d5444a96ea62f2381b395e27ea23d2..9a8397d3976c1da60940e499d537ad88dd89f2fb 100644
--- a/pkgs/call-stack.nix
+++ b/pkgs/call-stack.nix
@@ -19,4 +19,4 @@ mkDerivation {
   description = "Use GHC call-stacks in a backward compatible way";
   license = lib.licenses.mit;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/canonical-json.nix b/pkgs/canonical-json.nix
index 2b03a05d326584e3d9af0d324912014b6fe0d855..33f4f483457a52a04e3e2e227c0aa8df514e6521 100644
--- a/pkgs/canonical-json.nix
+++ b/pkgs/canonical-json.nix
@@ -1,18 +1,6 @@
-{ mkDerivation
-, QuickCheck
-, aeson
-, base
-, bytestring
-, containers
-, criterion
-, deepseq
-, lib
-, parsec
-, pretty
-, tasty
-, tasty-quickcheck
-, unordered-containers
-, vector
+{ mkDerivation, QuickCheck, aeson, base, bytestring, containers
+, criterion, deepseq, lib, parsec, pretty, tasty, tasty-quickcheck
+, unordered-containers, vector
 }:
 mkDerivation {
   pname = "canonical-json";
@@ -22,23 +10,11 @@ mkDerivation {
   isExecutable = false;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    base
-    bytestring
-    containers
-    deepseq
-    parsec
-    pretty
+    base bytestring containers deepseq parsec pretty
   ];
   testHaskellDepends = [
-    aeson
-    base
-    bytestring
-    containers
-    QuickCheck
-    tasty
-    tasty-quickcheck
-    unordered-containers
-    vector
+    aeson base bytestring containers QuickCheck tasty tasty-quickcheck
+    unordered-containers vector
   ];
   benchmarkHaskellDepends = [ base bytestring containers criterion ];
   enableLibraryProfiling = true;
@@ -52,4 +28,4 @@ mkDerivation {
   description = "Canonical JSON for signing and hashing JSON values";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/case-insensitive.nix b/pkgs/case-insensitive.nix
index 2d27424adc12dc2b6940f5d98f11eb6c327d8787..713c41b5902dab15ed2bd489b13be76485536f71 100644
--- a/pkgs/case-insensitive.nix
+++ b/pkgs/case-insensitive.nix
@@ -1,14 +1,5 @@
-{ mkDerivation
-, HUnit
-, base
-, bytestring
-, criterion
-, deepseq
-, hashable
-, lib
-, test-framework
-, test-framework-hunit
-, text
+{ mkDerivation, HUnit, base, bytestring, criterion, deepseq
+, hashable, lib, test-framework, test-framework-hunit, text
 }:
 mkDerivation {
   pname = "case-insensitive";
@@ -19,12 +10,7 @@ mkDerivation {
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [ base bytestring deepseq hashable text ];
   testHaskellDepends = [
-    base
-    bytestring
-    HUnit
-    test-framework
-    test-framework-hunit
-    text
+    base bytestring HUnit test-framework test-framework-hunit text
   ];
   benchmarkHaskellDepends = [ base bytestring criterion deepseq ];
   enableLibraryProfiling = true;
@@ -38,4 +24,4 @@ mkDerivation {
   description = "Case insensitive string comparison";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/casing.nix b/pkgs/casing.nix
index 58fc2d0b7e8b462d824f107669a22f358b18be21..040a4569e132ec58c23ccdb63ef81e05d98e51c8 100644
--- a/pkgs/casing.nix
+++ b/pkgs/casing.nix
@@ -20,4 +20,4 @@ mkDerivation {
   description = "Convert between various source code casing conventions";
   license = lib.licenses.mit;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/cassava-megaparsec.nix b/pkgs/cassava-megaparsec.nix
index 607e0b9df52908cfb4ab44bcfc35ce2a075a8917..457f118d3f70491ad9875fa789a7c8c6241dd49f 100644
--- a/pkgs/cassava-megaparsec.nix
+++ b/pkgs/cassava-megaparsec.nix
@@ -1,13 +1,5 @@
-{ mkDerivation
-, base
-, bytestring
-, cassava
-, hspec
-, hspec-megaparsec
-, lib
-, megaparsec
-, unordered-containers
-, vector
+{ mkDerivation, base, bytestring, cassava, hspec, hspec-megaparsec
+, lib, megaparsec, unordered-containers, vector
 }:
 mkDerivation {
   pname = "cassava-megaparsec";
@@ -19,20 +11,10 @@ mkDerivation {
   isExecutable = false;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    base
-    bytestring
-    cassava
-    megaparsec
-    unordered-containers
-    vector
+    base bytestring cassava megaparsec unordered-containers vector
   ];
   testHaskellDepends = [
-    base
-    bytestring
-    cassava
-    hspec
-    hspec-megaparsec
-    vector
+    base bytestring cassava hspec hspec-megaparsec vector
   ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
@@ -45,4 +27,4 @@ mkDerivation {
   description = "Megaparsec parser of CSV files that plays nicely with Cassava";
   license = lib.licenses.mit;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/cassava.nix b/pkgs/cassava.nix
index 976823dd0ff7e20e6b96db0884ac31a73906b2f4..17f4d50927f670e961a3e3e6ef2161d57a02b57d 100644
--- a/pkgs/cassava.nix
+++ b/pkgs/cassava.nix
@@ -1,65 +1,27 @@
-{ mkDerivation
-, HUnit
-, Only
-, QuickCheck
-, array
-, attoparsec
-, base
-, bytestring
-, containers
-, deepseq
-, hashable
-, lib
-, quickcheck-instances
-, scientific
-, test-framework
-, test-framework-hunit
-, test-framework-quickcheck2
-, text
-, text-short
-, transformers
-, unordered-containers
-, vector
+{ mkDerivation, HUnit, Only, QuickCheck, array, attoparsec, base
+, bytestring, containers, deepseq, hashable, lib
+, quickcheck-instances, scientific, test-framework
+, test-framework-hunit, test-framework-quickcheck2, text
+, text-short, transformers, unordered-containers, vector
 }:
 mkDerivation {
   pname = "cassava";
   version = "0.5.3.0";
   sha256 = "b4c8451f433ad7725cb8b9f7a7efe598ba103b16584713c91f48ae023829e9be";
+  revision = "1";
+  editedCabalFile = "1lavd2c7w2p2x4i7h35r8kgcgrrlhcql70zk5vgqv5ll04pp0niy";
   configureFlags = [ "-f-bytestring--lt-0_10_4" ];
   isLibrary = true;
   isExecutable = false;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    array
-    attoparsec
-    base
-    bytestring
-    containers
-    deepseq
-    hashable
-    Only
-    scientific
-    text
-    text-short
-    transformers
-    unordered-containers
-    vector
+    array attoparsec base bytestring containers deepseq hashable Only
+    scientific text text-short transformers unordered-containers vector
   ];
   testHaskellDepends = [
-    attoparsec
-    base
-    bytestring
-    hashable
-    HUnit
-    QuickCheck
-    quickcheck-instances
-    scientific
-    test-framework
-    test-framework-hunit
-    test-framework-quickcheck2
-    text
-    unordered-containers
-    vector
+    attoparsec base bytestring hashable HUnit QuickCheck
+    quickcheck-instances scientific test-framework test-framework-hunit
+    test-framework-quickcheck2 text unordered-containers vector
   ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
@@ -72,4 +34,4 @@ mkDerivation {
   description = "A CSV parsing and encoding library";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/cborg-json.nix b/pkgs/cborg-json.nix
index 5d99cb442cc79ea9f4f4761aa81cf3b6375c5af5..93fea46ec269fc5b4b5e95ec7434ab1c7c7a05b0 100644
--- a/pkgs/cborg-json.nix
+++ b/pkgs/cborg-json.nix
@@ -1,19 +1,6 @@
-{ mkDerivation
-, aeson
-, aeson-pretty
-, base
-, bytestring
-, cborg
-, criterion
-, deepseq
-, directory
-, lib
-, process
-, scientific
-, text
-, unordered-containers
-, vector
-, zlib
+{ mkDerivation, aeson, aeson-pretty, base, bytestring, cborg
+, criterion, deepseq, directory, lib, process, scientific, text
+, unordered-containers, vector, zlib
 }:
 mkDerivation {
   pname = "cborg-json";
@@ -25,24 +12,11 @@ mkDerivation {
   isExecutable = false;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    aeson
-    aeson-pretty
-    base
-    cborg
-    scientific
-    text
-    unordered-containers
+    aeson aeson-pretty base cborg scientific text unordered-containers
     vector
   ];
   benchmarkHaskellDepends = [
-    aeson
-    base
-    bytestring
-    cborg
-    criterion
-    deepseq
-    directory
-    process
+    aeson base bytestring cborg criterion deepseq directory process
     zlib
   ];
   enableLibraryProfiling = true;
@@ -56,4 +30,4 @@ mkDerivation {
   description = "A library for encoding JSON as CBOR";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/cborg.nix b/pkgs/cborg.nix
index 2b73ed4cbd8ccaea1f387b60c4f748b99768688f..d0d7925a8ca4adfd5c14d90ebd54b07606ca20a0 100644
--- a/pkgs/cborg.nix
+++ b/pkgs/cborg.nix
@@ -1,66 +1,25 @@
-{ mkDerivation
-, QuickCheck
-, aeson
-, array
-, base
-, base-orphans
-, base16-bytestring
-, base64-bytestring
-, bytestring
-, containers
-, deepseq
-, ghc-bignum
-, ghc-prim
-, half
-, lib
-, primitive
-, random
-, scientific
-, tasty
-, tasty-hunit
-, tasty-quickcheck
-, text
-, vector
+{ mkDerivation, QuickCheck, aeson, array, base, base-orphans
+, base16-bytestring, base64-bytestring, bytestring, containers
+, deepseq, ghc-bignum, ghc-prim, half, lib, primitive, random
+, scientific, tasty, tasty-hunit, tasty-quickcheck, text, vector
 }:
 mkDerivation {
   pname = "cborg";
   version = "0.2.8.0";
   sha256 = "2e59c827c273b57af0fcbbfb62f6d15faeb399e0d89d57baf8adcc60e62ab01e";
-  revision = "1";
-  editedCabalFile = "13m2shrlpvg5s9d40a2463mmckzg50y8jb47zfd6i1rg6q3q6xx6";
+  revision = "2";
+  editedCabalFile = "0pvnzanysxiikq3kghhax9v2m693s23v9pas03iaggw0h098yns4";
   isLibrary = true;
   isExecutable = false;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    array
-    base
-    bytestring
-    containers
-    deepseq
-    ghc-bignum
-    ghc-prim
-    half
-    primitive
-    text
+    array base bytestring containers deepseq ghc-bignum ghc-prim half
+    primitive text
   ];
   testHaskellDepends = [
-    aeson
-    array
-    base
-    base-orphans
-    base16-bytestring
-    base64-bytestring
-    bytestring
-    deepseq
-    half
-    QuickCheck
-    random
-    scientific
-    tasty
-    tasty-hunit
-    tasty-quickcheck
-    text
-    vector
+    aeson array base base-orphans base16-bytestring base64-bytestring
+    bytestring deepseq half QuickCheck random scientific tasty
+    tasty-hunit tasty-quickcheck text vector
   ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
@@ -72,4 +31,4 @@ mkDerivation {
   description = "Concise Binary Object Representation (CBOR)";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/cereal-vector.nix b/pkgs/cereal-vector.nix
index 9a345075f23fbdb00c2ca44c586d9b8b4f32bad5..0925986cb912540bd85aa86bfa7e33bbcdb9e4bf 100644
--- a/pkgs/cereal-vector.nix
+++ b/pkgs/cereal-vector.nix
@@ -1,10 +1,4 @@
-{ mkDerivation
-, QuickCheck
-, base
-, bytestring
-, cereal
-, lib
-, vector
+{ mkDerivation, QuickCheck, base, bytestring, cereal, lib, vector
 }:
 mkDerivation {
   pname = "cereal-vector";
@@ -26,4 +20,4 @@ mkDerivation {
   description = "Serialize instances for Data.Vector types.";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/cereal.nix b/pkgs/cereal.nix
index 1f18bcc1697b44b34de19184bb0c1996068f742d..76853397dd0f51819fe8df591f047c576c862dab 100644
--- a/pkgs/cereal.nix
+++ b/pkgs/cereal.nix
@@ -1,13 +1,5 @@
-{ mkDerivation
-, QuickCheck
-, array
-, base
-, bytestring
-, containers
-, ghc-prim
-, lib
-, test-framework
-, test-framework-quickcheck2
+{ mkDerivation, QuickCheck, array, base, bytestring, containers
+, ghc-prim, lib, test-framework, test-framework-quickcheck2
 }:
 mkDerivation {
   pname = "cereal";
@@ -17,17 +9,10 @@ mkDerivation {
   isExecutable = false;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    array
-    base
-    bytestring
-    containers
-    ghc-prim
+    array base bytestring containers ghc-prim
   ];
   testHaskellDepends = [
-    base
-    bytestring
-    QuickCheck
-    test-framework
+    base bytestring QuickCheck test-framework
     test-framework-quickcheck2
   ];
   enableLibraryProfiling = true;
@@ -41,4 +26,4 @@ mkDerivation {
   description = "A binary serialization library";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/charset.nix b/pkgs/charset.nix
index c3c39ca687b5af2f1fbe56e9623fe635ee2c0cc8..8a8ce37c9303dbbd34aab22d6511219e7413c93b 100644
--- a/pkgs/charset.nix
+++ b/pkgs/charset.nix
@@ -1,9 +1,4 @@
-{ mkDerivation
-, array
-, base
-, bytestring
-, containers
-, lib
+{ mkDerivation, array, base, bytestring, containers, lib
 , unordered-containers
 }:
 mkDerivation {
@@ -14,11 +9,7 @@ mkDerivation {
   isExecutable = false;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    array
-    base
-    bytestring
-    containers
-    unordered-containers
+    array base bytestring containers unordered-containers
   ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
@@ -31,4 +22,4 @@ mkDerivation {
   description = "Fast unicode character sets based on complemented PATRICIA tries";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/cheapskate.nix b/pkgs/cheapskate.nix
index e42d8023b91a0f5eb22159c0a5fc22610ec2d0bb..7b8cc34d38c2466237abfc93c4b95c15e8b2c156 100644
--- a/pkgs/cheapskate.nix
+++ b/pkgs/cheapskate.nix
@@ -1,15 +1,5 @@
-{ mkDerivation
-, base
-, blaze-html
-, bytestring
-, containers
-, data-default
-, deepseq
-, lib
-, mtl
-, syb
-, text
-, uniplate
+{ mkDerivation, base, blaze-html, bytestring, containers
+, data-default, deepseq, lib, mtl, syb, text, uniplate
 , xss-sanitize
 }:
 mkDerivation {
@@ -22,16 +12,8 @@ mkDerivation {
   isExecutable = true;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    base
-    blaze-html
-    containers
-    data-default
-    deepseq
-    mtl
-    syb
-    text
-    uniplate
-    xss-sanitize
+    base blaze-html containers data-default deepseq mtl syb text
+    uniplate xss-sanitize
   ];
   executableHaskellDepends = [ base blaze-html bytestring text ];
   enableLibraryProfiling = true;
@@ -45,4 +27,4 @@ mkDerivation {
   description = "Experimental markdown processor";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/checkers.nix b/pkgs/checkers.nix
index 19ee1301728e4d7b960bf458eb677fa1daca21fd..a6777063e9b604d03fc7b1c9516bccfe09045a76 100644
--- a/pkgs/checkers.nix
+++ b/pkgs/checkers.nix
@@ -1,24 +1,16 @@
-{ mkDerivation
-, QuickCheck
-, array
-, base
-, lib
-, random
-, semigroupoids
+{ mkDerivation, QuickCheck, array, base, lib, random, semigroupoids
 }:
 mkDerivation {
   pname = "checkers";
   version = "0.6.0";
   sha256 = "c07cd3563ea251000f7ce41db2d38e3bf94c9dcf60943a5eecc83b3089d299e4";
+  revision = "1";
+  editedCabalFile = "0wkvf57zd7i87z18vj285whjpcl9pscpwxz2cp7v7w6kk0769p0i";
   isLibrary = true;
   isExecutable = false;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    array
-    base
-    QuickCheck
-    random
-    semigroupoids
+    array base QuickCheck random semigroupoids
   ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
@@ -31,4 +23,4 @@ mkDerivation {
   description = "Check properties on standard classes and data structures";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/chell-quickcheck.nix b/pkgs/chell-quickcheck.nix
index 9cdb92820f84bdc839edbe7c855d1f469d6b444d..5e63b6908e9c48f3d1979ff5e9fdd04a4caadcad 100644
--- a/pkgs/chell-quickcheck.nix
+++ b/pkgs/chell-quickcheck.nix
@@ -18,4 +18,4 @@ mkDerivation {
   description = "QuickCheck support for the Chell testing library";
   license = lib.licenses.mit;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/chell.nix b/pkgs/chell.nix
index df44c8f7497ca69347bc69a1d65c6ba520d1b183..46cba8eccc004b81a8ddb4c6d9456784cda755b1 100644
--- a/pkgs/chell.nix
+++ b/pkgs/chell.nix
@@ -1,14 +1,5 @@
-{ mkDerivation
-, ansi-terminal
-, base
-, bytestring
-, lib
-, options
-, patience
-, random
-, template-haskell
-, text
-, transformers
+{ mkDerivation, ansi-terminal, base, bytestring, lib, options
+, patience, random, template-haskell, text, transformers
 }:
 mkDerivation {
   pname = "chell";
@@ -18,15 +9,8 @@ mkDerivation {
   isExecutable = false;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    ansi-terminal
-    base
-    bytestring
-    options
-    patience
-    random
-    template-haskell
-    text
-    transformers
+    ansi-terminal base bytestring options patience random
+    template-haskell text transformers
   ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
@@ -39,4 +23,4 @@ mkDerivation {
   description = "A simple and intuitive library for automated testing";
   license = lib.licenses.mit;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/circle-packing.nix b/pkgs/circle-packing.nix
index 6e2c79f7c1afea4140af79bec6b5eb7d9989fb2f..37d6955d32ff6dbea84b4d1f2c653907bb1258e1 100644
--- a/pkgs/circle-packing.nix
+++ b/pkgs/circle-packing.nix
@@ -19,4 +19,4 @@ mkDerivation {
   description = "Simple heuristic for packing discs of varying radii in a circle";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/clock.nix b/pkgs/clock.nix
index 74ecbbc18bab541e9e94f7a2503e97f84b53a258..f8f2aa8ebf7cbc60e25d42625ec3291625c1e451 100644
--- a/pkgs/clock.nix
+++ b/pkgs/clock.nix
@@ -20,4 +20,4 @@ mkDerivation {
   description = "High-resolution clock functions: monotonic, realtime, cputime";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/cmark-gfm.nix b/pkgs/cmark-gfm.nix
index b0f89006e687de5e6d074c4d1f5fbee099bb962b..0c141fbcb049e0379b115a2e00ef4e9d5fe539c7 100644
--- a/pkgs/cmark-gfm.nix
+++ b/pkgs/cmark-gfm.nix
@@ -1,15 +1,5 @@
-{ mkDerivation
-, HUnit
-, base
-, blaze-html
-, bytestring
-, cheapskate
-, criterion
-, discount
-, lib
-, markdown
-, sundown
-, text
+{ mkDerivation, HUnit, base, blaze-html, bytestring, cheapskate
+, criterion, discount, lib, markdown, sundown, text
 }:
 mkDerivation {
   pname = "cmark-gfm";
@@ -21,14 +11,7 @@ mkDerivation {
   libraryHaskellDepends = [ base bytestring text ];
   testHaskellDepends = [ base HUnit text ];
   benchmarkHaskellDepends = [
-    base
-    blaze-html
-    cheapskate
-    criterion
-    discount
-    markdown
-    sundown
-    text
+    base blaze-html cheapskate criterion discount markdown sundown text
   ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
@@ -41,4 +24,4 @@ mkDerivation {
   description = "Fast, accurate GitHub Flavored Markdown parser and renderer";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/co-log-polysemy.nix b/pkgs/co-log-polysemy.nix
index d4927f09b27a90acd8664ce194a1c79011c6a6b9..bcbd27c101e77a4f18bb8b3cf6f3bb9357cf24d0 100644
--- a/pkgs/co-log-polysemy.nix
+++ b/pkgs/co-log-polysemy.nix
@@ -19,4 +19,4 @@ mkDerivation {
   description = "Composable Contravariant Comonadic Logging Library";
   license = lib.licenses.mpl20;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/code-page.nix b/pkgs/code-page.nix
index 88edfcb61516f02399d84f706c529a117f11016f..aa7365b516a2a6e1183d981e0f53fae14a4894f9 100644
--- a/pkgs/code-page.nix
+++ b/pkgs/code-page.nix
@@ -19,4 +19,4 @@ mkDerivation {
   description = "Windows code page library for Haskell";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/colour.nix b/pkgs/colour.nix
index 24ef9eca2ef49fd94fde1670be163ed6b829a68a..b37401f69961e86b7ce6ed430b8a020c18a3effa 100644
--- a/pkgs/colour.nix
+++ b/pkgs/colour.nix
@@ -1,9 +1,4 @@
-{ mkDerivation
-, QuickCheck
-, base
-, lib
-, random
-, test-framework
+{ mkDerivation, QuickCheck, base, lib, random, test-framework
 , test-framework-quickcheck2
 }:
 mkDerivation {
@@ -15,11 +10,7 @@ mkDerivation {
   enableSeparateDataOutput = true;
   libraryHaskellDepends = [ base ];
   testHaskellDepends = [
-    base
-    QuickCheck
-    random
-    test-framework
-    test-framework-quickcheck2
+    base QuickCheck random test-framework test-framework-quickcheck2
   ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
@@ -32,4 +23,4 @@ mkDerivation {
   description = "A model for human colour/color perception";
   license = lib.licenses.mit;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/colourista.nix b/pkgs/colourista.nix
index f40a86a25e460b20eeec966d73a2d833893a84ff..610d0f2addc9e9ae672970da509002bcfb6bb01d 100644
--- a/pkgs/colourista.nix
+++ b/pkgs/colourista.nix
@@ -1,26 +1,13 @@
-{ mkDerivation
-, ansi-terminal
-, base
-, bytestring
-, ghc-prim
-, hspec
-, lib
-, text
+{ mkDerivation, ansi-terminal, base, bytestring, hspec, lib, text
 }:
 mkDerivation {
   pname = "colourista";
-  version = "0.1.0.1";
-  sha256 = "6ebd9a0ab5479ed0de649ad7326eb08279c1b71a0db72da4b2ca4f61bafa709a";
+  version = "0.1.0.2";
+  sha256 = "96afae0b54b12205a9871ecb4c7ee173e8b9f05363d843c15d373d394d08063c";
   isLibrary = true;
   isExecutable = false;
   enableSeparateDataOutput = false;
-  libraryHaskellDepends = [
-    ansi-terminal
-    base
-    bytestring
-    ghc-prim
-    text
-  ];
+  libraryHaskellDepends = [ ansi-terminal base bytestring text ];
   testHaskellDepends = [ base bytestring hspec text ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
@@ -33,4 +20,4 @@ mkDerivation {
   description = "Convenient interface for printing colourful messages";
   license = lib.licenses.mpl20;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/commonmark.nix b/pkgs/commonmark.nix
index 40f8047ec59cd2ae108f3d684692ae1bfbbc94a2..29adf0a79bb07b4e3fb8e79dc4971e875f8aeadd 100644
--- a/pkgs/commonmark.nix
+++ b/pkgs/commonmark.nix
@@ -1,17 +1,6 @@
-{ mkDerivation
-, base
-, bytestring
-, containers
-, lib
-, parsec
-, tasty
-, tasty-bench
-, tasty-hunit
-, tasty-quickcheck
-, text
-, transformers
-, unicode-data
-, unicode-transforms
+{ mkDerivation, base, bytestring, containers, lib, parsec, tasty
+, tasty-bench, tasty-hunit, tasty-quickcheck, text, transformers
+, unicode-data, unicode-transforms
 }:
 mkDerivation {
   pname = "commonmark";
@@ -21,22 +10,11 @@ mkDerivation {
   isExecutable = false;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    base
-    bytestring
-    containers
-    parsec
-    text
-    transformers
-    unicode-data
+    base bytestring containers parsec text transformers unicode-data
     unicode-transforms
   ];
   testHaskellDepends = [
-    base
-    parsec
-    tasty
-    tasty-hunit
-    tasty-quickcheck
-    text
+    base parsec tasty tasty-hunit tasty-quickcheck text
     unicode-transforms
   ];
   benchmarkHaskellDepends = [ base tasty-bench text ];
@@ -51,4 +29,4 @@ mkDerivation {
   description = "Pure Haskell commonmark parser";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/comonad.nix b/pkgs/comonad.nix
index 949b592b6cdc7ef5d9547ab7e1941e616a560cf8..ec09418f25c5436a04912a86b7f1363d87ac2a66 100644
--- a/pkgs/comonad.nix
+++ b/pkgs/comonad.nix
@@ -1,12 +1,5 @@
-{ mkDerivation
-, base
-, containers
-, distributive
-, indexed-traversable
-, lib
-, tagged
-, transformers
-, transformers-compat
+{ mkDerivation, base, containers, distributive, indexed-traversable
+, lib, tagged, transformers, transformers-compat
 }:
 mkDerivation {
   pname = "comonad";
@@ -18,13 +11,8 @@ mkDerivation {
   isExecutable = false;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    base
-    containers
-    distributive
-    indexed-traversable
-    tagged
-    transformers
-    transformers-compat
+    base containers distributive indexed-traversable tagged
+    transformers transformers-compat
   ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
@@ -37,4 +25,4 @@ mkDerivation {
   description = "Comonads";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/compact.nix b/pkgs/compact.nix
index c5b7d4a853a2a86a8bda0b8f13a5a59a117030a7..028a2c94a0b94b48b2b3167cf4e566d9a7ff2f8e 100644
--- a/pkgs/compact.nix
+++ b/pkgs/compact.nix
@@ -1,9 +1,4 @@
-{ mkDerivation
-, base
-, binary
-, bytestring
-, directory
-, ghc-compact
+{ mkDerivation, base, binary, bytestring, directory, ghc-compact
 , lib
 }:
 mkDerivation {
@@ -28,4 +23,4 @@ mkDerivation {
   description = "Non-GC'd, contiguous storage for immutable data structures";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/compactable.nix b/pkgs/compactable.nix
index daf44efa45c4c943e5bf5ae015a0aae29581758a..754372f30dade3d1edddea671a2c648c80873630 100644
--- a/pkgs/compactable.nix
+++ b/pkgs/compactable.nix
@@ -1,27 +1,8 @@
-{ mkDerivation
-, QuickCheck
-, aeson
-, base
-, base-compat
-, bifunctors
-, containers
-, contravariant
-, data-default-class
-, deepseq
-, fetchgit
-, hashable
-, keys
-, lens
-, lib
-, semigroupoids
-, sydtest
-, sydtest-discover
-, these
-, transformers
-, transformers-compat
-, unordered-containers
-, vector
-, vector-instances
+{ mkDerivation, QuickCheck, aeson, base, base-compat, bifunctors
+, containers, contravariant, data-default-class, deepseq, fetchgit
+, hashable, keys, lens, lib, semigroupoids, sydtest
+, sydtest-discover, these, transformers, transformers-compat
+, unordered-containers, vector, vector-instances
 }:
 mkDerivation {
   pname = "compactable";
@@ -36,34 +17,13 @@ mkDerivation {
   isExecutable = false;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    aeson
-    base
-    base-compat
-    bifunctors
-    containers
-    contravariant
-    data-default-class
-    deepseq
-    hashable
-    keys
-    lens
-    QuickCheck
-    semigroupoids
-    these
-    transformers
-    transformers-compat
-    unordered-containers
-    vector
-    vector-instances
+    aeson base base-compat bifunctors containers contravariant
+    data-default-class deepseq hashable keys lens QuickCheck
+    semigroupoids these transformers transformers-compat
+    unordered-containers vector vector-instances
   ];
   testHaskellDepends = [
-    base
-    containers
-    QuickCheck
-    sydtest
-    sydtest-discover
-    these
-    vector
+    base containers QuickCheck sydtest sydtest-discover these vector
   ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
@@ -75,4 +35,4 @@ mkDerivation {
   description = "A typeclass for structures which can be catMaybed, filtered, and partitioned";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/composite-cassava.nix b/pkgs/composite-cassava.nix
index 126294164d9ab2299e7e1a223a9059e4f96f589f..12de1ff7774892f6dab88dc4452cd24a9677d595 100644
--- a/pkgs/composite-cassava.nix
+++ b/pkgs/composite-cassava.nix
@@ -1,14 +1,5 @@
-{ mkDerivation
-, base
-, bytestring
-, cassava
-, composite-base
-, lib
-, tasty
-, tasty-hunit
-, text
-, unordered-containers
-, vector
+{ mkDerivation, base, bytestring, cassava, composite-base, lib
+, tasty, tasty-hunit, text, unordered-containers, vector
 }:
 mkDerivation {
   pname = "composite-cassava";
@@ -18,23 +9,11 @@ mkDerivation {
   isExecutable = false;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    base
-    cassava
-    composite-base
-    text
-    unordered-containers
-    vector
+    base cassava composite-base text unordered-containers vector
   ];
   testHaskellDepends = [
-    base
-    bytestring
-    cassava
-    composite-base
-    tasty
-    tasty-hunit
-    text
-    unordered-containers
-    vector
+    base bytestring cassava composite-base tasty tasty-hunit text
+    unordered-containers vector
   ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
@@ -46,4 +25,4 @@ mkDerivation {
   description = "Csv parsing functionality for composite";
   license = lib.licenses.mit;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/composite-dhall.nix b/pkgs/composite-dhall.nix
index 6dcc81d5e0200e8e0b752662bc64302d5b32a1e6..7bbc2b75ff34eb74418a91370d9b5c14df400a51 100644
--- a/pkgs/composite-dhall.nix
+++ b/pkgs/composite-dhall.nix
@@ -1,12 +1,5 @@
-{ mkDerivation
-, base
-, composite-base
-, dhall
-, lib
-, tasty
-, tasty-hunit
-, text
-, vinyl
+{ mkDerivation, base, composite-base, dhall, lib, tasty
+, tasty-hunit, text, vinyl
 }:
 mkDerivation {
   pname = "composite-dhall";
@@ -17,13 +10,7 @@ mkDerivation {
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [ base composite-base dhall text vinyl ];
   testHaskellDepends = [
-    base
-    composite-base
-    dhall
-    tasty
-    tasty-hunit
-    text
-    vinyl
+    base composite-base dhall tasty tasty-hunit text vinyl
   ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
@@ -35,4 +22,4 @@ mkDerivation {
   description = "Dhall instances for composite records";
   license = lib.licenses.mit;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/composite-lens-extra.nix b/pkgs/composite-lens-extra.nix
index b79874602e4476b570729cfde3f079a14d63dadd..f914ef2d5a110eacd52a52c1f92c593cfcab4498 100644
--- a/pkgs/composite-lens-extra.nix
+++ b/pkgs/composite-lens-extra.nix
@@ -17,4 +17,4 @@ mkDerivation {
   description = "Extra lens functions for composite";
   license = lib.licenses.mit;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/composite-tuple.nix b/pkgs/composite-tuple.nix
index 1fe98671678fa614965a8439795074acbfb72e54..593945ddf534f014fc36292dc8596db16b355522 100644
--- a/pkgs/composite-tuple.nix
+++ b/pkgs/composite-tuple.nix
@@ -19,4 +19,4 @@ mkDerivation {
   description = "Tuple functions for composite records";
   license = lib.licenses.mit;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/composition-prelude.nix b/pkgs/composition-prelude.nix
index d604205f86a77f0cc42d95dfc7c90fb14dee4d91..7452b989d232cb99619eb6149b01bfeb20e31ff7 100644
--- a/pkgs/composition-prelude.nix
+++ b/pkgs/composition-prelude.nix
@@ -17,4 +17,4 @@ mkDerivation {
   description = "Higher-order function combinators";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/concise.nix b/pkgs/concise.nix
index f76d0a8a4212c9d43ae9b63dc27be816835898c5..25d8f519f9ebc1a94ccae848b839db1dec630088 100644
--- a/pkgs/concise.nix
+++ b/pkgs/concise.nix
@@ -1,13 +1,5 @@
-{ mkDerivation
-, QuickCheck
-, base
-, bytestring
-, lens
-, lib
-, quickcheck-instances
-, tasty
-, tasty-quickcheck
-, text
+{ mkDerivation, QuickCheck, base, bytestring, lens, lib
+, quickcheck-instances, tasty, tasty-quickcheck, text
 }:
 mkDerivation {
   pname = "concise";
@@ -18,14 +10,8 @@ mkDerivation {
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [ base bytestring lens text ];
   testHaskellDepends = [
-    base
-    bytestring
-    lens
-    QuickCheck
-    quickcheck-instances
-    tasty
-    tasty-quickcheck
-    text
+    base bytestring lens QuickCheck quickcheck-instances tasty
+    tasty-quickcheck text
   ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
@@ -38,4 +24,4 @@ mkDerivation {
   description = "Utilities for Control.Lens.Cons";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/concurrent-extra.nix b/pkgs/concurrent-extra.nix
index 0ca8fc0552ec7e48d42c2bfa3afcb38f307a77ad..a5f0bd9ffe2322b92d9c37f868abe7ebcffc85a8 100644
--- a/pkgs/concurrent-extra.nix
+++ b/pkgs/concurrent-extra.nix
@@ -1,13 +1,5 @@
-{ mkDerivation
-, HUnit
-, async
-, base
-, lib
-, random
-, stm
-, test-framework
-, test-framework-hunit
-, unbounded-delays
+{ mkDerivation, HUnit, async, base, lib, random, stm
+, test-framework, test-framework-hunit, unbounded-delays
 }:
 mkDerivation {
   pname = "concurrent-extra";
@@ -18,13 +10,7 @@ mkDerivation {
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [ base stm unbounded-delays ];
   testHaskellDepends = [
-    async
-    base
-    HUnit
-    random
-    stm
-    test-framework
-    test-framework-hunit
+    async base HUnit random stm test-framework test-framework-hunit
     unbounded-delays
   ];
   enableLibraryProfiling = true;
@@ -38,4 +24,4 @@ mkDerivation {
   description = "Extra concurrency primitives";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/conduit-combinators.nix b/pkgs/conduit-combinators.nix
index 732c879432126cd54cd487a72d4ab119e580babc..88bd6c238357ae459c9477521f61ab186aef3725 100644
--- a/pkgs/conduit-combinators.nix
+++ b/pkgs/conduit-combinators.nix
@@ -18,4 +18,4 @@ mkDerivation {
   description = "DEPRECATED Functionality merged into the conduit package itself";
   license = lib.licenses.mit;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/conduit-extra.nix b/pkgs/conduit-extra.nix
index 44d53f71b4cbc01a9c82337a9a76fd8b76641ff9..c6676f89d32585dffc6b66226cbda9f60588c741 100644
--- a/pkgs/conduit-extra.nix
+++ b/pkgs/conduit-extra.nix
@@ -1,28 +1,8 @@
-{ mkDerivation
-, QuickCheck
-, async
-, attoparsec
-, base
-, bytestring
-, conduit
-, directory
-, exceptions
-, filepath
-, gauge
-, hspec
-, hspec-discover
-, lib
-, network
-, primitive
-, process
-, resourcet
-, stm
-, streaming-commons
-, text
-, transformers
-, transformers-base
-, typed-process
-, unliftio-core
+{ mkDerivation, QuickCheck, async, attoparsec, base, bytestring
+, conduit, directory, exceptions, filepath, gauge, hspec
+, hspec-discover, lib, network, primitive, process, resourcet, stm
+, streaming-commons, text, transformers, transformers-base
+, typed-process, unliftio-core
 }:
 mkDerivation {
   pname = "conduit-extra";
@@ -32,50 +12,18 @@ mkDerivation {
   isExecutable = false;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    async
-    attoparsec
-    base
-    bytestring
-    conduit
-    directory
-    filepath
-    network
-    primitive
-    process
-    resourcet
-    stm
-    streaming-commons
-    text
-    transformers
-    typed-process
-    unliftio-core
+    async attoparsec base bytestring conduit directory filepath network
+    primitive process resourcet stm streaming-commons text transformers
+    typed-process unliftio-core
   ];
   testHaskellDepends = [
-    async
-    attoparsec
-    base
-    bytestring
-    conduit
-    directory
-    exceptions
-    filepath
-    hspec
-    process
-    QuickCheck
-    resourcet
-    stm
-    streaming-commons
-    text
-    transformers
-    transformers-base
+    async attoparsec base bytestring conduit directory exceptions
+    filepath hspec process QuickCheck resourcet stm streaming-commons
+    text transformers transformers-base
   ];
   testToolDepends = [ hspec-discover ];
   benchmarkHaskellDepends = [
-    base
-    bytestring
-    conduit
-    gauge
-    transformers
+    base bytestring conduit gauge transformers
   ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
@@ -88,4 +36,4 @@ mkDerivation {
   description = "Batteries included conduit: adapters for common libraries";
   license = lib.licenses.mit;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/conduit-parse.nix b/pkgs/conduit-parse.nix
index e28c4397a85d755061d406c28a25d9d256bff242..f3cd3cbcb10bbda17a5bcf58c9110cf8e79978f2 100644
--- a/pkgs/conduit-parse.nix
+++ b/pkgs/conduit-parse.nix
@@ -1,17 +1,5 @@
-{ mkDerivation
-, base
-, conduit
-, dlist
-, lib
-, mtl
-, parsers
-, resourcet
-, safe
-, safe-exceptions
-, tasty
-, tasty-hunit
-, text
-, transformers
+{ mkDerivation, base, conduit, dlist, lib, mtl, parsers, resourcet
+, safe, safe-exceptions, tasty, tasty-hunit, text, transformers
 }:
 mkDerivation {
   pname = "conduit-parse";
@@ -23,24 +11,11 @@ mkDerivation {
   isExecutable = false;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    base
-    conduit
-    dlist
-    mtl
-    parsers
-    safe
-    safe-exceptions
-    text
+    base conduit dlist mtl parsers safe safe-exceptions text
     transformers
   ];
   testHaskellDepends = [
-    base
-    conduit
-    mtl
-    parsers
-    resourcet
-    safe-exceptions
-    tasty
+    base conduit mtl parsers resourcet safe-exceptions tasty
     tasty-hunit
   ];
   enableLibraryProfiling = true;
@@ -54,4 +29,4 @@ mkDerivation {
   description = "Parsing framework based on conduit";
   license = lib.licenses.publicDomain;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/config-ini.nix b/pkgs/config-ini.nix
index 78f2c1fb69d7aa15ea9933c3159f0140d10b36e6..b68d4f70b2edebd564b8824acdde8725cf5ef8c8 100644
--- a/pkgs/config-ini.nix
+++ b/pkgs/config-ini.nix
@@ -1,14 +1,5 @@
-{ mkDerivation
-, base
-, containers
-, directory
-, hedgehog
-, ini
-, lib
-, megaparsec
-, text
-, transformers
-, unordered-containers
+{ mkDerivation, base, containers, directory, hedgehog, ini, lib
+, megaparsec, text, transformers, unordered-containers
 }:
 mkDerivation {
   pname = "config-ini";
@@ -18,21 +9,10 @@ mkDerivation {
   isExecutable = false;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    base
-    containers
-    megaparsec
-    text
-    transformers
-    unordered-containers
+    base containers megaparsec text transformers unordered-containers
   ];
   testHaskellDepends = [
-    base
-    containers
-    directory
-    hedgehog
-    ini
-    text
-    unordered-containers
+    base containers directory hedgehog ini text unordered-containers
   ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
@@ -45,4 +25,4 @@ mkDerivation {
   description = "A library for simple INI-based configuration files";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/connection.nix b/pkgs/connection.nix
index cdcb896e7c668f2fc40753057e302d9bbbf45be0..1a3d28308b86a58d008b6790fa2eec3db33f3188 100644
--- a/pkgs/connection.nix
+++ b/pkgs/connection.nix
@@ -1,17 +1,6 @@
-{ mkDerivation
-, base
-, basement
-, bytestring
-, containers
-, data-default-class
-, lib
-, network
-, socks
-, tls
-, x509
-, x509-store
-, x509-system
-, x509-validation
+{ mkDerivation, base, basement, bytestring, containers
+, data-default-class, lib, network, socks, tls, x509, x509-store
+, x509-system, x509-validation
 }:
 mkDerivation {
   pname = "connection";
@@ -23,18 +12,8 @@ mkDerivation {
   isExecutable = false;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    base
-    basement
-    bytestring
-    containers
-    data-default-class
-    network
-    socks
-    tls
-    x509
-    x509-store
-    x509-system
-    x509-validation
+    base basement bytestring containers data-default-class network
+    socks tls x509 x509-store x509-system x509-validation
   ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
@@ -47,4 +26,4 @@ mkDerivation {
   description = "Simple and easy network connections API";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/constraints.nix b/pkgs/constraints.nix
index 8c219483fbd1d95a5a89543d708e94cfa74abf4b..c30ac1fd4dab516d549a4486b334d93aec697aee 100644
--- a/pkgs/constraints.nix
+++ b/pkgs/constraints.nix
@@ -1,15 +1,5 @@
-{ mkDerivation
-, base
-, binary
-, deepseq
-, ghc-prim
-, hashable
-, hspec
-, hspec-discover
-, lib
-, mtl
-, transformers
-, transformers-compat
+{ mkDerivation, base, binary, deepseq, ghc-prim, hashable, hspec
+, hspec-discover, lib, mtl, transformers, transformers-compat
 , type-equality
 }:
 mkDerivation {
@@ -20,15 +10,8 @@ mkDerivation {
   isExecutable = false;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    base
-    binary
-    deepseq
-    ghc-prim
-    hashable
-    mtl
-    transformers
-    transformers-compat
-    type-equality
+    base binary deepseq ghc-prim hashable mtl transformers
+    transformers-compat type-equality
   ];
   testHaskellDepends = [ base hspec ];
   testToolDepends = [ hspec-discover ];
@@ -43,4 +26,4 @@ mkDerivation {
   description = "Constraint manipulation";
   license = lib.licenses.bsd2;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/contravariant.nix b/pkgs/contravariant.nix
index 79c6932c2e0e25819c9266f87e2db083d8f5f4b2..de71ca2a84e4ade39de5966174efb4d74fbcca07 100644
--- a/pkgs/contravariant.nix
+++ b/pkgs/contravariant.nix
@@ -18,4 +18,4 @@ mkDerivation {
   description = "Contravariant functors";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/control-monad-free.nix b/pkgs/control-monad-free.nix
index 1833102a416d9b2f64d7ba1da599cc5cbe546dc8..efe4a47f25122fe7cf2466676034e0d6ccdba23c 100644
--- a/pkgs/control-monad-free.nix
+++ b/pkgs/control-monad-free.nix
@@ -18,4 +18,4 @@ mkDerivation {
   description = "Free monads and monad transformers";
   license = lib.licenses.publicDomain;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/cpphs.nix b/pkgs/cpphs.nix
index a83b6851a4d4644e9cb4d214a1c98bb20b92b4f2..24efbc7df757d8b240d8fc5f3ff9ceacab5f0198 100644
--- a/pkgs/cpphs.nix
+++ b/pkgs/cpphs.nix
@@ -21,4 +21,4 @@ mkDerivation {
   description = "A liberalised re-implementation of cpp, the C pre-processor";
   license = "LGPL";
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/crypto-api-tests.nix b/pkgs/crypto-api-tests.nix
index 2928d45328c4ea55698969d55a9debd9a4ffaefa..ac91553cf6c3829de04c7ac31cba04ad3177be75 100644
--- a/pkgs/crypto-api-tests.nix
+++ b/pkgs/crypto-api-tests.nix
@@ -1,16 +1,6 @@
-{ mkDerivation
-, HUnit
-, QuickCheck
-, base
-, bytestring
-, cereal
-, crypto-api
-, directory
-, filepath
-, lib
-, test-framework
-, test-framework-hunit
-, test-framework-quickcheck2
+{ mkDerivation, HUnit, QuickCheck, base, bytestring, cereal
+, crypto-api, directory, filepath, lib, test-framework
+, test-framework-hunit, test-framework-quickcheck2
 }:
 mkDerivation {
   pname = "crypto-api-tests";
@@ -20,16 +10,8 @@ mkDerivation {
   isExecutable = false;
   enableSeparateDataOutput = true;
   libraryHaskellDepends = [
-    base
-    bytestring
-    cereal
-    crypto-api
-    directory
-    filepath
-    HUnit
-    QuickCheck
-    test-framework
-    test-framework-hunit
+    base bytestring cereal crypto-api directory filepath HUnit
+    QuickCheck test-framework test-framework-hunit
     test-framework-quickcheck2
   ];
   enableLibraryProfiling = true;
@@ -43,4 +25,4 @@ mkDerivation {
   description = "A test framework and KATs for cryptographic operations";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/crypto-api.nix b/pkgs/crypto-api.nix
index b0f8f390f488dfea8d299b94d651c41be05a8b19..0907cdb66cee61efaad4a9a0da93c5c276a38ffb 100644
--- a/pkgs/crypto-api.nix
+++ b/pkgs/crypto-api.nix
@@ -1,10 +1,4 @@
-{ mkDerivation
-, base
-, bytestring
-, cereal
-, entropy
-, lib
-, tagged
+{ mkDerivation, base, bytestring, cereal, entropy, lib, tagged
 , transformers
 }:
 mkDerivation {
@@ -17,12 +11,7 @@ mkDerivation {
   isExecutable = false;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    base
-    bytestring
-    cereal
-    entropy
-    tagged
-    transformers
+    base bytestring cereal entropy tagged transformers
   ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
@@ -35,4 +24,4 @@ mkDerivation {
   description = "A generic interface for cryptographic operations";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/crypto-pubkey-types.nix b/pkgs/crypto-pubkey-types.nix
index 87d94e81fe1633345b499ca1ecdd82340ac7c5e1..56bcf30853e8489f4833cef6187ca4ac4b051092 100644
--- a/pkgs/crypto-pubkey-types.nix
+++ b/pkgs/crypto-pubkey-types.nix
@@ -18,4 +18,4 @@ mkDerivation {
   description = "Generic cryptography Public keys algorithm types";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/cryptohash-md5.nix b/pkgs/cryptohash-md5.nix
index 45e43e117b616c948faa4b82d1f68c561759f642..6bf6b192de94b8cf64ff26c833d1aaef26e7e6d1 100644
--- a/pkgs/cryptohash-md5.nix
+++ b/pkgs/cryptohash-md5.nix
@@ -1,13 +1,5 @@
-{ mkDerivation
-, base
-, base16-bytestring
-, bytestring
-, criterion
-, lib
-, pureMD5
-, tasty
-, tasty-hunit
-, tasty-quickcheck
+{ mkDerivation, base, base16-bytestring, bytestring, criterion, lib
+, pureMD5, tasty, tasty-hunit, tasty-quickcheck
 }:
 mkDerivation {
   pname = "cryptohash-md5";
@@ -20,12 +12,7 @@ mkDerivation {
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [ base bytestring ];
   testHaskellDepends = [
-    base
-    base16-bytestring
-    bytestring
-    pureMD5
-    tasty
-    tasty-hunit
+    base base16-bytestring bytestring pureMD5 tasty tasty-hunit
     tasty-quickcheck
   ];
   benchmarkHaskellDepends = [ base bytestring criterion ];
@@ -40,4 +27,4 @@ mkDerivation {
   description = "Fast, pure and practical MD5 implementation";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/cryptohash-sha1.nix b/pkgs/cryptohash-sha1.nix
index e66e21c78ec22697df0b6d98721c3aac0a8bdb6e..5dff2ec64d606f47d1f82c4e0a1218c496cb98e7 100644
--- a/pkgs/cryptohash-sha1.nix
+++ b/pkgs/cryptohash-sha1.nix
@@ -1,13 +1,5 @@
-{ mkDerivation
-, SHA
-, base
-, base16-bytestring
-, bytestring
-, criterion
-, lib
-, tasty
-, tasty-hunit
-, tasty-quickcheck
+{ mkDerivation, SHA, base, base16-bytestring, bytestring, criterion
+, lib, tasty, tasty-hunit, tasty-quickcheck
 }:
 mkDerivation {
   pname = "cryptohash-sha1";
@@ -20,12 +12,7 @@ mkDerivation {
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [ base bytestring ];
   testHaskellDepends = [
-    base
-    base16-bytestring
-    bytestring
-    SHA
-    tasty
-    tasty-hunit
+    base base16-bytestring bytestring SHA tasty tasty-hunit
     tasty-quickcheck
   ];
   benchmarkHaskellDepends = [ base bytestring criterion ];
@@ -40,4 +27,4 @@ mkDerivation {
   description = "Fast, pure and practical SHA-1 implementation";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/cryptohash-sha256.nix b/pkgs/cryptohash-sha256.nix
index 3a98c5ef4e7b9d1be3129da49613a98eb6846d71..3b70b175830fa1719e91de0e8c7ddf51ad7ab964 100644
--- a/pkgs/cryptohash-sha256.nix
+++ b/pkgs/cryptohash-sha256.nix
@@ -1,32 +1,19 @@
-{ mkDerivation
-, SHA
-, base
-, base16-bytestring
-, bytestring
-, criterion
-, lib
-, tasty
-, tasty-hunit
-, tasty-quickcheck
+{ mkDerivation, SHA, base, base16-bytestring, bytestring, criterion
+, lib, tasty, tasty-hunit, tasty-quickcheck
 }:
 mkDerivation {
   pname = "cryptohash-sha256";
   version = "0.11.102.1";
   sha256 = "73a7dc7163871a80837495039a099967b11f5c4fe70a118277842f7a713c6bf6";
-  revision = "1";
-  editedCabalFile = "1hyzqv30rpj920ddnr0zypyjjlh52vyp2d140pn2byayj820rkgs";
+  revision = "2";
+  editedCabalFile = "1g7lpcn3zhrp4a65gj71v2164387r0m42pyavlx6bbifhyar1kkj";
   configureFlags = [ "-fuse-cbits" ];
   isLibrary = true;
   isExecutable = true;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [ base bytestring ];
   testHaskellDepends = [
-    base
-    base16-bytestring
-    bytestring
-    SHA
-    tasty
-    tasty-hunit
+    base base16-bytestring bytestring SHA tasty tasty-hunit
     tasty-quickcheck
   ];
   benchmarkHaskellDepends = [ base bytestring criterion SHA ];
@@ -41,4 +28,4 @@ mkDerivation {
   description = "Fast, pure and practical SHA-256 implementation";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/cryptohash.nix b/pkgs/cryptohash.nix
index 3d30d8768679117d1baef3d0be967822326ab4fc..1ab86b5c5f9c8af3eefaa78df070739511b57f38 100644
--- a/pkgs/cryptohash.nix
+++ b/pkgs/cryptohash.nix
@@ -1,16 +1,5 @@
-{ mkDerivation
-, HUnit
-, QuickCheck
-, base
-, byteable
-, bytestring
-, criterion
-, cryptonite
-, ghc-prim
-, lib
-, memory
-, tasty
-, tasty-hunit
+{ mkDerivation, HUnit, QuickCheck, base, byteable, bytestring
+, criterion, cryptonite, ghc-prim, lib, memory, tasty, tasty-hunit
 , tasty-quickcheck
 }:
 mkDerivation {
@@ -21,21 +10,10 @@ mkDerivation {
   isExecutable = false;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    base
-    byteable
-    bytestring
-    cryptonite
-    ghc-prim
-    memory
+    base byteable bytestring cryptonite ghc-prim memory
   ];
   testHaskellDepends = [
-    base
-    byteable
-    bytestring
-    HUnit
-    QuickCheck
-    tasty
-    tasty-hunit
+    base byteable bytestring HUnit QuickCheck tasty tasty-hunit
     tasty-quickcheck
   ];
   benchmarkHaskellDepends = [ base byteable bytestring criterion ];
@@ -50,4 +28,4 @@ mkDerivation {
   description = "collection of crypto hashes, fast, pure and practical";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/cryptonite-conduit.nix b/pkgs/cryptonite-conduit.nix
index 484ba640ebe45bd07adae7fc92ac0ad03de6316a..c79458f7cbbdff59478d22743ead8491b854c50c 100644
--- a/pkgs/cryptonite-conduit.nix
+++ b/pkgs/cryptonite-conduit.nix
@@ -1,18 +1,6 @@
-{ mkDerivation
-, base
-, bytestring
-, conduit
-, conduit-combinators
-, conduit-extra
-, cryptonite
-, exceptions
-, lib
-, memory
-, resourcet
-, tasty
-, tasty-hunit
-, tasty-quickcheck
-, transformers
+{ mkDerivation, base, bytestring, conduit, conduit-combinators
+, conduit-extra, cryptonite, exceptions, lib, memory, resourcet
+, tasty, tasty-hunit, tasty-quickcheck, transformers
 }:
 mkDerivation {
   pname = "cryptonite-conduit";
@@ -24,26 +12,12 @@ mkDerivation {
   isExecutable = false;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    base
-    bytestring
-    conduit
-    conduit-extra
-    cryptonite
-    exceptions
-    memory
-    resourcet
-    transformers
+    base bytestring conduit conduit-extra cryptonite exceptions memory
+    resourcet transformers
   ];
   testHaskellDepends = [
-    base
-    bytestring
-    conduit
-    conduit-combinators
-    cryptonite
-    memory
-    tasty
-    tasty-hunit
-    tasty-quickcheck
+    base bytestring conduit conduit-combinators cryptonite memory tasty
+    tasty-hunit tasty-quickcheck
   ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
@@ -56,4 +30,4 @@ mkDerivation {
   description = "cryptonite conduit";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/cryptonite.nix b/pkgs/cryptonite.nix
index 07b1eb8e3b8be506330f8eaedd71566591de4049..db9ebc591b98b4b651c8ac121c4c5368274d3138 100644
--- a/pkgs/cryptonite.nix
+++ b/pkgs/cryptonite.nix
@@ -1,18 +1,6 @@
-{ mkDerivation
-, base
-, basement
-, bytestring
-, deepseq
-, gauge
-, ghc-prim
-, integer-gmp
-, lib
-, memory
-, random
-, tasty
-, tasty-hunit
-, tasty-kat
-, tasty-quickcheck
+{ mkDerivation, base, basement, bytestring, deepseq, gauge
+, ghc-prim, integer-gmp, lib, memory, random, tasty, tasty-hunit
+, tasty-kat, tasty-quickcheck
 }:
 mkDerivation {
   pname = "cryptonite";
@@ -22,30 +10,13 @@ mkDerivation {
   isExecutable = false;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    base
-    basement
-    bytestring
-    deepseq
-    ghc-prim
-    integer-gmp
-    memory
+    base basement bytestring deepseq ghc-prim integer-gmp memory
   ];
   testHaskellDepends = [
-    base
-    bytestring
-    memory
-    tasty
-    tasty-hunit
-    tasty-kat
-    tasty-quickcheck
+    base bytestring memory tasty tasty-hunit tasty-kat tasty-quickcheck
   ];
   benchmarkHaskellDepends = [
-    base
-    bytestring
-    deepseq
-    gauge
-    memory
-    random
+    base bytestring deepseq gauge memory random
   ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
@@ -58,4 +29,4 @@ mkDerivation {
   description = "Cryptography Primitives sink";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/css-text.nix b/pkgs/css-text.nix
index 59b5b7e34440d185b7bf62d39e27664fce44a9cc..8ae586601cc0d6216cdf5e76626cfd7c81a605c5 100644
--- a/pkgs/css-text.nix
+++ b/pkgs/css-text.nix
@@ -19,4 +19,4 @@ mkDerivation {
   description = "CSS parser and renderer";
   license = lib.licenses.mit;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/csv.nix b/pkgs/csv.nix
index e780723b8dc776be754d13b8c578221f17a07b34..cf1cb9109946c803e2649a2edd3a6b9b7afc7626 100644
--- a/pkgs/csv.nix
+++ b/pkgs/csv.nix
@@ -22,4 +22,4 @@ mkDerivation {
   description = "CSV loader and dumper";
   license = lib.licenses.mit;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/cubicbezier.nix b/pkgs/cubicbezier.nix
index d5eff55ccba74c3fcc9c78e600d41963ffda4823..a096d09cb4de886c225cc5b5ab2c0e4ba233b9f7 100644
--- a/pkgs/cubicbezier.nix
+++ b/pkgs/cubicbezier.nix
@@ -1,19 +1,6 @@
-{ mkDerivation
-, base
-, containers
-, fast-math
-, integration
-, lib
-, matrices
-, microlens
-, microlens-mtl
-, microlens-th
-, mtl
-, parsec
-, tasty
-, tasty-hunit
-, vector
-, vector-space
+{ mkDerivation, base, containers, fast-math, integration, lib
+, matrices, microlens, microlens-mtl, microlens-th, mtl, parsec
+, tasty, tasty-hunit, vector, vector-space
 }:
 mkDerivation {
   pname = "cubicbezier";
@@ -25,17 +12,8 @@ mkDerivation {
   isExecutable = false;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    base
-    containers
-    fast-math
-    integration
-    matrices
-    microlens
-    microlens-mtl
-    microlens-th
-    mtl
-    vector
-    vector-space
+    base containers fast-math integration matrices microlens
+    microlens-mtl microlens-th mtl vector vector-space
   ];
   testHaskellDepends = [ base parsec tasty tasty-hunit ];
   enableLibraryProfiling = true;
@@ -48,4 +26,4 @@ mkDerivation {
   description = "Efficient manipulating of 2D cubic bezier curves";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/cursor-brick.nix b/pkgs/cursor-brick.nix
index 7c66e7f16bf6e91fe0f6e0e20c8c45793b4cdb8b..ba8f83c2b794ea17c12d9df15af32cda046e6597 100644
--- a/pkgs/cursor-brick.nix
+++ b/pkgs/cursor-brick.nix
@@ -17,4 +17,4 @@ mkDerivation {
   homepage = "https://github.com/NorfairKing/cursor-brick#readme";
   license = lib.licenses.mit;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/cursor-dirforest-brick.nix b/pkgs/cursor-dirforest-brick.nix
index 341f645f4c1b41e22b03fd17c91bf421c37a6a56..fe4786150f8a4d2b2794129b47feafbc904bb519 100644
--- a/pkgs/cursor-dirforest-brick.nix
+++ b/pkgs/cursor-dirforest-brick.nix
@@ -1,14 +1,5 @@
-{ mkDerivation
-, base
-, brick
-, containers
-, cursor
-, cursor-brick
-, cursor-dirforest
-, dirforest
-, fetchgit
-, lib
-, vty
+{ mkDerivation, base, brick, containers, cursor, cursor-brick
+, cursor-dirforest, dirforest, fetchgit, lib, vty
 }:
 mkDerivation {
   pname = "cursor-dirforest-brick";
@@ -24,14 +15,8 @@ mkDerivation {
   isExecutable = false;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    base
-    brick
-    containers
-    cursor
-    cursor-brick
-    cursor-dirforest
-    dirforest
-    vty
+    base brick containers cursor cursor-brick cursor-dirforest
+    dirforest vty
   ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
@@ -43,4 +28,4 @@ mkDerivation {
   homepage = "https://github.com/NorfairKing/cursor-dirforest#readme";
   license = lib.licenses.mit;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/cursor-dirforest-gen.nix b/pkgs/cursor-dirforest-gen.nix
index 5de0f876642b541b872a5e974dd9802b75220cca..fa9fe6b9166ec2fe6af8935ffa65d946a52f784f 100644
--- a/pkgs/cursor-dirforest-gen.nix
+++ b/pkgs/cursor-dirforest-gen.nix
@@ -1,23 +1,8 @@
-{ mkDerivation
-, QuickCheck
-, base
-, containers
-, criterion
-, cursor
-, cursor-dirforest
-, cursor-gen
-, dirforest
-, fetchgit
-, filepath
-, genvalidity
-, genvalidity-containers
-, genvalidity-criterion
-, genvalidity-dirforest
-, genvalidity-hspec
-, genvalidity-hspec-optics
-, hspec
-, lib
-, path
+{ mkDerivation, QuickCheck, base, containers, criterion, cursor
+, cursor-dirforest, cursor-gen, dirforest, fetchgit, filepath
+, genvalidity, genvalidity-containers, genvalidity-criterion
+, genvalidity-dirforest, genvalidity-hspec
+, genvalidity-hspec-optics, hspec, lib, path
 }:
 mkDerivation {
   pname = "cursor-dirforest-gen";
@@ -33,37 +18,16 @@ mkDerivation {
   isExecutable = false;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    base
-    containers
-    cursor
-    cursor-dirforest
-    cursor-gen
-    dirforest
-    filepath
-    genvalidity
-    genvalidity-containers
-    genvalidity-dirforest
-    path
-    QuickCheck
+    base containers cursor cursor-dirforest cursor-gen dirforest
+    filepath genvalidity genvalidity-containers genvalidity-dirforest
+    path QuickCheck
   ];
   testHaskellDepends = [
-    base
-    cursor
-    cursor-dirforest
-    cursor-gen
-    dirforest
-    genvalidity-hspec
-    genvalidity-hspec-optics
-    hspec
-    path
-    QuickCheck
+    base cursor cursor-dirforest cursor-gen dirforest genvalidity-hspec
+    genvalidity-hspec-optics hspec path QuickCheck
   ];
   benchmarkHaskellDepends = [
-    base
-    criterion
-    cursor-dirforest
-    genvalidity-criterion
-    QuickCheck
+    base criterion cursor-dirforest genvalidity-criterion QuickCheck
   ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
@@ -75,4 +39,4 @@ mkDerivation {
   homepage = "https://github.com/NorfairKing/cursor-dirforest#readme";
   license = lib.licenses.mit;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/cursor-dirforest.nix b/pkgs/cursor-dirforest.nix
index 8c58a5ae35127f99a43e55cc83c43d8923661dd9..a51c0ae1b3822aead57be9e60322fa148ae204e4 100644
--- a/pkgs/cursor-dirforest.nix
+++ b/pkgs/cursor-dirforest.nix
@@ -1,16 +1,5 @@
-{ mkDerivation
-, base
-, containers
-, cursor
-, deepseq
-, dirforest
-, fetchgit
-, filepath
-, lib
-, microlens
-, path
-, text
-, validity
+{ mkDerivation, base, containers, cursor, deepseq, dirforest
+, fetchgit, filepath, lib, microlens, path, text, validity
 , validity-path
 }:
 mkDerivation {
@@ -27,17 +16,8 @@ mkDerivation {
   isExecutable = false;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    base
-    containers
-    cursor
-    deepseq
-    dirforest
-    filepath
-    microlens
-    path
-    text
-    validity
-    validity-path
+    base containers cursor deepseq dirforest filepath microlens path
+    text validity validity-path
   ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
@@ -49,4 +29,4 @@ mkDerivation {
   homepage = "https://github.com/NorfairKing/cursor-dirforest#readme";
   license = lib.licenses.mit;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/cursor-fuzzy-time.nix b/pkgs/cursor-fuzzy-time.nix
index 19b23a9bdfaa9c83f5d6643189bdcae8d53b89ae..bbfcd9b6bfe50eb833462fa43001afe84585427b 100644
--- a/pkgs/cursor-fuzzy-time.nix
+++ b/pkgs/cursor-fuzzy-time.nix
@@ -1,16 +1,5 @@
-{ mkDerivation
-, base
-, containers
-, cursor
-, deepseq
-, fuzzy-time
-, lib
-, megaparsec
-, microlens
-, text
-, time
-, validity
-, validity-time
+{ mkDerivation, base, containers, cursor, deepseq, fuzzy-time, lib
+, megaparsec, microlens, text, time, validity, validity-time
 }:
 mkDerivation {
   pname = "cursor-fuzzy-time";
@@ -20,17 +9,8 @@ mkDerivation {
   isExecutable = false;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    base
-    containers
-    cursor
-    deepseq
-    fuzzy-time
-    megaparsec
-    microlens
-    text
-    time
-    validity
-    validity-time
+    base containers cursor deepseq fuzzy-time megaparsec microlens text
+    time validity validity-time
   ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
@@ -42,4 +22,4 @@ mkDerivation {
   homepage = "https://github.com/NorfairKing/fuzzy-time";
   license = lib.licenses.mit;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/cursor-gen.nix b/pkgs/cursor-gen.nix
index 3a03c5f6ba09ecbd8375c458f2cad31762840a7d..a8a14c6fb89a520bd67fefbd3133c76f77b7f63e 100644
--- a/pkgs/cursor-gen.nix
+++ b/pkgs/cursor-gen.nix
@@ -1,20 +1,7 @@
-{ mkDerivation
-, QuickCheck
-, base
-, containers
-, criterion
-, cursor
-, genvalidity
-, genvalidity-containers
-, genvalidity-criterion
-, genvalidity-hspec
-, genvalidity-hspec-optics
-, genvalidity-text
-, hspec
-, lib
-, microlens
-, pretty-show
-, text
+{ mkDerivation, QuickCheck, base, containers, criterion, cursor
+, genvalidity, genvalidity-containers, genvalidity-criterion
+, genvalidity-hspec, genvalidity-hspec-optics, genvalidity-text
+, hspec, lib, microlens, pretty-show, text
 }:
 mkDerivation {
   pname = "cursor-gen";
@@ -24,32 +11,15 @@ mkDerivation {
   isExecutable = false;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    base
-    containers
-    cursor
-    genvalidity
-    genvalidity-containers
-    genvalidity-text
-    QuickCheck
-    text
+    base containers cursor genvalidity genvalidity-containers
+    genvalidity-text QuickCheck text
   ];
   testHaskellDepends = [
-    base
-    containers
-    cursor
-    genvalidity-hspec
-    genvalidity-hspec-optics
-    hspec
-    microlens
-    pretty-show
-    QuickCheck
-    text
+    base containers cursor genvalidity-hspec genvalidity-hspec-optics
+    hspec microlens pretty-show QuickCheck text
   ];
   benchmarkHaskellDepends = [
-    base
-    criterion
-    cursor
-    genvalidity-criterion
+    base criterion cursor genvalidity-criterion
   ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
@@ -62,4 +32,4 @@ mkDerivation {
   description = "Generators for Purely Functional Cursors";
   license = lib.licenses.mit;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/cursor.nix b/pkgs/cursor.nix
index 6d3d00d331875b9353844338203f6694a3c241ca..66de7c786e9d8447c4f0f076c9f076ba2e7da4b9 100644
--- a/pkgs/cursor.nix
+++ b/pkgs/cursor.nix
@@ -1,13 +1,5 @@
-{ mkDerivation
-, base
-, containers
-, deepseq
-, lib
-, microlens
-, text
-, validity
-, validity-containers
-, validity-text
+{ mkDerivation, base, containers, deepseq, lib, microlens, text
+, validity, validity-containers, validity-text
 }:
 mkDerivation {
   pname = "cursor";
@@ -17,13 +9,7 @@ mkDerivation {
   isExecutable = false;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    base
-    containers
-    deepseq
-    microlens
-    text
-    validity
-    validity-containers
+    base containers deepseq microlens text validity validity-containers
     validity-text
   ];
   enableLibraryProfiling = true;
@@ -37,4 +23,4 @@ mkDerivation {
   description = "Purely Functional Cursors";
   license = lib.licenses.mit;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/daemons.nix b/pkgs/daemons.nix
index bbd370234eb2c05aa4f77a77e276163287a23dd2..3f0313c3425a931ac22b798004b4ed3ca5bc9fe5 100644
--- a/pkgs/daemons.nix
+++ b/pkgs/daemons.nix
@@ -1,20 +1,6 @@
-{ mkDerivation
-, HUnit
-, base
-, bytestring
-, cereal
-, containers
-, data-default
-, directory
-, filepath
-, ghc-prim
-, lib
-, network
-, pipes
-, test-framework
-, test-framework-hunit
-, transformers
-, unix
+{ mkDerivation, HUnit, base, bytestring, cereal, containers
+, data-default, directory, filepath, ghc-prim, lib, network, pipes
+, test-framework, test-framework-hunit, transformers, unix
 }:
 mkDerivation {
   pname = "daemons";
@@ -24,38 +10,16 @@ mkDerivation {
   isExecutable = true;
   enableSeparateDataOutput = true;
   libraryHaskellDepends = [
-    base
-    bytestring
-    cereal
-    data-default
-    directory
-    filepath
-    ghc-prim
-    network
-    pipes
-    transformers
-    unix
+    base bytestring cereal data-default directory filepath ghc-prim
+    network pipes transformers unix
   ];
   executableHaskellDepends = [
-    base
-    bytestring
-    cereal
-    containers
-    data-default
-    ghc-prim
-    network
-    pipes
-    transformers
+    base bytestring cereal containers data-default ghc-prim network
+    pipes transformers
   ];
   testHaskellDepends = [
-    base
-    data-default
-    directory
-    ghc-prim
-    HUnit
-    test-framework
-    test-framework-hunit
-    unix
+    base data-default directory ghc-prim HUnit test-framework
+    test-framework-hunit unix
   ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
@@ -68,4 +32,4 @@ mkDerivation {
   description = "Daemons in Haskell made fun and easy";
   license = lib.licenses.gpl3Only;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/data-binary-ieee754.nix b/pkgs/data-binary-ieee754.nix
index 18550df19d5e06be88ecc8f6c49ba43e418eb6d7..6b05d68932f8ea40ae95cd880d7cfc365b74f3da 100644
--- a/pkgs/data-binary-ieee754.nix
+++ b/pkgs/data-binary-ieee754.nix
@@ -18,4 +18,4 @@ mkDerivation {
   description = "Parser/Serialiser for IEEE-754 floating-point values";
   license = lib.licenses.mit;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/data-clist.nix b/pkgs/data-clist.nix
index eac57a471f5e58b2cd85e2112aa5a6f0c23f5185..b71611fc4555fe43afd4dc4e5549c212a117d96c 100644
--- a/pkgs/data-clist.nix
+++ b/pkgs/data-clist.nix
@@ -19,4 +19,4 @@ mkDerivation {
   description = "Simple functional ring type";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/data-default-class.nix b/pkgs/data-default-class.nix
index 066cccf93df967b2c956adce7a16d45467d40a2c..ab5fb3fc1c0a76dfb40127b9364c269740745cbf 100644
--- a/pkgs/data-default-class.nix
+++ b/pkgs/data-default-class.nix
@@ -17,4 +17,4 @@ mkDerivation {
   description = "A class for types with a default value";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/data-default-instances-containers.nix b/pkgs/data-default-instances-containers.nix
index 60550417a27950ccdef84b725bc995788a3655ee..c513bcc277e498170b5a833becc8a8c3ea1dd7da 100644
--- a/pkgs/data-default-instances-containers.nix
+++ b/pkgs/data-default-instances-containers.nix
@@ -17,4 +17,4 @@ mkDerivation {
   description = "Default instances for types in containers";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/data-default-instances-dlist.nix b/pkgs/data-default-instances-dlist.nix
index 636adaeef28ae21e5711bade48de8f8942fc4f03..dee9d318a14df166d7e268ec8cbc0fbf5a387b41 100644
--- a/pkgs/data-default-instances-dlist.nix
+++ b/pkgs/data-default-instances-dlist.nix
@@ -17,4 +17,4 @@ mkDerivation {
   description = "Default instances for types in dlist";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/data-default-instances-old-locale.nix b/pkgs/data-default-instances-old-locale.nix
index 722f041d1a2338328623dccca09661540b342994..de12c0a0a6c949f203f97558d600e8c56d3774db 100644
--- a/pkgs/data-default-instances-old-locale.nix
+++ b/pkgs/data-default-instances-old-locale.nix
@@ -17,4 +17,4 @@ mkDerivation {
   description = "Default instances for types in old-locale";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/data-default.nix b/pkgs/data-default.nix
index 5d1f7ed3d8f299a206c6e6cbb716d08501028c59..adb8e06b8e944383e89e204c100ebd2a05440144 100644
--- a/pkgs/data-default.nix
+++ b/pkgs/data-default.nix
@@ -1,10 +1,6 @@
-{ mkDerivation
-, base
-, data-default-class
-, data-default-instances-containers
-, data-default-instances-dlist
-, data-default-instances-old-locale
-, lib
+{ mkDerivation, base, data-default-class
+, data-default-instances-containers, data-default-instances-dlist
+, data-default-instances-old-locale, lib
 }:
 mkDerivation {
   pname = "data-default";
@@ -14,11 +10,8 @@ mkDerivation {
   isExecutable = false;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    base
-    data-default-class
-    data-default-instances-containers
-    data-default-instances-dlist
-    data-default-instances-old-locale
+    base data-default-class data-default-instances-containers
+    data-default-instances-dlist data-default-instances-old-locale
   ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
@@ -30,4 +23,4 @@ mkDerivation {
   description = "A class for types with a default value";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/data-fix.nix b/pkgs/data-fix.nix
index c6a1e0e30798a6cb824bc660c28b2593b2d0ab06..acb300311dd375b6b5638508445c2159060b3d0e 100644
--- a/pkgs/data-fix.nix
+++ b/pkgs/data-fix.nix
@@ -3,8 +3,8 @@ mkDerivation {
   pname = "data-fix";
   version = "0.3.2";
   sha256 = "3a172d3bc0639c327345e965f9d9023e099425814b28dcdb7b60ff66d66219cc";
-  revision = "3";
-  editedCabalFile = "0z77i9y86wlc13396akl8qxq39rwpkhhcs5fadzk47bwn7v1gsmx";
+  revision = "4";
+  editedCabalFile = "1s9xivrnsp5n7jhflz4h4vzwwdcxal7kwchpaa982m8pfr23ayy2";
   isLibrary = true;
   isExecutable = false;
   enableSeparateDataOutput = false;
@@ -20,4 +20,4 @@ mkDerivation {
   description = "Fixpoint data types";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/data-ordlist.nix b/pkgs/data-ordlist.nix
index 4dd21c66adb4c73ff144040dca155471bc74a84c..b54f725043cc81505b048431957ad130f11750cd 100644
--- a/pkgs/data-ordlist.nix
+++ b/pkgs/data-ordlist.nix
@@ -17,4 +17,4 @@ mkDerivation {
   description = "Set and bag operations on ordered lists";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/data-sketches-core.nix b/pkgs/data-sketches-core.nix
index f78d41086cd8ce65e4f05749e2d5d9e7d0f087a1..d1a1c9663ef7f377b4ab89f83877a9ac1a9585b4 100644
--- a/pkgs/data-sketches-core.nix
+++ b/pkgs/data-sketches-core.nix
@@ -1,12 +1,5 @@
-{ mkDerivation
-, base
-, deepseq
-, ghc-prim
-, lib
-, mwc-random
-, primitive
-, vector
-, vector-algorithms
+{ mkDerivation, base, deepseq, ghc-prim, lib, mwc-random, primitive
+, vector, vector-algorithms
 }:
 mkDerivation {
   pname = "data-sketches-core";
@@ -16,22 +9,10 @@ mkDerivation {
   isExecutable = false;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    base
-    deepseq
-    ghc-prim
-    mwc-random
-    primitive
-    vector
-    vector-algorithms
+    base deepseq ghc-prim mwc-random primitive vector vector-algorithms
   ];
   testHaskellDepends = [
-    base
-    deepseq
-    ghc-prim
-    mwc-random
-    primitive
-    vector
-    vector-algorithms
+    base deepseq ghc-prim mwc-random primitive vector vector-algorithms
   ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
@@ -43,4 +24,4 @@ mkDerivation {
   homepage = "https://github.com/iand675/datasketches-haskell#readme";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/data-sketches.nix b/pkgs/data-sketches.nix
index 9f289b0a179663dd9e6aa4e83938790e73f66b69..4447c7c5d946f9e4b74d332f97a55bd223e0147d 100644
--- a/pkgs/data-sketches.nix
+++ b/pkgs/data-sketches.nix
@@ -1,19 +1,6 @@
-{ mkDerivation
-, QuickCheck
-, base
-, criterion
-, data-sketches-core
-, ghc-prim
-, hspec
-, hspec-discover
-, lib
-, mtl
-, mwc-random
-, pretty-show
-, primitive
-, statistics
-, vector
-, vector-algorithms
+{ mkDerivation, QuickCheck, base, criterion, data-sketches-core
+, ghc-prim, hspec, hspec-discover, lib, mtl, mwc-random
+, pretty-show, primitive, statistics, vector, vector-algorithms
 }:
 mkDerivation {
   pname = "data-sketches";
@@ -23,41 +10,18 @@ mkDerivation {
   isExecutable = false;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    base
-    data-sketches-core
-    ghc-prim
-    mtl
-    mwc-random
-    primitive
-    vector
+    base data-sketches-core ghc-prim mtl mwc-random primitive vector
     vector-algorithms
   ];
   testHaskellDepends = [
-    base
-    data-sketches-core
-    ghc-prim
-    hspec
-    hspec-discover
-    mtl
-    mwc-random
-    pretty-show
-    primitive
-    QuickCheck
-    statistics
-    vector
+    base data-sketches-core ghc-prim hspec hspec-discover mtl
+    mwc-random pretty-show primitive QuickCheck statistics vector
     vector-algorithms
   ];
   testToolDepends = [ hspec-discover ];
   benchmarkHaskellDepends = [
-    base
-    criterion
-    data-sketches-core
-    ghc-prim
-    mtl
-    mwc-random
-    primitive
-    vector
-    vector-algorithms
+    base criterion data-sketches-core ghc-prim mtl mwc-random primitive
+    vector vector-algorithms
   ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
@@ -69,4 +33,4 @@ mkDerivation {
   homepage = "https://github.com/iand675/datasketches-haskell#readme";
   license = lib.licenses.asl20;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/dbus.nix b/pkgs/dbus.nix
index 409a81a12e5ad1b6c1f8fcb180d27c4ce5e1011b..436d179e02aca8acfb9de57deeee6b8657e4a800 100644
--- a/pkgs/dbus.nix
+++ b/pkgs/dbus.nix
@@ -1,35 +1,8 @@
-{ mkDerivation
-, QuickCheck
-, base
-, bytestring
-, cereal
-, conduit
-, containers
-, criterion
-, deepseq
-, directory
-, exceptions
-, extra
-, filepath
-, lens
-, lib
-, network
-, parsec
-, process
-, random
-, resourcet
-, split
-, tasty
-, tasty-hunit
-, tasty-quickcheck
-, template-haskell
-, text
-, th-lift
-, transformers
-, unix
-, vector
-, xml-conduit
-, xml-types
+{ mkDerivation, QuickCheck, base, bytestring, cereal, conduit
+, containers, criterion, deepseq, directory, exceptions, extra
+, filepath, lens, lib, network, parsec, process, random, resourcet
+, split, tasty, tasty-hunit, tasty-quickcheck, template-haskell
+, text, th-lift, transformers, unix, vector, xml-conduit, xml-types
 }:
 mkDerivation {
   pname = "dbus";
@@ -39,49 +12,14 @@ mkDerivation {
   isExecutable = false;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    base
-    bytestring
-    cereal
-    conduit
-    containers
-    deepseq
-    exceptions
-    filepath
-    lens
-    network
-    parsec
-    random
-    split
-    template-haskell
-    text
-    th-lift
-    transformers
-    unix
-    vector
-    xml-conduit
-    xml-types
+    base bytestring cereal conduit containers deepseq exceptions
+    filepath lens network parsec random split template-haskell text
+    th-lift transformers unix vector xml-conduit xml-types
   ];
   testHaskellDepends = [
-    base
-    bytestring
-    cereal
-    containers
-    directory
-    extra
-    filepath
-    network
-    parsec
-    process
-    QuickCheck
-    random
-    resourcet
-    tasty
-    tasty-hunit
-    tasty-quickcheck
-    text
-    transformers
-    unix
-    vector
+    base bytestring cereal containers directory extra filepath network
+    parsec process QuickCheck random resourcet tasty tasty-hunit
+    tasty-quickcheck text transformers unix vector
   ];
   benchmarkHaskellDepends = [ base criterion ];
   enableLibraryProfiling = true;
@@ -95,4 +33,4 @@ mkDerivation {
   description = "A client library for the D-Bus IPC system";
   license = lib.licenses.asl20;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/dec.nix b/pkgs/dec.nix
index b0466af39fc4804e06a336be4e00aa60322ef47e..954a14192910e8532e26e11d8869488153e88579 100644
--- a/pkgs/dec.nix
+++ b/pkgs/dec.nix
@@ -3,6 +3,8 @@ mkDerivation {
   pname = "dec";
   version = "0.0.5";
   sha256 = "e18043c7c7e68168489f164921a02efede0c0175a5012ed5451ec2242338df88";
+  revision = "1";
+  editedCabalFile = "1vng67drg2y9vjg6106q4lcz0kf2f2kl4qrrnl76kmk6z9a9kakh";
   isLibrary = true;
   isExecutable = false;
   enableSeparateDataOutput = false;
@@ -14,8 +16,8 @@ mkDerivation {
   doCheck = false;
   doBenchmark = false;
   hyperlinkSource = false;
-  homepage = "https://github.com/phadej/vec";
+  homepage = "https://github.com/phadej/dec";
   description = "Decidable propositions";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/deepseq-generics.nix b/pkgs/deepseq-generics.nix
index eb0d3965790fd6889216fde7540f6d35d6041a39..a4c69eabeb85c6d3332b8951c303c3bb5aabd04e 100644
--- a/pkgs/deepseq-generics.nix
+++ b/pkgs/deepseq-generics.nix
@@ -1,10 +1,4 @@
-{ mkDerivation
-, HUnit
-, base
-, deepseq
-, ghc-prim
-, lib
-, test-framework
+{ mkDerivation, HUnit, base, deepseq, ghc-prim, lib, test-framework
 , test-framework-hunit
 }:
 mkDerivation {
@@ -18,12 +12,7 @@ mkDerivation {
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [ base deepseq ghc-prim ];
   testHaskellDepends = [
-    base
-    deepseq
-    ghc-prim
-    HUnit
-    test-framework
-    test-framework-hunit
+    base deepseq ghc-prim HUnit test-framework test-framework-hunit
   ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
@@ -36,4 +25,4 @@ mkDerivation {
   description = "GHC.Generics-based Control.DeepSeq.rnf implementation";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/dense-linear-algebra.nix b/pkgs/dense-linear-algebra.nix
index bb68ae5ab93d5383df760c2f07330f6b2b282356..f7459184c240f3389b7c3f9461d556f8c69091ee 100644
--- a/pkgs/dense-linear-algebra.nix
+++ b/pkgs/dense-linear-algebra.nix
@@ -1,15 +1,6 @@
-{ mkDerivation
-, QuickCheck
-, base
-, deepseq
-, hspec
-, lib
-, math-functions
-, primitive
-, vector
-, vector-algorithms
-, vector-binary-instances
-, vector-th-unbox
+{ mkDerivation, QuickCheck, base, deepseq, hspec, lib
+, math-functions, primitive, vector, vector-algorithms
+, vector-binary-instances, vector-th-unbox
 }:
 mkDerivation {
   pname = "dense-linear-algebra";
@@ -19,14 +10,8 @@ mkDerivation {
   isExecutable = false;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    base
-    deepseq
-    math-functions
-    primitive
-    vector
-    vector-algorithms
-    vector-binary-instances
-    vector-th-unbox
+    base deepseq math-functions primitive vector vector-algorithms
+    vector-binary-instances vector-th-unbox
   ];
   testHaskellDepends = [ base hspec QuickCheck ];
   enableLibraryProfiling = true;
@@ -39,4 +24,4 @@ mkDerivation {
   description = "Simple and incomplete pure haskell implementation of linear algebra";
   license = lib.licenses.bsd2;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/dependent-map.nix b/pkgs/dependent-map.nix
index 2b999c4bacc3ee53e16cbfe14367dcfd9c417043..8906e94a043f530b4fee16a69a2a49aee7c98364 100644
--- a/pkgs/dependent-map.nix
+++ b/pkgs/dependent-map.nix
@@ -1,8 +1,4 @@
-{ mkDerivation
-, base
-, constraints-extras
-, containers
-, dependent-sum
+{ mkDerivation, base, constraints-extras, containers, dependent-sum
 , lib
 }:
 mkDerivation {
@@ -15,10 +11,7 @@ mkDerivation {
   isExecutable = false;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    base
-    constraints-extras
-    containers
-    dependent-sum
+    base constraints-extras containers dependent-sum
   ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
@@ -31,4 +24,4 @@ mkDerivation {
   description = "Dependent finite maps (partial dependent products)";
   license = "unknown";
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/dependent-sum-template.nix b/pkgs/dependent-sum-template.nix
index e47018e63dfa7269f3902a2965cbc823d0948e77..88e83df68e33e8ebcf59e996bb833ca06c27061f 100644
--- a/pkgs/dependent-sum-template.nix
+++ b/pkgs/dependent-sum-template.nix
@@ -1,11 +1,5 @@
-{ mkDerivation
-, base
-, constraints-extras
-, dependent-sum
-, lib
-, template-haskell
-, th-abstraction
-, th-extras
+{ mkDerivation, base, constraints-extras, dependent-sum, lib
+, template-haskell, th-abstraction, th-extras
 }:
 mkDerivation {
   pname = "dependent-sum-template";
@@ -15,11 +9,7 @@ mkDerivation {
   isExecutable = false;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    base
-    dependent-sum
-    template-haskell
-    th-abstraction
-    th-extras
+    base dependent-sum template-haskell th-abstraction th-extras
   ];
   testHaskellDepends = [ base constraints-extras dependent-sum ];
   enableLibraryProfiling = true;
@@ -33,4 +23,4 @@ mkDerivation {
   description = "Template Haskell code to generate instances of classes in dependent-sum package";
   license = lib.licenses.publicDomain;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/deque.nix b/pkgs/deque.nix
index 7f659138afd09ab4ed66f7893624e13a91ddc83c..3614c1433518addb250e4ed5cf2e2f6c025b54c6 100644
--- a/pkgs/deque.nix
+++ b/pkgs/deque.nix
@@ -1,15 +1,5 @@
-{ mkDerivation
-, QuickCheck
-, base
-, deepseq
-, hashable
-, lib
-, mtl
-, quickcheck-instances
-, rerebase
-, strict-list
-, tasty
-, tasty-hunit
+{ mkDerivation, QuickCheck, base, deepseq, hashable, lib, mtl
+, quickcheck-instances, rerebase, strict-list, tasty, tasty-hunit
 , tasty-quickcheck
 }:
 mkDerivation {
@@ -21,11 +11,7 @@ mkDerivation {
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [ base deepseq hashable mtl strict-list ];
   testHaskellDepends = [
-    QuickCheck
-    quickcheck-instances
-    rerebase
-    tasty
-    tasty-hunit
+    QuickCheck quickcheck-instances rerebase tasty tasty-hunit
     tasty-quickcheck
   ];
   enableLibraryProfiling = true;
@@ -39,4 +25,4 @@ mkDerivation {
   description = "Double-ended queues";
   license = lib.licenses.mit;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/derp.nix b/pkgs/derp.nix
index 9e0c6275829369c36fbb213ffc1e6f47826d3179..b0932e634f3c76dddc2d430ad6df4de844399ce1 100644
--- a/pkgs/derp.nix
+++ b/pkgs/derp.nix
@@ -17,4 +17,4 @@ mkDerivation {
   description = "Derivative Parsing";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/dhall-docs.nix b/pkgs/dhall-docs.nix
index 6878d2ac17ac32365b79544a49e5cd7ad95a4fe5..8196bd4362fe6b2a1cd9c22789728c2d314b4a6b 100644
--- a/pkgs/dhall-docs.nix
+++ b/pkgs/dhall-docs.nix
@@ -1,32 +1,8 @@
-{ mkDerivation
-, base
-, base16-bytestring
-, bytestring
-, containers
-, cryptohash-sha256
-, dhall
-, directory
-, doctest
-, file-embed
-, filepath
-, foldl
-, lens-family-core
-, lib
-, lucid
-, megaparsec
-, mmark
-, mtl
-, optparse-applicative
-, path
-, path-io
-, pretty
-, prettyprinter
-, tasty
-, tasty-hunit
-, tasty-silver
-, text
-, transformers
-, turtle
+{ mkDerivation, base, base16-bytestring, bytestring, containers
+, cryptohash-sha256, dhall, directory, doctest, file-embed
+, filepath, foldl, lens-family-core, lib, lucid, megaparsec, mmark
+, mtl, optparse-applicative, path, path-io, pretty, prettyprinter
+, tasty, tasty-hunit, tasty-silver, text, transformers, turtle
 }:
 mkDerivation {
   pname = "dhall-docs";
@@ -38,45 +14,15 @@ mkDerivation {
   isExecutable = true;
   enableSeparateDataOutput = true;
   libraryHaskellDepends = [
-    base
-    base16-bytestring
-    bytestring
-    containers
-    cryptohash-sha256
-    dhall
-    directory
-    file-embed
-    filepath
-    lens-family-core
-    lucid
-    megaparsec
-    mmark
-    mtl
-    optparse-applicative
-    path
-    path-io
-    prettyprinter
-    text
-    transformers
+    base base16-bytestring bytestring containers cryptohash-sha256
+    dhall directory file-embed filepath lens-family-core lucid
+    megaparsec mmark mtl optparse-applicative path path-io
+    prettyprinter text transformers
   ];
   executableHaskellDepends = [ base dhall ];
   testHaskellDepends = [
-    base
-    bytestring
-    containers
-    dhall
-    directory
-    doctest
-    filepath
-    foldl
-    lucid
-    path
-    path-io
-    pretty
-    tasty
-    tasty-hunit
-    tasty-silver
-    text
+    base bytestring containers dhall directory doctest filepath foldl
+    lucid path path-io pretty tasty tasty-hunit tasty-silver text
     turtle
   ];
   enableLibraryProfiling = true;
@@ -89,4 +35,4 @@ mkDerivation {
   description = "Generate HTML docs from a dhall package";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/dhall-json.nix b/pkgs/dhall-json.nix
index bdcfdffc9d8373ab07535c238816c2f5b64693b8..e9c415c561235716bacb45d201780b28bb218440 100644
--- a/pkgs/dhall-json.nix
+++ b/pkgs/dhall-json.nix
@@ -1,26 +1,8 @@
-{ mkDerivation
-, aeson
-, aeson-pretty
-, aeson-yaml
-, ansi-terminal
-, base
-, bytestring
-, containers
-, dhall
-, exceptions
-, filepath
-, lens-family-core
-, lib
-, optparse-applicative
-, prettyprinter
-, prettyprinter-ansi-terminal
-, scientific
-, tasty
-, tasty-hunit
-, tasty-silver
-, text
-, unordered-containers
-, vector
+{ mkDerivation, aeson, aeson-pretty, aeson-yaml, ansi-terminal
+, base, bytestring, containers, dhall, exceptions, filepath
+, lens-family-core, lib, optparse-applicative, prettyprinter
+, prettyprinter-ansi-terminal, scientific, tasty, tasty-hunit
+, tasty-silver, text, unordered-containers, vector
 }:
 mkDerivation {
   pname = "dhall-json";
@@ -32,45 +14,16 @@ mkDerivation {
   isExecutable = true;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    aeson
-    aeson-pretty
-    aeson-yaml
-    base
-    bytestring
-    containers
-    dhall
-    exceptions
-    filepath
-    lens-family-core
-    optparse-applicative
-    prettyprinter
-    scientific
-    text
-    unordered-containers
-    vector
+    aeson aeson-pretty aeson-yaml base bytestring containers dhall
+    exceptions filepath lens-family-core optparse-applicative
+    prettyprinter scientific text unordered-containers vector
   ];
   executableHaskellDepends = [
-    aeson
-    aeson-pretty
-    ansi-terminal
-    base
-    bytestring
-    dhall
-    exceptions
-    optparse-applicative
-    prettyprinter
-    prettyprinter-ansi-terminal
-    text
+    aeson aeson-pretty ansi-terminal base bytestring dhall exceptions
+    optparse-applicative prettyprinter prettyprinter-ansi-terminal text
   ];
   testHaskellDepends = [
-    aeson
-    base
-    bytestring
-    dhall
-    tasty
-    tasty-hunit
-    tasty-silver
-    text
+    aeson base bytestring dhall tasty tasty-hunit tasty-silver text
   ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
@@ -82,4 +35,4 @@ mkDerivation {
   description = "Convert between Dhall and JSON or YAML";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/dhall-nixpkgs.nix b/pkgs/dhall-nixpkgs.nix
index 5e73fc5bc536b4fdaad522f744361f64a203e55a..fd77fed2830f272e5725ba976114f32b9a59d011 100644
--- a/pkgs/dhall-nixpkgs.nix
+++ b/pkgs/dhall-nixpkgs.nix
@@ -1,24 +1,7 @@
-{ mkDerivation
-, aeson
-, base
-, base16-bytestring
-, base64-bytestring
-, bytestring
-, data-fix
-, dhall
-, foldl
-, hnix
-, lens-family-core
-, lib
-, megaparsec
-, mmorph
-, neat-interpolation
-, network-uri
-, optparse-applicative
-, prettyprinter
-, text
-, transformers
-, turtle
+{ mkDerivation, aeson, base, base16-bytestring, base64-bytestring
+, bytestring, data-fix, dhall, foldl, hnix, lens-family-core, lib
+, megaparsec, mmorph, neat-interpolation, network-uri
+, optparse-applicative, prettyprinter, text, transformers, turtle
 }:
 mkDerivation {
   pname = "dhall-nixpkgs";
@@ -30,25 +13,10 @@ mkDerivation {
   isExecutable = true;
   enableSeparateDataOutput = false;
   executableHaskellDepends = [
-    aeson
-    base
-    base16-bytestring
-    base64-bytestring
-    bytestring
-    data-fix
-    dhall
-    foldl
-    hnix
-    lens-family-core
-    megaparsec
-    mmorph
-    neat-interpolation
-    network-uri
-    optparse-applicative
-    prettyprinter
-    text
-    transformers
-    turtle
+    aeson base base16-bytestring base64-bytestring bytestring data-fix
+    dhall foldl hnix lens-family-core megaparsec mmorph
+    neat-interpolation network-uri optparse-applicative prettyprinter
+    text transformers turtle
   ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
@@ -60,4 +28,4 @@ mkDerivation {
   description = "Convert Dhall projects to Nix packages";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/dhall.nix b/pkgs/dhall.nix
index 96efcc20a884e54aed48e7eef3579bf8dd8a3098..2ef77772db1b6549924e19bae62a16440cb2d8ca 100644
--- a/pkgs/dhall.nix
+++ b/pkgs/dhall.nix
@@ -1,311 +1,79 @@
-{ mkDerivation
-, Diff
-, QuickCheck
-, aeson
-, aeson-pretty
-, ansi-terminal
-, atomic-write
-, base
-, base16-bytestring
-, bytestring
-, case-insensitive
-, cborg
-, cborg-json
-, containers
-, contravariant
-, cryptohash-sha256
-, data-fix
-, deepseq
-, directory
-, doctest
-, dotgen
-, either
-, exceptions
-, filepath
-, foldl
-, gauge
-, generic-random
-, half
-, hashable
-, haskeline
-, http-client
-, http-client-tls
-, http-types
-, indexed-traversable
-, lens-family-core
-, lib
-, megaparsec
-, mmorph
-, mockery
-, mtl
-, network-uri
-, optparse-applicative
-, parser-combinators
-, parsers
-, pretty-simple
-, prettyprinter
-, prettyprinter-ansi-terminal
-, profunctors
-, quickcheck-instances
-, repline
-, scientific
-, serialise
-, special-values
-, spoon
-, system-filepath
-, tasty
-, tasty-expected-failure
-, tasty-hunit
-, tasty-quickcheck
-, tasty-silver
-, template-haskell
-, temporary
-, text
-, text-manipulate
-, text-short
-, th-lift-instances
-, time
-, transformers
-, turtle
-, unordered-containers
-, uri-encode
-, vector
+{ mkDerivation, Diff, QuickCheck, aeson, aeson-pretty
+, ansi-terminal, atomic-write, base, base16-bytestring, bytestring
+, case-insensitive, cborg, cborg-json, containers, contravariant
+, cryptohash-sha256, data-fix, deepseq, directory, doctest, dotgen
+, either, exceptions, filepath, foldl, gauge, generic-random, half
+, hashable, haskeline, http-client, http-client-tls, http-types
+, indexed-traversable, lens-family-core, lib, megaparsec, mmorph
+, mockery, mtl, network-uri, optparse-applicative
+, parser-combinators, parsers, pretty-simple, prettyprinter
+, prettyprinter-ansi-terminal, profunctors, quickcheck-instances
+, repline, scientific, serialise, special-values, spoon
+, system-filepath, tasty, tasty-expected-failure, tasty-hunit
+, tasty-quickcheck, tasty-silver, template-haskell, temporary, text
+, text-manipulate, text-short, th-lift-instances, time
+, transformers, turtle, unordered-containers, uri-encode, vector
 }:
 mkDerivation {
   pname = "dhall";
   version = "1.41.2";
   sha256 = "6a9a026e698e5c1a1e103fcb376e8494615b03ef2450f0b6c5e6b43877cea592";
-  revision = "4";
-  editedCabalFile = "0innb3cn98ynb8bd83jdyrm64ij7wcvajg5qcwzdwbyzpr62anfx";
+  revision = "5";
+  editedCabalFile = "0jhhwzzinlxyb2gxr2jcyr71mbdig7njkw2zi8znns1ik6ix0d4c";
   isLibrary = true;
   isExecutable = true;
   enableSeparateDataOutput = true;
   libraryHaskellDepends = [
-    aeson
-    aeson-pretty
-    ansi-terminal
-    atomic-write
-    base
-    base16-bytestring
-    bytestring
-    case-insensitive
-    cborg
-    cborg-json
-    containers
-    contravariant
-    cryptohash-sha256
-    data-fix
-    deepseq
-    Diff
-    directory
-    dotgen
-    either
-    exceptions
-    filepath
-    half
-    hashable
-    haskeline
-    http-client
-    http-client-tls
-    http-types
-    indexed-traversable
-    lens-family-core
-    megaparsec
-    mmorph
-    mtl
-    network-uri
-    optparse-applicative
-    parser-combinators
-    parsers
-    pretty-simple
-    prettyprinter
-    prettyprinter-ansi-terminal
-    profunctors
-    repline
-    scientific
-    serialise
-    template-haskell
-    text
-    text-manipulate
-    text-short
-    th-lift-instances
-    time
-    transformers
-    unordered-containers
-    uri-encode
-    vector
+    aeson aeson-pretty ansi-terminal atomic-write base
+    base16-bytestring bytestring case-insensitive cborg cborg-json
+    containers contravariant cryptohash-sha256 data-fix deepseq Diff
+    directory dotgen either exceptions filepath half hashable haskeline
+    http-client http-client-tls http-types indexed-traversable
+    lens-family-core megaparsec mmorph mtl network-uri
+    optparse-applicative parser-combinators parsers pretty-simple
+    prettyprinter prettyprinter-ansi-terminal profunctors repline
+    scientific serialise template-haskell text text-manipulate
+    text-short th-lift-instances time transformers unordered-containers
+    uri-encode vector
   ];
   executableHaskellDepends = [
-    aeson
-    aeson-pretty
-    ansi-terminal
-    atomic-write
-    base
-    base16-bytestring
-    bytestring
-    case-insensitive
-    cborg
-    cborg-json
-    containers
-    contravariant
-    data-fix
-    deepseq
-    Diff
-    directory
-    dotgen
-    either
-    exceptions
-    filepath
-    half
-    hashable
-    haskeline
-    indexed-traversable
-    lens-family-core
-    megaparsec
-    mmorph
-    mtl
-    network-uri
-    optparse-applicative
-    parser-combinators
-    parsers
-    pretty-simple
-    prettyprinter
-    prettyprinter-ansi-terminal
-    profunctors
-    repline
-    scientific
-    serialise
-    template-haskell
-    text
-    text-manipulate
-    text-short
-    th-lift-instances
-    time
-    transformers
-    unordered-containers
-    uri-encode
-    vector
+    aeson aeson-pretty ansi-terminal atomic-write base
+    base16-bytestring bytestring case-insensitive cborg cborg-json
+    containers contravariant data-fix deepseq Diff directory dotgen
+    either exceptions filepath half hashable haskeline
+    indexed-traversable lens-family-core megaparsec mmorph mtl
+    network-uri optparse-applicative parser-combinators parsers
+    pretty-simple prettyprinter prettyprinter-ansi-terminal profunctors
+    repline scientific serialise template-haskell text text-manipulate
+    text-short th-lift-instances time transformers unordered-containers
+    uri-encode vector
   ];
   testHaskellDepends = [
-    aeson
-    aeson-pretty
-    ansi-terminal
-    atomic-write
-    base
-    base16-bytestring
-    bytestring
-    case-insensitive
-    cborg
-    cborg-json
-    containers
-    contravariant
-    data-fix
-    deepseq
-    Diff
-    directory
-    doctest
-    dotgen
-    either
-    exceptions
-    filepath
-    foldl
-    generic-random
-    half
-    hashable
-    haskeline
-    http-client
-    http-client-tls
-    indexed-traversable
-    lens-family-core
-    megaparsec
-    mmorph
-    mockery
-    mtl
-    network-uri
-    optparse-applicative
-    parser-combinators
-    parsers
-    pretty-simple
-    prettyprinter
-    prettyprinter-ansi-terminal
-    profunctors
-    QuickCheck
-    quickcheck-instances
-    repline
-    scientific
-    serialise
-    special-values
-    spoon
-    system-filepath
-    tasty
-    tasty-expected-failure
-    tasty-hunit
-    tasty-quickcheck
-    tasty-silver
-    template-haskell
-    temporary
-    text
-    text-manipulate
-    text-short
-    th-lift-instances
-    time
-    transformers
-    turtle
-    unordered-containers
-    uri-encode
-    vector
+    aeson aeson-pretty ansi-terminal atomic-write base
+    base16-bytestring bytestring case-insensitive cborg cborg-json
+    containers contravariant data-fix deepseq Diff directory doctest
+    dotgen either exceptions filepath foldl generic-random half
+    hashable haskeline http-client http-client-tls indexed-traversable
+    lens-family-core megaparsec mmorph mockery mtl network-uri
+    optparse-applicative parser-combinators parsers pretty-simple
+    prettyprinter prettyprinter-ansi-terminal profunctors QuickCheck
+    quickcheck-instances repline scientific serialise special-values
+    spoon system-filepath tasty tasty-expected-failure tasty-hunit
+    tasty-quickcheck tasty-silver template-haskell temporary text
+    text-manipulate text-short th-lift-instances time transformers
+    turtle unordered-containers uri-encode vector
   ];
   benchmarkHaskellDepends = [
-    aeson
-    aeson-pretty
-    ansi-terminal
-    atomic-write
-    base
-    base16-bytestring
-    bytestring
-    case-insensitive
-    cborg
-    cborg-json
-    containers
-    contravariant
-    data-fix
-    deepseq
-    Diff
-    directory
-    dotgen
-    either
-    exceptions
-    filepath
-    gauge
-    half
-    hashable
-    haskeline
-    indexed-traversable
-    lens-family-core
-    megaparsec
-    mmorph
-    mtl
-    network-uri
-    optparse-applicative
-    parser-combinators
-    parsers
-    pretty-simple
-    prettyprinter
-    prettyprinter-ansi-terminal
-    profunctors
-    repline
-    scientific
-    serialise
-    template-haskell
-    text
-    text-manipulate
-    text-short
-    th-lift-instances
-    time
-    transformers
-    unordered-containers
-    uri-encode
-    vector
+    aeson aeson-pretty ansi-terminal atomic-write base
+    base16-bytestring bytestring case-insensitive cborg cborg-json
+    containers contravariant data-fix deepseq Diff directory dotgen
+    either exceptions filepath gauge half hashable haskeline
+    indexed-traversable lens-family-core megaparsec mmorph mtl
+    network-uri optparse-applicative parser-combinators parsers
+    pretty-simple prettyprinter prettyprinter-ansi-terminal profunctors
+    repline scientific serialise template-haskell text text-manipulate
+    text-short th-lift-instances time transformers unordered-containers
+    uri-encode vector
   ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
@@ -317,4 +85,4 @@ mkDerivation {
   description = "A configuration language guaranteed to terminate";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/diagrams-contrib.nix b/pkgs/diagrams-contrib.nix
index dc3dfd518e4d7eb9faba981534b780c6224b4d39..617dfe0ee070b59104e122dfe643bf23084ec167 100644
--- a/pkgs/diagrams-contrib.nix
+++ b/pkgs/diagrams-contrib.nix
@@ -1,33 +1,9 @@
-{ mkDerivation
-, HUnit
-, MonadRandom
-, QuickCheck
-, base
-, circle-packing
-, colour
-, containers
-, cubicbezier
-, data-default
-, data-default-class
-, diagrams-core
-, diagrams-lib
-, diagrams-solve
-, force-layout
-, hashable
-, lens
-, lib
-, linear
-, mfsolve
-, monoid-extras
-, mtl
-, mtl-compat
-, parsec
-, random
-, semigroups
-, split
-, test-framework
-, test-framework-hunit
-, test-framework-quickcheck2
+{ mkDerivation, HUnit, MonadRandom, QuickCheck, base
+, circle-packing, colour, containers, cubicbezier, data-default
+, data-default-class, diagrams-core, diagrams-lib, diagrams-solve
+, force-layout, hashable, lens, lib, linear, mfsolve, monoid-extras
+, mtl, mtl-compat, parsec, random, semigroups, split
+, test-framework, test-framework-hunit, test-framework-quickcheck2
 , text
 }:
 mkDerivation {
@@ -40,40 +16,14 @@ mkDerivation {
   isExecutable = false;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    base
-    circle-packing
-    colour
-    containers
-    cubicbezier
-    data-default
-    data-default-class
-    diagrams-core
-    diagrams-lib
-    diagrams-solve
-    force-layout
-    hashable
-    lens
-    linear
-    mfsolve
-    MonadRandom
-    monoid-extras
-    mtl
-    mtl-compat
-    parsec
-    random
-    semigroups
-    split
-    text
+    base circle-packing colour containers cubicbezier data-default
+    data-default-class diagrams-core diagrams-lib diagrams-solve
+    force-layout hashable lens linear mfsolve MonadRandom monoid-extras
+    mtl mtl-compat parsec random semigroups split text
   ];
   testHaskellDepends = [
-    base
-    containers
-    diagrams-lib
-    HUnit
-    QuickCheck
-    test-framework
-    test-framework-hunit
-    test-framework-quickcheck2
+    base containers diagrams-lib HUnit QuickCheck test-framework
+    test-framework-hunit test-framework-quickcheck2
   ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
@@ -86,4 +36,4 @@ mkDerivation {
   description = "Collection of user contributions to diagrams EDSL";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/diagrams-core.nix b/pkgs/diagrams-core.nix
index 6bb66a9b05405f8babc78086c8f05a9f0dc1dd15..e9aa7cc353c76154dda6b49b682be178c988cffe 100644
--- a/pkgs/diagrams-core.nix
+++ b/pkgs/diagrams-core.nix
@@ -1,17 +1,6 @@
-{ mkDerivation
-, adjunctions
-, base
-, containers
-, distributive
-, dual-tree
-, lens
-, lib
-, linear
-, monoid-extras
-, mtl
-, profunctors
-, semigroups
-, unordered-containers
+{ mkDerivation, adjunctions, base, containers, distributive
+, dual-tree, lens, lib, linear, monoid-extras, mtl, profunctors
+, semigroups, unordered-containers
 }:
 mkDerivation {
   pname = "diagrams-core";
@@ -23,18 +12,8 @@ mkDerivation {
   isExecutable = false;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    adjunctions
-    base
-    containers
-    distributive
-    dual-tree
-    lens
-    linear
-    monoid-extras
-    mtl
-    profunctors
-    semigroups
-    unordered-containers
+    adjunctions base containers distributive dual-tree lens linear
+    monoid-extras mtl profunctors semigroups unordered-containers
   ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
@@ -47,4 +26,4 @@ mkDerivation {
   description = "Core libraries for diagrams EDSL";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/diagrams-lib.nix b/pkgs/diagrams-lib.nix
index 448f849f64b903c29b570f9cf747ca342cd6b6c2..650c260869abae52e54cd90f35728ee97b5af484 100644
--- a/pkgs/diagrams-lib.nix
+++ b/pkgs/diagrams-lib.nix
@@ -1,45 +1,11 @@
-{ mkDerivation
-, JuicyPixels
-, QuickCheck
-, active
-, adjunctions
-, array
-, base
-, bytestring
-, cereal
-, colour
-, containers
-, criterion
-, data-default-class
-, deepseq
-, diagrams-core
-, diagrams-solve
-, directory
-, distributive
-, dual-tree
-, exceptions
-, filepath
-, fingertree
-, fsnotify
-, hashable
-, intervals
-, lens
-, lib
-, linear
-, monoid-extras
-, mtl
-, numeric-extras
-, optparse-applicative
-, process
-, profunctors
-, semigroups
-, tagged
-, tasty
-, tasty-hunit
-, tasty-quickcheck
-, text
-, transformers
-, unordered-containers
+{ mkDerivation, JuicyPixels, QuickCheck, active, adjunctions, array
+, base, bytestring, cereal, colour, containers, criterion
+, data-default-class, deepseq, diagrams-core, diagrams-solve
+, directory, distributive, dual-tree, exceptions, filepath
+, fingertree, fsnotify, hashable, intervals, lens, lib, linear
+, monoid-extras, mtl, numeric-extras, optparse-applicative, process
+, profunctors, semigroups, tagged, tasty, tasty-hunit
+, tasty-quickcheck, text, transformers, unordered-containers
 }:
 mkDerivation {
   pname = "diagrams-lib";
@@ -51,51 +17,16 @@ mkDerivation {
   isExecutable = false;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    active
-    adjunctions
-    array
-    base
-    bytestring
-    cereal
-    colour
-    containers
-    data-default-class
-    diagrams-core
-    diagrams-solve
-    directory
-    distributive
-    dual-tree
-    exceptions
-    filepath
-    fingertree
-    fsnotify
-    hashable
-    intervals
-    JuicyPixels
-    lens
-    linear
-    monoid-extras
-    mtl
-    optparse-applicative
-    process
-    profunctors
-    semigroups
-    tagged
-    text
-    transformers
-    unordered-containers
+    active adjunctions array base bytestring cereal colour containers
+    data-default-class diagrams-core diagrams-solve directory
+    distributive dual-tree exceptions filepath fingertree fsnotify
+    hashable intervals JuicyPixels lens linear monoid-extras mtl
+    optparse-applicative process profunctors semigroups tagged text
+    transformers unordered-containers
   ];
   testHaskellDepends = [
-    base
-    deepseq
-    diagrams-solve
-    distributive
-    lens
-    numeric-extras
-    QuickCheck
-    tasty
-    tasty-hunit
-    tasty-quickcheck
+    base deepseq diagrams-solve distributive lens numeric-extras
+    QuickCheck tasty tasty-hunit tasty-quickcheck
   ];
   benchmarkHaskellDepends = [ base criterion diagrams-core ];
   enableLibraryProfiling = true;
@@ -109,4 +40,4 @@ mkDerivation {
   description = "Embedded domain-specific language for declarative graphics";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/diagrams-solve.nix b/pkgs/diagrams-solve.nix
index cc7357b519bcb862f0ac9602c4a14b65ad7bfadc..1f6b80f1403001fcd087b8abdf6dcde4cb8eb0b4 100644
--- a/pkgs/diagrams-solve.nix
+++ b/pkgs/diagrams-solve.nix
@@ -1,9 +1,4 @@
-{ mkDerivation
-, base
-, deepseq
-, lib
-, tasty
-, tasty-hunit
+{ mkDerivation, base, deepseq, lib, tasty, tasty-hunit
 , tasty-quickcheck
 }:
 mkDerivation {
@@ -17,11 +12,7 @@ mkDerivation {
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [ base ];
   testHaskellDepends = [
-    base
-    deepseq
-    tasty
-    tasty-hunit
-    tasty-quickcheck
+    base deepseq tasty tasty-hunit tasty-quickcheck
   ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
@@ -34,4 +25,4 @@ mkDerivation {
   description = "Pure Haskell solver routines used by diagrams";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/diagrams-svg.nix b/pkgs/diagrams-svg.nix
index b877cd90860bd9d2953d1015f6242bc128646b9b..ccfe7d72106da2a3738af75893aeb4d4521c283b 100644
--- a/pkgs/diagrams-svg.nix
+++ b/pkgs/diagrams-svg.nix
@@ -1,23 +1,7 @@
-{ mkDerivation
-, JuicyPixels
-, base
-, base64-bytestring
-, bytestring
-, colour
-, containers
-, diagrams-core
-, diagrams-lib
-, filepath
-, hashable
-, lens
-, lib
-, monoid-extras
-, mtl
-, optparse-applicative
-, semigroups
-, split
-, svg-builder
-, text
+{ mkDerivation, JuicyPixels, base, base64-bytestring, bytestring
+, colour, containers, diagrams-core, diagrams-lib, filepath
+, hashable, lens, lib, monoid-extras, mtl, optparse-applicative
+, semigroups, split, svg-builder, text
 }:
 mkDerivation {
   pname = "diagrams-svg";
@@ -29,24 +13,9 @@ mkDerivation {
   isExecutable = false;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    base
-    base64-bytestring
-    bytestring
-    colour
-    containers
-    diagrams-core
-    diagrams-lib
-    filepath
-    hashable
-    JuicyPixels
-    lens
-    monoid-extras
-    mtl
-    optparse-applicative
-    semigroups
-    split
-    svg-builder
-    text
+    base base64-bytestring bytestring colour containers diagrams-core
+    diagrams-lib filepath hashable JuicyPixels lens monoid-extras mtl
+    optparse-applicative semigroups split svg-builder text
   ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
@@ -59,4 +28,4 @@ mkDerivation {
   description = "SVG backend for diagrams drawing EDSL";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/dictionary-sharing.nix b/pkgs/dictionary-sharing.nix
index 9857a9b4da7f497e99ce9c02daeb98aedb13e00d..0d4c1fac8b751bcb3ba6f4238be741d74475f39e 100644
--- a/pkgs/dictionary-sharing.nix
+++ b/pkgs/dictionary-sharing.nix
@@ -19,4 +19,4 @@ mkDerivation {
   description = "Sharing/memoization of class members";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/dimensional.nix b/pkgs/dimensional.nix
index ce3607e2404c90c3495e585f4a416ae95e420a92..13e34e8d71db1b1967bca3414ca2c081df79abab 100644
--- a/pkgs/dimensional.nix
+++ b/pkgs/dimensional.nix
@@ -1,18 +1,6 @@
-{ mkDerivation
-, Glob
-, QuickCheck
-, base
-, criterion
-, deepseq
-, doctest
-, exact-pi
-, hspec
-, hspec-discover
-, ieee754
-, lib
-, numtype-dk
-, template-haskell
-, vector
+{ mkDerivation, Glob, QuickCheck, base, criterion, deepseq, doctest
+, exact-pi, hspec, hspec-discover, ieee754, lib, numtype-dk
+, template-haskell, vector
 }:
 mkDerivation {
   pname = "dimensional";
@@ -22,20 +10,10 @@ mkDerivation {
   isExecutable = false;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    base
-    deepseq
-    exact-pi
-    ieee754
-    numtype-dk
-    vector
+    base deepseq exact-pi ieee754 numtype-dk vector
   ];
   testHaskellDepends = [
-    base
-    doctest
-    Glob
-    hspec
-    QuickCheck
-    template-haskell
+    base doctest Glob hspec QuickCheck template-haskell
   ];
   testToolDepends = [ hspec-discover ];
   benchmarkHaskellDepends = [ base criterion deepseq ];
@@ -50,4 +28,4 @@ mkDerivation {
   description = "Statically checked physical dimensions";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/dirforest.nix b/pkgs/dirforest.nix
index 401b4d933d93e9f0908b3d2caaa4b9a05c5ffd4e..3f3e69313985a056bca251f9049cae10d0c4cd5f 100644
--- a/pkgs/dirforest.nix
+++ b/pkgs/dirforest.nix
@@ -1,15 +1,5 @@
-{ mkDerivation
-, aeson
-, base
-, containers
-, deepseq
-, fetchgit
-, filepath
-, lib
-, path
-, path-io
-, validity
-, validity-containers
+{ mkDerivation, aeson, base, containers, deepseq, fetchgit
+, filepath, lib, path, path-io, validity, validity-containers
 , validity-path
 }:
 mkDerivation {
@@ -26,16 +16,8 @@ mkDerivation {
   isExecutable = false;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    aeson
-    base
-    containers
-    deepseq
-    filepath
-    path
-    path-io
-    validity
-    validity-containers
-    validity-path
+    aeson base containers deepseq filepath path path-io validity
+    validity-containers validity-path
   ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
@@ -47,4 +29,4 @@ mkDerivation {
   homepage = "https://github.com/NorfairKing/dirforest#readme";
   license = "unknown";
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/distributive.nix b/pkgs/distributive.nix
index e0aab7b02121a216a98aa350d57c951615080bfb..f45e315331e0c104f6e285337d75ef708b841048 100644
--- a/pkgs/distributive.nix
+++ b/pkgs/distributive.nix
@@ -1,12 +1,5 @@
-{ mkDerivation
-, base
-, base-orphans
-, generic-deriving
-, hspec
-, hspec-discover
-, lib
-, tagged
-, transformers
+{ mkDerivation, base, base-orphans, generic-deriving, hspec
+, hspec-discover, lib, tagged, transformers
 }:
 mkDerivation {
   pname = "distributive";
@@ -31,4 +24,4 @@ mkDerivation {
   description = "Distributive functors -- Dual to Traversable";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/dlist.nix b/pkgs/dlist.nix
index 7cfb578b11a558b4286d348947071818ed362249..0096750b9a98de6e08c236456ad892d88466e106 100644
--- a/pkgs/dlist.nix
+++ b/pkgs/dlist.nix
@@ -19,4 +19,4 @@ mkDerivation {
   description = "Difference lists";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/dns.nix b/pkgs/dns.nix
index c619e374a829b8810f7a088d6a91554276db7bb5..3b0f312fae96db76cb73852bc94c5a819d468fb4 100644
--- a/pkgs/dns.nix
+++ b/pkgs/dns.nix
@@ -1,25 +1,7 @@
-{ mkDerivation
-, QuickCheck
-, array
-, async
-, attoparsec
-, auto-update
-, base
-, base16-bytestring
-, base64-bytestring
-, bytestring
-, containers
-, cryptonite
-, doctest
-, hourglass
-, hspec
-, hspec-discover
-, iproute
-, lib
-, mtl
-, network
-, psqueues
-, word8
+{ mkDerivation, QuickCheck, array, async, attoparsec, auto-update
+, base, base16-bytestring, base64-bytestring, bytestring
+, containers, cryptonite, doctest, hourglass, hspec, hspec-discover
+, iproute, lib, mtl, network, psqueues, word8
 }:
 mkDerivation {
   pname = "dns";
@@ -29,31 +11,12 @@ mkDerivation {
   isExecutable = false;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    array
-    async
-    attoparsec
-    auto-update
-    base
-    base16-bytestring
-    base64-bytestring
-    bytestring
-    containers
-    cryptonite
-    hourglass
-    iproute
-    mtl
-    network
-    psqueues
+    array async attoparsec auto-update base base16-bytestring
+    base64-bytestring bytestring containers cryptonite hourglass
+    iproute mtl network psqueues
   ];
   testHaskellDepends = [
-    base
-    bytestring
-    doctest
-    hspec
-    iproute
-    network
-    QuickCheck
-    word8
+    base bytestring doctest hspec iproute network QuickCheck word8
   ];
   testToolDepends = [ hspec-discover ];
   enableLibraryProfiling = true;
@@ -67,4 +30,4 @@ mkDerivation {
   description = "DNS library in Haskell";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/doclayout.nix b/pkgs/doclayout.nix
index a1595b13ed993ab3945ddc8ef44c9cffacf6bcf3..16d2ed18faf6e7b08f7df88ddc90e3f99d52aa95 100644
--- a/pkgs/doclayout.nix
+++ b/pkgs/doclayout.nix
@@ -1,16 +1,5 @@
-{ mkDerivation
-, base
-, containers
-, criterion
-, deepseq
-, emojis
-, lib
-, mtl
-, safe
-, tasty
-, tasty-golden
-, tasty-hunit
-, tasty-quickcheck
+{ mkDerivation, base, containers, criterion, deepseq, emojis, lib
+, mtl, safe, tasty, tasty-golden, tasty-hunit, tasty-quickcheck
 , text
 }:
 mkDerivation {
@@ -24,22 +13,11 @@ mkDerivation {
   enableSeparateDataOutput = true;
   libraryHaskellDepends = [ base containers emojis mtl safe text ];
   testHaskellDepends = [
-    base
-    emojis
-    mtl
-    tasty
-    tasty-golden
-    tasty-hunit
-    tasty-quickcheck
+    base emojis mtl tasty tasty-golden tasty-hunit tasty-quickcheck
     text
   ];
   benchmarkHaskellDepends = [
-    base
-    criterion
-    deepseq
-    emojis
-    mtl
-    text
+    base criterion deepseq emojis mtl text
   ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
@@ -52,4 +30,4 @@ mkDerivation {
   description = "A prettyprinting library for laying out text documents";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/doctemplates.nix b/pkgs/doctemplates.nix
index 2cd42e57f7da6e5bef22d6c181ac998ba6dc155e..f1e93894a4e18beee6d74de7494cffaacd365d92 100644
--- a/pkgs/doctemplates.nix
+++ b/pkgs/doctemplates.nix
@@ -1,73 +1,25 @@
-{ mkDerivation
-, Glob
-, HsYAML
-, aeson
-, base
-, bytestring
-, containers
-, criterion
-, doclayout
-, filepath
-, lib
-, mtl
-, parsec
-, safe
-, scientific
-, tasty
-, tasty-golden
-, tasty-hunit
-, temporary
-, text
-, text-conversions
-, vector
+{ mkDerivation, Glob, aeson, base, bytestring, containers
+, criterion, doclayout, filepath, lib, mtl, parsec, safe
+, scientific, tasty, tasty-golden, tasty-hunit, temporary, text
+, text-conversions, vector
 }:
 mkDerivation {
   pname = "doctemplates";
-  version = "0.10.0.2";
-  sha256 = "a7749f36083c23ec72fa1a37c1ff72ab9ff470478be23686f80532d209d3402b";
-  revision = "1";
-  editedCabalFile = "17r6ig72bzqd59p11sjaf9y27pm4yig1a1s1igs57s88cy47qz05";
+  version = "0.11";
+  sha256 = "e0080c7f030e98ce6156fd31e77df4c83b8f3ee049beee5006ce923a0169546b";
   isLibrary = true;
   isExecutable = false;
   enableSeparateDataOutput = true;
   libraryHaskellDepends = [
-    aeson
-    base
-    containers
-    doclayout
-    filepath
-    HsYAML
-    mtl
-    parsec
-    safe
-    scientific
-    text
-    text-conversions
-    vector
+    aeson base containers doclayout filepath mtl parsec safe scientific
+    text text-conversions vector
   ];
   testHaskellDepends = [
-    aeson
-    base
-    bytestring
-    containers
-    doclayout
-    filepath
-    Glob
-    tasty
-    tasty-golden
-    tasty-hunit
-    temporary
-    text
+    aeson base bytestring containers doclayout filepath Glob tasty
+    tasty-golden tasty-hunit temporary text
   ];
   benchmarkHaskellDepends = [
-    aeson
-    base
-    containers
-    criterion
-    doclayout
-    filepath
-    mtl
-    text
+    aeson base containers criterion doclayout filepath mtl text
   ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
@@ -80,4 +32,4 @@ mkDerivation {
   description = "Pandoc-style document templates";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/doctest-discover.nix b/pkgs/doctest-discover.nix
index 58a61a454920bba09aacc438878f7552473d3825..78feb55dd48f671979a487a1fdbfe5c0ffab01ac 100644
--- a/pkgs/doctest-discover.nix
+++ b/pkgs/doctest-discover.nix
@@ -1,11 +1,5 @@
-{ mkDerivation
-, aeson
-, base
-, bytestring
-, directory
-, doctest
-, filepath
-, lib
+{ mkDerivation, aeson, base, bytestring, directory, doctest
+, filepath, lib
 }:
 mkDerivation {
   pname = "doctest-discover";
@@ -15,20 +9,10 @@ mkDerivation {
   isExecutable = true;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    aeson
-    base
-    bytestring
-    directory
-    doctest
-    filepath
+    aeson base bytestring directory doctest filepath
   ];
   executableHaskellDepends = [
-    aeson
-    base
-    bytestring
-    directory
-    doctest
-    filepath
+    aeson base bytestring directory doctest filepath
   ];
   testHaskellDepends = [ base doctest ];
   enableLibraryProfiling = true;
@@ -42,4 +26,4 @@ mkDerivation {
   description = "Easy way to run doctests via cabal";
   license = lib.licenses.publicDomain;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/doctest-exitcode-stdio.nix b/pkgs/doctest-exitcode-stdio.nix
index 8075e43ee1d13bd754f0f4c2eaca3bea96f6dd00..5c391d03a56f89b2607cede22e250c6a75d7f0a5 100644
--- a/pkgs/doctest-exitcode-stdio.nix
+++ b/pkgs/doctest-exitcode-stdio.nix
@@ -1,26 +1,17 @@
-{ mkDerivation
-, QuickCheck
-, base
-, doctest-lib
-, lib
-, semigroups
+{ mkDerivation, QuickCheck, base, doctest-lib, lib, semigroups
 , transformers
 }:
 mkDerivation {
   pname = "doctest-exitcode-stdio";
   version = "0.0";
   sha256 = "1dec779d5e67ea46c8b0d69d454e0717383654e87323bdebc2bc0a8cb33f6cbc";
-  revision = "1";
-  editedCabalFile = "1065s8bch6zhl6mc8nhvfpwd1irmjd04z7xgycbpihc14x4ijim3";
+  revision = "2";
+  editedCabalFile = "0gfnxkbm126m0d4pnqgl5ca6ab8x5p1vpbxjxgz1sxczablsmk5b";
   isLibrary = true;
   isExecutable = false;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    base
-    doctest-lib
-    QuickCheck
-    semigroups
-    transformers
+    base doctest-lib QuickCheck semigroups transformers
   ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
@@ -33,4 +24,4 @@ mkDerivation {
   description = "Run doctest's in a Cabal.Test.exitcode-stdio environment";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/doctest-lib.nix b/pkgs/doctest-lib.nix
index 2f64bd61183a0cac423e554ad08f9eebc34c486e..412217929d282b27ba2f9b3b4575b984dffcc05d 100644
--- a/pkgs/doctest-lib.nix
+++ b/pkgs/doctest-lib.nix
@@ -18,4 +18,4 @@ mkDerivation {
   description = "Parts of doctest exposed as library";
   license = lib.licenses.mit;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/dom-lt.nix b/pkgs/dom-lt.nix
index cf7db7e2b75aa40957293cb23cfd1aca8b1acadc..f7431ba57676eaeb4ace5536470de6ad957bd519 100644
--- a/pkgs/dom-lt.nix
+++ b/pkgs/dom-lt.nix
@@ -1,10 +1,4 @@
-{ mkDerivation
-, HUnit
-, array
-, base
-, containers
-, criterion
-, deepseq
+{ mkDerivation, HUnit, array, base, containers, criterion, deepseq
 , lib
 }:
 mkDerivation {
@@ -27,4 +21,4 @@ mkDerivation {
   description = "The Lengauer-Tarjan graph dominators algorithm";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/dotgen.nix b/pkgs/dotgen.nix
index 8b22b371ff1e3c99b4526edbdd5315d72b734a6a..457600e209ec0c25ad466595e854c672baf138ca 100644
--- a/pkgs/dotgen.nix
+++ b/pkgs/dotgen.nix
@@ -18,4 +18,4 @@ mkDerivation {
   description = "A simple interface for building .dot graph files.";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/double-conversion.nix b/pkgs/double-conversion.nix
index ce76fefdef46860a2bbc088a97e2335e71825666..97f8d150e71610c248680fce43e09dbb3f72d764 100644
--- a/pkgs/double-conversion.nix
+++ b/pkgs/double-conversion.nix
@@ -1,14 +1,6 @@
-{ mkDerivation
-, HUnit
-, base
-, bytestring
-, ghc-prim
-, lib
-, system-cxx-std-lib
-, test-framework
-, test-framework-hunit
-, test-framework-quickcheck2
-, text
+{ mkDerivation, HUnit, base, bytestring, ghc-prim, lib
+, system-cxx-std-lib, test-framework, test-framework-hunit
+, test-framework-quickcheck2, text
 }:
 mkDerivation {
   pname = "double-conversion";
@@ -20,20 +12,11 @@ mkDerivation {
   isExecutable = false;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    base
-    bytestring
-    ghc-prim
-    system-cxx-std-lib
-    text
+    base bytestring ghc-prim system-cxx-std-lib text
   ];
   testHaskellDepends = [
-    base
-    bytestring
-    HUnit
-    test-framework
-    test-framework-hunit
-    test-framework-quickcheck2
-    text
+    base bytestring HUnit test-framework test-framework-hunit
+    test-framework-quickcheck2 text
   ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
@@ -46,4 +29,4 @@ mkDerivation {
   description = "Fast conversion between single and double precision floating point and text";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/dual-tree.nix b/pkgs/dual-tree.nix
index 81f124db2364c85ffc8148fe023be69cedea3d3b..043c2ebd4476b3c7934bc8ccbf1d8818634e512d 100644
--- a/pkgs/dual-tree.nix
+++ b/pkgs/dual-tree.nix
@@ -1,9 +1,4 @@
-{ mkDerivation
-, QuickCheck
-, base
-, lib
-, monoid-extras
-, semigroups
+{ mkDerivation, QuickCheck, base, lib, monoid-extras, semigroups
 , testing-feat
 }:
 mkDerivation {
@@ -15,11 +10,7 @@ mkDerivation {
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [ base monoid-extras semigroups ];
   testHaskellDepends = [
-    base
-    monoid-extras
-    QuickCheck
-    semigroups
-    testing-feat
+    base monoid-extras QuickCheck semigroups testing-feat
   ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
@@ -31,4 +22,4 @@ mkDerivation {
   description = "Rose trees with cached and accumulating monoidal annotations";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/echo.nix b/pkgs/echo.nix
index 3c53919459faaefc2c8adef6da24ed13d3f0c827..7fc63601521c790092d7803f9dd5ff4ac43325a4 100644
--- a/pkgs/echo.nix
+++ b/pkgs/echo.nix
@@ -18,4 +18,4 @@ mkDerivation {
   description = "A cross-platform, cross-console way to handle echoing terminal input";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/ed25519.nix b/pkgs/ed25519.nix
index e4169f0231c6454ad15991976950c5ffa047f0b0..9b11d0089667c9bbb00760779339047899093426 100644
--- a/pkgs/ed25519.nix
+++ b/pkgs/ed25519.nix
@@ -1,16 +1,5 @@
-{ mkDerivation
-, QuickCheck
-, base
-, bytestring
-, criterion
-, deepseq
-, directory
-, doctest
-, fetchgit
-, filepath
-, ghc-prim
-, hlint
-, lib
+{ mkDerivation, QuickCheck, base, bytestring, criterion, deepseq
+, directory, doctest, fetchgit, filepath, ghc-prim, hlint, lib
 }:
 mkDerivation {
   pname = "ed25519";
@@ -26,13 +15,7 @@ mkDerivation {
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [ base bytestring ghc-prim ];
   testHaskellDepends = [
-    base
-    bytestring
-    directory
-    doctest
-    filepath
-    hlint
-    QuickCheck
+    base bytestring directory doctest filepath hlint QuickCheck
   ];
   benchmarkHaskellDepends = [ base bytestring criterion deepseq ];
   enableLibraryProfiling = true;
@@ -46,4 +29,4 @@ mkDerivation {
   description = "Ed25519 cryptographic signatures";
   license = lib.licenses.mit;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/edit-distance.nix b/pkgs/edit-distance.nix
index 06f6fc637677980907ae97c4459bb6f2d4a6b616..8f632d67a118793f621e86cbfae73ffd235c169d 100644
--- a/pkgs/edit-distance.nix
+++ b/pkgs/edit-distance.nix
@@ -1,17 +1,6 @@
-{ mkDerivation
-, QuickCheck
-, array
-, base
-, containers
-, criterion
-, deepseq
-, lib
-, process
-, random
-, test-framework
-, test-framework-quickcheck2
-, time
-, unix
+{ mkDerivation, QuickCheck, array, base, containers, criterion
+, deepseq, lib, process, random, test-framework
+, test-framework-quickcheck2, time, unix
 }:
 mkDerivation {
   pname = "edit-distance";
@@ -24,24 +13,11 @@ mkDerivation {
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [ array base containers random ];
   testHaskellDepends = [
-    array
-    base
-    containers
-    QuickCheck
-    random
-    test-framework
+    array base containers QuickCheck random test-framework
     test-framework-quickcheck2
   ];
   benchmarkHaskellDepends = [
-    array
-    base
-    containers
-    criterion
-    deepseq
-    process
-    random
-    time
-    unix
+    array base containers criterion deepseq process random time unix
   ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
@@ -54,4 +30,4 @@ mkDerivation {
   description = "Levenshtein and restricted Damerau-Levenshtein edit distances";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/effectful-cache.nix b/pkgs/effectful-cache.nix
index 9f29c8fcdc4d04f0cad08f44a391894cc9bf945a..d6cc79765d9ef124297baa8544581641e0ba1911 100644
--- a/pkgs/effectful-cache.nix
+++ b/pkgs/effectful-cache.nix
@@ -1,12 +1,5 @@
-{ mkDerivation
-, base
-, cache
-, effectful-core
-, fetchgit
-, hashable
-, lib
-, tasty
-, tasty-hunit
+{ mkDerivation, base, cache, effectful-core, fetchgit, hashable
+, lib, tasty, tasty-hunit
 }:
 mkDerivation {
   pname = "effectful-cache";
@@ -22,12 +15,7 @@ mkDerivation {
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [ base cache effectful-core hashable ];
   testHaskellDepends = [
-    base
-    cache
-    effectful-core
-    hashable
-    tasty
-    tasty-hunit
+    base cache effectful-core hashable tasty tasty-hunit
   ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
@@ -39,4 +27,4 @@ mkDerivation {
   homepage = "https://github.com/haskell-effectful/effectful-cache/tree/main/effectful-cache#readme";
   license = lib.licenses.mit;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/either.nix b/pkgs/either.nix
index 090f87bf296f5aaf71c7f20fa07cedf9e0f654d7..6ef0ebb330da7e58f8d1120712e30099d0da65ee 100644
--- a/pkgs/either.nix
+++ b/pkgs/either.nix
@@ -1,33 +1,20 @@
-{ mkDerivation
-, QuickCheck
-, base
-, bifunctors
-, lib
-, mtl
-, profunctors
-, semigroupoids
-, test-framework
-, test-framework-quickcheck2
+{ mkDerivation, QuickCheck, base, bifunctors, lib, mtl, profunctors
+, semigroupoids, test-framework, test-framework-quickcheck2
 }:
 mkDerivation {
   pname = "either";
   version = "5.0.2";
   sha256 = "bfa45b967fd77b1c7c952e156377441e3c42b6dc873ab1f06a7421a3222287be";
+  revision = "1";
+  editedCabalFile = "1w2rxrj0gc3a7p74pybji8yy2zsjnhxyi4zhlmx4qsyz6w616ggv";
   isLibrary = true;
   isExecutable = false;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    base
-    bifunctors
-    mtl
-    profunctors
-    semigroupoids
+    base bifunctors mtl profunctors semigroupoids
   ];
   testHaskellDepends = [
-    base
-    QuickCheck
-    test-framework
-    test-framework-quickcheck2
+    base QuickCheck test-framework test-framework-quickcheck2
   ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
@@ -40,4 +27,4 @@ mkDerivation {
   description = "Combinators for working with sums";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/ekg-core.nix b/pkgs/ekg-core.nix
index 651ed6b74b1b171dac0669606c87638cdae43aea..c3271619746da01eaf12b85df000a16ab984b1fc 100644
--- a/pkgs/ekg-core.nix
+++ b/pkgs/ekg-core.nix
@@ -1,9 +1,4 @@
-{ mkDerivation
-, base
-, containers
-, ghc-prim
-, lib
-, text
+{ mkDerivation, base, containers, ghc-prim, lib, text
 , unordered-containers
 }:
 mkDerivation {
@@ -16,11 +11,7 @@ mkDerivation {
   isExecutable = false;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    base
-    containers
-    ghc-prim
-    text
-    unordered-containers
+    base containers ghc-prim text unordered-containers
   ];
   benchmarkHaskellDepends = [ base ];
   enableLibraryProfiling = true;
@@ -34,4 +25,4 @@ mkDerivation {
   description = "Tracking of system metrics";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/ekg-json.nix b/pkgs/ekg-json.nix
index 9bd6fba86a4dffca5b6feb1c635d68e3b0d8e883..e7633f8077142311fdf8fef346a51b3cb3ab214e 100644
--- a/pkgs/ekg-json.nix
+++ b/pkgs/ekg-json.nix
@@ -1,10 +1,4 @@
-{ mkDerivation
-, aeson
-, base
-, ekg-core
-, fetchgit
-, lib
-, text
+{ mkDerivation, aeson, base, ekg-core, fetchgit, lib, text
 , unordered-containers
 }:
 mkDerivation {
@@ -20,11 +14,7 @@ mkDerivation {
   isExecutable = false;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    aeson
-    base
-    ekg-core
-    text
-    unordered-containers
+    aeson base ekg-core text unordered-containers
   ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
@@ -37,4 +27,4 @@ mkDerivation {
   description = "JSON encoding of ekg metrics";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/ekg-statsd.nix b/pkgs/ekg-statsd.nix
index 56658732cca69ed7ba8ac92c2e1e212da4413207..35a0675c3c3973af5cf79a47bb9a27ad2fa384d0 100644
--- a/pkgs/ekg-statsd.nix
+++ b/pkgs/ekg-statsd.nix
@@ -1,12 +1,5 @@
-{ mkDerivation
-, base
-, bytestring
-, ekg-core
-, lib
-, network
-, text
-, time
-, unordered-containers
+{ mkDerivation, base, bytestring, ekg-core, lib, network, text
+, time, unordered-containers
 }:
 mkDerivation {
   pname = "ekg-statsd";
@@ -16,13 +9,7 @@ mkDerivation {
   isExecutable = false;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    base
-    bytestring
-    ekg-core
-    network
-    text
-    time
-    unordered-containers
+    base bytestring ekg-core network text time unordered-containers
   ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
@@ -35,4 +22,4 @@ mkDerivation {
   description = "Push metrics to statsd";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/ekg-wai.nix b/pkgs/ekg-wai.nix
index 1869c2790473041e3c31c7d0d8eae55a413f2ca9..30c8068ec8dbc7fe5b14e29753fe7ed91aecb639 100644
--- a/pkgs/ekg-wai.nix
+++ b/pkgs/ekg-wai.nix
@@ -1,20 +1,6 @@
-{ mkDerivation
-, aeson
-, base
-, bytestring
-, ekg-core
-, ekg-json
-, filepath
-, http-types
-, lib
-, network
-, text
-, time
-, transformers
-, unordered-containers
-, wai
-, wai-app-static
-, warp
+{ mkDerivation, aeson, base, bytestring, ekg-core, ekg-json
+, filepath, http-types, lib, network, text, time, transformers
+, unordered-containers, wai, wai-app-static, warp
 }:
 mkDerivation {
   pname = "ekg-wai";
@@ -24,21 +10,8 @@ mkDerivation {
   isExecutable = false;
   enableSeparateDataOutput = true;
   libraryHaskellDepends = [
-    aeson
-    base
-    bytestring
-    ekg-core
-    ekg-json
-    filepath
-    http-types
-    network
-    text
-    time
-    transformers
-    unordered-containers
-    wai
-    wai-app-static
-    warp
+    aeson base bytestring ekg-core ekg-json filepath http-types network
+    text time transformers unordered-containers wai wai-app-static warp
   ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
@@ -51,4 +24,4 @@ mkDerivation {
   description = "Remote monitoring of processes";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/ekg.nix b/pkgs/ekg.nix
index aad3a07e3de29d97b2e335eafa9ead8b7113a3cc..30fdb9327457bd02e705d0644c2b897d34e44d1f 100644
--- a/pkgs/ekg.nix
+++ b/pkgs/ekg.nix
@@ -1,18 +1,6 @@
-{ mkDerivation
-, aeson
-, base
-, bytestring
-, ekg-core
-, ekg-json
-, filepath
-, lib
-, network
-, snap-core
-, snap-server
-, text
-, time
-, transformers
-, unordered-containers
+{ mkDerivation, aeson, base, bytestring, ekg-core, ekg-json
+, filepath, lib, network, snap-core, snap-server, text, time
+, transformers, unordered-containers
 }:
 mkDerivation {
   pname = "ekg";
@@ -24,19 +12,8 @@ mkDerivation {
   isExecutable = false;
   enableSeparateDataOutput = true;
   libraryHaskellDepends = [
-    aeson
-    base
-    bytestring
-    ekg-core
-    ekg-json
-    filepath
-    network
-    snap-core
-    snap-server
-    text
-    time
-    transformers
-    unordered-containers
+    aeson base bytestring ekg-core ekg-json filepath network snap-core
+    snap-server text time transformers unordered-containers
   ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
@@ -49,4 +26,4 @@ mkDerivation {
   description = "Remote monitoring of processes";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/ema.nix b/pkgs/ema.nix
index 355e87f196183342caaf763a65b04b947796f2e9..03b83d01626e3f30e200fad4bb0a9ec7fc4cc6be 100644
--- a/pkgs/ema.nix
+++ b/pkgs/ema.nix
@@ -1,34 +1,10 @@
-{ mkDerivation
-, aeson
-, async
-, base
-, constraints-extras
-, data-default
-, dependent-sum
-, dependent-sum-template
-, directory
-, file-embed
-, filepath
-, filepattern
-, http-types
-, lib
-, lvar
-, monad-logger
-, monad-logger-extras
-, mtl
-, neat-interpolation
-, optics-core
-, optparse-applicative
-, relude
-, sop-core
-, text
-, unliftio
-, url-slug
-, wai
-, wai-middleware-static
-, wai-websockets
-, warp
-, websockets
+{ mkDerivation, aeson, async, base, constraints-extras
+, data-default, dependent-sum, dependent-sum-template, directory
+, file-embed, filepath, filepattern, http-types, lib, lvar
+, monad-logger, monad-logger-extras, mtl, neat-interpolation
+, optics-core, optparse-applicative, relude, sop-core, text
+, unliftio, url-slug, wai, wai-middleware-static, wai-websockets
+, warp, websockets
 }:
 mkDerivation {
   pname = "ema";
@@ -38,35 +14,12 @@ mkDerivation {
   isExecutable = false;
   enableSeparateDataOutput = true;
   libraryHaskellDepends = [
-    aeson
-    async
-    base
-    constraints-extras
-    data-default
-    dependent-sum
-    dependent-sum-template
-    directory
-    file-embed
-    filepath
-    filepattern
-    http-types
-    lvar
-    monad-logger
-    monad-logger-extras
-    mtl
-    neat-interpolation
-    optics-core
-    optparse-applicative
-    relude
-    sop-core
-    text
-    unliftio
-    url-slug
-    wai
-    wai-middleware-static
-    wai-websockets
-    warp
-    websockets
+    aeson async base constraints-extras data-default dependent-sum
+    dependent-sum-template directory file-embed filepath filepattern
+    http-types lvar monad-logger monad-logger-extras mtl
+    neat-interpolation optics-core optparse-applicative relude sop-core
+    text unliftio url-slug wai wai-middleware-static wai-websockets
+    warp websockets
   ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
@@ -79,4 +32,4 @@ mkDerivation {
   description = "Static site generator library with hot reload";
   license = lib.licenses.agpl3Only;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/emojis.nix b/pkgs/emojis.nix
index b5d10dec0a5076449ea0d8fce8d79e10582c4b4d..e18111e3dee8ae884c10d7ebe5842a34a1cb168e 100644
--- a/pkgs/emojis.nix
+++ b/pkgs/emojis.nix
@@ -19,4 +19,4 @@ mkDerivation {
   description = "Conversion between emoji characters and their names";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/enclosed-exceptions.nix b/pkgs/enclosed-exceptions.nix
index 2ff32dd854983195f449352c691fb6a2f891b9aa..b29cf2514f38b32802cfdb824e10174b630cc676 100644
--- a/pkgs/enclosed-exceptions.nix
+++ b/pkgs/enclosed-exceptions.nix
@@ -1,15 +1,5 @@
-{ mkDerivation
-, QuickCheck
-, async
-, base
-, deepseq
-, hspec
-, lib
-, lifted-base
-, monad-control
-, stm
-, transformers
-, transformers-base
+{ mkDerivation, QuickCheck, async, base, deepseq, hspec, lib
+, lifted-base, monad-control, stm, transformers, transformers-base
 }:
 mkDerivation {
   pname = "enclosed-exceptions";
@@ -19,24 +9,12 @@ mkDerivation {
   isExecutable = false;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    base
-    deepseq
-    lifted-base
-    monad-control
-    transformers
+    base deepseq lifted-base monad-control transformers
     transformers-base
   ];
   testHaskellDepends = [
-    async
-    base
-    deepseq
-    hspec
-    lifted-base
-    monad-control
-    QuickCheck
-    stm
-    transformers
-    transformers-base
+    async base deepseq hspec lifted-base monad-control QuickCheck stm
+    transformers transformers-base
   ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
@@ -49,4 +27,4 @@ mkDerivation {
   description = "Catching all exceptions from within an enclosed computation";
   license = lib.licenses.mit;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/entropy.nix b/pkgs/entropy.nix
index 0c3e1371aafdd571b3afbd6b99e84f7448b32c72..6e32691c8e1107a6e44f1efa90c276beb0872914 100644
--- a/pkgs/entropy.nix
+++ b/pkgs/entropy.nix
@@ -1,12 +1,5 @@
-{ mkDerivation
-, Cabal
-, base
-, bytestring
-, directory
-, filepath
-, lib
-, process
-, unix
+{ mkDerivation, Cabal, base, bytestring, directory, filepath, lib
+, process, unix
 }:
 mkDerivation {
   pname = "entropy";
@@ -28,4 +21,4 @@ mkDerivation {
   description = "A platform independent entropy source";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/enummapset.nix b/pkgs/enummapset.nix
index 80243688399dfa796f2e2eff88fdc8d7c1cb4ae2..0d6b72c5dd382705edb6e94c78a6aa3ed87451c8 100644
--- a/pkgs/enummapset.nix
+++ b/pkgs/enummapset.nix
@@ -1,15 +1,5 @@
-{ mkDerivation
-, HUnit
-, QuickCheck
-, aeson
-, array
-, base
-, containers
-, deepseq
-, ghc-prim
-, lib
-, test-framework
-, test-framework-hunit
+{ mkDerivation, HUnit, QuickCheck, aeson, array, base, containers
+, deepseq, ghc-prim, lib, test-framework, test-framework-hunit
 , test-framework-quickcheck2
 }:
 mkDerivation {
@@ -21,17 +11,8 @@ mkDerivation {
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [ aeson base containers deepseq ];
   testHaskellDepends = [
-    aeson
-    array
-    base
-    containers
-    deepseq
-    ghc-prim
-    HUnit
-    QuickCheck
-    test-framework
-    test-framework-hunit
-    test-framework-quickcheck2
+    aeson array base containers deepseq ghc-prim HUnit QuickCheck
+    test-framework test-framework-hunit test-framework-quickcheck2
   ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
@@ -44,4 +25,4 @@ mkDerivation {
   description = "IntMap and IntSet with Enum keys/elements";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/envparse.nix b/pkgs/envparse.nix
index 111c2df52071fdf6b58858475b8f783ba4eb3ea5..97db37aa8c71ffc47778d9d0cba90336d22f4947 100644
--- a/pkgs/envparse.nix
+++ b/pkgs/envparse.nix
@@ -19,4 +19,4 @@ mkDerivation {
   description = "Parse environment variables";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/erf.nix b/pkgs/erf.nix
index 44de98405d67bdf81387072c05985c262405a3f4..9a1ebd22ff996ccbd4dfd5d037d45195561f4d33 100644
--- a/pkgs/erf.nix
+++ b/pkgs/erf.nix
@@ -17,4 +17,4 @@ mkDerivation {
   description = "The error function, erf, and related functions";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/errors.nix b/pkgs/errors.nix
index dc40c6d5b3733e0fb7b5ecd6a5b724ea61d355f5..6fd99807957008028ee747b38c4e0fda218de317 100644
--- a/pkgs/errors.nix
+++ b/pkgs/errors.nix
@@ -1,10 +1,4 @@
-{ mkDerivation
-, base
-, exceptions
-, lib
-, safe
-, text
-, transformers
+{ mkDerivation, base, exceptions, lib, safe, text, transformers
 , transformers-compat
 }:
 mkDerivation {
@@ -17,12 +11,7 @@ mkDerivation {
   isExecutable = false;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    base
-    exceptions
-    safe
-    text
-    transformers
-    transformers-compat
+    base exceptions safe text transformers transformers-compat
   ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
@@ -34,4 +23,4 @@ mkDerivation {
   description = "Simplified error-handling";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/exact-combinatorics.nix b/pkgs/exact-combinatorics.nix
index 87b9d82ba01985f0965788f7098994d98dd1e6a7..699a58a4ce5a640ec27ffc819449016ff12b8460 100644
--- a/pkgs/exact-combinatorics.nix
+++ b/pkgs/exact-combinatorics.nix
@@ -18,4 +18,4 @@ mkDerivation {
   description = "Efficient exact computation of combinatoric functions";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/exact-pi.nix b/pkgs/exact-pi.nix
index c4d71f7e1c730910301a1ef1fd409ead6b28a00d..8c093d93cfb9b6b48811e8cf8c764351adce364e 100644
--- a/pkgs/exact-pi.nix
+++ b/pkgs/exact-pi.nix
@@ -1,11 +1,5 @@
-{ mkDerivation
-, QuickCheck
-, base
-, lib
-, numtype-dk
-, tasty
-, tasty-hunit
-, tasty-quickcheck
+{ mkDerivation, QuickCheck, base, lib, numtype-dk, tasty
+, tasty-hunit, tasty-quickcheck
 }:
 mkDerivation {
   pname = "exact-pi";
@@ -16,12 +10,7 @@ mkDerivation {
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [ base numtype-dk ];
   testHaskellDepends = [
-    base
-    numtype-dk
-    QuickCheck
-    tasty
-    tasty-hunit
-    tasty-quickcheck
+    base numtype-dk QuickCheck tasty tasty-hunit tasty-quickcheck
   ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
@@ -34,4 +23,4 @@ mkDerivation {
   description = "Exact rational multiples of pi (and integer powers of pi)";
   license = lib.licenses.mit;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/expiring-cache-map.nix b/pkgs/expiring-cache-map.nix
index 8d182e39afbd05cf60ab1ec163d8e2317cdb8b7b..cd47630753a4848ddcc6241f184e6e5095d9b4e7 100644
--- a/pkgs/expiring-cache-map.nix
+++ b/pkgs/expiring-cache-map.nix
@@ -1,10 +1,4 @@
-{ mkDerivation
-, base
-, bytestring
-, containers
-, hashable
-, lib
-, time
+{ mkDerivation, base, bytestring, containers, hashable, lib, time
 , unordered-containers
 }:
 mkDerivation {
@@ -17,18 +11,10 @@ mkDerivation {
   isExecutable = false;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    base
-    containers
-    hashable
-    unordered-containers
+    base containers hashable unordered-containers
   ];
   testHaskellDepends = [
-    base
-    bytestring
-    containers
-    hashable
-    time
-    unordered-containers
+    base bytestring containers hashable time unordered-containers
   ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
@@ -41,4 +27,4 @@ mkDerivation {
   description = "General purpose simple caching";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/extended-reals.nix b/pkgs/extended-reals.nix
index 0eaa76836dd6888335950789d2332d64fca1628c..9af5f64a37669ec2a3a8ce30fdd2e85e76185e0c 100644
--- a/pkgs/extended-reals.nix
+++ b/pkgs/extended-reals.nix
@@ -1,14 +1,5 @@
-{ mkDerivation
-, HUnit
-, QuickCheck
-, base
-, deepseq
-, hashable
-, lib
-, tasty
-, tasty-hunit
-, tasty-quickcheck
-, tasty-th
+{ mkDerivation, HUnit, QuickCheck, base, deepseq, hashable, lib
+, tasty, tasty-hunit, tasty-quickcheck, tasty-th
 }:
 mkDerivation {
   pname = "extended-reals";
@@ -21,13 +12,7 @@ mkDerivation {
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [ base deepseq hashable ];
   testHaskellDepends = [
-    base
-    deepseq
-    HUnit
-    QuickCheck
-    tasty
-    tasty-hunit
-    tasty-quickcheck
+    base deepseq HUnit QuickCheck tasty tasty-hunit tasty-quickcheck
     tasty-th
   ];
   enableLibraryProfiling = true;
@@ -41,4 +26,4 @@ mkDerivation {
   description = "Extension of real numbers with positive/negative infinities";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/extensible-effects.nix b/pkgs/extensible-effects.nix
index 983e7df65b94e452e5c0eb9b1292657660d34bfc..1fe24630406f08b95096f927f9424e1ec05b9dd3 100644
--- a/pkgs/extensible-effects.nix
+++ b/pkgs/extensible-effects.nix
@@ -1,18 +1,7 @@
-{ mkDerivation
-, HUnit
-, QuickCheck
-, base
-, criterion
-, doctest
-, lib
-, monad-control
-, mtl
-, silently
-, test-framework
-, test-framework-hunit
-, test-framework-quickcheck2
-, test-framework-th
-, transformers-base
+{ mkDerivation, HUnit, QuickCheck, base, criterion, doctest, lib
+, monad-control, mtl, silently, test-framework
+, test-framework-hunit, test-framework-quickcheck2
+, test-framework-th, transformers-base
 }:
 mkDerivation {
   pname = "extensible-effects";
@@ -25,27 +14,13 @@ mkDerivation {
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [ base monad-control transformers-base ];
   testHaskellDepends = [
-    base
-    doctest
-    HUnit
-    monad-control
-    mtl
-    QuickCheck
-    silently
-    test-framework
-    test-framework-hunit
-    test-framework-quickcheck2
+    base doctest HUnit monad-control mtl QuickCheck silently
+    test-framework test-framework-hunit test-framework-quickcheck2
     test-framework-th
   ];
   benchmarkHaskellDepends = [
-    base
-    criterion
-    HUnit
-    mtl
-    test-framework
-    test-framework-hunit
-    test-framework-quickcheck2
-    test-framework-th
+    base criterion HUnit mtl test-framework test-framework-hunit
+    test-framework-quickcheck2 test-framework-th
   ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
@@ -58,4 +33,4 @@ mkDerivation {
   description = "An Alternative to Monad Transformers";
   license = lib.licenses.mit;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/extensible-exceptions.nix b/pkgs/extensible-exceptions.nix
index 104450de98b6570fa5c5d650a6d81e7a70458711..a23d02cbe3e96d928227143c414781df1286e0c9 100644
--- a/pkgs/extensible-exceptions.nix
+++ b/pkgs/extensible-exceptions.nix
@@ -17,4 +17,4 @@ mkDerivation {
   description = "Extensible exceptions";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/extra.nix b/pkgs/extra.nix
index 98336c52a4e7960e8ca4afcf47162a0880d28cf6..c52f6cfc8bf46f96c1e42e69be3d1b44b15b593f 100644
--- a/pkgs/extra.nix
+++ b/pkgs/extra.nix
@@ -1,14 +1,5 @@
-{ mkDerivation
-, QuickCheck
-, base
-, clock
-, directory
-, filepath
-, lib
-, process
-, quickcheck-instances
-, time
-, unix
+{ mkDerivation, QuickCheck, base, clock, directory, filepath, lib
+, process, quickcheck-instances, time, unix
 }:
 mkDerivation {
   pname = "extra";
@@ -18,21 +9,10 @@ mkDerivation {
   isExecutable = false;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    base
-    clock
-    directory
-    filepath
-    process
-    time
-    unix
+    base clock directory filepath process time unix
   ];
   testHaskellDepends = [
-    base
-    directory
-    filepath
-    QuickCheck
-    quickcheck-instances
-    unix
+    base directory filepath QuickCheck quickcheck-instances unix
   ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
@@ -45,4 +25,4 @@ mkDerivation {
   description = "Extra functions I use";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/fail.nix b/pkgs/fail.nix
index 98d75834d82b5427468196fc4eaa39ec8fe7d26d..ddac0caf6dcb72daae9a21a24134267e8a1cdcc4 100644
--- a/pkgs/fail.nix
+++ b/pkgs/fail.nix
@@ -17,4 +17,4 @@ mkDerivation {
   description = "Forward-compatible MonadFail class";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/fast-math.nix b/pkgs/fast-math.nix
index 8b01aeb0748cb2ce73e0bd101718d437cb34fbf3..7df10fc9068924656d9869e501e9271ec6addfb6 100644
--- a/pkgs/fast-math.nix
+++ b/pkgs/fast-math.nix
@@ -17,4 +17,4 @@ mkDerivation {
   description = "Non IEEE-754 compliant compile-time floating-point optimisations";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/feedback.nix b/pkgs/feedback.nix
index ae6b0cef1fbb989c6f0d4ff1c54135a4572b9e00..b04464a390c5c0825ebcd92c18bc1444fd457d0e 100644
--- a/pkgs/feedback.nix
+++ b/pkgs/feedback.nix
@@ -1,26 +1,9 @@
-{ mkDerivation
-, autodocodec
-, autodocodec-yaml
-, base
-, bytestring
-, conduit
-, containers
-, envparse
-, fsnotify
-, lib
-, optparse-applicative
-, path
-, path-io
-, pretty-show
-, safe-coloured-text
-, safe-coloured-text-layout
-, safe-coloured-text-terminfo
-, text
-, time
-, typed-process
-, unix
-, unliftio
-, yaml
+{ mkDerivation, autodocodec, autodocodec-yaml, base, bytestring
+, conduit, containers, envparse, fsnotify, lib
+, optparse-applicative, path, path-io, pretty-show
+, safe-coloured-text, safe-coloured-text-layout
+, safe-coloured-text-terminfo, text, time, typed-process, unix
+, unliftio, yaml
 }:
 mkDerivation {
   pname = "feedback";
@@ -30,26 +13,10 @@ mkDerivation {
   isExecutable = true;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    autodocodec
-    autodocodec-yaml
-    base
-    bytestring
-    conduit
-    containers
-    envparse
-    fsnotify
-    optparse-applicative
-    path
-    path-io
-    pretty-show
-    safe-coloured-text
-    safe-coloured-text-layout
-    safe-coloured-text-terminfo
-    text
-    time
-    typed-process
-    unix
-    unliftio
+    autodocodec autodocodec-yaml base bytestring conduit containers
+    envparse fsnotify optparse-applicative path path-io pretty-show
+    safe-coloured-text safe-coloured-text-layout
+    safe-coloured-text-terminfo text time typed-process unix unliftio
     yaml
   ];
   executableHaskellDepends = [ base ];
@@ -64,4 +31,4 @@ mkDerivation {
   description = "Declarative feedback loop manager";
   license = lib.licenses.gpl3Only;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/file-embed-lzma.nix b/pkgs/file-embed-lzma.nix
index 369355154b19cf60615cd35d21e014fe10053348..d146ed002a25c7b43fb863446927e13661a706fd 100644
--- a/pkgs/file-embed-lzma.nix
+++ b/pkgs/file-embed-lzma.nix
@@ -1,13 +1,5 @@
-{ mkDerivation
-, base
-, bytestring
-, directory
-, filepath
-, lib
-, lzma
-, template-haskell
-, text
-, transformers
+{ mkDerivation, base, bytestring, directory, filepath, lib, lzma
+, template-haskell, text, transformers
 }:
 mkDerivation {
   pname = "file-embed-lzma";
@@ -17,13 +9,7 @@ mkDerivation {
   isExecutable = false;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    base
-    bytestring
-    directory
-    filepath
-    lzma
-    template-haskell
-    text
+    base bytestring directory filepath lzma template-haskell text
     transformers
   ];
   testHaskellDepends = [ base bytestring ];
@@ -38,4 +24,4 @@ mkDerivation {
   description = "Use Template Haskell to embed (LZMA compressed) data";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/file-embed.nix b/pkgs/file-embed.nix
index ff90945cb45bf4de9c7a393556a21473efa6b74e..2735548843c21d6ef5272a561dfea647e530738a 100644
--- a/pkgs/file-embed.nix
+++ b/pkgs/file-embed.nix
@@ -1,9 +1,4 @@
-{ mkDerivation
-, base
-, bytestring
-, directory
-, filepath
-, lib
+{ mkDerivation, base, bytestring, directory, filepath, lib
 , template-haskell
 }:
 mkDerivation {
@@ -14,11 +9,7 @@ mkDerivation {
   isExecutable = false;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    base
-    bytestring
-    directory
-    filepath
-    template-haskell
+    base bytestring directory filepath template-haskell
   ];
   testHaskellDepends = [ base bytestring filepath ];
   enableLibraryProfiling = true;
@@ -32,4 +23,4 @@ mkDerivation {
   description = "Use Template Haskell to embed file contents directly";
   license = lib.licenses.bsd2;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/filelock.nix b/pkgs/filelock.nix
index a41492ddc7032c46fbecea3201193719f8fad41c..cd300bd469b01ed9f0056f8988e394177a936514 100644
--- a/pkgs/filelock.nix
+++ b/pkgs/filelock.nix
@@ -19,4 +19,4 @@ mkDerivation {
   description = "Portable interface to file locking (flock / LockFileEx)";
   license = lib.licenses.publicDomain;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/filemanip.nix b/pkgs/filemanip.nix
index 607d21f4671e114ac4a0dd283838ddea1b08d3e6..e596fa39d01333f3d46bd2de8c8e23811aff5be2 100644
--- a/pkgs/filemanip.nix
+++ b/pkgs/filemanip.nix
@@ -1,26 +1,17 @@
-{ mkDerivation
-, base
-, bytestring
-, directory
-, filepath
-, lib
-, mtl
+{ mkDerivation, base, bytestring, directory, filepath, lib, mtl
 , unix-compat
 }:
 mkDerivation {
   pname = "filemanip";
   version = "0.3.6.3";
   sha256 = "8836da17baaaf02ca080c9990ece4e0b0c8d6a128f458f8b64fd07b225ca9846";
+  revision = "1";
+  editedCabalFile = "1l53qqlh9w7572n5dxk8rq0p8vsvg6m1afbak6xzdx0kgg8j6y8a";
   isLibrary = true;
   isExecutable = false;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    base
-    bytestring
-    directory
-    filepath
-    mtl
-    unix-compat
+    base bytestring directory filepath mtl unix-compat
   ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
@@ -33,4 +24,4 @@ mkDerivation {
   description = "Expressive file and directory manipulation for Haskell";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/filepattern.nix b/pkgs/filepattern.nix
index 757f61d6d96d2b3608e9fcbff7f3c3eb9da3c3b4..d94cf5fc89c63a05e18fb42b719569241b3445fb 100644
--- a/pkgs/filepattern.nix
+++ b/pkgs/filepattern.nix
@@ -1,10 +1,4 @@
-{ mkDerivation
-, QuickCheck
-, base
-, directory
-, extra
-, filepath
-, lib
+{ mkDerivation, QuickCheck, base, directory, extra, filepath, lib
 }:
 mkDerivation {
   pname = "filepattern";
@@ -26,4 +20,4 @@ mkDerivation {
   description = "File path glob-like matching";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/filtrable.nix b/pkgs/filtrable.nix
index b6265d201622f9e28e71f7d01ab57f9c36de3972..c0c5bdf10531b8c68706565f33478217a693c866 100644
--- a/pkgs/filtrable.nix
+++ b/pkgs/filtrable.nix
@@ -1,11 +1,5 @@
-{ mkDerivation
-, base
-, containers
-, lib
-, smallcheck
-, tasty
-, tasty-smallcheck
-, transformers
+{ mkDerivation, base, containers, lib, smallcheck, tasty
+, tasty-smallcheck, transformers
 }:
 mkDerivation {
   pname = "filtrable";
@@ -27,4 +21,4 @@ mkDerivation {
   description = "Class of filtrable containers";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/fin.nix b/pkgs/fin.nix
index ad8a1bd3638cad03f9780dcaea6d3c16373859ae..a471f2b58eb5fcb1df644f5116d4e9e37495eab7 100644
--- a/pkgs/fin.nix
+++ b/pkgs/fin.nix
@@ -1,15 +1,5 @@
-{ mkDerivation
-, QuickCheck
-, base
-, boring
-, dec
-, deepseq
-, hashable
-, inspection-testing
-, lib
-, some
-, tagged
-, universe-base
+{ mkDerivation, QuickCheck, base, boring, dec, deepseq, hashable
+, inspection-testing, lib, some, tagged, universe-base
 }:
 mkDerivation {
   pname = "fin";
@@ -21,14 +11,7 @@ mkDerivation {
   isExecutable = false;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    base
-    boring
-    dec
-    deepseq
-    hashable
-    QuickCheck
-    some
-    universe-base
+    base boring dec deepseq hashable QuickCheck some universe-base
   ];
   testHaskellDepends = [ base inspection-testing tagged ];
   enableLibraryProfiling = true;
@@ -42,4 +25,4 @@ mkDerivation {
   description = "Nat and Fin: peano naturals and finite numbers";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/fingertree-psqueue.nix b/pkgs/fingertree-psqueue.nix
index 00af227521aac9a7e8ba87cecc1e549b945d0b6e..0c96784965646e76afa09d4a953bcfce29b26018 100644
--- a/pkgs/fingertree-psqueue.nix
+++ b/pkgs/fingertree-psqueue.nix
@@ -22,4 +22,4 @@ mkDerivation {
   description = "Implementation of priority search queues as finger trees";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/fingertree.nix b/pkgs/fingertree.nix
index f7f4e57cefb5673197a683ba8c44c65124c721e8..9a32caeb08ea1260d8033122e3a777bfa996cf09 100644
--- a/pkgs/fingertree.nix
+++ b/pkgs/fingertree.nix
@@ -1,11 +1,5 @@
-{ mkDerivation
-, HUnit
-, QuickCheck
-, base
-, lib
-, test-framework
-, test-framework-hunit
-, test-framework-quickcheck2
+{ mkDerivation, HUnit, QuickCheck, base, lib, test-framework
+, test-framework-hunit, test-framework-quickcheck2
 }:
 mkDerivation {
   pname = "fingertree";
@@ -16,11 +10,7 @@ mkDerivation {
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [ base ];
   testHaskellDepends = [
-    base
-    HUnit
-    QuickCheck
-    test-framework
-    test-framework-hunit
+    base HUnit QuickCheck test-framework test-framework-hunit
     test-framework-quickcheck2
   ];
   enableLibraryProfiling = true;
@@ -33,4 +23,4 @@ mkDerivation {
   description = "Generic finger-tree structure, with example instances";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/finite-field.nix b/pkgs/finite-field.nix
index 11f73e8fcb21bb722a84cf5601313110f59fc9d5..1f356f3e82b53a03215deb0dd853f489127ba2d4 100644
--- a/pkgs/finite-field.nix
+++ b/pkgs/finite-field.nix
@@ -1,17 +1,6 @@
-{ mkDerivation
-, QuickCheck
-, base
-, containers
-, deepseq
-, hashable
-, lib
-, primes
-, singletons
-, tasty
-, tasty-hunit
-, tasty-quickcheck
-, tasty-th
-, template-haskell
+{ mkDerivation, QuickCheck, base, containers, deepseq, hashable
+, lib, primes, singletons, tasty, tasty-hunit, tasty-quickcheck
+, tasty-th, template-haskell
 }:
 mkDerivation {
   pname = "finite-field";
@@ -21,24 +10,11 @@ mkDerivation {
   isExecutable = false;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    base
-    deepseq
-    hashable
-    singletons
-    template-haskell
+    base deepseq hashable singletons template-haskell
   ];
   testHaskellDepends = [
-    base
-    containers
-    deepseq
-    hashable
-    primes
-    QuickCheck
-    singletons
-    tasty
-    tasty-hunit
-    tasty-quickcheck
-    tasty-th
+    base containers deepseq hashable primes QuickCheck singletons tasty
+    tasty-hunit tasty-quickcheck tasty-th
   ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
@@ -50,4 +26,4 @@ mkDerivation {
   description = "Finite Fields";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/finite-typelits.nix b/pkgs/finite-typelits.nix
index 46a28b5227963f0fe6c0fa4fc6026a14cf655e30..f719398a92a5cb1d9641f2eb322407ccd4ddac59 100644
--- a/pkgs/finite-typelits.nix
+++ b/pkgs/finite-typelits.nix
@@ -19,4 +19,4 @@ mkDerivation {
   description = "A type inhabited by finitely many values, indexed by type-level naturals";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/first-class-families.nix b/pkgs/first-class-families.nix
index 2f6735f90a828c8f2c498a457d5297c1529f9365..8a129e7aa67322b0493152d59affc2fce2e6ee78 100644
--- a/pkgs/first-class-families.nix
+++ b/pkgs/first-class-families.nix
@@ -21,4 +21,4 @@ mkDerivation {
   description = "First-class type families";
   license = lib.licenses.mit;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/fixed.nix b/pkgs/fixed.nix
index 1c2c1cdf59173356bac1f8a6b5dd598feea81553..ffe054fe347496c9c2af5e677dbfb5750252b78f 100644
--- a/pkgs/fixed.nix
+++ b/pkgs/fixed.nix
@@ -18,4 +18,4 @@ mkDerivation {
   description = "Signed 15.16 precision fixed point arithmetic";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/floatshow.nix b/pkgs/floatshow.nix
index 6073a014c5f971831d2254ede49fd90ddde0d99d..7af06beb103181db918718c01b94b52f49381bc8 100644
--- a/pkgs/floatshow.nix
+++ b/pkgs/floatshow.nix
@@ -18,4 +18,4 @@ mkDerivation {
   description = "Alternative faster String representations for Double and Float, String representations for more general numeric types";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/fmlist.nix b/pkgs/fmlist.nix
index 3ae17b1bb6456a1577dc7930c693054b3f382875..5c004c9d37576714591bd095323edd222f505d6f 100644
--- a/pkgs/fmlist.nix
+++ b/pkgs/fmlist.nix
@@ -18,4 +18,4 @@ mkDerivation {
   description = "FoldMap lists";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/fmt.nix b/pkgs/fmt.nix
index 857493479ac7b876267bdedf04d8fd928b06daf6..574a71f1129ebb0c5b267232a8f786ed29b9ff2e 100644
--- a/pkgs/fmt.nix
+++ b/pkgs/fmt.nix
@@ -1,24 +1,7 @@
-{ mkDerivation
-, QuickCheck
-, base
-, base64-bytestring
-, bytestring
-, call-stack
-, containers
-, criterion
-, deepseq
-, doctest
-, doctest-discover
-, formatting
-, hspec
-, interpolate
-, lib
-, microlens
-, neat-interpolation
-, text
-, time
-, time-locale-compat
-, vector
+{ mkDerivation, QuickCheck, base, base64-bytestring, bytestring
+, call-stack, containers, criterion, deepseq, doctest
+, doctest-discover, formatting, hspec, interpolate, lib, microlens
+, neat-interpolation, text, time, time-locale-compat, vector
 }:
 mkDerivation {
   pname = "fmt";
@@ -28,40 +11,17 @@ mkDerivation {
   isExecutable = false;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    base
-    base64-bytestring
-    bytestring
-    call-stack
-    containers
-    formatting
-    microlens
-    text
-    time
-    time-locale-compat
+    base base64-bytestring bytestring call-stack containers formatting
+    microlens text time time-locale-compat
   ];
   testHaskellDepends = [
-    base
-    bytestring
-    call-stack
-    containers
-    doctest
-    hspec
-    neat-interpolation
-    QuickCheck
-    text
-    vector
+    base bytestring call-stack containers doctest hspec
+    neat-interpolation QuickCheck text vector
   ];
   testToolDepends = [ doctest-discover ];
   benchmarkHaskellDepends = [
-    base
-    bytestring
-    containers
-    criterion
-    deepseq
-    formatting
-    interpolate
-    text
-    vector
+    base bytestring containers criterion deepseq formatting interpolate
+    text vector
   ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
@@ -74,4 +34,4 @@ mkDerivation {
   description = "A new formatting library";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/focus.nix b/pkgs/focus.nix
index 05f5057df65ac2544fa813be3f5bec83385ecfa1..125089d46105a77f3953099180a6bf1e4dee0ac5 100644
--- a/pkgs/focus.nix
+++ b/pkgs/focus.nix
@@ -1,13 +1,5 @@
-{ mkDerivation
-, QuickCheck
-, base
-, lib
-, quickcheck-instances
-, rerebase
-, tasty
-, tasty-hunit
-, tasty-quickcheck
-, transformers
+{ mkDerivation, QuickCheck, base, lib, quickcheck-instances
+, rerebase, tasty, tasty-hunit, tasty-quickcheck, transformers
 }:
 mkDerivation {
   pname = "focus";
@@ -18,11 +10,7 @@ mkDerivation {
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [ base transformers ];
   testHaskellDepends = [
-    QuickCheck
-    quickcheck-instances
-    rerebase
-    tasty
-    tasty-hunit
+    QuickCheck quickcheck-instances rerebase tasty tasty-hunit
     tasty-quickcheck
   ];
   enableLibraryProfiling = true;
@@ -36,4 +24,4 @@ mkDerivation {
   description = "A general abstraction for manipulating elements of container data structures";
   license = lib.licenses.mit;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/foldable1-classes-compat.nix b/pkgs/foldable1-classes-compat.nix
index 71c964ef7dc78cb9dc57f24fb6b601afc8488c08..5e6156ab63e0556e2e659a5a37c4265fac2e06b6 100644
--- a/pkgs/foldable1-classes-compat.nix
+++ b/pkgs/foldable1-classes-compat.nix
@@ -1,16 +1,6 @@
-{ mkDerivation
-, QuickCheck
-, base
-, containers
-, criterion
-, deepseq
-, ghc-prim
-, lib
-, quickcheck-instances
-, tagged
-, test-framework
-, test-framework-quickcheck2
-, transformers
+{ mkDerivation, QuickCheck, base, containers, criterion, deepseq
+, ghc-prim, lib, quickcheck-instances, tagged, test-framework
+, test-framework-quickcheck2, transformers
 }:
 mkDerivation {
   pname = "foldable1-classes-compat";
@@ -22,27 +12,14 @@ mkDerivation {
   isExecutable = false;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    base
-    containers
-    ghc-prim
-    tagged
-    transformers
+    base containers ghc-prim tagged transformers
   ];
   testHaskellDepends = [
-    base
-    containers
-    QuickCheck
-    quickcheck-instances
-    test-framework
-    test-framework-quickcheck2
-    transformers
+    base containers QuickCheck quickcheck-instances test-framework
+    test-framework-quickcheck2 transformers
   ];
   benchmarkHaskellDepends = [
-    base
-    containers
-    criterion
-    deepseq
-    transformers
+    base containers criterion deepseq transformers
   ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
@@ -55,4 +32,4 @@ mkDerivation {
   description = "Compatibility package for the Foldable1 and Bifoldable1 type classes";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/force-layout.nix b/pkgs/force-layout.nix
index e2195d4522fcd63edbc2dd9f05ec1aaeb1120a03..94d8569471d81c5d6d3df42b4e13ec978d0e8928 100644
--- a/pkgs/force-layout.nix
+++ b/pkgs/force-layout.nix
@@ -1,9 +1,4 @@
-{ mkDerivation
-, base
-, containers
-, data-default-class
-, lens
-, lib
+{ mkDerivation, base, containers, data-default-class, lens, lib
 , linear
 }:
 mkDerivation {
@@ -16,11 +11,7 @@ mkDerivation {
   isExecutable = false;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    base
-    containers
-    data-default-class
-    lens
-    linear
+    base containers data-default-class lens linear
   ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
@@ -32,4 +23,4 @@ mkDerivation {
   description = "Simple force-directed layout";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/foreign-store.nix b/pkgs/foreign-store.nix
index 940371b81be0128bfb0b67bc47da13c1aba919e6..3df6e50e0b4d0602a5e836663f9822246675d788 100644
--- a/pkgs/foreign-store.nix
+++ b/pkgs/foreign-store.nix
@@ -18,4 +18,4 @@ mkDerivation {
   description = "Store a stable pointer in a foreign context to be retrieved later";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/foundation.nix b/pkgs/foundation.nix
index e5118aeae50e018279c16c3b9d5244ad3925c81e..8ae04cb99f032e719f52188ba334b5a1d13d6944 100644
--- a/pkgs/foundation.nix
+++ b/pkgs/foundation.nix
@@ -20,4 +20,4 @@ mkDerivation {
   description = "Alternative prelude with batteries and no dependencies";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/fourmolu.nix b/pkgs/fourmolu.nix
index 67b84277fc33a0fb2b1c6607d00b8c3d7c0fd983..6e080b4aae9fd10a7ecf24f835fcbc2454177365 100644
--- a/pkgs/fourmolu.nix
+++ b/pkgs/fourmolu.nix
@@ -1,37 +1,9 @@
-{ mkDerivation
-, Cabal-syntax
-, Diff
-, MemoTrie
-, QuickCheck
-, aeson
-, ansi-terminal
-, array
-, base
-, bytestring
-, containers
-, directory
-, dlist
-, exceptions
-, filepath
-, ghc-lib-parser
-, gitrev
-, hspec
-, hspec-discover
-, hspec-megaparsec
-, lib
-, megaparsec
-, mtl
-, optparse-applicative
-, path
-, path-io
-, pretty
-, process
-, syb
-, template-haskell
-, temporary
-, text
-, th-lift-instances
-, yaml
+{ mkDerivation, Cabal-syntax, Diff, MemoTrie, QuickCheck, aeson
+, ansi-terminal, array, base, bytestring, containers, directory
+, dlist, exceptions, filepath, ghc-lib-parser, gitrev, hspec
+, hspec-discover, hspec-megaparsec, lib, megaparsec, mtl
+, optparse-applicative, path, path-io, pretty, process, syb
+, template-haskell, temporary, text, th-lift-instances, yaml
 }:
 mkDerivation {
   pname = "fourmolu";
@@ -41,56 +13,18 @@ mkDerivation {
   isExecutable = true;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    aeson
-    ansi-terminal
-    array
-    base
-    bytestring
-    Cabal-syntax
-    containers
-    Diff
-    directory
-    dlist
-    exceptions
-    filepath
-    ghc-lib-parser
-    megaparsec
-    MemoTrie
-    mtl
-    syb
-    template-haskell
-    text
-    th-lift-instances
-    yaml
+    aeson ansi-terminal array base bytestring Cabal-syntax containers
+    Diff directory dlist exceptions filepath ghc-lib-parser megaparsec
+    MemoTrie mtl syb template-haskell text th-lift-instances yaml
   ];
   executableHaskellDepends = [
-    base
-    containers
-    directory
-    filepath
-    ghc-lib-parser
-    gitrev
-    optparse-applicative
-    text
-    yaml
+    base containers directory filepath ghc-lib-parser gitrev
+    optparse-applicative text yaml
   ];
   testHaskellDepends = [
-    base
-    containers
-    Diff
-    directory
-    filepath
-    ghc-lib-parser
-    hspec
-    hspec-megaparsec
-    megaparsec
-    path
-    path-io
-    pretty
-    process
-    QuickCheck
-    temporary
-    text
+    base containers Diff directory filepath ghc-lib-parser hspec
+    hspec-megaparsec megaparsec path path-io pretty process QuickCheck
+    temporary text
   ];
   testToolDepends = [ hspec-discover ];
   enableLibraryProfiling = true;
@@ -104,4 +38,4 @@ mkDerivation {
   description = "A formatter for Haskell source code";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/freer-simple.nix b/pkgs/freer-simple.nix
index c442b48ab3f1e2c032d0f039783d5f0c38cd31a5..9f8c27f1b72b77d2f15074dd004bfc45ab6d6aff 100644
--- a/pkgs/freer-simple.nix
+++ b/pkgs/freer-simple.nix
@@ -1,17 +1,6 @@
-{ mkDerivation
-, QuickCheck
-, base
-, criterion
-, extensible-effects
-, free
-, lib
-, mtl
-, natural-transformation
-, tasty
-, tasty-hunit
-, tasty-quickcheck
-, template-haskell
-, transformers-base
+{ mkDerivation, QuickCheck, base, criterion, extensible-effects
+, free, lib, mtl, natural-transformation, tasty, tasty-hunit
+, tasty-quickcheck, template-haskell, transformers-base
 }:
 mkDerivation {
   pname = "freer-simple";
@@ -21,25 +10,14 @@ mkDerivation {
   isExecutable = true;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    base
-    natural-transformation
-    template-haskell
-    transformers-base
+    base natural-transformation template-haskell transformers-base
   ];
   executableHaskellDepends = [ base ];
   testHaskellDepends = [
-    base
-    QuickCheck
-    tasty
-    tasty-hunit
-    tasty-quickcheck
+    base QuickCheck tasty tasty-hunit tasty-quickcheck
   ];
   benchmarkHaskellDepends = [
-    base
-    criterion
-    extensible-effects
-    free
-    mtl
+    base criterion extensible-effects free mtl
   ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
@@ -52,4 +30,4 @@ mkDerivation {
   description = "A friendly effect system for Haskell";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/friendly-time.nix b/pkgs/friendly-time.nix
index 4956ad4c244238ce0fc22a38ebf25a428f223365..138ff804bab3761d5506b5f1c96fbffba5ac792d 100644
--- a/pkgs/friendly-time.nix
+++ b/pkgs/friendly-time.nix
@@ -20,4 +20,4 @@ mkDerivation {
   description = "Print time information in friendly ways";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/fsnotify.nix b/pkgs/fsnotify.nix
index 9c0ba6bacf045aa5cf4671fd40f9f5147b7cab81..e9c43d5c86c46860f50e94ace6f7eec94142deab 100644
--- a/pkgs/fsnotify.nix
+++ b/pkgs/fsnotify.nix
@@ -1,24 +1,7 @@
-{ mkDerivation
-, async
-, base
-, bytestring
-, containers
-, directory
-, exceptions
-, filepath
-, hinotify
-, lib
-, monad-control
-, random
-, retry
-, safe-exceptions
-, sandwich
-, temporary
-, text
-, time
-, unix
-, unix-compat
-, unliftio
+{ mkDerivation, async, base, bytestring, containers, directory
+, exceptions, filepath, hinotify, lib, monad-control, random, retry
+, safe-exceptions, sandwich, temporary, text, time, unix
+, unix-compat, unliftio
 }:
 mkDerivation {
   pname = "fsnotify";
@@ -28,33 +11,12 @@ mkDerivation {
   isExecutable = false;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    async
-    base
-    bytestring
-    containers
-    directory
-    filepath
-    hinotify
-    monad-control
-    safe-exceptions
-    text
-    time
-    unix
-    unix-compat
+    async base bytestring containers directory filepath hinotify
+    monad-control safe-exceptions text time unix unix-compat
   ];
   testHaskellDepends = [
-    async
-    base
-    directory
-    exceptions
-    filepath
-    random
-    retry
-    safe-exceptions
-    sandwich
-    temporary
-    unix-compat
-    unliftio
+    async base directory exceptions filepath random retry
+    safe-exceptions sandwich temporary unix-compat unliftio
   ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
@@ -67,4 +29,4 @@ mkDerivation {
   description = "Cross platform library for file change notification";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/fusion-plugin-types.nix b/pkgs/fusion-plugin-types.nix
index e36d2b857e51d87ba0fe637a23b72eb05647f407..cb1e059a984893defcd5e67a82ff9784bb787a6c 100644
--- a/pkgs/fusion-plugin-types.nix
+++ b/pkgs/fusion-plugin-types.nix
@@ -18,4 +18,4 @@ mkDerivation {
   description = "Types for the fusion-plugin package";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/fuzzy-time-gen.nix b/pkgs/fuzzy-time-gen.nix
index a98a706fb045485119a8808e9bdcbb5d51ebae04..d8e9f854916ebff22fba53729759699ce2a2cba6 100644
--- a/pkgs/fuzzy-time-gen.nix
+++ b/pkgs/fuzzy-time-gen.nix
@@ -1,18 +1,6 @@
-{ mkDerivation
-, QuickCheck
-, base
-, containers
-, criterion
-, fuzzy-time
-, genvalidity
-, genvalidity-criterion
-, genvalidity-hspec
-, genvalidity-text
-, genvalidity-time
-, hspec
-, lib
-, megaparsec
-, text
+{ mkDerivation, QuickCheck, base, containers, criterion, fuzzy-time
+, genvalidity, genvalidity-criterion, genvalidity-hspec
+, genvalidity-text, genvalidity-time, hspec, lib, megaparsec, text
 , time
 }:
 mkDerivation {
@@ -23,33 +11,15 @@ mkDerivation {
   isExecutable = false;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    base
-    containers
-    fuzzy-time
-    genvalidity
-    genvalidity-time
-    megaparsec
-    QuickCheck
-    time
+    base containers fuzzy-time genvalidity genvalidity-time megaparsec
+    QuickCheck time
   ];
   testHaskellDepends = [
-    base
-    fuzzy-time
-    genvalidity
-    genvalidity-hspec
-    genvalidity-text
-    genvalidity-time
-    hspec
-    megaparsec
-    QuickCheck
-    text
-    time
+    base fuzzy-time genvalidity genvalidity-hspec genvalidity-text
+    genvalidity-time hspec megaparsec QuickCheck text time
   ];
   benchmarkHaskellDepends = [
-    base
-    criterion
-    fuzzy-time
-    genvalidity-criterion
+    base criterion fuzzy-time genvalidity-criterion
   ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
@@ -61,4 +31,4 @@ mkDerivation {
   homepage = "https://github.com/NorfairKing/fuzzy-time";
   license = lib.licenses.mit;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/fuzzy-time.nix b/pkgs/fuzzy-time.nix
index d3a5e94f63a5c0d9481f688c4fabaa77694af7e8..b35a778cef87e1c88549287b3898a21795211bbb 100644
--- a/pkgs/fuzzy-time.nix
+++ b/pkgs/fuzzy-time.nix
@@ -1,13 +1,5 @@
-{ mkDerivation
-, base
-, containers
-, deepseq
-, lib
-, megaparsec
-, text
-, time
-, validity
-, validity-time
+{ mkDerivation, base, containers, deepseq, lib, megaparsec, text
+, time, validity, validity-time
 }:
 mkDerivation {
   pname = "fuzzy-time";
@@ -17,14 +9,7 @@ mkDerivation {
   isExecutable = false;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    base
-    containers
-    deepseq
-    megaparsec
-    text
-    time
-    validity
-    validity-time
+    base containers deepseq megaparsec text time validity validity-time
   ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
@@ -36,4 +21,4 @@ mkDerivation {
   homepage = "https://github.com/NorfairKing/fuzzy-time";
   license = lib.licenses.mit;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/fuzzy.nix b/pkgs/fuzzy.nix
index 44a3be3c9bd8b5cd25e56da80a6546fe46cf7e53..ccbfdb462babc9b9f7f560025073025c397041fc 100644
--- a/pkgs/fuzzy.nix
+++ b/pkgs/fuzzy.nix
@@ -19,4 +19,4 @@ mkDerivation {
   description = "Filters a list based on a fuzzy string search";
   license = lib.licenses.mit;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/generic-arbitrary.nix b/pkgs/generic-arbitrary.nix
index 9c8aa42021cb6df249efe4225b6548e075eba543..548b775b9af77c56dd3591bcae5a0b321e343e99 100644
--- a/pkgs/generic-arbitrary.nix
+++ b/pkgs/generic-arbitrary.nix
@@ -1,12 +1,5 @@
-{ mkDerivation
-, QuickCheck
-, base
-, deepseq
-, lib
-, tasty
-, tasty-discover
-, tasty-hunit
-, tasty-quickcheck
+{ mkDerivation, QuickCheck, base, deepseq, lib, tasty
+, tasty-discover, tasty-hunit, tasty-quickcheck
 }:
 mkDerivation {
   pname = "generic-arbitrary";
@@ -17,12 +10,7 @@ mkDerivation {
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [ base QuickCheck ];
   testHaskellDepends = [
-    base
-    deepseq
-    QuickCheck
-    tasty
-    tasty-discover
-    tasty-hunit
+    base deepseq QuickCheck tasty tasty-discover tasty-hunit
     tasty-quickcheck
   ];
   testToolDepends = [ tasty-discover ];
@@ -37,4 +25,4 @@ mkDerivation {
   description = "Generic implementation for QuickCheck's Arbitrary";
   license = lib.licenses.mit;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/generic-lens-core.nix b/pkgs/generic-lens-core.nix
index 9bc8ce480291fd1e7cd1e690e9a09ff0ef205918..74e00690d553a55e899d2f00a76772760d260102 100644
--- a/pkgs/generic-lens-core.nix
+++ b/pkgs/generic-lens-core.nix
@@ -20,4 +20,4 @@ mkDerivation {
   description = "Generically derive traversals, lenses and prisms";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/generic-lens-lite.nix b/pkgs/generic-lens-lite.nix
index 3a56ee8137b546ba6964a3ecc20cdb1ee8e3cc4f..5dd451f2b5e6b783f3144604a0f7dc082126cee1 100644
--- a/pkgs/generic-lens-lite.nix
+++ b/pkgs/generic-lens-lite.nix
@@ -21,4 +21,4 @@ mkDerivation {
   description = "Monomorphic field lens like with generic-lens";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/generic-lens.nix b/pkgs/generic-lens.nix
index f7bd0f9f41d2b9f6f3891784f5e2dc7f7ce9b577..aaf8f8d5c3858c7e395a4b30bb8e0c52cbf4a2f1 100644
--- a/pkgs/generic-lens.nix
+++ b/pkgs/generic-lens.nix
@@ -1,13 +1,5 @@
-{ mkDerivation
-, HUnit
-, base
-, doctest
-, generic-lens-core
-, inspection-testing
-, lens
-, lib
-, profunctors
-, text
+{ mkDerivation, HUnit, base, doctest, generic-lens-core
+, inspection-testing, lens, lib, profunctors, text
 }:
 mkDerivation {
   pname = "generic-lens";
@@ -19,18 +11,10 @@ mkDerivation {
   isExecutable = false;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    base
-    generic-lens-core
-    profunctors
-    text
+    base generic-lens-core profunctors text
   ];
   testHaskellDepends = [
-    base
-    doctest
-    HUnit
-    inspection-testing
-    lens
-    profunctors
+    base doctest HUnit inspection-testing lens profunctors
   ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
@@ -43,4 +27,4 @@ mkDerivation {
   description = "Generically derive traversals, lenses and prisms";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/generic-monoid.nix b/pkgs/generic-monoid.nix
index 9cc55ba698800f774ca332dda16f55293663ecbc..f3bb2974ab9712589a773724be735658e9337d7b 100644
--- a/pkgs/generic-monoid.nix
+++ b/pkgs/generic-monoid.nix
@@ -19,4 +19,4 @@ mkDerivation {
   description = "Derive monoid instances for product types";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/generic-optics-lite.nix b/pkgs/generic-optics-lite.nix
index a8e190cf52b9c69aa54dec2d52ffbccca89db3b7..bc0465bc04a9ff6f3a0171b3bd82539de2512254 100644
--- a/pkgs/generic-optics-lite.nix
+++ b/pkgs/generic-optics-lite.nix
@@ -21,4 +21,4 @@ mkDerivation {
   description = "Monomorphic field opics like with generic-lens";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/generic-optics.nix b/pkgs/generic-optics.nix
index 687608abe8f7351b4226ed46a55d6765e965d1a7..d02198bbcc392cbdfdfe5bec11f35db156e255ab 100644
--- a/pkgs/generic-optics.nix
+++ b/pkgs/generic-optics.nix
@@ -1,12 +1,5 @@
-{ mkDerivation
-, HUnit
-, base
-, doctest
-, generic-lens-core
-, inspection-testing
-, lib
-, optics-core
-, text
+{ mkDerivation, HUnit, base, doctest, generic-lens-core
+, inspection-testing, lib, optics-core, text
 }:
 mkDerivation {
   pname = "generic-optics";
@@ -18,17 +11,10 @@ mkDerivation {
   isExecutable = false;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    base
-    generic-lens-core
-    optics-core
-    text
+    base generic-lens-core optics-core text
   ];
   testHaskellDepends = [
-    base
-    doctest
-    HUnit
-    inspection-testing
-    optics-core
+    base doctest HUnit inspection-testing optics-core
   ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
@@ -41,4 +27,4 @@ mkDerivation {
   description = "Generically derive traversals, lenses and prisms";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/generic-random.nix b/pkgs/generic-random.nix
index 4e6fa39c134174bb5dc86f99edcf2523a5abab39..416c60909bba1065875f9a2b6be73a537280af46 100644
--- a/pkgs/generic-random.nix
+++ b/pkgs/generic-random.nix
@@ -19,4 +19,4 @@ mkDerivation {
   description = "Generic random generators for QuickCheck";
   license = lib.licenses.mit;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/generics-sop.nix b/pkgs/generics-sop.nix
index f8a87bfeaeec00c97500b5c76dbd45275c47fa05..8732c366144a02578c73ab73f1db1d7caa7e662a 100644
--- a/pkgs/generics-sop.nix
+++ b/pkgs/generics-sop.nix
@@ -1,12 +1,5 @@
-{ mkDerivation
-, base
-, criterion
-, deepseq
-, ghc-prim
-, lib
-, sop-core
-, template-haskell
-, th-abstraction
+{ mkDerivation, base, criterion, deepseq, ghc-prim, lib, sop-core
+, template-haskell, th-abstraction
 }:
 mkDerivation {
   pname = "generics-sop";
@@ -18,18 +11,11 @@ mkDerivation {
   isExecutable = false;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    base
-    ghc-prim
-    sop-core
-    template-haskell
-    th-abstraction
+    base ghc-prim sop-core template-haskell th-abstraction
   ];
   testHaskellDepends = [ base ];
   benchmarkHaskellDepends = [
-    base
-    criterion
-    deepseq
-    template-haskell
+    base criterion deepseq template-haskell
   ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
@@ -41,4 +27,4 @@ mkDerivation {
   description = "Generic Programming using True Sums of Products";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/genvalidity-aeson.nix b/pkgs/genvalidity-aeson.nix
index 11355ee1c676e42d2e037a13a88cefb274ad5f74..45086594f56aa0f07311f8153f0048e6ba2e9abe 100644
--- a/pkgs/genvalidity-aeson.nix
+++ b/pkgs/genvalidity-aeson.nix
@@ -1,20 +1,8 @@
-{ mkDerivation
-, QuickCheck
-, aeson
-, base
-, criterion
-, deepseq
-, genvalidity
-, genvalidity-criterion
-, genvalidity-hspec
-, genvalidity-scientific
-, genvalidity-text
-, genvalidity-unordered-containers
-, genvalidity-vector
-, hspec
-, lib
-, validity
-, validity-aeson
+{ mkDerivation, QuickCheck, aeson, base, criterion, deepseq
+, genvalidity, genvalidity-criterion, genvalidity-hspec
+, genvalidity-scientific, genvalidity-text
+, genvalidity-unordered-containers, genvalidity-vector, hspec, lib
+, validity, validity-aeson
 }:
 mkDerivation {
   pname = "genvalidity-aeson";
@@ -24,30 +12,15 @@ mkDerivation {
   isExecutable = false;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    aeson
-    base
-    genvalidity
-    genvalidity-scientific
-    genvalidity-text
-    genvalidity-unordered-containers
-    genvalidity-vector
-    QuickCheck
-    validity
-    validity-aeson
+    aeson base genvalidity genvalidity-scientific genvalidity-text
+    genvalidity-unordered-containers genvalidity-vector QuickCheck
+    validity validity-aeson
   ];
   testHaskellDepends = [
-    aeson
-    base
-    deepseq
-    genvalidity
-    genvalidity-hspec
-    hspec
+    aeson base deepseq genvalidity genvalidity-hspec hspec
   ];
   benchmarkHaskellDepends = [
-    aeson
-    base
-    criterion
-    genvalidity-criterion
+    aeson base criterion genvalidity-criterion
   ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
@@ -60,4 +33,4 @@ mkDerivation {
   description = "GenValidity support for aeson";
   license = lib.licenses.mit;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/genvalidity-bytestring.nix b/pkgs/genvalidity-bytestring.nix
index e1dce6de0ce38a57f8ba559dcbe938a80e3f8fa8..e1eb4e7092cc769f14565f27ade8da58dc4618d0 100644
--- a/pkgs/genvalidity-bytestring.nix
+++ b/pkgs/genvalidity-bytestring.nix
@@ -1,17 +1,6 @@
-{ mkDerivation
-, QuickCheck
-, base
-, bytestring
-, criterion
-, deepseq
-, genvalidity
-, genvalidity-criterion
-, genvalidity-hspec
-, hspec
-, lib
-, random
-, validity
-, validity-bytestring
+{ mkDerivation, QuickCheck, base, bytestring, criterion, deepseq
+, genvalidity, genvalidity-criterion, genvalidity-hspec, hspec, lib
+, random, validity, validity-bytestring
 }:
 mkDerivation {
   pname = "genvalidity-bytestring";
@@ -21,30 +10,15 @@ mkDerivation {
   isExecutable = false;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    base
-    bytestring
-    genvalidity
-    QuickCheck
-    random
-    validity
+    base bytestring genvalidity QuickCheck random validity
     validity-bytestring
   ];
   testHaskellDepends = [
-    base
-    bytestring
-    deepseq
-    genvalidity
-    genvalidity-hspec
-    hspec
-    QuickCheck
-    validity
+    base bytestring deepseq genvalidity genvalidity-hspec hspec
+    QuickCheck validity
   ];
   benchmarkHaskellDepends = [
-    base
-    bytestring
-    criterion
-    genvalidity
-    genvalidity-criterion
+    base bytestring criterion genvalidity genvalidity-criterion
     QuickCheck
   ];
   enableLibraryProfiling = true;
@@ -58,4 +32,4 @@ mkDerivation {
   description = "GenValidity support for ByteString";
   license = lib.licenses.mit;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/genvalidity-case-insensitive.nix b/pkgs/genvalidity-case-insensitive.nix
index 23bf4c189a1d94beea0a068f5ce02e197b216e07..a1df639017a0aaef0fa90d2bcba29e29069cfe51 100644
--- a/pkgs/genvalidity-case-insensitive.nix
+++ b/pkgs/genvalidity-case-insensitive.nix
@@ -1,13 +1,5 @@
-{ mkDerivation
-, QuickCheck
-, base
-, case-insensitive
-, criterion
-, genvalidity
-, genvalidity-criterion
-, genvalidity-hspec
-, hspec
-, lib
+{ mkDerivation, QuickCheck, base, case-insensitive, criterion
+, genvalidity, genvalidity-criterion, genvalidity-hspec, hspec, lib
 , validity-case-insensitive
 }:
 mkDerivation {
@@ -18,23 +10,13 @@ mkDerivation {
   isExecutable = false;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    base
-    case-insensitive
-    genvalidity
-    validity-case-insensitive
+    base case-insensitive genvalidity validity-case-insensitive
   ];
   testHaskellDepends = [
-    base
-    case-insensitive
-    genvalidity-hspec
-    hspec
+    base case-insensitive genvalidity-hspec hspec
   ];
   benchmarkHaskellDepends = [
-    base
-    case-insensitive
-    criterion
-    genvalidity
-    genvalidity-criterion
+    base case-insensitive criterion genvalidity genvalidity-criterion
     QuickCheck
   ];
   enableLibraryProfiling = true;
@@ -48,4 +30,4 @@ mkDerivation {
   description = "GenValidity support for case-insensitive";
   license = lib.licenses.mit;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/genvalidity-containers.nix b/pkgs/genvalidity-containers.nix
index d127e2da2ead5aaf4dba8c65f95a460b109f924b..639b9a134e2baa730a34e4ac14b4b521c1024e9b 100644
--- a/pkgs/genvalidity-containers.nix
+++ b/pkgs/genvalidity-containers.nix
@@ -1,16 +1,6 @@
-{ mkDerivation
-, QuickCheck
-, base
-, containers
-, criterion
-, genvalidity
-, genvalidity-criterion
-, genvalidity-hspec
-, genvalidity-property
-, hspec
-, lib
-, validity
-, validity-containers
+{ mkDerivation, QuickCheck, base, containers, criterion
+, genvalidity, genvalidity-criterion, genvalidity-hspec
+, genvalidity-property, hspec, lib, validity, validity-containers
 }:
 mkDerivation {
   pname = "genvalidity-containers";
@@ -20,30 +10,14 @@ mkDerivation {
   isExecutable = false;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    base
-    containers
-    genvalidity
-    QuickCheck
-    validity
-    validity-containers
+    base containers genvalidity QuickCheck validity validity-containers
   ];
   testHaskellDepends = [
-    base
-    containers
-    genvalidity
-    genvalidity-hspec
-    genvalidity-property
-    hspec
-    QuickCheck
-    validity
-    validity-containers
+    base containers genvalidity genvalidity-hspec genvalidity-property
+    hspec QuickCheck validity validity-containers
   ];
   benchmarkHaskellDepends = [
-    base
-    containers
-    criterion
-    genvalidity
-    genvalidity-criterion
+    base containers criterion genvalidity genvalidity-criterion
     QuickCheck
   ];
   enableLibraryProfiling = true;
@@ -57,4 +31,4 @@ mkDerivation {
   description = "GenValidity support for containers";
   license = lib.licenses.mit;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/genvalidity-criterion.nix b/pkgs/genvalidity-criterion.nix
index ba07f01a4beb2f6bcd035dbf7a5cc0adbc008b0a..94e0953ac63e95b2ee2f3985db32c170cc4376eb 100644
--- a/pkgs/genvalidity-criterion.nix
+++ b/pkgs/genvalidity-criterion.nix
@@ -1,11 +1,5 @@
-{ mkDerivation
-, QuickCheck
-, base
-, criterion
-, deepseq
-, genvalidity
-, lib
-, vector
+{ mkDerivation, QuickCheck, base, criterion, deepseq, genvalidity
+, lib, vector
 }:
 mkDerivation {
   pname = "genvalidity-criterion";
@@ -15,18 +9,10 @@ mkDerivation {
   isExecutable = false;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    base
-    criterion
-    deepseq
-    genvalidity
-    QuickCheck
-    vector
+    base criterion deepseq genvalidity QuickCheck vector
   ];
   benchmarkHaskellDepends = [
-    base
-    criterion
-    genvalidity
-    QuickCheck
+    base criterion genvalidity QuickCheck
   ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
@@ -39,4 +25,4 @@ mkDerivation {
   description = "Criterion benchmarks for generators";
   license = lib.licenses.mit;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/genvalidity-dirforest.nix b/pkgs/genvalidity-dirforest.nix
index 39a5b6f3eacae25f5977201b91ed923a0dd66ead..4bad6557a11a5c5bb406b2937aeb78d039bfbb30 100644
--- a/pkgs/genvalidity-dirforest.nix
+++ b/pkgs/genvalidity-dirforest.nix
@@ -1,24 +1,8 @@
-{ mkDerivation
-, QuickCheck
-, base
-, bytestring
-, containers
-, criterion
-, dirforest
-, fetchgit
-, filepath
-, genvalidity
-, genvalidity-bytestring
-, genvalidity-containers
-, genvalidity-criterion
-, genvalidity-hspec
-, genvalidity-hspec-aeson
-, genvalidity-path
-, genvalidity-text
-, hspec
-, lib
-, path
-, path-io
+{ mkDerivation, QuickCheck, base, bytestring, containers, criterion
+, dirforest, fetchgit, filepath, genvalidity
+, genvalidity-bytestring, genvalidity-containers
+, genvalidity-criterion, genvalidity-hspec, genvalidity-hspec-aeson
+, genvalidity-path, genvalidity-text, hspec, lib, path, path-io
 , pretty-show
 }:
 mkDerivation {
@@ -35,37 +19,16 @@ mkDerivation {
   isExecutable = false;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    base
-    containers
-    dirforest
-    filepath
-    genvalidity
-    genvalidity-containers
-    genvalidity-path
-    path
-    QuickCheck
+    base containers dirforest filepath genvalidity
+    genvalidity-containers genvalidity-path path QuickCheck
   ];
   testHaskellDepends = [
-    base
-    bytestring
-    containers
-    dirforest
-    filepath
-    genvalidity-bytestring
-    genvalidity-hspec
-    genvalidity-hspec-aeson
-    hspec
-    path
-    path-io
-    pretty-show
-    QuickCheck
+    base bytestring containers dirforest filepath
+    genvalidity-bytestring genvalidity-hspec genvalidity-hspec-aeson
+    hspec path path-io pretty-show QuickCheck
   ];
   benchmarkHaskellDepends = [
-    base
-    criterion
-    dirforest
-    genvalidity
-    genvalidity-criterion
+    base criterion dirforest genvalidity genvalidity-criterion
     genvalidity-text
   ];
   enableLibraryProfiling = true;
@@ -78,4 +41,4 @@ mkDerivation {
   homepage = "https://github.com/NorfairKing/dirforest#readme";
   license = "unknown";
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/genvalidity-hspec-aeson.nix b/pkgs/genvalidity-hspec-aeson.nix
index 2149ffda1100580d7620cdc8847d30bf8174102f..eb2149e1b93afb7db722036537f0006d49f0be59 100644
--- a/pkgs/genvalidity-hspec-aeson.nix
+++ b/pkgs/genvalidity-hspec-aeson.nix
@@ -1,17 +1,6 @@
-{ mkDerivation
-, QuickCheck
-, aeson
-, base
-, bytestring
-, deepseq
-, genvalidity
-, genvalidity-aeson
-, genvalidity-hspec
-, genvalidity-property
-, genvalidity-text
-, hspec
-, lib
-, text
+{ mkDerivation, QuickCheck, aeson, base, bytestring, deepseq
+, genvalidity, genvalidity-aeson, genvalidity-hspec
+, genvalidity-property, genvalidity-text, hspec, lib, text
 , validity
 }:
 mkDerivation {
@@ -22,26 +11,12 @@ mkDerivation {
   isExecutable = false;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    aeson
-    base
-    bytestring
-    deepseq
-    genvalidity
-    genvalidity-hspec
-    hspec
+    aeson base bytestring deepseq genvalidity genvalidity-hspec hspec
     QuickCheck
   ];
   testHaskellDepends = [
-    aeson
-    base
-    genvalidity
-    genvalidity-aeson
-    genvalidity-hspec
-    genvalidity-property
-    genvalidity-text
-    hspec
-    QuickCheck
-    text
+    aeson base genvalidity genvalidity-aeson genvalidity-hspec
+    genvalidity-property genvalidity-text hspec QuickCheck text
     validity
   ];
   enableLibraryProfiling = true;
@@ -55,4 +30,4 @@ mkDerivation {
   description = "Standard spec's for aeson-related instances";
   license = lib.licenses.mit;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/genvalidity-hspec-optics.nix b/pkgs/genvalidity-hspec-optics.nix
index e7127c28ed4092ca5d7bb79f66c8be393edbb0a7..a3fe8ad87a19b71bd4312311c352d08e01489f75 100644
--- a/pkgs/genvalidity-hspec-optics.nix
+++ b/pkgs/genvalidity-hspec-optics.nix
@@ -1,13 +1,5 @@
-{ mkDerivation
-, QuickCheck
-, base
-, genvalidity
-, genvalidity-hspec
-, genvalidity-property
-, hspec
-, lib
-, microlens
-, validity
+{ mkDerivation, QuickCheck, base, genvalidity, genvalidity-hspec
+, genvalidity-property, hspec, lib, microlens, validity
 }:
 mkDerivation {
   pname = "genvalidity-hspec-optics";
@@ -17,21 +9,11 @@ mkDerivation {
   isExecutable = false;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    base
-    genvalidity
-    genvalidity-hspec
-    hspec
-    microlens
-    QuickCheck
+    base genvalidity genvalidity-hspec hspec microlens QuickCheck
   ];
   testHaskellDepends = [
-    base
-    genvalidity
-    genvalidity-hspec
-    genvalidity-property
-    hspec
-    microlens
-    validity
+    base genvalidity genvalidity-hspec genvalidity-property hspec
+    microlens validity
   ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
@@ -44,4 +26,4 @@ mkDerivation {
   description = "Standard spec's for lens";
   license = lib.licenses.mit;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/genvalidity-hspec.nix b/pkgs/genvalidity-hspec.nix
index 30e0f624f0bf2775816915c771d61576b6481961..4487a1116e68da7063fb0a031db4ec77053fe99f 100644
--- a/pkgs/genvalidity-hspec.nix
+++ b/pkgs/genvalidity-hspec.nix
@@ -1,13 +1,5 @@
-{ mkDerivation
-, QuickCheck
-, base
-, genvalidity
-, genvalidity-property
-, hspec
-, hspec-core
-, lib
-, transformers
-, validity
+{ mkDerivation, QuickCheck, base, genvalidity, genvalidity-property
+, hspec, hspec-core, lib, transformers, validity
 }:
 mkDerivation {
   pname = "genvalidity-hspec";
@@ -17,21 +9,11 @@ mkDerivation {
   isExecutable = false;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    base
-    genvalidity
-    genvalidity-property
-    hspec
-    hspec-core
-    QuickCheck
-    transformers
-    validity
+    base genvalidity genvalidity-property hspec hspec-core QuickCheck
+    transformers validity
   ];
   testHaskellDepends = [
-    base
-    genvalidity
-    hspec
-    hspec-core
-    QuickCheck
+    base genvalidity hspec hspec-core QuickCheck
   ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
@@ -44,4 +26,4 @@ mkDerivation {
   description = "Standard spec's for GenValidity instances";
   license = lib.licenses.mit;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/genvalidity-path.nix b/pkgs/genvalidity-path.nix
index 92ffbcedae06eb411436b7b2c42f89195aed45a8..380e729dd117522e92a740df435543136ef1d6d1 100644
--- a/pkgs/genvalidity-path.nix
+++ b/pkgs/genvalidity-path.nix
@@ -1,13 +1,5 @@
-{ mkDerivation
-, QuickCheck
-, base
-, criterion
-, genvalidity
-, genvalidity-criterion
-, genvalidity-hspec
-, hspec
-, lib
-, path
+{ mkDerivation, QuickCheck, base, criterion, genvalidity
+, genvalidity-criterion, genvalidity-hspec, hspec, lib, path
 , validity-path
 }:
 mkDerivation {
@@ -18,20 +10,11 @@ mkDerivation {
   isExecutable = false;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    base
-    genvalidity
-    path
-    QuickCheck
-    validity-path
+    base genvalidity path QuickCheck validity-path
   ];
   testHaskellDepends = [ base genvalidity-hspec hspec path ];
   benchmarkHaskellDepends = [
-    base
-    criterion
-    genvalidity
-    genvalidity-criterion
-    path
-    QuickCheck
+    base criterion genvalidity genvalidity-criterion path QuickCheck
   ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
@@ -44,4 +27,4 @@ mkDerivation {
   description = "GenValidity support for Path";
   license = lib.licenses.mit;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/genvalidity-persistent.nix b/pkgs/genvalidity-persistent.nix
index 185b58874def93fef6fe181394447b4fa74fce7f..531afa98ededb34d8c3a6c309d1fae9daad2c981 100644
--- a/pkgs/genvalidity-persistent.nix
+++ b/pkgs/genvalidity-persistent.nix
@@ -1,19 +1,7 @@
-{ mkDerivation
-, QuickCheck
-, base
-, containers
-, criterion
-, deepseq
-, genvalidity
-, genvalidity-containers
-, genvalidity-criterion
-, genvalidity-hspec
-, hspec
-, lib
-, persistent
-, persistent-template
-, validity-containers
-, validity-persistent
+{ mkDerivation, QuickCheck, base, containers, criterion, deepseq
+, genvalidity, genvalidity-containers, genvalidity-criterion
+, genvalidity-hspec, hspec, lib, persistent, persistent-template
+, validity-containers, validity-persistent
 }:
 mkDerivation {
   pname = "genvalidity-persistent";
@@ -23,32 +11,15 @@ mkDerivation {
   isExecutable = false;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    base
-    containers
-    genvalidity
-    genvalidity-containers
-    persistent
-    QuickCheck
-    validity-containers
-    validity-persistent
+    base containers genvalidity genvalidity-containers persistent
+    QuickCheck validity-containers validity-persistent
   ];
   testHaskellDepends = [
-    base
-    genvalidity
-    genvalidity-hspec
-    hspec
-    persistent
-    persistent-template
-    QuickCheck
-    validity-containers
+    base genvalidity genvalidity-hspec hspec persistent
+    persistent-template QuickCheck validity-containers
   ];
   benchmarkHaskellDepends = [
-    base
-    criterion
-    deepseq
-    genvalidity
-    genvalidity-criterion
-    persistent
+    base criterion deepseq genvalidity genvalidity-criterion persistent
     persistent-template
   ];
   enableLibraryProfiling = true;
@@ -62,4 +33,4 @@ mkDerivation {
   description = "GenValidity support for Persistent";
   license = lib.licenses.mit;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/genvalidity-property.nix b/pkgs/genvalidity-property.nix
index e07825c36dc82bd023bae298b8a25a132b16f33e..b8ce09640563221f9c201d59670efea3503bf91b 100644
--- a/pkgs/genvalidity-property.nix
+++ b/pkgs/genvalidity-property.nix
@@ -1,11 +1,5 @@
-{ mkDerivation
-, QuickCheck
-, base
-, genvalidity
-, hspec
-, lib
-, pretty-show
-, validity
+{ mkDerivation, QuickCheck, base, genvalidity, hspec, lib
+, pretty-show, validity
 }:
 mkDerivation {
   pname = "genvalidity-property";
@@ -15,12 +9,7 @@ mkDerivation {
   isExecutable = false;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    base
-    genvalidity
-    hspec
-    pretty-show
-    QuickCheck
-    validity
+    base genvalidity hspec pretty-show QuickCheck validity
   ];
   testHaskellDepends = [ base genvalidity hspec QuickCheck ];
   enableLibraryProfiling = true;
@@ -34,4 +23,4 @@ mkDerivation {
   description = "Standard properties for functions on `Validity` types";
   license = lib.licenses.mit;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/genvalidity-scientific.nix b/pkgs/genvalidity-scientific.nix
index ff861d5f4bd30b8e7821a033770e0a5156100594..5fa54da3cade5e4fe16d25c3744625841184165f 100644
--- a/pkgs/genvalidity-scientific.nix
+++ b/pkgs/genvalidity-scientific.nix
@@ -1,13 +1,5 @@
-{ mkDerivation
-, QuickCheck
-, base
-, genvalidity
-, genvalidity-hspec
-, hspec
-, lib
-, scientific
-, validity
-, validity-scientific
+{ mkDerivation, QuickCheck, base, genvalidity, genvalidity-hspec
+, hspec, lib, scientific, validity, validity-scientific
 }:
 mkDerivation {
   pname = "genvalidity-scientific";
@@ -17,20 +9,10 @@ mkDerivation {
   isExecutable = false;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    base
-    genvalidity
-    QuickCheck
-    scientific
-    validity
-    validity-scientific
+    base genvalidity QuickCheck scientific validity validity-scientific
   ];
   testHaskellDepends = [
-    base
-    genvalidity
-    genvalidity-hspec
-    hspec
-    QuickCheck
-    scientific
+    base genvalidity genvalidity-hspec hspec QuickCheck scientific
   ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
@@ -43,4 +25,4 @@ mkDerivation {
   description = "GenValidity support for Scientific";
   license = lib.licenses.mit;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/genvalidity-sydtest-aeson.nix b/pkgs/genvalidity-sydtest-aeson.nix
index 575fc1e420cb5f2047b1d8aa741eeb331ad12486..604e95b20ea98a36582d7e2f6b0990286b91332e 100644
--- a/pkgs/genvalidity-sydtest-aeson.nix
+++ b/pkgs/genvalidity-sydtest-aeson.nix
@@ -1,18 +1,6 @@
-{ mkDerivation
-, QuickCheck
-, aeson
-, base
-, bytestring
-, deepseq
-, genvalidity
-, genvalidity-aeson
-, genvalidity-sydtest
-, genvalidity-text
-, lib
-, sydtest
-, sydtest-discover
-, text
-, validity
+{ mkDerivation, QuickCheck, aeson, base, bytestring, deepseq
+, genvalidity, genvalidity-aeson, genvalidity-sydtest
+, genvalidity-text, lib, sydtest, sydtest-discover, text, validity
 }:
 mkDerivation {
   pname = "genvalidity-sydtest-aeson";
@@ -22,26 +10,12 @@ mkDerivation {
   isExecutable = false;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    aeson
-    base
-    bytestring
-    deepseq
-    genvalidity
-    genvalidity-sydtest
-    QuickCheck
-    sydtest
+    aeson base bytestring deepseq genvalidity genvalidity-sydtest
+    QuickCheck sydtest
   ];
   testHaskellDepends = [
-    aeson
-    base
-    genvalidity
-    genvalidity-aeson
-    genvalidity-sydtest
-    genvalidity-text
-    QuickCheck
-    sydtest
-    text
-    validity
+    aeson base genvalidity genvalidity-aeson genvalidity-sydtest
+    genvalidity-text QuickCheck sydtest text validity
   ];
   testToolDepends = [ sydtest-discover ];
   enableLibraryProfiling = true;
@@ -55,4 +29,4 @@ mkDerivation {
   description = "Standard spec's for aeson-related instances in sydtest";
   license = lib.licenses.mit;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/genvalidity-sydtest-hashable.nix b/pkgs/genvalidity-sydtest-hashable.nix
index 9ace0ee3e21a187a2ed9481017942626029243de..fee866cea8067d6c513dda8186e03972b51e86b5 100644
--- a/pkgs/genvalidity-sydtest-hashable.nix
+++ b/pkgs/genvalidity-sydtest-hashable.nix
@@ -1,13 +1,5 @@
-{ mkDerivation
-, QuickCheck
-, base
-, genvalidity
-, genvalidity-sydtest
-, hashable
-, lib
-, sydtest
-, sydtest-discover
-, validity
+{ mkDerivation, QuickCheck, base, genvalidity, genvalidity-sydtest
+, hashable, lib, sydtest, sydtest-discover, validity
 }:
 mkDerivation {
   pname = "genvalidity-sydtest-hashable";
@@ -17,21 +9,11 @@ mkDerivation {
   isExecutable = false;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    base
-    genvalidity
-    genvalidity-sydtest
-    hashable
-    QuickCheck
-    sydtest
+    base genvalidity genvalidity-sydtest hashable QuickCheck sydtest
     validity
   ];
   testHaskellDepends = [
-    base
-    genvalidity
-    genvalidity-sydtest
-    hashable
-    QuickCheck
-    sydtest
+    base genvalidity genvalidity-sydtest hashable QuickCheck sydtest
     validity
   ];
   testToolDepends = [ sydtest-discover ];
@@ -46,4 +28,4 @@ mkDerivation {
   description = "Standard spec's for Hashable instances for sydtest";
   license = lib.licenses.mit;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/genvalidity-sydtest-lens.nix b/pkgs/genvalidity-sydtest-lens.nix
index 5efe689e7a09485474a8f1afc27afce2ad9313db..ea4fba5df9f48bed048ac5851d32cb78e3c91568 100644
--- a/pkgs/genvalidity-sydtest-lens.nix
+++ b/pkgs/genvalidity-sydtest-lens.nix
@@ -1,13 +1,5 @@
-{ mkDerivation
-, QuickCheck
-, base
-, genvalidity
-, genvalidity-sydtest
-, lib
-, microlens
-, sydtest
-, sydtest-discover
-, validity
+{ mkDerivation, QuickCheck, base, genvalidity, genvalidity-sydtest
+, lib, microlens, sydtest, sydtest-discover, validity
 }:
 mkDerivation {
   pname = "genvalidity-sydtest-lens";
@@ -17,20 +9,10 @@ mkDerivation {
   isExecutable = false;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    base
-    genvalidity
-    genvalidity-sydtest
-    microlens
-    QuickCheck
-    sydtest
+    base genvalidity genvalidity-sydtest microlens QuickCheck sydtest
   ];
   testHaskellDepends = [
-    base
-    genvalidity
-    genvalidity-sydtest
-    microlens
-    sydtest
-    validity
+    base genvalidity genvalidity-sydtest microlens sydtest validity
   ];
   testToolDepends = [ sydtest-discover ];
   enableLibraryProfiling = true;
@@ -44,4 +26,4 @@ mkDerivation {
   description = "Standard spec's for lens for sydtest";
   license = lib.licenses.mit;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/genvalidity-sydtest-persistent.nix b/pkgs/genvalidity-sydtest-persistent.nix
index 18b04d1a3e70301b64f1fc97166f89a1230bede6..429b55ea382ba797542974baef7310cf8e3b3d4e 100644
--- a/pkgs/genvalidity-sydtest-persistent.nix
+++ b/pkgs/genvalidity-sydtest-persistent.nix
@@ -1,15 +1,6 @@
-{ mkDerivation
-, QuickCheck
-, base
-, genvalidity
-, genvalidity-sydtest
-, genvalidity-text
-, lib
-, persistent
-, sydtest
-, sydtest-discover
-, text
-, validity
+{ mkDerivation, QuickCheck, base, genvalidity, genvalidity-sydtest
+, genvalidity-text, lib, persistent, sydtest, sydtest-discover
+, text, validity
 }:
 mkDerivation {
   pname = "genvalidity-sydtest-persistent";
@@ -19,24 +10,12 @@ mkDerivation {
   isExecutable = false;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    base
-    genvalidity
-    genvalidity-sydtest
-    persistent
-    QuickCheck
-    sydtest
+    base genvalidity genvalidity-sydtest persistent QuickCheck sydtest
     text
   ];
   testHaskellDepends = [
-    base
-    genvalidity
-    genvalidity-sydtest
-    genvalidity-text
-    persistent
-    QuickCheck
-    sydtest
-    text
-    validity
+    base genvalidity genvalidity-sydtest genvalidity-text persistent
+    QuickCheck sydtest text validity
   ];
   testToolDepends = [ sydtest-discover ];
   enableLibraryProfiling = true;
@@ -50,4 +29,4 @@ mkDerivation {
   description = "Standard spec's for persistent-related instances for sydtest";
   license = lib.licenses.mit;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/genvalidity-sydtest.nix b/pkgs/genvalidity-sydtest.nix
index 8430e7f51231a6cf4c3204d8c4941e589f1d2cbb..17c342bf93d4d9ba874b257dcb4ace14e31df6cf 100644
--- a/pkgs/genvalidity-sydtest.nix
+++ b/pkgs/genvalidity-sydtest.nix
@@ -1,12 +1,5 @@
-{ mkDerivation
-, QuickCheck
-, base
-, genvalidity
-, lib
-, pretty-show
-, sydtest
-, sydtest-discover
-, validity
+{ mkDerivation, QuickCheck, base, genvalidity, lib, pretty-show
+, sydtest, sydtest-discover, validity
 }:
 mkDerivation {
   pname = "genvalidity-sydtest";
@@ -16,12 +9,7 @@ mkDerivation {
   isExecutable = false;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    base
-    genvalidity
-    pretty-show
-    QuickCheck
-    sydtest
-    validity
+    base genvalidity pretty-show QuickCheck sydtest validity
   ];
   testHaskellDepends = [ base genvalidity QuickCheck sydtest ];
   testToolDepends = [ sydtest-discover ];
@@ -36,4 +24,4 @@ mkDerivation {
   description = "Standard properties for functions on `Validity` types for the sydtest framework";
   license = lib.licenses.mit;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/genvalidity-text.nix b/pkgs/genvalidity-text.nix
index 40324acc916505b06bf9e65fa6825c28375fe51e..647fa34df1c6bd57732421ee8f873af2c8f12a9d 100644
--- a/pkgs/genvalidity-text.nix
+++ b/pkgs/genvalidity-text.nix
@@ -1,17 +1,6 @@
-{ mkDerivation
-, QuickCheck
-, array
-, base
-, criterion
-, genvalidity
-, genvalidity-criterion
-, genvalidity-hspec
-, hspec
-, lib
-, random
-, text
-, validity
-, validity-text
+{ mkDerivation, QuickCheck, array, base, criterion, genvalidity
+, genvalidity-criterion, genvalidity-hspec, hspec, lib, random
+, text, validity, validity-text
 }:
 mkDerivation {
   pname = "genvalidity-text";
@@ -21,30 +10,14 @@ mkDerivation {
   isExecutable = false;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    array
-    base
-    genvalidity
-    QuickCheck
-    random
-    text
-    validity
+    array base genvalidity QuickCheck random text validity
     validity-text
   ];
   testHaskellDepends = [
-    base
-    genvalidity
-    genvalidity-hspec
-    hspec
-    QuickCheck
-    text
+    base genvalidity genvalidity-hspec hspec QuickCheck text
   ];
   benchmarkHaskellDepends = [
-    base
-    criterion
-    genvalidity
-    genvalidity-criterion
-    QuickCheck
-    text
+    base criterion genvalidity genvalidity-criterion QuickCheck text
   ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
@@ -57,4 +30,4 @@ mkDerivation {
   description = "GenValidity support for Text";
   license = lib.licenses.mit;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/genvalidity-time.nix b/pkgs/genvalidity-time.nix
index 0f0b3c7b7ab0adaaea5ab29bbfcd61f6500173fe..5a0e4d5fd653d59ebf71ed196b4b224ec324e1e3 100644
--- a/pkgs/genvalidity-time.nix
+++ b/pkgs/genvalidity-time.nix
@@ -1,13 +1,5 @@
-{ mkDerivation
-, QuickCheck
-, base
-, criterion
-, genvalidity
-, genvalidity-criterion
-, genvalidity-hspec
-, hspec
-, lib
-, time
+{ mkDerivation, QuickCheck, base, criterion, genvalidity
+, genvalidity-criterion, genvalidity-hspec, hspec, lib, time
 , validity-time
 }:
 mkDerivation {
@@ -18,18 +10,11 @@ mkDerivation {
   isExecutable = false;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    base
-    genvalidity
-    QuickCheck
-    time
-    validity-time
+    base genvalidity QuickCheck time validity-time
   ];
   testHaskellDepends = [ base genvalidity-hspec hspec time ];
   benchmarkHaskellDepends = [
-    base
-    criterion
-    genvalidity-criterion
-    time
+    base criterion genvalidity-criterion time
   ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
@@ -42,4 +27,4 @@ mkDerivation {
   description = "GenValidity support for time";
   license = lib.licenses.mit;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/genvalidity-unordered-containers.nix b/pkgs/genvalidity-unordered-containers.nix
index fcaf27dc7d90a0330b9e739b3cabb7978bd6643e..d3597a56d7d4f8b9b4b5a5ec1e0177bb89b79e75 100644
--- a/pkgs/genvalidity-unordered-containers.nix
+++ b/pkgs/genvalidity-unordered-containers.nix
@@ -1,13 +1,5 @@
-{ mkDerivation
-, QuickCheck
-, base
-, genvalidity
-, genvalidity-hspec
-, hashable
-, hspec
-, lib
-, unordered-containers
-, validity
+{ mkDerivation, QuickCheck, base, genvalidity, genvalidity-hspec
+, hashable, hspec, lib, unordered-containers, validity
 , validity-unordered-containers
 }:
 mkDerivation {
@@ -18,20 +10,11 @@ mkDerivation {
   isExecutable = false;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    base
-    genvalidity
-    hashable
-    QuickCheck
-    unordered-containers
-    validity
+    base genvalidity hashable QuickCheck unordered-containers validity
     validity-unordered-containers
   ];
   testHaskellDepends = [
-    base
-    genvalidity
-    genvalidity-hspec
-    hspec
-    unordered-containers
+    base genvalidity genvalidity-hspec hspec unordered-containers
     validity
   ];
   enableLibraryProfiling = true;
@@ -45,4 +28,4 @@ mkDerivation {
   description = "GenValidity support for unordered-containers";
   license = lib.licenses.mit;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/genvalidity-uuid.nix b/pkgs/genvalidity-uuid.nix
index 34be197bd905ceefd7232117ecc0c77823287ceb..a2b362b979d6c8c49a52c512cbee02ee1da272f9 100644
--- a/pkgs/genvalidity-uuid.nix
+++ b/pkgs/genvalidity-uuid.nix
@@ -1,15 +1,6 @@
-{ mkDerivation
-, QuickCheck
-, base
-, criterion
-, genvalidity
-, genvalidity-criterion
-, genvalidity-hspec
-, hspec
-, lib
-, uuid
-, validity
-, validity-uuid
+{ mkDerivation, QuickCheck, base, criterion, genvalidity
+, genvalidity-criterion, genvalidity-hspec, hspec, lib, uuid
+, validity, validity-uuid
 }:
 mkDerivation {
   pname = "genvalidity-uuid";
@@ -19,28 +10,13 @@ mkDerivation {
   isExecutable = false;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    base
-    genvalidity
-    QuickCheck
-    uuid
-    validity
-    validity-uuid
+    base genvalidity QuickCheck uuid validity validity-uuid
   ];
   testHaskellDepends = [
-    base
-    genvalidity
-    genvalidity-hspec
-    hspec
-    QuickCheck
-    uuid
+    base genvalidity genvalidity-hspec hspec QuickCheck uuid
   ];
   benchmarkHaskellDepends = [
-    base
-    criterion
-    genvalidity
-    genvalidity-criterion
-    QuickCheck
-    uuid
+    base criterion genvalidity genvalidity-criterion QuickCheck uuid
   ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
@@ -53,4 +29,4 @@ mkDerivation {
   description = "GenValidity support for UUID";
   license = lib.licenses.mit;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/genvalidity-vector.nix b/pkgs/genvalidity-vector.nix
index 00e44638f773362d4a91925341accfea559dc83d..9ab30cab15b02baa709114f6696edd766b60a70d 100644
--- a/pkgs/genvalidity-vector.nix
+++ b/pkgs/genvalidity-vector.nix
@@ -1,13 +1,5 @@
-{ mkDerivation
-, QuickCheck
-, base
-, genvalidity
-, genvalidity-hspec
-, hspec
-, lib
-, validity
-, validity-vector
-, vector
+{ mkDerivation, QuickCheck, base, genvalidity, genvalidity-hspec
+, hspec, lib, validity, validity-vector, vector
 }:
 mkDerivation {
   pname = "genvalidity-vector";
@@ -17,19 +9,10 @@ mkDerivation {
   isExecutable = false;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    base
-    genvalidity
-    QuickCheck
-    validity
-    validity-vector
-    vector
+    base genvalidity QuickCheck validity validity-vector vector
   ];
   testHaskellDepends = [
-    base
-    genvalidity
-    genvalidity-hspec
-    hspec
-    vector
+    base genvalidity genvalidity-hspec hspec vector
   ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
@@ -42,4 +25,4 @@ mkDerivation {
   description = "GenValidity support for vector";
   license = lib.licenses.mit;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/genvalidity.nix b/pkgs/genvalidity.nix
index 6e592274a2a42cdf6da8712666b63f292781e895..4e546a04ca8b64569c3f9478bb59bc2c459e4a45 100644
--- a/pkgs/genvalidity.nix
+++ b/pkgs/genvalidity.nix
@@ -1,10 +1,4 @@
-{ mkDerivation
-, QuickCheck
-, base
-, hspec
-, hspec-core
-, lib
-, random
+{ mkDerivation, QuickCheck, base, hspec, hspec-core, lib, random
 , validity
 }:
 mkDerivation {
@@ -27,4 +21,4 @@ mkDerivation {
   description = "Testing utilities for the validity library";
   license = lib.licenses.mit;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/ghc-byteorder.nix b/pkgs/ghc-byteorder.nix
index 64cb860484e244122b11eacc944af0eb22ea18d0..8a781a05ab68dd86bff3edf8d7a2e75e04386c9f 100644
--- a/pkgs/ghc-byteorder.nix
+++ b/pkgs/ghc-byteorder.nix
@@ -3,8 +3,8 @@ mkDerivation {
   pname = "ghc-byteorder";
   version = "4.11.0.0.10";
   sha256 = "86e50a89798181db4f44ec3848fc52940c73098e88549a351ceb54fefc691fb6";
-  revision = "3";
-  editedCabalFile = "088rz5c0pq2r1w3msy0y9hl4gca8s8nblpcz7w2f5sx5pajg8flj";
+  revision = "4";
+  editedCabalFile = "0jc4d4is49d6ddxpdkyqkpr464y80ydsb57shqndp08assplj93b";
   isLibrary = true;
   isExecutable = false;
   enableSeparateDataOutput = false;
@@ -20,4 +20,4 @@ mkDerivation {
   description = "\"GHC.ByteOrder\" API Compatibility Layer";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/ghc-check.nix b/pkgs/ghc-check.nix
index 79dda76e38127b132dc5caff5db74cb4c6896dab..22a8c0f585982eb591d47dbe0624d603052d6597 100644
--- a/pkgs/ghc-check.nix
+++ b/pkgs/ghc-check.nix
@@ -1,17 +1,6 @@
-{ mkDerivation
-, base
-, containers
-, directory
-, filepath
-, ghc
-, ghc-boot
-, ghc-paths
-, lib
-, process
-, safe-exceptions
-, template-haskell
-, th-compat
-, transformers
+{ mkDerivation, base, containers, directory, filepath, ghc
+, ghc-boot, ghc-paths, lib, process, safe-exceptions
+, template-haskell, th-compat, transformers
 }:
 mkDerivation {
   pname = "ghc-check";
@@ -21,18 +10,8 @@ mkDerivation {
   isExecutable = false;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    base
-    containers
-    directory
-    filepath
-    ghc
-    ghc-boot
-    ghc-paths
-    process
-    safe-exceptions
-    template-haskell
-    th-compat
-    transformers
+    base containers directory filepath ghc ghc-boot ghc-paths process
+    safe-exceptions template-haskell th-compat transformers
   ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
@@ -44,4 +23,4 @@ mkDerivation {
   description = "detect mismatches between compile-time and run-time versions of the ghc api";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/ghc-exactprint.nix b/pkgs/ghc-exactprint.nix
index 1f500f9de8e6abb5d5f539c30c1a24fdbb3f1a73..ea1f07e583266ed4df72771d76e1631a3da0d86b 100644
--- a/pkgs/ghc-exactprint.nix
+++ b/pkgs/ghc-exactprint.nix
@@ -1,24 +1,7 @@
-{ mkDerivation
-, Cabal-syntax
-, Diff
-, HUnit
-, base
-, bytestring
-, containers
-, data-default
-, directory
-, fail
-, filemanip
-, filepath
-, free
-, ghc
-, ghc-boot
-, ghc-paths
-, lib
-, mtl
-, ordered-containers
-, silently
-, syb
+{ mkDerivation, Cabal-syntax, Diff, HUnit, base, bytestring
+, containers, data-default, directory, fail, filemanip, filepath
+, free, ghc, ghc-boot, ghc-paths, lib, mtl, ordered-containers
+, silently, syb
 }:
 mkDerivation {
   pname = "ghc-exactprint";
@@ -28,39 +11,13 @@ mkDerivation {
   isExecutable = true;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    base
-    bytestring
-    containers
-    data-default
-    directory
-    fail
-    filepath
-    free
-    ghc
-    ghc-boot
-    mtl
-    ordered-containers
-    syb
+    base bytestring containers data-default directory fail filepath
+    free ghc ghc-boot mtl ordered-containers syb
   ];
   testHaskellDepends = [
-    base
-    bytestring
-    Cabal-syntax
-    containers
-    data-default
-    Diff
-    directory
-    fail
-    filemanip
-    filepath
-    ghc
-    ghc-boot
-    ghc-paths
-    HUnit
-    mtl
-    ordered-containers
-    silently
-    syb
+    base bytestring Cabal-syntax containers data-default Diff directory
+    fail filemanip filepath ghc ghc-boot ghc-paths HUnit mtl
+    ordered-containers silently syb
   ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
@@ -72,4 +29,4 @@ mkDerivation {
   description = "ExactPrint for GHC";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/ghc-lib-parser-ex.nix b/pkgs/ghc-lib-parser-ex.nix
index acb2000a3bfda6d9370ae6c8be10376aae0eef01..3434a3ab19c24bfa95491a864d64aafa10d75b8b 100644
--- a/pkgs/ghc-lib-parser-ex.nix
+++ b/pkgs/ghc-lib-parser-ex.nix
@@ -1,15 +1,5 @@
-{ mkDerivation
-, base
-, bytestring
-, containers
-, directory
-, extra
-, filepath
-, ghc-lib-parser
-, lib
-, tasty
-, tasty-hunit
-, uniplate
+{ mkDerivation, base, bytestring, containers, directory, extra
+, filepath, ghc-lib-parser, lib, tasty, tasty-hunit, uniplate
 }:
 mkDerivation {
   pname = "ghc-lib-parser-ex";
@@ -19,20 +9,10 @@ mkDerivation {
   isExecutable = false;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    base
-    bytestring
-    containers
-    ghc-lib-parser
-    uniplate
+    base bytestring containers ghc-lib-parser uniplate
   ];
   testHaskellDepends = [
-    base
-    directory
-    extra
-    filepath
-    ghc-lib-parser
-    tasty
-    tasty-hunit
+    base directory extra filepath ghc-lib-parser tasty tasty-hunit
     uniplate
   ];
   enableLibraryProfiling = true;
@@ -46,4 +26,4 @@ mkDerivation {
   description = "Algorithms on GHC parse trees";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/ghc-lib-parser.nix b/pkgs/ghc-lib-parser.nix
index d4fc7086c4447022a0343ab23b2e9f5fcf23c801..1b8f24ed6414aa77b2586fbe2621c33df7315dc3 100644
--- a/pkgs/ghc-lib-parser.nix
+++ b/pkgs/ghc-lib-parser.nix
@@ -1,23 +1,6 @@
-{ mkDerivation
-, alex
-, array
-, base
-, binary
-, bytestring
-, containers
-, deepseq
-, directory
-, exceptions
-, filepath
-, ghc-prim
-, happy
-, lib
-, parsec
-, pretty
-, process
-, time
-, transformers
-, unix
+{ mkDerivation, alex, array, base, binary, bytestring, containers
+, deepseq, directory, exceptions, filepath, ghc-prim, happy, lib
+, parsec, pretty, process, time, transformers, unix
 }:
 mkDerivation {
   pname = "ghc-lib-parser";
@@ -27,22 +10,9 @@ mkDerivation {
   isExecutable = false;
   enableSeparateDataOutput = true;
   libraryHaskellDepends = [
-    array
-    base
-    binary
-    bytestring
-    containers
-    deepseq
-    directory
-    exceptions
-    filepath
-    ghc-prim
-    parsec
-    pretty
-    process
-    time
-    transformers
-    unix
+    array base binary bytestring containers deepseq directory
+    exceptions filepath ghc-prim parsec pretty process time
+    transformers unix
   ];
   libraryToolDepends = [ alex happy ];
   enableLibraryProfiling = true;
@@ -56,4 +26,4 @@ mkDerivation {
   description = "The GHC API, decoupled from GHC versions";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/ghc-paths.nix b/pkgs/ghc-paths.nix
index 79a68fc6f1698cec7d8236742da35b3f2399c5d7..653f5348d52c982ad97a704a8d93a4c892948a06 100644
--- a/pkgs/ghc-paths.nix
+++ b/pkgs/ghc-paths.nix
@@ -3,8 +3,8 @@ mkDerivation {
   pname = "ghc-paths";
   version = "0.1.0.12";
   sha256 = "6ecbe676d073cb07989c61ce4c5709c4e67cbefdd2d55a4095f9388b6fe2c484";
-  revision = "4";
-  editedCabalFile = "1d5za4k498q48wk6cz0jm3d68rh5ldz6adr8vp24nn7jv17g770w";
+  revision = "5";
+  editedCabalFile = "12y71qx0yjxxjjzvkpx12ld0fkmpkli8qxpfxp3xfnz8w0gxbv9c";
   isLibrary = true;
   isExecutable = false;
   enableSeparateDataOutput = false;
@@ -20,4 +20,4 @@ mkDerivation {
   description = "Knowledge of GHC's installation directories";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/ghc-trace-events.nix b/pkgs/ghc-trace-events.nix
index 3dc15303b4a09952935fa5cd9230b232373c4c02..c00b81f04e9c49e599c5a341785cb39c3c2c0470 100644
--- a/pkgs/ghc-trace-events.nix
+++ b/pkgs/ghc-trace-events.nix
@@ -19,4 +19,4 @@ mkDerivation {
   description = "Faster traceEvent and traceMarker, and binary object logging for eventlog";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/ghcid.nix b/pkgs/ghcid.nix
index c92aa12c75ae6421d194ccd034227f857470b801..5622b0d37b27acc6d496d01a5b92c45e1e957ad3 100644
--- a/pkgs/ghcid.nix
+++ b/pkgs/ghcid.nix
@@ -1,19 +1,6 @@
-{ mkDerivation
-, ansi-terminal
-, base
-, cmdargs
-, containers
-, directory
-, extra
-, filepath
-, fsnotify
-, lib
-, process
-, tasty
-, tasty-hunit
-, terminal-size
-, time
-, unix
+{ mkDerivation, ansi-terminal, base, cmdargs, containers, directory
+, extra, filepath, fsnotify, lib, process, tasty, tasty-hunit
+, terminal-size, time, unix
 }:
 mkDerivation {
   pname = "ghcid";
@@ -23,44 +10,15 @@ mkDerivation {
   isExecutable = true;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    ansi-terminal
-    base
-    cmdargs
-    directory
-    extra
-    filepath
-    process
-    time
+    ansi-terminal base cmdargs directory extra filepath process time
   ];
   executableHaskellDepends = [
-    ansi-terminal
-    base
-    cmdargs
-    containers
-    directory
-    extra
-    filepath
-    fsnotify
-    process
-    terminal-size
-    time
-    unix
+    ansi-terminal base cmdargs containers directory extra filepath
+    fsnotify process terminal-size time unix
   ];
   testHaskellDepends = [
-    ansi-terminal
-    base
-    cmdargs
-    containers
-    directory
-    extra
-    filepath
-    fsnotify
-    process
-    tasty
-    tasty-hunit
-    terminal-size
-    time
-    unix
+    ansi-terminal base cmdargs containers directory extra filepath
+    fsnotify process tasty tasty-hunit terminal-size time unix
   ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
@@ -73,4 +31,4 @@ mkDerivation {
   description = "GHCi based bare bones IDE";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/ghcide-bench.nix b/pkgs/ghcide-bench.nix
index 1417c26bbe36fe905f5447791eb735522676f48c..14044dfab2ff463fa7b9e0b594ddaac0733b73cb 100644
--- a/pkgs/ghcide-bench.nix
+++ b/pkgs/ghcide-bench.nix
@@ -1,34 +1,9 @@
-{ mkDerivation
-, aeson
-, async
-, base
-, binary
-, bytestring
-, containers
-, data-default
-, deepseq
-, directory
-, extra
-, filepath
-, ghcide
-, ghcide-test-utils
-, hashable
-, hls-graph
-, hls-plugin-api
-, implicit-hie
-, lens
-, lib
-, lsp-test
-, lsp-types
-, optparse-applicative
-, parser-combinators
-, process
-, safe-exceptions
-, shake
-, tasty
-, tasty-hunit
-, tasty-rerun
-, text
+{ mkDerivation, aeson, async, base, binary, bytestring, containers
+, data-default, deepseq, directory, extra, filepath, ghcide
+, ghcide-test-utils, hashable, hls-graph, hls-plugin-api
+, implicit-hie, lens, lib, lsp-test, lsp-types
+, optparse-applicative, parser-combinators, process
+, safe-exceptions, shake, tasty, tasty-hunit, tasty-rerun, text
 }:
 mkDerivation {
   pname = "ghcide-bench";
@@ -38,56 +13,18 @@ mkDerivation {
   isExecutable = true;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    aeson
-    async
-    base
-    binary
-    bytestring
-    deepseq
-    directory
-    extra
-    filepath
-    ghcide
-    ghcide-test-utils
-    hashable
-    lens
-    lsp-test
-    lsp-types
-    optparse-applicative
-    parser-combinators
-    process
-    safe-exceptions
-    shake
-    text
+    aeson async base binary bytestring deepseq directory extra filepath
+    ghcide ghcide-test-utils hashable lens lsp-test lsp-types
+    optparse-applicative parser-combinators process safe-exceptions
+    shake text
   ];
   executableHaskellDepends = [
-    aeson
-    base
-    bytestring
-    containers
-    data-default
-    directory
-    extra
-    filepath
-    hls-graph
-    hls-plugin-api
-    lens
-    lsp-test
-    lsp-types
-    optparse-applicative
-    process
-    safe-exceptions
-    shake
-    tasty-hunit
-    text
+    aeson base bytestring containers data-default directory extra
+    filepath hls-graph hls-plugin-api lens lsp-test lsp-types
+    optparse-applicative process safe-exceptions shake tasty-hunit text
   ];
   testHaskellDepends = [
-    base
-    extra
-    lsp-test
-    tasty
-    tasty-hunit
-    tasty-rerun
+    base extra lsp-test tasty tasty-hunit tasty-rerun
   ];
   testToolDepends = [ ghcide implicit-hie ];
   enableLibraryProfiling = true;
@@ -101,4 +38,4 @@ mkDerivation {
   description = "An LSP client for running performance experiments on HLS";
   license = lib.licenses.asl20;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/ghcide-test-utils.nix b/pkgs/ghcide-test-utils.nix
index e44444ed45324cd01880bf7b4645778325c50161..1426b0c66a4e5e4a5f3f291996d3d5787eae40e7 100644
--- a/pkgs/ghcide-test-utils.nix
+++ b/pkgs/ghcide-test-utils.nix
@@ -1,19 +1,6 @@
-{ mkDerivation
-, aeson
-, base
-, containers
-, data-default
-, directory
-, extra
-, filepath
-, ghcide
-, hls-plugin-api
-, lens
-, lib
-, lsp-test
-, lsp-types
-, tasty-hunit
-, text
+{ mkDerivation, aeson, base, containers, data-default, directory
+, extra, filepath, ghcide, hls-plugin-api, lens, lib, lsp-test
+, lsp-types, tasty-hunit, text
 }:
 mkDerivation {
   pname = "ghcide-test-utils";
@@ -23,20 +10,8 @@ mkDerivation {
   isExecutable = false;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    aeson
-    base
-    containers
-    data-default
-    directory
-    extra
-    filepath
-    ghcide
-    hls-plugin-api
-    lens
-    lsp-test
-    lsp-types
-    tasty-hunit
-    text
+    aeson base containers data-default directory extra filepath ghcide
+    hls-plugin-api lens lsp-test lsp-types tasty-hunit text
   ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
@@ -49,4 +24,4 @@ mkDerivation {
   description = "Test utils for ghcide";
   license = lib.licenses.asl20;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/githash.nix b/pkgs/githash.nix
index b8e1f92992cbdc6c380af8c3b187bd5efe196d02..d0c40e566e117f1baccf61ca8df01277dcc3bede 100644
--- a/pkgs/githash.nix
+++ b/pkgs/githash.nix
@@ -1,15 +1,5 @@
-{ mkDerivation
-, base
-, bytestring
-, directory
-, filepath
-, hspec
-, lib
-, process
-, template-haskell
-, temporary
-, th-compat
-, unliftio
+{ mkDerivation, base, bytestring, directory, filepath, hspec, lib
+, process, template-haskell, temporary, th-compat, unliftio
 }:
 mkDerivation {
   pname = "githash";
@@ -19,25 +9,12 @@ mkDerivation {
   isExecutable = false;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    base
-    bytestring
-    directory
-    filepath
-    process
-    template-haskell
+    base bytestring directory filepath process template-haskell
     th-compat
   ];
   testHaskellDepends = [
-    base
-    bytestring
-    directory
-    filepath
-    hspec
-    process
-    template-haskell
-    temporary
-    th-compat
-    unliftio
+    base bytestring directory filepath hspec process template-haskell
+    temporary th-compat unliftio
   ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
@@ -50,4 +27,4 @@ mkDerivation {
   description = "Compile git revision info into Haskell projects";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/gitrev.nix b/pkgs/gitrev.nix
index 675a7f440e2aa1d812c001e9f7d15f71c1cc8606..772d476249eb2e51ac4d08995cbdf1542b5b4666 100644
--- a/pkgs/gitrev.nix
+++ b/pkgs/gitrev.nix
@@ -1,11 +1,5 @@
-{ mkDerivation
-, base
-, base-compat
-, directory
-, filepath
-, lib
-, process
-, template-haskell
+{ mkDerivation, base, base-compat, directory, filepath, lib
+, process, template-haskell
 }:
 mkDerivation {
   pname = "gitrev";
@@ -15,12 +9,7 @@ mkDerivation {
   isExecutable = false;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    base
-    base-compat
-    directory
-    filepath
-    process
-    template-haskell
+    base base-compat directory filepath process template-haskell
   ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
@@ -33,4 +22,4 @@ mkDerivation {
   description = "Compile git revision info into Haskell projects";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/gridtables.nix b/pkgs/gridtables.nix
index bdefc61a74bfe18b1fe97b00dd8af5433a232acb..0785f49804c0ed6b16d2e5f18d1620ff1134c9a9 100644
--- a/pkgs/gridtables.nix
+++ b/pkgs/gridtables.nix
@@ -1,13 +1,5 @@
-{ mkDerivation
-, array
-, base
-, containers
-, doclayout
-, lib
-, parsec
-, tasty
-, tasty-hunit
-, text
+{ mkDerivation, array, base, containers, doclayout, lib, parsec
+, tasty, tasty-hunit, text
 }:
 mkDerivation {
   pname = "gridtables";
@@ -17,12 +9,7 @@ mkDerivation {
   isExecutable = false;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    array
-    base
-    containers
-    doclayout
-    parsec
-    text
+    array base containers doclayout parsec text
   ];
   testHaskellDepends = [ array base parsec tasty tasty-hunit text ];
   enableLibraryProfiling = true;
@@ -36,4 +23,4 @@ mkDerivation {
   description = "Parser for reStructuredText-style grid tables";
   license = lib.licenses.mit;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/groups.nix b/pkgs/groups.nix
index c8129c7caf50dd12108a074669f323477e453547..495a97857e5f0dfc8a6e1668ffd9a7435a20e2a6 100644
--- a/pkgs/groups.nix
+++ b/pkgs/groups.nix
@@ -17,4 +17,4 @@ mkDerivation {
   description = "Groups";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/gtk2hs-buildtools.nix b/pkgs/gtk2hs-buildtools.nix
index 5c4817a947056845b35883a5e51770db6909938d..83f8232d152d9a2b10021b40580113117f24cb0d 100644
--- a/pkgs/gtk2hs-buildtools.nix
+++ b/pkgs/gtk2hs-buildtools.nix
@@ -1,17 +1,5 @@
-{ mkDerivation
-, Cabal
-, alex
-, array
-, base
-, containers
-, directory
-, filepath
-, happy
-, hashtables
-, lib
-, pretty
-, process
-, random
+{ mkDerivation, Cabal, alex, array, base, containers, directory
+, filepath, happy, hashtables, lib, pretty, process, random
 }:
 mkDerivation {
   pname = "gtk2hs-buildtools";
@@ -21,16 +9,8 @@ mkDerivation {
   isExecutable = true;
   enableSeparateDataOutput = true;
   libraryHaskellDepends = [
-    array
-    base
-    Cabal
-    containers
-    directory
-    filepath
-    hashtables
-    pretty
-    process
-    random
+    array base Cabal containers directory filepath hashtables pretty
+    process random
   ];
   libraryToolDepends = [ alex happy ];
   executableHaskellDepends = [ base ];
@@ -45,4 +25,4 @@ mkDerivation {
   description = "Tools to build the Gtk2Hs suite of User Interface libraries";
   license = lib.licenses.gpl2Only;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/hackage-db.nix b/pkgs/hackage-db.nix
index 438709906fc51bfd5b6eb17e965bddd6608b5e6f..c655aabefe561c7f25d3d9b8c796fa626259e1c2 100644
--- a/pkgs/hackage-db.nix
+++ b/pkgs/hackage-db.nix
@@ -1,16 +1,5 @@
-{ mkDerivation
-, Cabal
-, aeson
-, base
-, bytestring
-, containers
-, directory
-, exceptions
-, filepath
-, lib
-, tar
-, time
-, utf8-string
+{ mkDerivation, Cabal, aeson, base, bytestring, containers
+, directory, exceptions, filepath, lib, tar, time, utf8-string
 }:
 mkDerivation {
   pname = "hackage-db";
@@ -22,17 +11,8 @@ mkDerivation {
   isExecutable = true;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    aeson
-    base
-    bytestring
-    Cabal
-    containers
-    directory
-    exceptions
-    filepath
-    tar
-    time
-    utf8-string
+    aeson base bytestring Cabal containers directory exceptions
+    filepath tar time utf8-string
   ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
@@ -45,4 +25,4 @@ mkDerivation {
   description = "Access cabal-install's Hackage database via Data.Map";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/hackage-security.nix b/pkgs/hackage-security.nix
index 10d727b875ae58248f43aa146fe6de9db25fa80b..dd13c3f85d850eced9fd5c63ac1e5ab3a7c96e7e 100644
--- a/pkgs/hackage-security.nix
+++ b/pkgs/hackage-security.nix
@@ -9,8 +9,8 @@ mkDerivation {
   pname = "hackage-security";
   version = "0.6.2.3";
   sha256 = "52ee0576971955571d846b8e6c09638f89f4f7881f4a95173e44ccc0d856a066";
-  revision = "2";
-  editedCabalFile = "07i8f4sappqphh39jj9268a6ci7l972qi33p4zydsdrvh5s58h0q";
+  revision = "3";
+  editedCabalFile = "1vdmpklil8a6r03ixzch5d36ngimmq5q8931i8bg9f7hh8nmq8jv";
   isLibrary = true;
   isExecutable = false;
   enableSeparateDataOutput = false;
diff --git a/pkgs/haddock-library.nix b/pkgs/haddock-library.nix
index 088a54da0250233c3810e5b72ee159d0244fa4aa..4bc065c6e961e30853272474839e4162167738aa 100644
--- a/pkgs/haddock-library.nix
+++ b/pkgs/haddock-library.nix
@@ -1,18 +1,6 @@
-{ mkDerivation
-, QuickCheck
-, base
-, base-compat
-, containers
-, deepseq
-, directory
-, filepath
-, hspec
-, hspec-discover
-, lib
-, optparse-applicative
-, parsec
-, text
-, tree-diff
+{ mkDerivation, QuickCheck, base, base-compat, containers, deepseq
+, directory, filepath, hspec, hspec-discover, lib
+, optparse-applicative, parsec, text, tree-diff
 }:
 mkDerivation {
   pname = "haddock-library";
@@ -25,18 +13,8 @@ mkDerivation {
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [ base containers parsec text ];
   testHaskellDepends = [
-    base
-    base-compat
-    containers
-    deepseq
-    directory
-    filepath
-    hspec
-    optparse-applicative
-    parsec
-    QuickCheck
-    text
-    tree-diff
+    base base-compat containers deepseq directory filepath hspec
+    optparse-applicative parsec QuickCheck text tree-diff
   ];
   testToolDepends = [ hspec-discover ];
   enableLibraryProfiling = true;
@@ -50,4 +28,4 @@ mkDerivation {
   description = "Library exposing some functionality of Haddock";
   license = lib.licenses.bsd2;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/half.nix b/pkgs/half.nix
index cb5994f0aad63ef3a1b92e3b9163b0c81864e09c..2c2c8bfdf59baed0a0578b61fbfc31bc337c11cc 100644
--- a/pkgs/half.nix
+++ b/pkgs/half.nix
@@ -1,13 +1,5 @@
-{ mkDerivation
-, QuickCheck
-, base
-, binary
-, bytestring
-, deepseq
-, lib
-, template-haskell
-, test-framework
-, test-framework-quickcheck2
+{ mkDerivation, QuickCheck, base, binary, bytestring, deepseq, lib
+, template-haskell, test-framework, test-framework-quickcheck2
 }:
 mkDerivation {
   pname = "half";
@@ -18,11 +10,7 @@ mkDerivation {
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [ base binary deepseq template-haskell ];
   testHaskellDepends = [
-    base
-    binary
-    bytestring
-    QuickCheck
-    test-framework
+    base binary bytestring QuickCheck test-framework
     test-framework-quickcheck2
   ];
   enableLibraryProfiling = true;
@@ -36,4 +24,4 @@ mkDerivation {
   description = "Half-precision floating-point";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/hashmap.nix b/pkgs/hashmap.nix
index 2bb7c27ecf5a494f9082eee97eb02677292f76f2..767f1ad4fae4bb31ffa1f0d098e5b23317ed5307 100644
--- a/pkgs/hashmap.nix
+++ b/pkgs/hashmap.nix
@@ -18,4 +18,4 @@ mkDerivation {
   description = "Persistent containers Map and Set based on hashing";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/haskell-src-exts.nix b/pkgs/haskell-src-exts.nix
index f508e65f4ce0bada618f245d0a4385ec8ca76e12..2b3fe90fc5e20448d920692862fc9d8d7e10f938 100644
--- a/pkgs/haskell-src-exts.nix
+++ b/pkgs/haskell-src-exts.nix
@@ -1,19 +1,6 @@
-{ mkDerivation
-, array
-, base
-, containers
-, directory
-, filepath
-, ghc-prim
-, happy
-, lib
-, mtl
-, pretty
-, pretty-show
-, smallcheck
-, tasty
-, tasty-golden
-, tasty-smallcheck
+{ mkDerivation, array, base, containers, directory, filepath
+, ghc-prim, happy, lib, mtl, pretty, pretty-show, smallcheck, tasty
+, tasty-golden, tasty-smallcheck
 }:
 mkDerivation {
   pname = "haskell-src-exts";
@@ -25,16 +12,8 @@ mkDerivation {
   libraryHaskellDepends = [ array base ghc-prim pretty ];
   libraryToolDepends = [ happy ];
   testHaskellDepends = [
-    base
-    containers
-    directory
-    filepath
-    mtl
-    pretty-show
-    smallcheck
-    tasty
-    tasty-golden
-    tasty-smallcheck
+    base containers directory filepath mtl pretty-show smallcheck tasty
+    tasty-golden tasty-smallcheck
   ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
@@ -47,4 +26,4 @@ mkDerivation {
   description = "Manipulating Haskell source: abstract syntax, lexer, parser, and pretty-printer";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/haskell-src-meta.nix b/pkgs/haskell-src-meta.nix
index ea819ae9235abf179ce6672441adcd80ad93bff3..007f87c92582a81160d941ac2d6b5476c6229aff 100644
--- a/pkgs/haskell-src-meta.nix
+++ b/pkgs/haskell-src-meta.nix
@@ -1,15 +1,5 @@
-{ mkDerivation
-, HUnit
-, base
-, containers
-, haskell-src-exts
-, lib
-, pretty
-, syb
-, tasty
-, tasty-hunit
-, template-haskell
-, th-orphans
+{ mkDerivation, HUnit, base, containers, haskell-src-exts, lib
+, pretty, syb, tasty, tasty-hunit, template-haskell, th-orphans
 }:
 mkDerivation {
   pname = "haskell-src-meta";
@@ -19,22 +9,10 @@ mkDerivation {
   isExecutable = false;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    base
-    haskell-src-exts
-    pretty
-    syb
-    template-haskell
-    th-orphans
+    base haskell-src-exts pretty syb template-haskell th-orphans
   ];
   testHaskellDepends = [
-    base
-    containers
-    haskell-src-exts
-    HUnit
-    pretty
-    syb
-    tasty
-    tasty-hunit
+    base containers haskell-src-exts HUnit pretty syb tasty tasty-hunit
     template-haskell
   ];
   enableLibraryProfiling = true;
@@ -47,4 +25,4 @@ mkDerivation {
   description = "Parse source to template-haskell abstract syntax";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/haskell-src.nix b/pkgs/haskell-src.nix
index efacbb85e15cf77d5004e41d7a24cc49f0a542c4..da6454316b5af73d75a3e539f6bf3d45e7317980 100644
--- a/pkgs/haskell-src.nix
+++ b/pkgs/haskell-src.nix
@@ -20,4 +20,4 @@ mkDerivation {
   description = "Support for manipulating Haskell source code";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/heaps.nix b/pkgs/heaps.nix
index 7982bbf92f52f5720fcd3eb98ddd8d9adc464c24..4af164a917e17f8c630f604704990c24b598d42a 100644
--- a/pkgs/heaps.nix
+++ b/pkgs/heaps.nix
@@ -18,4 +18,4 @@ mkDerivation {
   description = "Asymptotically optimal Brodal/Okasaki heaps";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/hedgehog-fn.nix b/pkgs/hedgehog-fn.nix
index 69e7feb34d5c91094b7ba4c31c873921bbd58349..aa695d438ff402a2a37add5e0403ea9a0aced2ec 100644
--- a/pkgs/hedgehog-fn.nix
+++ b/pkgs/hedgehog-fn.nix
@@ -9,10 +9,7 @@ mkDerivation {
   isExecutable = true;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    base
-    contravariant
-    hedgehog
-    transformers
+    base contravariant hedgehog transformers
   ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
@@ -25,4 +22,4 @@ mkDerivation {
   description = "Function generation for `hedgehog`";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/hedgehog-golden.nix b/pkgs/hedgehog-golden.nix
index 41e54310683a308f66c858d5de066aa1b2503ee8..47457ea98538e5f9c92f27c7cadfd4e2c467d802 100644
--- a/pkgs/hedgehog-golden.nix
+++ b/pkgs/hedgehog-golden.nix
@@ -1,16 +1,5 @@
-{ mkDerivation
-, Diff
-, aeson
-, aeson-pretty
-, base
-, bytestring
-, containers
-, directory
-, extra
-, fetchgit
-, hedgehog
-, lib
-, text
+{ mkDerivation, Diff, aeson, aeson-pretty, base, bytestring
+, containers, directory, extra, fetchgit, hedgehog, lib, text
 , with-utf8
 }:
 mkDerivation {
@@ -26,16 +15,8 @@ mkDerivation {
   isExecutable = false;
   enableSeparateDataOutput = true;
   libraryHaskellDepends = [
-    aeson
-    aeson-pretty
-    base
-    bytestring
-    containers
-    Diff
-    directory
-    extra
-    hedgehog
-    text
+    aeson aeson-pretty base bytestring containers Diff directory extra
+    hedgehog text
   ];
   testHaskellDepends = [ aeson base hedgehog with-utf8 ];
   enableLibraryProfiling = true;
@@ -49,4 +30,4 @@ mkDerivation {
   description = "Golden testing capabilities for hedgehog using Aeson";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/hedgehog-quickcheck.nix b/pkgs/hedgehog-quickcheck.nix
index 7ffd0577f52ec78a42234e198965084a29ebbe02..94c60d66cc496ff7c8a2973163f2009adbe5c365 100644
--- a/pkgs/hedgehog-quickcheck.nix
+++ b/pkgs/hedgehog-quickcheck.nix
@@ -20,4 +20,4 @@ mkDerivation {
   description = "Use QuickCheck generators in Hedgehog and vice versa";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/hedgehog.nix b/pkgs/hedgehog.nix
index 5839e6c7214645e5fe1d13cad16b0b27307c8fa0..697017e0b941ae17edd442e6d2648f70162ceea8 100644
--- a/pkgs/hedgehog.nix
+++ b/pkgs/hedgehog.nix
@@ -1,31 +1,8 @@
-{ mkDerivation
-, ansi-terminal
-, async
-, barbies
-, base
-, bytestring
-, concurrent-output
-, containers
-, deepseq
-, directory
-, erf
-, exceptions
-, lib
-, lifted-async
-, mmorph
-, monad-control
-, mtl
-, pretty-show
-, primitive
-, random
-, resourcet
-, stm
-, template-haskell
-, text
-, time
-, transformers
-, transformers-base
-, wl-pprint-annotated
+{ mkDerivation, ansi-terminal, async, barbies, base, bytestring
+, concurrent-output, containers, deepseq, directory, erf
+, exceptions, lib, lifted-async, mmorph, monad-control, mtl
+, pretty-show, primitive, random, resourcet, stm, template-haskell
+, text, time, transformers, transformers-base, wl-pprint-annotated
 }:
 mkDerivation {
   pname = "hedgehog";
@@ -35,41 +12,14 @@ mkDerivation {
   isExecutable = false;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    ansi-terminal
-    async
-    barbies
-    base
-    bytestring
-    concurrent-output
-    containers
-    deepseq
-    directory
-    erf
-    exceptions
-    lifted-async
-    mmorph
-    monad-control
-    mtl
-    pretty-show
-    primitive
-    random
-    resourcet
-    stm
-    template-haskell
-    text
-    time
-    transformers
-    transformers-base
+    ansi-terminal async barbies base bytestring concurrent-output
+    containers deepseq directory erf exceptions lifted-async mmorph
+    monad-control mtl pretty-show primitive random resourcet stm
+    template-haskell text time transformers transformers-base
     wl-pprint-annotated
   ];
   testHaskellDepends = [
-    base
-    containers
-    mmorph
-    mtl
-    pretty-show
-    text
-    transformers
+    base containers mmorph mtl pretty-show text transformers
   ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
@@ -82,4 +32,4 @@ mkDerivation {
   description = "Release with confidence";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/heredoc.nix b/pkgs/heredoc.nix
index 1361ee6555112a6f396e852ddacddc243310f7a4..46ef01bac4271f0abe3caaf5b36b46f3acfb86c0 100644
--- a/pkgs/heredoc.nix
+++ b/pkgs/heredoc.nix
@@ -18,4 +18,4 @@ mkDerivation {
   description = "multi-line string / here document using QuasiQuotes";
   license = lib.licenses.publicDomain;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/hiedb.nix b/pkgs/hiedb.nix
index 6c476dee68f5a4b1ef849cd01b725abdbc4cf574..4bac5808a2d3ac8218848392c002ec8a687ae443 100644
--- a/pkgs/hiedb.nix
+++ b/pkgs/hiedb.nix
@@ -1,26 +1,8 @@
-{ mkDerivation
-, algebraic-graphs
-, ansi-terminal
-, array
-, base
-, bytestring
-, containers
-, directory
-, extra
-, filepath
-, ghc
-, ghc-paths
-, hie-compat
-, hspec
-, lib
-, lucid
-, mtl
-, optparse-applicative
-, process
-, sqlite-simple
-, temporary
-, terminal-size
-, text
+{ mkDerivation, algebraic-graphs, ansi-terminal, array, base
+, bytestring, containers, directory, extra, filepath, ghc
+, ghc-paths, hie-compat, hspec, lib, lucid, mtl
+, optparse-applicative, process, sqlite-simple, temporary
+, terminal-size, text
 }:
 mkDerivation {
   pname = "hiedb";
@@ -30,34 +12,13 @@ mkDerivation {
   isExecutable = true;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    algebraic-graphs
-    ansi-terminal
-    array
-    base
-    bytestring
-    containers
-    directory
-    extra
-    filepath
-    ghc
-    hie-compat
-    lucid
-    mtl
-    optparse-applicative
-    sqlite-simple
-    terminal-size
-    text
+    algebraic-graphs ansi-terminal array base bytestring containers
+    directory extra filepath ghc hie-compat lucid mtl
+    optparse-applicative sqlite-simple terminal-size text
   ];
   executableHaskellDepends = [ base ghc-paths ];
   testHaskellDepends = [
-    base
-    directory
-    filepath
-    ghc
-    ghc-paths
-    hspec
-    process
-    temporary
+    base directory filepath ghc ghc-paths hspec process temporary
   ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
@@ -69,4 +30,4 @@ mkDerivation {
   description = "Generates a references DB from .hie files";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/hinotify.nix b/pkgs/hinotify.nix
index e24b583449e1fef9756e3112a61aa153e076e503..8349819766f851058acf19b596e7d32a08f992c5 100644
--- a/pkgs/hinotify.nix
+++ b/pkgs/hinotify.nix
@@ -1,10 +1,4 @@
-{ mkDerivation
-, async
-, base
-, bytestring
-, containers
-, directory
-, lib
+{ mkDerivation, async, base, bytestring, containers, directory, lib
 , unix
 }:
 mkDerivation {
@@ -27,4 +21,4 @@ mkDerivation {
   description = "Haskell binding to inotify";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/hlint.nix b/pkgs/hlint.nix
index dad3d690c7d1f355813a348e2429d8846b561a05..befdfabcf4e4a635c4acb4fa914b1e4ef6316ada 100644
--- a/pkgs/hlint.nix
+++ b/pkgs/hlint.nix
@@ -1,30 +1,8 @@
-{ mkDerivation
-, aeson
-, ansi-terminal
-, base
-, bytestring
-, cmdargs
-, containers
-, cpphs
-, data-default
-, deriving-aeson
-, directory
-, extra
-, file-embed
-, filepath
-, filepattern
-, ghc-lib-parser
-, ghc-lib-parser-ex
-, hscolour
-, lib
-, process
-, refact
-, text
-, transformers
-, uniplate
-, unordered-containers
-, utf8-string
-, vector
+{ mkDerivation, aeson, ansi-terminal, base, bytestring, cmdargs
+, containers, cpphs, data-default, deriving-aeson, directory, extra
+, file-embed, filepath, filepattern, ghc-lib-parser
+, ghc-lib-parser-ex, hscolour, lib, process, refact, text
+, transformers, uniplate, unordered-containers, utf8-string, vector
 , yaml
 }:
 mkDerivation {
@@ -35,32 +13,11 @@ mkDerivation {
   isExecutable = true;
   enableSeparateDataOutput = true;
   libraryHaskellDepends = [
-    aeson
-    ansi-terminal
-    base
-    bytestring
-    cmdargs
-    containers
-    cpphs
-    data-default
-    deriving-aeson
-    directory
-    extra
-    file-embed
-    filepath
-    filepattern
-    ghc-lib-parser
-    ghc-lib-parser-ex
-    hscolour
-    process
-    refact
-    text
-    transformers
-    uniplate
-    unordered-containers
-    utf8-string
-    vector
-    yaml
+    aeson ansi-terminal base bytestring cmdargs containers cpphs
+    data-default deriving-aeson directory extra file-embed filepath
+    filepattern ghc-lib-parser ghc-lib-parser-ex hscolour process
+    refact text transformers uniplate unordered-containers utf8-string
+    vector yaml
   ];
   executableHaskellDepends = [ base ];
   enableLibraryProfiling = true;
@@ -74,4 +31,4 @@ mkDerivation {
   description = "Source code suggestions";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/hls-alternate-number-format-plugin.nix b/pkgs/hls-alternate-number-format-plugin.nix
index dfd20bdd173f6f05cb6285a65e0ebd9e4547422d..5ead59332f75a2e09cbd9f8056abcaa3b24bcb22 100644
--- a/pkgs/hls-alternate-number-format-plugin.nix
+++ b/pkgs/hls-alternate-number-format-plugin.nix
@@ -1,25 +1,7 @@
-{ mkDerivation
-, QuickCheck
-, aeson
-, base
-, containers
-, extra
-, filepath
-, ghc-boot-th
-, ghcide
-, hie-compat
-, hls-graph
-, hls-plugin-api
-, hls-test-utils
-, lens
-, lib
-, lsp
-, mtl
-, regex-tdfa
-, syb
-, tasty-quickcheck
-, text
-, unordered-containers
+{ mkDerivation, QuickCheck, aeson, base, containers, extra
+, filepath, ghc-boot-th, ghcide, hie-compat, hls-graph
+, hls-plugin-api, hls-test-utils, lens, lib, lsp, mtl, regex-tdfa
+, syb, tasty-quickcheck, text, unordered-containers
 }:
 mkDerivation {
   pname = "hls-alternate-number-format-plugin";
@@ -29,32 +11,13 @@ mkDerivation {
   isExecutable = false;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    aeson
-    base
-    containers
-    extra
-    ghc-boot-th
-    ghcide
-    hie-compat
-    hls-graph
-    hls-plugin-api
-    lens
-    lsp
-    mtl
-    regex-tdfa
-    syb
-    text
+    aeson base containers extra ghc-boot-th ghcide hie-compat hls-graph
+    hls-plugin-api lens lsp mtl regex-tdfa syb text
     unordered-containers
   ];
   testHaskellDepends = [
-    base
-    filepath
-    hls-test-utils
-    lsp
-    QuickCheck
-    regex-tdfa
-    tasty-quickcheck
-    text
+    base filepath hls-test-utils lsp QuickCheck regex-tdfa
+    tasty-quickcheck text
   ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
@@ -66,4 +29,4 @@ mkDerivation {
   description = "Provide Alternate Number Formats plugin for Haskell Language Server";
   license = lib.licenses.asl20;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/hls-cabal-fmt-plugin.nix b/pkgs/hls-cabal-fmt-plugin.nix
index be6e56eec4addcb22cc65870539019bc6c23ba11..3fb7e09f21a946d3022eaf1b6cdc3f81c43bb5b6 100644
--- a/pkgs/hls-cabal-fmt-plugin.nix
+++ b/pkgs/hls-cabal-fmt-plugin.nix
@@ -1,16 +1,5 @@
-{ mkDerivation
-, base
-, directory
-, filepath
-, ghcide
-, hls-plugin-api
-, hls-test-utils
-, lens
-, lib
-, lsp-types
-, process
-, text
-, transformers
+{ mkDerivation, base, directory, filepath, ghcide, hls-plugin-api
+, hls-test-utils, lens, lib, lsp-types, process, text, transformers
 }:
 mkDerivation {
   pname = "hls-cabal-fmt-plugin";
@@ -20,16 +9,8 @@ mkDerivation {
   isExecutable = false;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    base
-    directory
-    filepath
-    ghcide
-    hls-plugin-api
-    lens
-    lsp-types
-    process
-    text
-    transformers
+    base directory filepath ghcide hls-plugin-api lens lsp-types
+    process text transformers
   ];
   testHaskellDepends = [ base directory filepath hls-test-utils ];
   enableLibraryProfiling = true;
@@ -42,4 +23,4 @@ mkDerivation {
   description = "Integration with the cabal-fmt code formatter";
   license = lib.licenses.asl20;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/hls-cabal-plugin.nix b/pkgs/hls-cabal-plugin.nix
index 35f49c16a48634e4f30fcc7ec98234d88e1d6278..d98b15b4e2c33c0ff66322b65003443b8ada753f 100644
--- a/pkgs/hls-cabal-plugin.nix
+++ b/pkgs/hls-cabal-plugin.nix
@@ -1,25 +1,7 @@
-{ mkDerivation
-, Cabal
-, base
-, bytestring
-, deepseq
-, directory
-, extra
-, filepath
-, ghcide
-, hashable
-, hls-graph
-, hls-plugin-api
-, hls-test-utils
-, lens
-, lib
-, lsp
-, lsp-types
-, regex-tdfa
-, stm
-, tasty-hunit
-, text
-, unordered-containers
+{ mkDerivation, Cabal, base, bytestring, deepseq, directory, extra
+, filepath, ghcide, hashable, hls-graph, hls-plugin-api
+, hls-test-utils, lens, lib, lsp, lsp-types, regex-tdfa, stm
+, tasty-hunit, text, unordered-containers
 }:
 mkDerivation {
   pname = "hls-cabal-plugin";
@@ -29,33 +11,13 @@ mkDerivation {
   isExecutable = false;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    base
-    bytestring
-    Cabal
-    deepseq
-    directory
-    extra
-    ghcide
-    hashable
-    hls-graph
-    hls-plugin-api
-    lsp
-    lsp-types
-    regex-tdfa
-    stm
-    text
+    base bytestring Cabal deepseq directory extra ghcide hashable
+    hls-graph hls-plugin-api lsp lsp-types regex-tdfa stm text
     unordered-containers
   ];
   testHaskellDepends = [
-    base
-    bytestring
-    filepath
-    ghcide
-    hls-test-utils
-    lens
-    lsp-types
-    tasty-hunit
-    text
+    base bytestring filepath ghcide hls-test-utils lens lsp-types
+    tasty-hunit text
   ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
@@ -67,4 +29,4 @@ mkDerivation {
   description = "Cabal integration plugin with Haskell Language Server";
   license = lib.licenses.mit;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/hls-call-hierarchy-plugin.nix b/pkgs/hls-call-hierarchy-plugin.nix
index fb0c2bff7c8b7c86f504c8f41cb0f587d969af8c..62e7c7abbfbf5718cec3ef33998c83a620192b77 100644
--- a/pkgs/hls-call-hierarchy-plugin.nix
+++ b/pkgs/hls-call-hierarchy-plugin.nix
@@ -1,21 +1,6 @@
-{ mkDerivation
-, aeson
-, base
-, containers
-, extra
-, filepath
-, ghcide
-, ghcide-test-utils
-, hiedb
-, hls-plugin-api
-, hls-test-utils
-, lens
-, lib
-, lsp
-, lsp-test
-, sqlite-simple
-, text
-, unordered-containers
+{ mkDerivation, aeson, base, containers, extra, filepath, ghcide
+, ghcide-test-utils, hiedb, hls-plugin-api, hls-test-utils, lens
+, lib, lsp, lsp-test, sqlite-simple, text, unordered-containers
 }:
 mkDerivation {
   pname = "hls-call-hierarchy-plugin";
@@ -25,31 +10,12 @@ mkDerivation {
   isExecutable = false;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    aeson
-    base
-    containers
-    extra
-    ghcide
-    hiedb
-    hls-plugin-api
-    lens
-    lsp
-    sqlite-simple
-    text
-    unordered-containers
+    aeson base containers extra ghcide hiedb hls-plugin-api lens lsp
+    sqlite-simple text unordered-containers
   ];
   testHaskellDepends = [
-    aeson
-    base
-    containers
-    extra
-    filepath
-    ghcide-test-utils
-    hls-test-utils
-    lens
-    lsp
-    lsp-test
-    text
+    aeson base containers extra filepath ghcide-test-utils
+    hls-test-utils lens lsp lsp-test text
   ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
@@ -61,4 +27,4 @@ mkDerivation {
   description = "Call hierarchy plugin for Haskell Language Server";
   license = lib.licenses.asl20;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/hls-change-type-signature-plugin.nix b/pkgs/hls-change-type-signature-plugin.nix
index e8970b905f87d6f17e93dbd14e060e29ef58ec93..73c66d0781e0bed5d54f99bcd0a3e2b8bc30280c 100644
--- a/pkgs/hls-change-type-signature-plugin.nix
+++ b/pkgs/hls-change-type-signature-plugin.nix
@@ -1,18 +1,6 @@
-{ mkDerivation
-, QuickCheck
-, base
-, filepath
-, ghcide
-, hls-plugin-api
-, hls-test-utils
-, lib
-, lsp
-, lsp-types
-, regex-tdfa
-, syb
-, text
-, transformers
-, unordered-containers
+{ mkDerivation, QuickCheck, base, filepath, ghcide, hls-plugin-api
+, hls-test-utils, lib, lsp, lsp-types, regex-tdfa, syb, text
+, transformers, unordered-containers
 }:
 mkDerivation {
   pname = "hls-change-type-signature-plugin";
@@ -22,24 +10,11 @@ mkDerivation {
   isExecutable = false;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    base
-    ghcide
-    hls-plugin-api
-    lsp-types
-    regex-tdfa
-    syb
-    text
-    transformers
-    unordered-containers
+    base ghcide hls-plugin-api lsp-types regex-tdfa syb text
+    transformers unordered-containers
   ];
   testHaskellDepends = [
-    base
-    filepath
-    hls-test-utils
-    lsp
-    QuickCheck
-    regex-tdfa
-    text
+    base filepath hls-test-utils lsp QuickCheck regex-tdfa text
   ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
@@ -51,4 +26,4 @@ mkDerivation {
   description = "Change a declarations type signature with a Code Action";
   license = lib.licenses.asl20;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/hls-class-plugin.nix b/pkgs/hls-class-plugin.nix
index 5d25ed8cd1fe87a9e6beb6c0adebbf2eff3e4ceb..fb105b68644777575f5ff62988f7d5138ed20a06 100644
--- a/pkgs/hls-class-plugin.nix
+++ b/pkgs/hls-class-plugin.nix
@@ -1,22 +1,6 @@
-{ mkDerivation
-, aeson
-, base
-, containers
-, deepseq
-, extra
-, filepath
-, ghc
-, ghc-boot-th
-, ghc-exactprint
-, ghcide
-, hls-graph
-, hls-plugin-api
-, hls-test-utils
-, lens
-, lib
-, lsp
-, lsp-types
-, text
+{ mkDerivation, aeson, base, containers, deepseq, extra, filepath
+, ghc, ghc-boot-th, ghc-exactprint, ghcide, hls-graph
+, hls-plugin-api, hls-test-utils, lens, lib, lsp, lsp-types, text
 , transformers
 }:
 mkDerivation {
@@ -27,30 +11,11 @@ mkDerivation {
   isExecutable = false;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    aeson
-    base
-    containers
-    deepseq
-    extra
-    ghc
-    ghc-boot-th
-    ghc-exactprint
-    ghcide
-    hls-graph
-    hls-plugin-api
-    lens
-    lsp
-    text
-    transformers
+    aeson base containers deepseq extra ghc ghc-boot-th ghc-exactprint
+    ghcide hls-graph hls-plugin-api lens lsp text transformers
   ];
   testHaskellDepends = [
-    aeson
-    base
-    filepath
-    ghcide
-    hls-plugin-api
-    hls-test-utils
-    lens
+    aeson base filepath ghcide hls-plugin-api hls-test-utils lens
     lsp-types
   ];
   enableLibraryProfiling = true;
@@ -64,4 +29,4 @@ mkDerivation {
   description = "Class/instance management plugin for Haskell Language Server";
   license = lib.licenses.asl20;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/hls-code-range-plugin.nix b/pkgs/hls-code-range-plugin.nix
index 2cb3fe93636ecc725240c817670c315c790e3c39..4fd859e73d97b8b621dc71ac35ed5fc8131b18a7 100644
--- a/pkgs/hls-code-range-plugin.nix
+++ b/pkgs/hls-code-range-plugin.nix
@@ -1,25 +1,7 @@
-{ mkDerivation
-, aeson
-, base
-, bytestring
-, containers
-, deepseq
-, extra
-, filepath
-, ghcide
-, hashable
-, hls-plugin-api
-, hls-test-utils
-, lens
-, lib
-, lsp
-, lsp-test
-, mtl
-, semigroupoids
-, tasty-hunit
-, text
-, transformers
-, vector
+{ mkDerivation, aeson, base, bytestring, containers, deepseq, extra
+, filepath, ghcide, hashable, hls-plugin-api, hls-test-utils, lens
+, lib, lsp, lsp-test, mtl, semigroupoids, tasty-hunit, text
+, transformers, vector
 }:
 mkDerivation {
   pname = "hls-code-range-plugin";
@@ -29,36 +11,12 @@ mkDerivation {
   isExecutable = false;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    aeson
-    base
-    containers
-    deepseq
-    extra
-    ghcide
-    hashable
-    hls-plugin-api
-    lens
-    lsp
-    mtl
-    semigroupoids
-    text
-    transformers
-    vector
+    aeson base containers deepseq extra ghcide hashable hls-plugin-api
+    lens lsp mtl semigroupoids text transformers vector
   ];
   testHaskellDepends = [
-    base
-    bytestring
-    containers
-    filepath
-    ghcide
-    hls-test-utils
-    lens
-    lsp
-    lsp-test
-    tasty-hunit
-    text
-    transformers
-    vector
+    base bytestring containers filepath ghcide hls-test-utils lens lsp
+    lsp-test tasty-hunit text transformers vector
   ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
@@ -70,4 +28,4 @@ mkDerivation {
   description = "HLS Plugin to support smart selection range and Folding range";
   license = lib.licenses.asl20;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/hls-explicit-fixity-plugin.nix b/pkgs/hls-explicit-fixity-plugin.nix
index c8a08fe9c156e6b65d2b329d2db19c5e77d58958..58d8b3d4d353d8604d867123de0b7ed950ce2a5b 100644
--- a/pkgs/hls-explicit-fixity-plugin.nix
+++ b/pkgs/hls-explicit-fixity-plugin.nix
@@ -1,17 +1,5 @@
-{ mkDerivation
-, base
-, containers
-, deepseq
-, extra
-, filepath
-, ghc
-, ghcide
-, hashable
-, hls-plugin-api
-, hls-test-utils
-, lib
-, lsp
-, text
+{ mkDerivation, base, containers, deepseq, extra, filepath, ghc
+, ghcide, hashable, hls-plugin-api, hls-test-utils, lib, lsp, text
 , transformers
 }:
 mkDerivation {
@@ -22,17 +10,8 @@ mkDerivation {
   isExecutable = false;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    base
-    containers
-    deepseq
-    extra
-    ghc
-    ghcide
-    hashable
-    hls-plugin-api
-    lsp
-    text
-    transformers
+    base containers deepseq extra ghc ghcide hashable hls-plugin-api
+    lsp text transformers
   ];
   testHaskellDepends = [ base filepath hls-test-utils text ];
   enableLibraryProfiling = true;
@@ -45,4 +24,4 @@ mkDerivation {
   description = "Show fixity explicitly while hovering";
   license = lib.licenses.asl20;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/hls-explicit-imports-plugin.nix b/pkgs/hls-explicit-imports-plugin.nix
index e89df2939bbd1138a3ad2efd157dfa8cc200e728..c1721bfef1bc89957823e8dd2e01753cd0c24821 100644
--- a/pkgs/hls-explicit-imports-plugin.nix
+++ b/pkgs/hls-explicit-imports-plugin.nix
@@ -1,17 +1,5 @@
-{ mkDerivation
-, aeson
-, base
-, containers
-, deepseq
-, filepath
-, ghc
-, ghcide
-, hls-graph
-, hls-plugin-api
-, hls-test-utils
-, lib
-, lsp
-, text
+{ mkDerivation, aeson, base, containers, deepseq, filepath, ghc
+, ghcide, hls-graph, hls-plugin-api, hls-test-utils, lib, lsp, text
 , unordered-containers
 }:
 mkDerivation {
@@ -22,17 +10,8 @@ mkDerivation {
   isExecutable = false;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    aeson
-    base
-    containers
-    deepseq
-    ghc
-    ghcide
-    hls-graph
-    hls-plugin-api
-    lsp
-    text
-    unordered-containers
+    aeson base containers deepseq ghc ghcide hls-graph hls-plugin-api
+    lsp text unordered-containers
   ];
   testHaskellDepends = [ base filepath hls-test-utils text ];
   enableLibraryProfiling = true;
@@ -45,4 +24,4 @@ mkDerivation {
   description = "Explicit imports plugin for Haskell Language Server";
   license = lib.licenses.asl20;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/hls-explicit-record-fields-plugin.nix b/pkgs/hls-explicit-record-fields-plugin.nix
index 0f65f28662b047c19d72dd94b247f57c6d2d619c..ad5fcb7293e5c2f37ad4c49008699fbb19afb18c 100644
--- a/pkgs/hls-explicit-record-fields-plugin.nix
+++ b/pkgs/hls-explicit-record-fields-plugin.nix
@@ -1,20 +1,6 @@
-{ mkDerivation
-, base
-, containers
-, filepath
-, ghc-boot-th
-, ghcide
-, hls-graph
-, hls-plugin-api
-, hls-test-utils
-, lens
-, lib
-, lsp
-, lsp-test
-, syb
-, text
-, transformers
-, unordered-containers
+{ mkDerivation, base, containers, filepath, ghc-boot-th, ghcide
+, hls-graph, hls-plugin-api, hls-test-utils, lens, lib, lsp
+, lsp-test, syb, text, transformers, unordered-containers
 }:
 mkDerivation {
   pname = "hls-explicit-record-fields-plugin";
@@ -24,25 +10,11 @@ mkDerivation {
   isExecutable = false;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    base
-    containers
-    ghc-boot-th
-    ghcide
-    hls-graph
-    hls-plugin-api
-    lens
-    lsp
-    syb
-    text
-    transformers
-    unordered-containers
+    base containers ghc-boot-th ghcide hls-graph hls-plugin-api lens
+    lsp syb text transformers unordered-containers
   ];
   testHaskellDepends = [
-    base
-    filepath
-    hls-test-utils
-    lsp-test
-    text
+    base filepath hls-test-utils lsp-test text
   ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
@@ -54,4 +26,4 @@ mkDerivation {
   description = "Explicit record fields plugin for Haskell Language Server";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/hls-fourmolu-plugin.nix b/pkgs/hls-fourmolu-plugin.nix
index fa1e6434dde418fd32af06dba87976910c85f868..800e994c376654eec5894dea584986a9cb472738 100644
--- a/pkgs/hls-fourmolu-plugin.nix
+++ b/pkgs/hls-fourmolu-plugin.nix
@@ -1,48 +1,22 @@
-{ mkDerivation
-, aeson
-, base
-, containers
-, filepath
-, fourmolu
-, ghc
-, ghc-boot-th
-, ghcide
-, hls-plugin-api
-, hls-test-utils
-, lens
-, lib
-, lsp
-, lsp-test
-, process-extras
-, text
+{ mkDerivation, aeson, base, containers, filepath, fourmolu, ghc
+, ghc-boot-th, ghcide, hls-plugin-api, hls-test-utils, lens, lib
+, lsp, lsp-test, process-extras, text
 }:
 mkDerivation {
   pname = "hls-fourmolu-plugin";
   version = "1.1.1.0";
   sha256 = "4f121a85ea4edbbbee9d9e426ed6c9f8b349eb189e1d8edf06f5c9a971e8babf";
+  revision = "1";
+  editedCabalFile = "0v65jd14rvfrw5bcn6asqr5sk1zwbvazv233gnw4ylkw0kspmww5";
   isLibrary = true;
   isExecutable = false;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    base
-    filepath
-    fourmolu
-    ghc
-    ghc-boot-th
-    ghcide
-    hls-plugin-api
-    lens
-    lsp
-    process-extras
-    text
+    base filepath fourmolu ghc ghc-boot-th ghcide hls-plugin-api lens
+    lsp process-extras text
   ];
   testHaskellDepends = [
-    aeson
-    base
-    containers
-    filepath
-    hls-plugin-api
-    hls-test-utils
+    aeson base containers filepath hls-plugin-api hls-test-utils
     lsp-test
   ];
   testToolDepends = [ fourmolu ];
@@ -57,4 +31,4 @@ mkDerivation {
   description = "Integration with the Fourmolu code formatter";
   license = lib.licenses.asl20;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/hls-gadt-plugin.nix b/pkgs/hls-gadt-plugin.nix
index aba4cd0522f472145030f2ac25650b1975d54f0b..6b3f6580e37caa7cd2b3c5aac3534d1919f69858 100644
--- a/pkgs/hls-gadt-plugin.nix
+++ b/pkgs/hls-gadt-plugin.nix
@@ -1,24 +1,7 @@
-{ mkDerivation
-, aeson
-, base
-, containers
-, extra
-, filepath
-, ghc
-, ghc-boot-th
-, ghc-exactprint
-, ghcide
-, hls-plugin-api
-, hls-refactor-plugin
-, hls-test-utils
-, lens
-, lib
-, lsp
-, lsp-test
-, mtl
-, text
-, transformers
-, unordered-containers
+{ mkDerivation, aeson, base, containers, extra, filepath, ghc
+, ghc-boot-th, ghc-exactprint, ghcide, hls-plugin-api
+, hls-refactor-plugin, hls-test-utils, lens, lib, lsp, lsp-test
+, mtl, text, transformers, unordered-containers
 }:
 mkDerivation {
   pname = "hls-gadt-plugin";
@@ -28,31 +11,12 @@ mkDerivation {
   isExecutable = false;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    aeson
-    base
-    containers
-    extra
-    ghc
-    ghc-boot-th
-    ghc-exactprint
-    ghcide
-    hls-plugin-api
-    hls-refactor-plugin
-    lens
-    lsp
-    mtl
-    text
-    transformers
+    aeson base containers extra ghc ghc-boot-th ghc-exactprint ghcide
+    hls-plugin-api hls-refactor-plugin lens lsp mtl text transformers
     unordered-containers
   ];
   testHaskellDepends = [
-    base
-    filepath
-    hls-test-utils
-    lens
-    lsp
-    lsp-test
-    text
+    base filepath hls-test-utils lens lsp lsp-test text
   ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
@@ -64,4 +28,4 @@ mkDerivation {
   description = "Convert to GADT syntax plugin";
   license = lib.licenses.asl20;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/hls-graph.nix b/pkgs/hls-graph.nix
index c297f50f93385cfd675d34480d5a87cb976d177c..d3f4481c1c69a15779f7248b6fda0a167931e1b1 100644
--- a/pkgs/hls-graph.nix
+++ b/pkgs/hls-graph.nix
@@ -1,34 +1,8 @@
-{ mkDerivation
-, aeson
-, async
-, base
-, bytestring
-, containers
-, deepseq
-, directory
-, exceptions
-, extra
-, filepath
-, focus
-, hashable
-, hspec
-, hspec-discover
-, js-dgtable
-, js-flot
-, js-jquery
-, lib
-, list-t
-, stm
-, stm-containers
-, tasty
-, tasty-hspec
-, tasty-hunit
-, tasty-rerun
-, text
-, time
-, transformers
-, unliftio
-, unordered-containers
+{ mkDerivation, aeson, async, base, bytestring, containers, deepseq
+, directory, exceptions, extra, filepath, focus, hashable, hspec
+, hspec-discover, js-dgtable, js-flot, js-jquery, lib, list-t, stm
+, stm-containers, tasty, tasty-hspec, tasty-hunit, tasty-rerun
+, text, time, transformers, unliftio, unordered-containers
 }:
 mkDerivation {
   pname = "hls-graph";
@@ -38,45 +12,14 @@ mkDerivation {
   isExecutable = false;
   enableSeparateDataOutput = true;
   libraryHaskellDepends = [
-    aeson
-    async
-    base
-    bytestring
-    containers
-    deepseq
-    directory
-    exceptions
-    extra
-    filepath
-    focus
-    hashable
-    js-dgtable
-    js-flot
-    js-jquery
-    list-t
-    stm
-    stm-containers
-    text
-    time
-    transformers
-    unliftio
+    aeson async base bytestring containers deepseq directory exceptions
+    extra filepath focus hashable js-dgtable js-flot js-jquery list-t
+    stm stm-containers text time transformers unliftio
     unordered-containers
   ];
   testHaskellDepends = [
-    base
-    containers
-    directory
-    extra
-    filepath
-    hspec
-    stm
-    stm-containers
-    tasty
-    tasty-hspec
-    tasty-hunit
-    tasty-rerun
-    text
-    unordered-containers
+    base containers directory extra filepath hspec stm stm-containers
+    tasty tasty-hspec tasty-hunit tasty-rerun text unordered-containers
   ];
   testToolDepends = [ hspec-discover ];
   enableLibraryProfiling = true;
@@ -90,4 +33,4 @@ mkDerivation {
   description = "Haskell Language Server internal graph API";
   license = lib.licenses.asl20;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/hls-module-name-plugin.nix b/pkgs/hls-module-name-plugin.nix
index ef0ab79eacfa10566265cc5045560049920af496..6abe5ea0c23f9706d991be60adfdff3ed6e834c2 100644
--- a/pkgs/hls-module-name-plugin.nix
+++ b/pkgs/hls-module-name-plugin.nix
@@ -1,15 +1,5 @@
-{ mkDerivation
-, aeson
-, base
-, directory
-, filepath
-, ghcide
-, hls-plugin-api
-, hls-test-utils
-, lib
-, lsp
-, text
-, transformers
+{ mkDerivation, aeson, base, directory, filepath, ghcide
+, hls-plugin-api, hls-test-utils, lib, lsp, text, transformers
 , unordered-containers
 }:
 mkDerivation {
@@ -20,16 +10,8 @@ mkDerivation {
   isExecutable = false;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    aeson
-    base
-    directory
-    filepath
-    ghcide
-    hls-plugin-api
-    lsp
-    text
-    transformers
-    unordered-containers
+    aeson base directory filepath ghcide hls-plugin-api lsp text
+    transformers unordered-containers
   ];
   testHaskellDepends = [ base filepath hls-test-utils ];
   enableLibraryProfiling = true;
@@ -42,4 +24,4 @@ mkDerivation {
   description = "Module name plugin for Haskell Language Server";
   license = lib.licenses.asl20;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/hls-plugin-api.nix b/pkgs/hls-plugin-api.nix
index bfd7fc7a6844d9cf868da769c695eab450c4d546..d96ad651a6e7085fe47c145111d846f6faac7006 100644
--- a/pkgs/hls-plugin-api.nix
+++ b/pkgs/hls-plugin-api.nix
@@ -1,39 +1,10 @@
-{ mkDerivation
-, Diff
-, aeson
-, base
-, containers
-, criterion
-, data-default
-, deepseq
-, dependent-map
-, dependent-sum
-, dlist
-, extra
-, filepath
-, ghc
-, hashable
-, hls-graph
-, hw-fingertree
-, lens
-, lens-aeson
-, lib
-, lsp
-, lsp-types
-, megaparsec
-, opentelemetry
-, optparse-applicative
-, random
-, random-fu
-, regex-tdfa
-, tasty
-, tasty-hunit
-, tasty-quickcheck
-, tasty-rerun
-, text
-, transformers
-, unix
-, unordered-containers
+{ mkDerivation, Diff, aeson, base, containers, criterion
+, data-default, deepseq, dependent-map, dependent-sum, dlist, extra
+, filepath, ghc, hashable, hls-graph, hw-fingertree, lens
+, lens-aeson, lib, lsp, lsp-types, megaparsec, opentelemetry
+, optparse-applicative, random, random-fu, regex-tdfa, tasty
+, tasty-hunit, tasty-quickcheck, tasty-rerun, text, transformers
+, unix, unordered-containers
 }:
 mkDerivation {
   pname = "hls-plugin-api";
@@ -43,49 +14,17 @@ mkDerivation {
   isExecutable = false;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    aeson
-    base
-    containers
-    data-default
-    dependent-map
-    dependent-sum
-    Diff
-    dlist
-    extra
-    filepath
-    ghc
-    hashable
-    hls-graph
-    hw-fingertree
-    lens
-    lens-aeson
-    lsp
-    megaparsec
-    opentelemetry
-    optparse-applicative
-    regex-tdfa
-    text
-    transformers
-    unix
-    unordered-containers
+    aeson base containers data-default dependent-map dependent-sum Diff
+    dlist extra filepath ghc hashable hls-graph hw-fingertree lens
+    lens-aeson lsp megaparsec opentelemetry optparse-applicative
+    regex-tdfa text transformers unix unordered-containers
   ];
   testHaskellDepends = [
-    base
-    containers
-    lsp-types
-    tasty
-    tasty-hunit
-    tasty-quickcheck
-    tasty-rerun
-    text
+    base containers lsp-types tasty tasty-hunit tasty-quickcheck
+    tasty-rerun text
   ];
   benchmarkHaskellDepends = [
-    base
-    criterion
-    deepseq
-    lsp-types
-    random
-    random-fu
+    base criterion deepseq lsp-types random random-fu
   ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
@@ -98,4 +37,4 @@ mkDerivation {
   description = "Haskell Language Server API for plugin communication";
   license = lib.licenses.asl20;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/hls-pragmas-plugin.nix b/pkgs/hls-pragmas-plugin.nix
index 31e0eb27b40ce2f6b727b57358a1e4671fc80d13..3f6580c1d0a083301c201514d79ce0fd758e8584 100644
--- a/pkgs/hls-pragmas-plugin.nix
+++ b/pkgs/hls-pragmas-plugin.nix
@@ -1,20 +1,6 @@
-{ mkDerivation
-, base
-, containers
-, extra
-, filepath
-, fuzzy
-, ghc
-, ghcide
-, hls-plugin-api
-, hls-test-utils
-, lens
-, lib
-, lsp
-, lsp-types
-, text
-, transformers
-, unordered-containers
+{ mkDerivation, base, containers, extra, filepath, fuzzy, ghc
+, ghcide, hls-plugin-api, hls-test-utils, lens, lib, lsp, lsp-types
+, text, transformers, unordered-containers
 }:
 mkDerivation {
   pname = "hls-pragmas-plugin";
@@ -24,26 +10,11 @@ mkDerivation {
   isExecutable = false;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    base
-    containers
-    extra
-    fuzzy
-    ghc
-    ghcide
-    hls-plugin-api
-    lens
-    lsp
-    text
-    transformers
-    unordered-containers
+    base containers extra fuzzy ghc ghcide hls-plugin-api lens lsp text
+    transformers unordered-containers
   ];
   testHaskellDepends = [
-    base
-    filepath
-    hls-test-utils
-    lens
-    lsp-types
-    text
+    base filepath hls-test-utils lens lsp-types text
   ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
@@ -55,4 +26,4 @@ mkDerivation {
   description = "Pragmas plugin for Haskell Language Server";
   license = lib.licenses.asl20;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/hls-qualify-imported-names-plugin.nix b/pkgs/hls-qualify-imported-names-plugin.nix
index 6135974c2a33faf55aac8f817d880509d58b2e12..c4c891b192f6ef0d67aa287725317f793e6a6bda 100644
--- a/pkgs/hls-qualify-imported-names-plugin.nix
+++ b/pkgs/hls-qualify-imported-names-plugin.nix
@@ -1,20 +1,6 @@
-{ mkDerivation
-, aeson
-, base
-, containers
-, deepseq
-, dlist
-, filepath
-, ghc
-, ghcide
-, hls-graph
-, hls-plugin-api
-, hls-test-utils
-, lib
-, lsp
-, text
-, transformers
-, unordered-containers
+{ mkDerivation, aeson, base, containers, deepseq, dlist, filepath
+, ghc, ghcide, hls-graph, hls-plugin-api, hls-test-utils, lib, lsp
+, text, transformers, unordered-containers
 }:
 mkDerivation {
   pname = "hls-qualify-imported-names-plugin";
@@ -24,19 +10,8 @@ mkDerivation {
   isExecutable = false;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    aeson
-    base
-    containers
-    deepseq
-    dlist
-    ghc
-    ghcide
-    hls-graph
-    hls-plugin-api
-    lsp
-    text
-    transformers
-    unordered-containers
+    aeson base containers deepseq dlist ghc ghcide hls-graph
+    hls-plugin-api lsp text transformers unordered-containers
   ];
   testHaskellDepends = [ base filepath hls-test-utils text ];
   enableLibraryProfiling = true;
@@ -49,4 +24,4 @@ mkDerivation {
   description = "A Haskell Language Server plugin that qualifies imported names";
   license = lib.licenses.asl20;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/hls-refactor-plugin.nix b/pkgs/hls-refactor-plugin.nix
index aa11108527a8d8842f7e4aa060532b357414e139..a4b700c047d899ff00b19af78e0709ed4058e8fb 100644
--- a/pkgs/hls-refactor-plugin.nix
+++ b/pkgs/hls-refactor-plugin.nix
@@ -1,43 +1,10 @@
-{ mkDerivation
-, aeson
-, async
-, base
-, bytestring
-, containers
-, data-default
-, deepseq
-, directory
-, dlist
-, extra
-, filepath
-, ghc
-, ghc-boot
-, ghc-exactprint
-, ghcide
-, ghcide-test-utils
-, hls-graph
-, hls-plugin-api
-, hls-test-utils
-, lens
-, lib
-, lsp
-, lsp-test
-, lsp-types
-, mtl
-, network-uri
-, parser-combinators
-, regex-tdfa
-, retrie
-, shake
-, syb
-, tasty
-, tasty-expected-failure
-, tasty-hunit
-, tasty-rerun
-, text
-, text-rope
-, time
-, transformers
+{ mkDerivation, aeson, async, base, bytestring, containers
+, data-default, deepseq, directory, dlist, extra, filepath, ghc
+, ghc-boot, ghc-exactprint, ghcide, ghcide-test-utils, hls-graph
+, hls-plugin-api, hls-test-utils, lens, lib, lsp, lsp-test
+, lsp-types, mtl, network-uri, parser-combinators, regex-tdfa
+, retrie, shake, syb, tasty, tasty-expected-failure, tasty-hunit
+, tasty-rerun, text, text-rope, time, transformers
 , unordered-containers
 }:
 mkDerivation {
@@ -48,59 +15,16 @@ mkDerivation {
   isExecutable = false;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    aeson
-    base
-    bytestring
-    containers
-    data-default
-    deepseq
-    dlist
-    extra
-    ghc
-    ghc-boot
-    ghc-exactprint
-    ghcide
-    hls-graph
-    hls-plugin-api
-    lens
-    lsp
-    mtl
-    regex-tdfa
-    retrie
-    syb
-    text
-    text-rope
-    time
-    transformers
+    aeson base bytestring containers data-default deepseq dlist extra
+    ghc ghc-boot ghc-exactprint ghcide hls-graph hls-plugin-api lens
+    lsp mtl regex-tdfa retrie syb text text-rope time transformers
     unordered-containers
   ];
   testHaskellDepends = [
-    aeson
-    async
-    base
-    containers
-    data-default
-    directory
-    extra
-    filepath
-    ghc
-    ghcide
-    ghcide-test-utils
-    hls-plugin-api
-    hls-test-utils
-    lens
-    lsp-test
-    lsp-types
-    network-uri
-    parser-combinators
-    regex-tdfa
-    shake
-    tasty
-    tasty-expected-failure
-    tasty-hunit
-    tasty-rerun
-    text
-    text-rope
+    aeson async base containers data-default directory extra filepath
+    ghc ghcide ghcide-test-utils hls-plugin-api hls-test-utils lens
+    lsp-test lsp-types network-uri parser-combinators regex-tdfa shake
+    tasty tasty-expected-failure tasty-hunit tasty-rerun text text-rope
   ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
@@ -112,4 +36,4 @@ mkDerivation {
   description = "Exactprint refactorings for Haskell Language Server";
   license = lib.licenses.asl20;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/hls-refine-imports-plugin.nix b/pkgs/hls-refine-imports-plugin.nix
index 541e1ca2ecb2fa07200d7b189f451b48781e34ff..e35e935d6cadea9c1a7e1ebbcaa6276c30c49846 100644
--- a/pkgs/hls-refine-imports-plugin.nix
+++ b/pkgs/hls-refine-imports-plugin.nix
@@ -1,19 +1,6 @@
-{ mkDerivation
-, aeson
-, base
-, containers
-, deepseq
-, filepath
-, ghc
-, ghcide
-, hls-explicit-imports-plugin
-, hls-graph
-, hls-plugin-api
-, hls-test-utils
-, lib
-, lsp
-, text
-, unordered-containers
+{ mkDerivation, aeson, base, containers, deepseq, filepath, ghc
+, ghcide, hls-explicit-imports-plugin, hls-graph, hls-plugin-api
+, hls-test-utils, lib, lsp, text, unordered-containers
 }:
 mkDerivation {
   pname = "hls-refine-imports-plugin";
@@ -23,17 +10,8 @@ mkDerivation {
   isExecutable = false;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    aeson
-    base
-    containers
-    deepseq
-    ghc
-    ghcide
-    hls-explicit-imports-plugin
-    hls-graph
-    hls-plugin-api
-    lsp
-    text
+    aeson base containers deepseq ghc ghcide
+    hls-explicit-imports-plugin hls-graph hls-plugin-api lsp text
     unordered-containers
   ];
   testHaskellDepends = [ base filepath hls-test-utils text ];
@@ -47,4 +25,4 @@ mkDerivation {
   description = "Refine imports plugin for Haskell Language Server";
   license = lib.licenses.asl20;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/hls-retrie-plugin.nix b/pkgs/hls-retrie-plugin.nix
index a2d26ea2a0b1289000f9384f0d287acd0b88ac11..6106019fc10220ff72db8c651614b860732ca956 100644
--- a/pkgs/hls-retrie-plugin.nix
+++ b/pkgs/hls-retrie-plugin.nix
@@ -1,23 +1,6 @@
-{ mkDerivation
-, aeson
-, base
-, bytestring
-, containers
-, deepseq
-, directory
-, extra
-, ghc
-, ghcide
-, hashable
-, hls-plugin-api
-, lib
-, lsp
-, lsp-types
-, retrie
-, safe-exceptions
-, stm
-, text
-, transformers
+{ mkDerivation, aeson, base, bytestring, containers, deepseq
+, directory, extra, ghc, ghcide, hashable, hls-plugin-api, lib, lsp
+, lsp-types, retrie, safe-exceptions, stm, text, transformers
 , unordered-containers
 }:
 mkDerivation {
@@ -28,25 +11,9 @@ mkDerivation {
   isExecutable = false;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    aeson
-    base
-    bytestring
-    containers
-    deepseq
-    directory
-    extra
-    ghc
-    ghcide
-    hashable
-    hls-plugin-api
-    lsp
-    lsp-types
-    retrie
-    safe-exceptions
-    stm
-    text
-    transformers
-    unordered-containers
+    aeson base bytestring containers deepseq directory extra ghc ghcide
+    hashable hls-plugin-api lsp lsp-types retrie safe-exceptions stm
+    text transformers unordered-containers
   ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
@@ -58,4 +25,4 @@ mkDerivation {
   description = "Retrie integration plugin for Haskell Language Server";
   license = lib.licenses.asl20;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/hls-splice-plugin.nix b/pkgs/hls-splice-plugin.nix
index 962425c8db5e4de63d6bd7c46a3782e568e8ea6c..54654e9dbaeea2d8cd4f843b4e087d71a83abbdc 100644
--- a/pkgs/hls-splice-plugin.nix
+++ b/pkgs/hls-splice-plugin.nix
@@ -1,26 +1,7 @@
-{ mkDerivation
-, aeson
-, base
-, containers
-, dlist
-, extra
-, filepath
-, foldl
-, ghc
-, ghc-exactprint
-, ghcide
-, hls-plugin-api
-, hls-refactor-plugin
-, hls-test-utils
-, lens
-, lib
-, lsp
-, retrie
-, syb
-, text
-, transformers
-, unliftio-core
-, unordered-containers
+{ mkDerivation, aeson, base, containers, dlist, extra, filepath
+, foldl, ghc, ghc-exactprint, ghcide, hls-plugin-api
+, hls-refactor-plugin, hls-test-utils, lens, lib, lsp, retrie, syb
+, text, transformers, unliftio-core, unordered-containers
 }:
 mkDerivation {
   pname = "hls-splice-plugin";
@@ -30,25 +11,9 @@ mkDerivation {
   isExecutable = false;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    aeson
-    base
-    containers
-    dlist
-    extra
-    foldl
-    ghc
-    ghc-exactprint
-    ghcide
-    hls-plugin-api
-    hls-refactor-plugin
-    lens
-    lsp
-    retrie
-    syb
-    text
-    transformers
-    unliftio-core
-    unordered-containers
+    aeson base containers dlist extra foldl ghc ghc-exactprint ghcide
+    hls-plugin-api hls-refactor-plugin lens lsp retrie syb text
+    transformers unliftio-core unordered-containers
   ];
   testHaskellDepends = [ base filepath hls-test-utils text ];
   enableLibraryProfiling = true;
@@ -61,4 +26,4 @@ mkDerivation {
   description = "HLS Plugin to expand TemplateHaskell Splices and QuasiQuotes";
   license = lib.licenses.asl20;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/hls-test-utils.nix b/pkgs/hls-test-utils.nix
index 7d1a6216efff046535fbd095ceb5a98f7905209b..5d35a80c2463c865b01a1352737f249cba016ce6 100644
--- a/pkgs/hls-test-utils.nix
+++ b/pkgs/hls-test-utils.nix
@@ -1,30 +1,8 @@
-{ mkDerivation
-, aeson
-, async
-, base
-, blaze-markup
-, bytestring
-, containers
-, data-default
-, directory
-, extra
-, filepath
-, ghcide
-, hls-graph
-, hls-plugin-api
-, lens
-, lib
-, lsp
-, lsp-test
-, lsp-types
-, tasty
-, tasty-expected-failure
-, tasty-golden
-, tasty-hunit
-, tasty-rerun
-, temporary
-, text
-, unordered-containers
+{ mkDerivation, aeson, async, base, blaze-markup, bytestring
+, containers, data-default, directory, extra, filepath, ghcide
+, hls-graph, hls-plugin-api, lens, lib, lsp, lsp-test, lsp-types
+, tasty, tasty-expected-failure, tasty-golden, tasty-hunit
+, tasty-rerun, temporary, text, unordered-containers
 }:
 mkDerivation {
   pname = "hls-test-utils";
@@ -34,31 +12,10 @@ mkDerivation {
   isExecutable = false;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    aeson
-    async
-    base
-    blaze-markup
-    bytestring
-    containers
-    data-default
-    directory
-    extra
-    filepath
-    ghcide
-    hls-graph
-    hls-plugin-api
-    lens
-    lsp
-    lsp-test
-    lsp-types
-    tasty
-    tasty-expected-failure
-    tasty-golden
-    tasty-hunit
-    tasty-rerun
-    temporary
-    text
-    unordered-containers
+    aeson async base blaze-markup bytestring containers data-default
+    directory extra filepath ghcide hls-graph hls-plugin-api lens lsp
+    lsp-test lsp-types tasty tasty-expected-failure tasty-golden
+    tasty-hunit tasty-rerun temporary text unordered-containers
   ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
@@ -71,4 +28,4 @@ mkDerivation {
   description = "Utilities used in the tests of Haskell Language Server";
   license = lib.licenses.asl20;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/hnix-store-core.nix b/pkgs/hnix-store-core.nix
index a68b6866b29cb7e15a00fc702bca039aa38baf65..0eb2254aac17ae962a42c63887d26a074e471ed7 100644
--- a/pkgs/hnix-store-core.nix
+++ b/pkgs/hnix-store-core.nix
@@ -1,39 +1,10 @@
-{ mkDerivation
-, algebraic-graphs
-, attoparsec
-, base
-, base16-bytestring
-, base64-bytestring
-, binary
-, bytestring
-, cereal
-, containers
-, cryptonite
-, directory
-, filepath
-, hashable
-, hspec
-, lib
-, lifted-base
-, memory
-, monad-control
-, mtl
-, nix-derivation
-, process
-, relude
-, saltine
-, tasty
-, tasty-discover
-, tasty-golden
-, tasty-hspec
-, tasty-hunit
-, tasty-quickcheck
-, temporary
-, text
-, time
-, unix
-, unordered-containers
-, vector
+{ mkDerivation, algebraic-graphs, attoparsec, base
+, base16-bytestring, base64-bytestring, binary, bytestring, cereal
+, containers, cryptonite, directory, filepath, hashable, hspec, lib
+, lifted-base, memory, monad-control, mtl, nix-derivation, process
+, relude, saltine, tasty, tasty-discover, tasty-golden, tasty-hspec
+, tasty-hunit, tasty-quickcheck, temporary, text, time, unix
+, unordered-containers, vector
 }:
 mkDerivation {
   pname = "hnix-store-core";
@@ -43,53 +14,17 @@ mkDerivation {
   isExecutable = false;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    algebraic-graphs
-    attoparsec
-    base
-    base16-bytestring
-    base64-bytestring
-    bytestring
-    cereal
-    containers
-    cryptonite
-    directory
-    filepath
-    hashable
-    lifted-base
-    memory
-    monad-control
-    mtl
-    nix-derivation
-    relude
-    saltine
-    text
-    time
-    unix
-    unordered-containers
+    algebraic-graphs attoparsec base base16-bytestring
+    base64-bytestring bytestring cereal containers cryptonite directory
+    filepath hashable lifted-base memory monad-control mtl
+    nix-derivation relude saltine text time unix unordered-containers
     vector
   ];
   testHaskellDepends = [
-    attoparsec
-    base
-    base16-bytestring
-    base64-bytestring
-    binary
-    bytestring
-    containers
-    cryptonite
-    directory
-    filepath
-    hspec
-    process
-    relude
-    tasty
-    tasty-golden
-    tasty-hspec
-    tasty-hunit
-    tasty-quickcheck
-    temporary
-    text
-    unix
+    attoparsec base base16-bytestring base64-bytestring binary
+    bytestring containers cryptonite directory filepath hspec process
+    relude tasty tasty-golden tasty-hspec tasty-hunit tasty-quickcheck
+    temporary text unix
   ];
   testToolDepends = [ tasty-discover ];
   enableLibraryProfiling = true;
@@ -103,4 +38,4 @@ mkDerivation {
   description = "Core effects for interacting with the Nix store";
   license = lib.licenses.asl20;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/hnix-store-remote.nix b/pkgs/hnix-store-remote.nix
index 977d7e9137d3520c9ad80d995558ea8c52e5bc84..4f868fae431cbaa3678a8cda0f6a2f5679e58c44 100644
--- a/pkgs/hnix-store-remote.nix
+++ b/pkgs/hnix-store-remote.nix
@@ -1,19 +1,6 @@
-{ mkDerivation
-, attoparsec
-, base
-, binary
-, bytestring
-, containers
-, cryptonite
-, hnix-store-core
-, lib
-, mtl
-, network
-, nix-derivation
-, relude
-, text
-, time
-, unordered-containers
+{ mkDerivation, attoparsec, base, binary, bytestring, containers
+, cryptonite, hnix-store-core, lib, mtl, network, nix-derivation
+, relude, text, time, unordered-containers
 }:
 mkDerivation {
   pname = "hnix-store-remote";
@@ -23,19 +10,8 @@ mkDerivation {
   isExecutable = false;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    attoparsec
-    base
-    binary
-    bytestring
-    containers
-    cryptonite
-    hnix-store-core
-    mtl
-    network
-    nix-derivation
-    relude
-    text
-    time
+    attoparsec base binary bytestring containers cryptonite
+    hnix-store-core mtl network nix-derivation relude text time
     unordered-containers
   ];
   enableLibraryProfiling = true;
@@ -49,4 +25,4 @@ mkDerivation {
   description = "Remote hnix store";
   license = lib.licenses.asl20;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/hnix.nix b/pkgs/hnix.nix
index 8fd8e818bd0f8596bedef58a6bae8ea9b0abdf0b..72aee02252449bb5957be528ba46177dc7765dbd 100644
--- a/pkgs/hnix.nix
+++ b/pkgs/hnix.nix
@@ -1,75 +1,16 @@
-{ mkDerivation
-, Diff
-, Glob
-, aeson
-, array
-, base
-, base16-bytestring
-, binary
-, bytestring
-, comonad
-, containers
-, criterion
-, cryptonite
-, data-fix
-, deepseq
-, deriving-compat
-, directory
-, exceptions
-, extra
-, fetchgit
-, filepath
-, free
-, gitrev
-, hashable
-, hashing
-, haskeline
-, hedgehog
-, hnix-store-core
-, hnix-store-remote
-, http-client
-, http-client-tls
-, http-types
-, lens-family
-, lens-family-core
-, lens-family-th
-, lib
-, logict
-, megaparsec
-, monad-control
-, monadlist
-, mtl
-, neat-interpolation
-, optparse-applicative
-, parser-combinators
-, pretty-show
-, prettyprinter
-, process
-, ref-tf
-, regex-tdfa
-, relude
-, repline
-, scientific
-, semialign
-, serialise
-, some
-, split
-, syb
-, tasty
-, tasty-hedgehog
-, tasty-hunit
-, tasty-th
-, template-haskell
-, text
-, th-lift-instances
-, these
-, time
-, transformers
-, transformers-base
-, unix-compat
-, unordered-containers
-, vector
-, xml
+{ mkDerivation, Diff, Glob, aeson, array, base, base16-bytestring
+, binary, bytestring, comonad, containers, criterion, cryptonite
+, data-fix, deepseq, deriving-compat, directory, exceptions, extra
+, fetchgit, filepath, free, gitrev, hashable, hashing, haskeline
+, hedgehog, hnix-store-core, hnix-store-remote, http-client
+, http-client-tls, http-types, lens-family, lens-family-core
+, lens-family-th, lib, logict, megaparsec, monad-control, monadlist
+, mtl, neat-interpolation, optparse-applicative, parser-combinators
+, pretty-show, prettyprinter, process, ref-tf, regex-tdfa, relude
+, repline, scientific, semialign, serialise, some, split, syb
+, tasty, tasty-hedgehog, tasty-hunit, tasty-th, template-haskell
+, text, th-lift-instances, these, time, transformers
+, transformers-base, unix-compat, unordered-containers, vector, xml
 }:
 mkDerivation {
   pname = "hnix";
@@ -84,125 +25,33 @@ mkDerivation {
   isExecutable = true;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    aeson
-    array
-    base
-    base16-bytestring
-    binary
-    bytestring
-    comonad
-    containers
-    cryptonite
-    data-fix
-    deepseq
-    deriving-compat
-    directory
-    exceptions
-    extra
-    filepath
-    free
-    gitrev
-    hashable
-    hashing
-    hnix-store-core
-    hnix-store-remote
-    http-client
-    http-client-tls
-    http-types
-    lens-family
-    lens-family-core
-    lens-family-th
-    logict
-    megaparsec
-    monad-control
-    monadlist
-    mtl
-    neat-interpolation
-    optparse-applicative
-    parser-combinators
-    pretty-show
-    prettyprinter
-    process
-    ref-tf
-    regex-tdfa
-    relude
-    scientific
-    semialign
-    serialise
-    some
-    split
-    syb
-    template-haskell
-    text
-    th-lift-instances
-    these
-    time
-    transformers
-    transformers-base
-    unix-compat
-    unordered-containers
-    vector
-    xml
+    aeson array base base16-bytestring binary bytestring comonad
+    containers cryptonite data-fix deepseq deriving-compat directory
+    exceptions extra filepath free gitrev hashable hashing
+    hnix-store-core hnix-store-remote http-client http-client-tls
+    http-types lens-family lens-family-core lens-family-th logict
+    megaparsec monad-control monadlist mtl neat-interpolation
+    optparse-applicative parser-combinators pretty-show prettyprinter
+    process ref-tf regex-tdfa relude scientific semialign serialise
+    some split syb template-haskell text th-lift-instances these time
+    transformers transformers-base unix-compat unordered-containers
+    vector xml
   ];
   executableHaskellDepends = [
-    aeson
-    base
-    comonad
-    containers
-    data-fix
-    deepseq
-    exceptions
-    filepath
-    free
-    haskeline
-    optparse-applicative
-    pretty-show
-    prettyprinter
-    ref-tf
-    relude
-    repline
-    serialise
-    template-haskell
-    time
+    aeson base comonad containers data-fix deepseq exceptions filepath
+    free haskeline optparse-applicative pretty-show prettyprinter
+    ref-tf relude repline serialise template-haskell time
   ];
   testHaskellDepends = [
-    base
-    containers
-    data-fix
-    Diff
-    directory
-    exceptions
-    filepath
-    Glob
-    hedgehog
-    megaparsec
-    neat-interpolation
-    optparse-applicative
-    pretty-show
-    prettyprinter
-    process
-    relude
-    serialise
-    split
-    tasty
-    tasty-hedgehog
-    tasty-hunit
-    tasty-th
-    template-haskell
-    time
+    base containers data-fix Diff directory exceptions filepath Glob
+    hedgehog megaparsec neat-interpolation optparse-applicative
+    pretty-show prettyprinter process relude serialise split tasty
+    tasty-hedgehog tasty-hunit tasty-th template-haskell time
     unix-compat
   ];
   benchmarkHaskellDepends = [
-    base
-    criterion
-    data-fix
-    exceptions
-    filepath
-    optparse-applicative
-    relude
-    serialise
-    template-haskell
-    time
+    base criterion data-fix exceptions filepath optparse-applicative
+    relude serialise template-haskell time
   ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
@@ -215,4 +64,4 @@ mkDerivation {
   description = "Haskell implementation of the Nix language";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/horizon-gen-nix.nix b/pkgs/horizon-gen-nix.nix
index 69976dbb5c887353a6b9a52cd1a61200bfca2157..aeec3918779d6287eb8349d3d4d80372f5b7b4b7 100644
--- a/pkgs/horizon-gen-nix.nix
+++ b/pkgs/horizon-gen-nix.nix
@@ -1,24 +1,7 @@
-{ mkDerivation
-, Cabal-syntax
-, base
-, cabal2nix
-, containers
-, dhall
-, directory
-, distribution-nixpkgs
-, either
-, fetchzip
-, horizon-spec
-, language-nix
-, lens
-, lib
-, optparse-applicative
-, path
-, path-dhall-instance
-, pretty
-, raw-strings-qq
-, silently
-, sydtest
+{ mkDerivation, Cabal-syntax, base, cabal2nix, containers, dhall
+, directory, distribution-nixpkgs, either, fetchzip, horizon-spec
+, language-nix, lens, lib, optparse-applicative, path
+, path-dhall-instance, pretty, raw-strings-qq, silently, sydtest
 , text
 }:
 mkDerivation {
@@ -33,24 +16,10 @@ mkDerivation {
   isExecutable = true;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    base
-    Cabal-syntax
-    cabal2nix
-    containers
-    dhall
-    directory
-    distribution-nixpkgs
-    either
-    horizon-spec
-    language-nix
-    lens
-    optparse-applicative
-    path
-    path-dhall-instance
-    pretty
-    raw-strings-qq
-    silently
-    text
+    base Cabal-syntax cabal2nix containers dhall directory
+    distribution-nixpkgs either horizon-spec language-nix lens
+    optparse-applicative path path-dhall-instance pretty raw-strings-qq
+    silently text
   ];
   executableHaskellDepends = [ base directory path sydtest ];
   enableLibraryProfiling = true;
@@ -63,4 +32,4 @@ mkDerivation {
   description = "Generate nix expressions from horizon-spec definitions";
   license = lib.licenses.mit;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/horizon-spec.nix b/pkgs/horizon-spec.nix
index aa18ef0673475b13db005fc439232265b2a5f64d..54745ae755f4af5e5de7801ab0b76493e3e594ed 100644
--- a/pkgs/horizon-spec.nix
+++ b/pkgs/horizon-spec.nix
@@ -1,14 +1,5 @@
-{ mkDerivation
-, base
-, containers
-, dhall
-, fetchzip
-, lib
-, path
-, path-dhall-instance
-, template-haskell
-, text
-, th-lift
+{ mkDerivation, base, containers, dhall, fetchzip, lib, path
+, path-dhall-instance, template-haskell, text, th-lift
 }:
 mkDerivation {
   pname = "horizon-spec";
@@ -22,14 +13,8 @@ mkDerivation {
   isExecutable = false;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    base
-    containers
-    dhall
-    path
-    path-dhall-instance
-    template-haskell
-    text
-    th-lift
+    base containers dhall path path-dhall-instance template-haskell
+    text th-lift
   ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
@@ -42,4 +27,4 @@ mkDerivation {
   description = "Horizon Stable Package Set Type Definitions";
   license = lib.licenses.mit;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/hostname.nix b/pkgs/hostname.nix
index 318ffa2e9bcf62e62658804ce84a8db69cd0c880..d141ca30c29d3d558427c3162ac9e08248c2fa99 100644
--- a/pkgs/hostname.nix
+++ b/pkgs/hostname.nix
@@ -17,4 +17,4 @@ mkDerivation {
   description = "A very simple package providing a cross-platform means of determining the hostname";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/hourglass.nix b/pkgs/hourglass.nix
index 0719c74103c9bcd68d370514519526c20b322c4c..b7c376a6bb22e88aea6f49c4189e59e97d1d8ad3 100644
--- a/pkgs/hourglass.nix
+++ b/pkgs/hourglass.nix
@@ -1,15 +1,5 @@
-{ mkDerivation
-, base
-, bytestring
-, deepseq
-, gauge
-, lib
-, mtl
-, old-locale
-, tasty
-, tasty-hunit
-, tasty-quickcheck
-, time
+{ mkDerivation, base, bytestring, deepseq, gauge, lib, mtl
+, old-locale, tasty, tasty-hunit, tasty-quickcheck, time
 }:
 mkDerivation {
   pname = "hourglass";
@@ -20,23 +10,10 @@ mkDerivation {
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [ base deepseq ];
   testHaskellDepends = [
-    base
-    deepseq
-    mtl
-    old-locale
-    tasty
-    tasty-hunit
-    tasty-quickcheck
-    time
+    base deepseq mtl old-locale tasty tasty-hunit tasty-quickcheck time
   ];
   benchmarkHaskellDepends = [
-    base
-    bytestring
-    deepseq
-    gauge
-    mtl
-    old-locale
-    time
+    base bytestring deepseq gauge mtl old-locale time
   ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
@@ -49,4 +26,4 @@ mkDerivation {
   description = "simple performant time related library";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/hp2pretty.nix b/pkgs/hp2pretty.nix
index b4f2967cf97860ca097812e6f1ed45f4e87da39a..1709a470f26ff13dba7484064d01a3935db3ee76 100644
--- a/pkgs/hp2pretty.nix
+++ b/pkgs/hp2pretty.nix
@@ -1,15 +1,5 @@
-{ mkDerivation
-, array
-, attoparsec
-, base
-, containers
-, filepath
-, floatshow
-, lib
-, mtl
-, optparse-applicative
-, semigroups
-, text
+{ mkDerivation, array, attoparsec, base, containers, filepath
+, floatshow, lib, mtl, optparse-applicative, semigroups, text
 }:
 mkDerivation {
   pname = "hp2pretty";
@@ -19,16 +9,8 @@ mkDerivation {
   isExecutable = true;
   enableSeparateDataOutput = false;
   executableHaskellDepends = [
-    array
-    attoparsec
-    base
-    containers
-    filepath
-    floatshow
-    mtl
-    optparse-applicative
-    semigroups
-    text
+    array attoparsec base containers filepath floatshow mtl
+    optparse-applicative semigroups text
   ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
@@ -41,4 +23,4 @@ mkDerivation {
   description = "generate pretty graphs from heap profiles";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/hpack-dhall.nix b/pkgs/hpack-dhall.nix
index 59ade8e92de0f0b1178f573cf5dd87c345f87f37..1360e944447ee8916f927224284f7bf78706c010 100644
--- a/pkgs/hpack-dhall.nix
+++ b/pkgs/hpack-dhall.nix
@@ -1,26 +1,7 @@
-{ mkDerivation
-, Cabal
-, Diff
-, aeson
-, aeson-pretty
-, base
-, bytestring
-, dhall
-, dhall-json
-, directory
-, filepath
-, hpack
-, lib
-, megaparsec
-, microlens
-, optparse-applicative
-, prettyprinter
-, tasty
-, tasty-golden
-, text
-, transformers
-, utf8-string
-, yaml
+{ mkDerivation, Cabal, Diff, aeson, aeson-pretty, base, bytestring
+, dhall, dhall-json, directory, filepath, hpack, lib, megaparsec
+, microlens, optparse-applicative, prettyprinter, tasty
+, tasty-golden, text, transformers, utf8-string, yaml
 }:
 mkDerivation {
   pname = "hpack-dhall";
@@ -30,59 +11,18 @@ mkDerivation {
   isExecutable = true;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    aeson
-    aeson-pretty
-    base
-    bytestring
-    dhall
-    dhall-json
-    filepath
-    hpack
-    megaparsec
-    microlens
-    prettyprinter
-    text
-    transformers
-    yaml
+    aeson aeson-pretty base bytestring dhall dhall-json filepath hpack
+    megaparsec microlens prettyprinter text transformers yaml
   ];
   executableHaskellDepends = [
-    aeson
-    aeson-pretty
-    base
-    bytestring
-    dhall
-    dhall-json
-    filepath
-    hpack
-    megaparsec
-    microlens
-    optparse-applicative
-    prettyprinter
-    text
-    transformers
-    yaml
+    aeson aeson-pretty base bytestring dhall dhall-json filepath hpack
+    megaparsec microlens optparse-applicative prettyprinter text
+    transformers yaml
   ];
   testHaskellDepends = [
-    aeson
-    aeson-pretty
-    base
-    bytestring
-    Cabal
-    dhall
-    dhall-json
-    Diff
-    directory
-    filepath
-    hpack
-    megaparsec
-    microlens
-    prettyprinter
-    tasty
-    tasty-golden
-    text
-    transformers
-    utf8-string
-    yaml
+    aeson aeson-pretty base bytestring Cabal dhall dhall-json Diff
+    directory filepath hpack megaparsec microlens prettyprinter tasty
+    tasty-golden text transformers utf8-string yaml
   ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
@@ -95,4 +35,4 @@ mkDerivation {
   description = "hpack's dhalling";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/hscolour.nix b/pkgs/hscolour.nix
index 42a48f7cf6c9f7b9301803b081e0128dcb6f7252..a9a308d1b88f5233a630e0fcbb9c4aaeacf692f6 100644
--- a/pkgs/hscolour.nix
+++ b/pkgs/hscolour.nix
@@ -19,4 +19,4 @@ mkDerivation {
   description = "Colourise Haskell code";
   license = "LGPL";
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/hslogger.nix b/pkgs/hslogger.nix
index fbb073cdce0116e873a293aff0af9146dc13db6e..a14f7dfb57eb966b4391632edabe2a51267803a1 100644
--- a/pkgs/hslogger.nix
+++ b/pkgs/hslogger.nix
@@ -1,15 +1,5 @@
-{ mkDerivation
-, HUnit
-, base
-, bytestring
-, containers
-, deepseq
-, lib
-, network
-, network-bsd
-, old-locale
-, time
-, unix
+{ mkDerivation, HUnit, base, bytestring, containers, deepseq, lib
+, network, network-bsd, old-locale, time, unix
 }:
 mkDerivation {
   pname = "hslogger";
@@ -21,15 +11,8 @@ mkDerivation {
   isExecutable = false;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    base
-    bytestring
-    containers
-    deepseq
-    network
-    network-bsd
-    old-locale
-    time
-    unix
+    base bytestring containers deepseq network network-bsd old-locale
+    time unix
   ];
   testHaskellDepends = [ base HUnit ];
   enableLibraryProfiling = true;
@@ -43,4 +26,4 @@ mkDerivation {
   description = "Versatile logging framework";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/hsyslog.nix b/pkgs/hsyslog.nix
index 2a9440f0e09dc291003252faceccdf35d8e6fc99..e38ecd1a74a11d8950cb7dab0ff6e1a3e4e9ee72 100644
--- a/pkgs/hsyslog.nix
+++ b/pkgs/hsyslog.nix
@@ -20,4 +20,4 @@ mkDerivation {
   description = "FFI interface to syslog(3) from POSIX.1-2001";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/html-entities.nix b/pkgs/html-entities.nix
index e90808b358d4a8caed8e908b380fa32cbf23c909..49ebbb925168ebd48d185b853e27a061cfec1264 100644
--- a/pkgs/html-entities.nix
+++ b/pkgs/html-entities.nix
@@ -1,9 +1,4 @@
-{ mkDerivation
-, attoparsec
-, base
-, lib
-, text
-, unordered-containers
+{ mkDerivation, attoparsec, base, lib, text, unordered-containers
 }:
 mkDerivation {
   pname = "html-entities";
@@ -13,10 +8,7 @@ mkDerivation {
   isExecutable = false;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    attoparsec
-    base
-    text
-    unordered-containers
+    attoparsec base text unordered-containers
   ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
@@ -29,4 +21,4 @@ mkDerivation {
   description = "A codec library for HTML-escaped text and HTML-entities";
   license = lib.licenses.mit;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/html-entity-map.nix b/pkgs/html-entity-map.nix
index 8d26c9e52d9129cb6b68449e9fdcefe891540911..b59e603ae38d0ae06a4ccb441a632bf700d71861 100644
--- a/pkgs/html-entity-map.nix
+++ b/pkgs/html-entity-map.nix
@@ -10,10 +10,7 @@ mkDerivation {
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [ base text unordered-containers ];
   benchmarkHaskellDepends = [
-    base
-    criterion
-    text
-    unordered-containers
+    base criterion text unordered-containers
   ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
@@ -26,4 +23,4 @@ mkDerivation {
   description = "Map from HTML5 entity names to the corresponding Unicode text";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/html.nix b/pkgs/html.nix
index 4618c5cd0a38e8c889e712fbbd12ccff5d25bf3e..ca6fac85ace4e4eefad34a11fdb75c4531b10f50 100644
--- a/pkgs/html.nix
+++ b/pkgs/html.nix
@@ -17,4 +17,4 @@ mkDerivation {
   description = "HTML combinator library";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/http-api-data.nix b/pkgs/http-api-data.nix
index 96133d4bc78fdb4737d782e1d24484e002d6e17a..c8118559e5973b76abc809f6a4bddf6cbcfa9518 100644
--- a/pkgs/http-api-data.nix
+++ b/pkgs/http-api-data.nix
@@ -1,24 +1,7 @@
-{ mkDerivation
-, HUnit
-, QuickCheck
-, attoparsec
-, attoparsec-iso8601
-, base
-, base-compat
-, bytestring
-, containers
-, cookie
-, hashable
-, hspec
-, hspec-discover
-, http-types
-, lib
-, quickcheck-instances
-, tagged
-, text
-, time-compat
-, transformers
-, unordered-containers
+{ mkDerivation, HUnit, QuickCheck, attoparsec, attoparsec-iso8601
+, base, base-compat, bytestring, containers, cookie, hashable
+, hspec, hspec-discover, http-types, lib, quickcheck-instances
+, tagged, text, time-compat, transformers, unordered-containers
 , uuid-types
 }:
 mkDerivation {
@@ -31,34 +14,13 @@ mkDerivation {
   isExecutable = false;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    attoparsec
-    attoparsec-iso8601
-    base
-    base-compat
-    bytestring
-    containers
-    cookie
-    hashable
-    http-types
-    tagged
-    text
-    time-compat
-    transformers
-    unordered-containers
-    uuid-types
+    attoparsec attoparsec-iso8601 base base-compat bytestring
+    containers cookie hashable http-types tagged text time-compat
+    transformers unordered-containers uuid-types
   ];
   testHaskellDepends = [
-    base
-    base-compat
-    bytestring
-    cookie
-    hspec
-    HUnit
-    QuickCheck
-    quickcheck-instances
-    text
-    time-compat
-    unordered-containers
+    base base-compat bytestring cookie hspec HUnit QuickCheck
+    quickcheck-instances text time-compat unordered-containers
     uuid-types
   ];
   testToolDepends = [ hspec-discover ];
@@ -73,4 +35,4 @@ mkDerivation {
   description = "Converting to/from HTTP API data like URL pieces, headers and query parameters";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/http-client-tls.nix b/pkgs/http-client-tls.nix
index 849466a1517f8c2bc0cf647bcea0bc6515ba3775..459f5d4e3e88e38eb3c11723d9f56f05e6c153e6 100644
--- a/pkgs/http-client-tls.nix
+++ b/pkgs/http-client-tls.nix
@@ -1,23 +1,7 @@
-{ mkDerivation
-, base
-, bytestring
-, case-insensitive
-, connection
-, containers
-, cryptonite
-, data-default-class
-, exceptions
-, gauge
-, hspec
-, http-client
-, http-types
-, lib
-, memory
-, network
-, network-uri
-, text
-, tls
-, transformers
+{ mkDerivation, base, bytestring, case-insensitive, connection
+, containers, cryptonite, data-default-class, exceptions, gauge
+, hspec, http-client, http-types, lib, memory, network, network-uri
+, text, tls, transformers
 }:
 mkDerivation {
   pname = "http-client-tls";
@@ -27,29 +11,12 @@ mkDerivation {
   isExecutable = false;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    base
-    bytestring
-    case-insensitive
-    connection
-    containers
-    cryptonite
-    data-default-class
-    exceptions
-    http-client
-    http-types
-    memory
-    network
-    network-uri
-    text
-    tls
-    transformers
+    base bytestring case-insensitive connection containers cryptonite
+    data-default-class exceptions http-client http-types memory network
+    network-uri text tls transformers
   ];
   testHaskellDepends = [
-    base
-    connection
-    hspec
-    http-client
-    http-types
+    base connection hspec http-client http-types
   ];
   benchmarkHaskellDepends = [ base gauge http-client ];
   enableLibraryProfiling = true;
@@ -63,4 +30,4 @@ mkDerivation {
   description = "http-client backend using the connection package and tls library";
   license = lib.licenses.mit;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/http-client.nix b/pkgs/http-client.nix
index 08fa38fcee7f762e5f84692bab996d52202aca33..38e1b65b4f2517e094d76e302a72f23f70c3511c 100644
--- a/pkgs/http-client.nix
+++ b/pkgs/http-client.nix
@@ -1,88 +1,29 @@
-{ mkDerivation
-, array
-, async
-, base
-, base64-bytestring
-, blaze-builder
-, bytestring
-, case-insensitive
-, containers
-, cookie
-, deepseq
-, directory
-, exceptions
-, filepath
-, ghc-prim
-, hspec
-, hspec-discover
-, http-types
-, iproute
-, lib
-, mime-types
-, monad-control
-, network
-, network-uri
-, random
-, stm
-, streaming-commons
-, text
-, time
-, transformers
-, zlib
+{ mkDerivation, array, async, base, base64-bytestring
+, blaze-builder, bytestring, case-insensitive, containers, cookie
+, deepseq, directory, exceptions, filepath, ghc-prim, hspec
+, hspec-discover, http-types, iproute, lib, mime-types
+, monad-control, network, network-uri, random, stm
+, streaming-commons, text, time, transformers, zlib
 }:
 mkDerivation {
   pname = "http-client";
   version = "0.7.13.1";
   sha256 = "c98e86a0382fa877e320d83dbbd173c41c966a60a32c9bc597058929a7aa0e27";
+  revision = "1";
+  editedCabalFile = "168nbb80kcxyz59sz4mnaydpag5flq32y9ikfxa1jygj8j8p9034";
   isLibrary = true;
   isExecutable = false;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    array
-    async
-    base
-    base64-bytestring
-    blaze-builder
-    bytestring
-    case-insensitive
-    containers
-    cookie
-    deepseq
-    exceptions
-    filepath
-    ghc-prim
-    http-types
-    iproute
-    mime-types
-    network
-    network-uri
-    random
-    stm
-    streaming-commons
-    text
-    time
-    transformers
+    array async base base64-bytestring blaze-builder bytestring
+    case-insensitive containers cookie deepseq exceptions filepath
+    ghc-prim http-types iproute mime-types network network-uri random
+    stm streaming-commons text time transformers
   ];
   testHaskellDepends = [
-    async
-    base
-    blaze-builder
-    bytestring
-    case-insensitive
-    containers
-    cookie
-    deepseq
-    directory
-    hspec
-    http-types
-    monad-control
-    network
-    network-uri
-    streaming-commons
-    text
-    time
-    transformers
-    zlib
+    async base blaze-builder bytestring case-insensitive containers
+    cookie deepseq directory hspec http-types monad-control network
+    network-uri streaming-commons text time transformers zlib
   ];
   testToolDepends = [ hspec-discover ];
   enableLibraryProfiling = true;
@@ -96,4 +37,4 @@ mkDerivation {
   description = "An HTTP client engine";
   license = lib.licenses.mit;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/http-common.nix b/pkgs/http-common.nix
index bd1cff37545f3b84f60dbd605fa4b0fc6353dbeb..f145b30a63abe18e5323b2bbe485a659db55fe1c 100644
--- a/pkgs/http-common.nix
+++ b/pkgs/http-common.nix
@@ -1,17 +1,6 @@
-{ mkDerivation
-, base
-, base64-bytestring
-, blaze-builder
-, bytestring
-, case-insensitive
-, directory
-, lib
-, mtl
-, network
-, random
-, text
-, transformers
-, unordered-containers
+{ mkDerivation, base, base64-bytestring, blaze-builder, bytestring
+, case-insensitive, directory, lib, mtl, network, random, text
+, transformers, unordered-containers
 }:
 mkDerivation {
   pname = "http-common";
@@ -21,18 +10,8 @@ mkDerivation {
   isExecutable = false;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    base
-    base64-bytestring
-    blaze-builder
-    bytestring
-    case-insensitive
-    directory
-    mtl
-    network
-    random
-    text
-    transformers
-    unordered-containers
+    base base64-bytestring blaze-builder bytestring case-insensitive
+    directory mtl network random text transformers unordered-containers
   ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
@@ -45,4 +24,4 @@ mkDerivation {
   description = "Common types for HTTP clients and servers";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/http-conduit.nix b/pkgs/http-conduit.nix
index 0bf5e32f3250f7965ae5db42899529cc0d0d030d..101f48d4594869ac2b9da447c99f95693081fb95 100644
--- a/pkgs/http-conduit.nix
+++ b/pkgs/http-conduit.nix
@@ -1,37 +1,9 @@
-{ mkDerivation
-, HUnit
-, aeson
-, attoparsec
-, base
-, blaze-builder
-, bytestring
-, case-insensitive
-, conduit
-, conduit-extra
-, connection
-, cookie
-, data-default-class
-, hspec
-, http-client
-, http-client-tls
-, http-types
-, lib
-, mtl
-, network
-, resourcet
-, streaming-commons
-, temporary
-, text
-, time
-, tls
-, transformers
-, unliftio
-, unliftio-core
-, utf8-string
-, wai
-, wai-conduit
-, warp
-, warp-tls
+{ mkDerivation, HUnit, aeson, attoparsec, base, blaze-builder
+, bytestring, case-insensitive, conduit, conduit-extra, connection
+, cookie, data-default-class, hspec, http-client, http-client-tls
+, http-types, lib, mtl, network, resourcet, streaming-commons
+, temporary, text, time, tls, transformers, unliftio, unliftio-core
+, utf8-string, wai, wai-conduit, warp, warp-tls
 }:
 mkDerivation {
   pname = "http-conduit";
@@ -41,49 +13,15 @@ mkDerivation {
   isExecutable = false;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    aeson
-    attoparsec
-    base
-    bytestring
-    conduit
-    conduit-extra
-    http-client
-    http-client-tls
-    http-types
-    mtl
-    resourcet
-    transformers
-    unliftio-core
+    aeson attoparsec base bytestring conduit conduit-extra http-client
+    http-client-tls http-types mtl resourcet transformers unliftio-core
   ];
   testHaskellDepends = [
-    aeson
-    base
-    blaze-builder
-    bytestring
-    case-insensitive
-    conduit
-    conduit-extra
-    connection
-    cookie
-    data-default-class
-    hspec
-    http-client
-    http-types
-    HUnit
-    network
-    resourcet
-    streaming-commons
-    temporary
-    text
-    time
-    tls
-    transformers
-    unliftio
-    utf8-string
-    wai
-    wai-conduit
-    warp
-    warp-tls
+    aeson base blaze-builder bytestring case-insensitive conduit
+    conduit-extra connection cookie data-default-class hspec
+    http-client http-types HUnit network resourcet streaming-commons
+    temporary text time tls transformers unliftio utf8-string wai
+    wai-conduit warp warp-tls
   ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
@@ -96,4 +34,4 @@ mkDerivation {
   description = "HTTP client package with conduit interface and HTTPS support";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/http-date.nix b/pkgs/http-date.nix
index 9ad6e858ac1a367e28c79b316f4b1dc838250a10..04bab89e4acb3c0ff0b3cfdcf0f87aa0cd2f111e 100644
--- a/pkgs/http-date.nix
+++ b/pkgs/http-date.nix
@@ -1,13 +1,5 @@
-{ mkDerivation
-, array
-, attoparsec
-, base
-, bytestring
-, doctest
-, hspec
-, lib
-, old-locale
-, time
+{ mkDerivation, array, attoparsec, base, bytestring, doctest, hspec
+, lib, old-locale, time
 }:
 mkDerivation {
   pname = "http-date";
@@ -18,12 +10,7 @@ mkDerivation {
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [ array attoparsec base bytestring time ];
   testHaskellDepends = [
-    base
-    bytestring
-    doctest
-    hspec
-    old-locale
-    time
+    base bytestring doctest hspec old-locale time
   ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
@@ -35,4 +22,4 @@ mkDerivation {
   description = "HTTP Date parser/formatter";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/http-media.nix b/pkgs/http-media.nix
index 01bee60458363ce7f8030b9cbb31862167178d39..5dd8506cedb0cae7dc160912af51c56b72698559 100644
--- a/pkgs/http-media.nix
+++ b/pkgs/http-media.nix
@@ -1,12 +1,5 @@
-{ mkDerivation
-, QuickCheck
-, base
-, bytestring
-, case-insensitive
-, containers
-, lib
-, test-framework
-, test-framework-quickcheck2
+{ mkDerivation, QuickCheck, base, bytestring, case-insensitive
+, containers, lib, test-framework, test-framework-quickcheck2
 , utf8-string
 }:
 mkDerivation {
@@ -19,21 +12,11 @@ mkDerivation {
   isExecutable = false;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    base
-    bytestring
-    case-insensitive
-    containers
-    utf8-string
+    base bytestring case-insensitive containers utf8-string
   ];
   testHaskellDepends = [
-    base
-    bytestring
-    case-insensitive
-    containers
-    QuickCheck
-    test-framework
-    test-framework-quickcheck2
-    utf8-string
+    base bytestring case-insensitive containers QuickCheck
+    test-framework test-framework-quickcheck2 utf8-string
   ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
@@ -46,4 +29,4 @@ mkDerivation {
   description = "Processing HTTP Content-Type and Accept headers";
   license = lib.licenses.mit;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/http-streams.nix b/pkgs/http-streams.nix
index 0c237a54f501a3c69c264b09806440fa00260bc7..1c67a05f1453995b7a3f85c7720136d402905ddd 100644
--- a/pkgs/http-streams.nix
+++ b/pkgs/http-streams.nix
@@ -1,33 +1,9 @@
-{ mkDerivation
-, HUnit
-, HsOpenSSL
-, aeson
-, aeson-pretty
-, attoparsec
-, base
-, base64-bytestring
-, blaze-builder
-, bytestring
-, case-insensitive
-, directory
-, filepath
-, ghc-prim
-, hspec
-, hspec-expectations
-, http-common
-, io-streams
-, lib
-, lifted-base
-, mtl
-, network
-, network-uri
-, openssl-streams
-, random
-, snap-core
-, snap-server
-, text
-, transformers
-, unordered-containers
+{ mkDerivation, HUnit, HsOpenSSL, aeson, aeson-pretty, attoparsec
+, base, base64-bytestring, blaze-builder, bytestring
+, case-insensitive, directory, filepath, ghc-prim, hspec
+, hspec-expectations, http-common, io-streams, lib, lifted-base
+, mtl, network, network-uri, openssl-streams, random, snap-core
+, snap-server, text, transformers, unordered-containers
 }:
 mkDerivation {
   pname = "http-streams";
@@ -37,54 +13,17 @@ mkDerivation {
   isExecutable = false;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    aeson
-    attoparsec
-    base
-    base64-bytestring
-    blaze-builder
-    bytestring
-    case-insensitive
-    directory
-    filepath
-    HsOpenSSL
-    http-common
-    io-streams
-    mtl
-    network
-    network-uri
-    openssl-streams
-    text
-    transformers
-    unordered-containers
+    aeson attoparsec base base64-bytestring blaze-builder bytestring
+    case-insensitive directory filepath HsOpenSSL http-common
+    io-streams mtl network network-uri openssl-streams text
+    transformers unordered-containers
   ];
   testHaskellDepends = [
-    aeson
-    aeson-pretty
-    attoparsec
-    base
-    base64-bytestring
-    blaze-builder
-    bytestring
-    case-insensitive
-    directory
-    ghc-prim
-    HsOpenSSL
-    hspec
-    hspec-expectations
-    http-common
-    HUnit
-    io-streams
-    lifted-base
-    mtl
-    network
-    network-uri
-    openssl-streams
-    random
-    snap-core
-    snap-server
-    text
-    transformers
-    unordered-containers
+    aeson aeson-pretty attoparsec base base64-bytestring blaze-builder
+    bytestring case-insensitive directory ghc-prim HsOpenSSL hspec
+    hspec-expectations http-common HUnit io-streams lifted-base mtl
+    network network-uri openssl-streams random snap-core snap-server
+    text transformers unordered-containers
   ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
@@ -97,4 +36,4 @@ mkDerivation {
   description = "An HTTP client using io-streams";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/http-types.nix b/pkgs/http-types.nix
index 1514284915a095e9b54d71c8a39136d58a0095e4..f18322840bb64bf7a7c59d209b35c4cce4cdf949 100644
--- a/pkgs/http-types.nix
+++ b/pkgs/http-types.nix
@@ -1,14 +1,5 @@
-{ mkDerivation
-, QuickCheck
-, array
-, base
-, bytestring
-, case-insensitive
-, doctest
-, hspec
-, lib
-, quickcheck-instances
-, text
+{ mkDerivation, QuickCheck, array, base, bytestring
+, case-insensitive, doctest, hspec, lib, quickcheck-instances, text
 }:
 mkDerivation {
   pname = "http-types";
@@ -18,20 +9,10 @@ mkDerivation {
   isExecutable = false;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    array
-    base
-    bytestring
-    case-insensitive
-    text
+    array base bytestring case-insensitive text
   ];
   testHaskellDepends = [
-    base
-    bytestring
-    doctest
-    hspec
-    QuickCheck
-    quickcheck-instances
-    text
+    base bytestring doctest hspec QuickCheck quickcheck-instances text
   ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
@@ -44,4 +25,4 @@ mkDerivation {
   description = "Generic HTTP types for Haskell (for both client and server code)";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/httpd-shed.nix b/pkgs/httpd-shed.nix
index ce93e11eadc1ca34ff7d840dde76e44a2eb5ef7e..09806042925bbaba8a219927d23fdf4ff9542470 100644
--- a/pkgs/httpd-shed.nix
+++ b/pkgs/httpd-shed.nix
@@ -17,4 +17,4 @@ mkDerivation {
   description = "A simple web-server with an interact style API";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/hw-aeson.nix b/pkgs/hw-aeson.nix
index fe08b280825059e75ffc5669927c1c7f090a7f7a..9dbad5db49c019e39f2a10c6ce76c28dca5bd9d3 100644
--- a/pkgs/hw-aeson.nix
+++ b/pkgs/hw-aeson.nix
@@ -1,18 +1,6 @@
-{ mkDerivation
-, aeson
-, base
-, bytestring
-, containers
-, doctest
-, doctest-discover
-, hashable
-, hedgehog
-, hspec
-, hspec-discover
-, lib
-, text
-, text-short
-, unordered-containers
+{ mkDerivation, aeson, base, bytestring, containers, doctest
+, doctest-discover, hashable, hedgehog, hspec, hspec-discover, lib
+, text, text-short, unordered-containers
 }:
 mkDerivation {
   pname = "hw-aeson";
@@ -24,22 +12,11 @@ mkDerivation {
   isExecutable = false;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    aeson
-    base
-    bytestring
-    containers
-    hashable
-    text
-    text-short
+    aeson base bytestring containers hashable text text-short
     unordered-containers
   ];
   testHaskellDepends = [
-    aeson
-    base
-    doctest
-    doctest-discover
-    hedgehog
-    hspec
+    aeson base doctest doctest-discover hedgehog hspec
   ];
   testToolDepends = [ doctest-discover hspec-discover ];
   enableLibraryProfiling = true;
@@ -53,4 +30,4 @@ mkDerivation {
   description = "Convenience functions for Aeson";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/hw-fingertree.nix b/pkgs/hw-fingertree.nix
index 61d767f3f9ef3f9b790c2e89fef20cb001d06a42..08d24bdd7bd3a63c02de5d9cc66844f9290ba7a3 100644
--- a/pkgs/hw-fingertree.nix
+++ b/pkgs/hw-fingertree.nix
@@ -1,14 +1,5 @@
-{ mkDerivation
-, base
-, deepseq
-, doctest
-, doctest-discover
-, hedgehog
-, hspec
-, hspec-discover
-, hw-hspec-hedgehog
-, hw-prim
-, lib
+{ mkDerivation, base, deepseq, doctest, doctest-discover, hedgehog
+, hspec, hspec-discover, hw-hspec-hedgehog, hw-prim, lib
 }:
 mkDerivation {
   pname = "hw-fingertree";
@@ -21,12 +12,7 @@ mkDerivation {
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [ base deepseq hw-prim ];
   testHaskellDepends = [
-    base
-    deepseq
-    doctest
-    doctest-discover
-    hedgehog
-    hspec
+    base deepseq doctest doctest-discover hedgehog hspec
     hw-hspec-hedgehog
   ];
   testToolDepends = [ doctest-discover hspec-discover ];
@@ -41,4 +27,4 @@ mkDerivation {
   description = "Generic finger-tree structure, with example instances";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/hw-hedgehog.nix b/pkgs/hw-hedgehog.nix
index ef50380a23e9b89c5b6f44def410010c2d222f41..26793bc547a7c09a4f79638fb9ebf2539673cf5d 100644
--- a/pkgs/hw-hedgehog.nix
+++ b/pkgs/hw-hedgehog.nix
@@ -1,9 +1,4 @@
-{ mkDerivation
-, base
-, doctest
-, doctest-discover
-, hedgehog
-, lib
+{ mkDerivation, base, doctest, doctest-discover, hedgehog, lib
 , vector
 }:
 mkDerivation {
@@ -29,4 +24,4 @@ mkDerivation {
   description = "Extra hedgehog functionality";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/hw-hspec-hedgehog.nix b/pkgs/hw-hspec-hedgehog.nix
index 1418e239f5fa11ffc8c98d937095c6cd708f75b2..f1a50f0e2fe5eeceae9e4b84789512a7e9a64b0d 100644
--- a/pkgs/hw-hspec-hedgehog.nix
+++ b/pkgs/hw-hspec-hedgehog.nix
@@ -1,14 +1,5 @@
-{ mkDerivation
-, HUnit
-, base
-, call-stack
-, doctest
-, doctest-discover
-, hedgehog
-, hspec
-, hspec-discover
-, lib
-, transformers
+{ mkDerivation, HUnit, base, call-stack, doctest, doctest-discover
+, hedgehog, hspec, hspec-discover, lib, transformers
 }:
 mkDerivation {
   pname = "hw-hspec-hedgehog";
@@ -20,21 +11,10 @@ mkDerivation {
   isExecutable = false;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    base
-    call-stack
-    hedgehog
-    hspec
-    HUnit
-    transformers
+    base call-stack hedgehog hspec HUnit transformers
   ];
   testHaskellDepends = [
-    base
-    call-stack
-    doctest
-    doctest-discover
-    hedgehog
-    hspec
-    HUnit
+    base call-stack doctest doctest-discover hedgehog hspec HUnit
   ];
   testToolDepends = [ doctest-discover hspec-discover ];
   enableLibraryProfiling = true;
@@ -48,4 +28,4 @@ mkDerivation {
   description = "Interoperability between hspec and hedgehog";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/hw-prim.nix b/pkgs/hw-prim.nix
index 558bd4dd3fade505d1df3eac18da060e500d5b2d..63a021659abc32f67b6040ebe2188b2579e9ea5a 100644
--- a/pkgs/hw-prim.nix
+++ b/pkgs/hw-prim.nix
@@ -1,23 +1,7 @@
-{ mkDerivation
-, QuickCheck
-, base
-, bytestring
-, criterion
-, deepseq
-, directory
-, doctest
-, doctest-discover
-, exceptions
-, ghc-prim
-, hedgehog
-, hspec
-, hspec-discover
-, hw-hspec-hedgehog
-, lib
-, mmap
-, transformers
-, unliftio-core
-, vector
+{ mkDerivation, QuickCheck, base, bytestring, criterion, deepseq
+, directory, doctest, doctest-discover, exceptions, ghc-prim
+, hedgehog, hspec, hspec-discover, hw-hspec-hedgehog, lib, mmap
+, transformers, unliftio-core, vector
 }:
 mkDerivation {
   pname = "hw-prim";
@@ -27,38 +11,17 @@ mkDerivation {
   isExecutable = false;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    base
-    bytestring
-    deepseq
-    ghc-prim
-    mmap
-    transformers
-    unliftio-core
+    base bytestring deepseq ghc-prim mmap transformers unliftio-core
     vector
   ];
   testHaskellDepends = [
-    base
-    bytestring
-    directory
-    doctest
-    doctest-discover
-    exceptions
-    hedgehog
-    hspec
-    hw-hspec-hedgehog
-    mmap
-    QuickCheck
-    transformers
+    base bytestring directory doctest doctest-discover exceptions
+    hedgehog hspec hw-hspec-hedgehog mmap QuickCheck transformers
     vector
   ];
   testToolDepends = [ doctest-discover hspec-discover ];
   benchmarkHaskellDepends = [
-    base
-    bytestring
-    criterion
-    mmap
-    transformers
-    vector
+    base bytestring criterion mmap transformers vector
   ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
@@ -71,4 +34,4 @@ mkDerivation {
   description = "Primitive functions and data types";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/hxt-charproperties.nix b/pkgs/hxt-charproperties.nix
index cc3488101e503d02c83b7ace9b84bbdb3ab72415..2f5f2085a6f89d70bb3426d3cfc7b796e3067fe9 100644
--- a/pkgs/hxt-charproperties.nix
+++ b/pkgs/hxt-charproperties.nix
@@ -18,4 +18,4 @@ mkDerivation {
   description = "Character properties and classes for XML and Unicode";
   license = lib.licenses.mit;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/hxt-regex-xmlschema.nix b/pkgs/hxt-regex-xmlschema.nix
index 05108c9b3253eccb8f94b09d8d56408c5d8f1998..54dd2e4c423b4080e4b7fc7445fd501735b50474 100644
--- a/pkgs/hxt-regex-xmlschema.nix
+++ b/pkgs/hxt-regex-xmlschema.nix
@@ -1,13 +1,5 @@
-{ mkDerivation
-, HUnit
-, base
-, bytestring
-, criterion
-, deepseq
-, hxt-charproperties
-, lib
-, parsec
-, text
+{ mkDerivation, HUnit, base, bytestring, criterion, deepseq
+, hxt-charproperties, lib, parsec, text
 }:
 mkDerivation {
   pname = "hxt-regex-xmlschema";
@@ -17,20 +9,11 @@ mkDerivation {
   isExecutable = false;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    base
-    bytestring
-    hxt-charproperties
-    parsec
-    text
+    base bytestring hxt-charproperties parsec text
   ];
   testHaskellDepends = [ base bytestring HUnit parsec text ];
   benchmarkHaskellDepends = [
-    base
-    bytestring
-    criterion
-    deepseq
-    parsec
-    text
+    base bytestring criterion deepseq parsec text
   ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
@@ -43,4 +26,4 @@ mkDerivation {
   description = "A regular expression library for W3C XML Schema regular expressions";
   license = lib.licenses.mit;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/hxt-unicode.nix b/pkgs/hxt-unicode.nix
index e6ff3de1b831e14a02dc7bbed5cc6bdf78350e2b..398d4c4fe3156ddc4e4b5a8a9f352d3db67af070 100644
--- a/pkgs/hxt-unicode.nix
+++ b/pkgs/hxt-unicode.nix
@@ -18,4 +18,4 @@ mkDerivation {
   description = "Unicode en-/decoding functions for utf8, iso-latin-* and other encodings";
   license = lib.licenses.mit;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/hxt.nix b/pkgs/hxt.nix
index f408de5d8fcf6f50eaab932b5ebafeaac954f9ed..be0d7cb476b128605faffa7b9cc57aa9ec1ef534 100644
--- a/pkgs/hxt.nix
+++ b/pkgs/hxt.nix
@@ -1,18 +1,6 @@
-{ mkDerivation
-, base
-, binary
-, bytestring
-, containers
-, deepseq
-, directory
-, filepath
-, hxt-charproperties
-, hxt-regex-xmlschema
-, hxt-unicode
-, lib
-, mtl
-, network-uri
-, parsec
+{ mkDerivation, base, binary, bytestring, containers, deepseq
+, directory, filepath, hxt-charproperties, hxt-regex-xmlschema
+, hxt-unicode, lib, mtl, network-uri, parsec
 }:
 mkDerivation {
   pname = "hxt";
@@ -22,18 +10,8 @@ mkDerivation {
   isExecutable = false;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    base
-    binary
-    bytestring
-    containers
-    deepseq
-    directory
-    filepath
-    hxt-charproperties
-    hxt-regex-xmlschema
-    hxt-unicode
-    mtl
-    network-uri
+    base binary bytestring containers deepseq directory filepath
+    hxt-charproperties hxt-regex-xmlschema hxt-unicode mtl network-uri
     parsec
   ];
   enableLibraryProfiling = true;
@@ -47,4 +25,4 @@ mkDerivation {
   description = "A collection of tools for processing XML with Haskell";
   license = lib.licenses.mit;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/ieee754.nix b/pkgs/ieee754.nix
index f64f2b25e635426cfcc9e1e6706b6c9f13e5e613..de9cdc0fe408ff658270a7347e72caefa719daa7 100644
--- a/pkgs/ieee754.nix
+++ b/pkgs/ieee754.nix
@@ -18,4 +18,4 @@ mkDerivation {
   description = "Utilities for dealing with IEEE floating point numbers";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/implicit-hie.nix b/pkgs/implicit-hie.nix
index 12f4f7540372127d1c0b09d6035ef4e76dfab9ca..247c26144432a9720d08c75ad93079aa250cf11c 100644
--- a/pkgs/implicit-hie.nix
+++ b/pkgs/implicit-hie.nix
@@ -1,15 +1,5 @@
-{ mkDerivation
-, attoparsec
-, base
-, directory
-, filepath
-, filepattern
-, hspec
-, hspec-attoparsec
-, lib
-, text
-, transformers
-, yaml
+{ mkDerivation, attoparsec, base, directory, filepath, filepattern
+, hspec, hspec-attoparsec, lib, text, transformers, yaml
 }:
 mkDerivation {
   pname = "implicit-hie";
@@ -19,36 +9,16 @@ mkDerivation {
   isExecutable = true;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    attoparsec
-    base
-    directory
-    filepath
-    filepattern
-    text
-    transformers
+    attoparsec base directory filepath filepattern text transformers
     yaml
   ];
   executableHaskellDepends = [
-    attoparsec
-    base
-    directory
-    filepath
-    filepattern
-    text
-    transformers
+    attoparsec base directory filepath filepattern text transformers
     yaml
   ];
   testHaskellDepends = [
-    attoparsec
-    base
-    directory
-    filepath
-    filepattern
-    hspec
-    hspec-attoparsec
-    text
-    transformers
-    yaml
+    attoparsec base directory filepath filepattern hspec
+    hspec-attoparsec text transformers yaml
   ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
@@ -61,4 +31,4 @@ mkDerivation {
   description = "Auto generate hie-bios cradles & hie.yaml";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/indexed-list-literals.nix b/pkgs/indexed-list-literals.nix
index 70c5d9ddd431eb1ede5ade8a93af4557e079b402..1300d77fc8814edab8af59c04a7f3fa2b0225834 100644
--- a/pkgs/indexed-list-literals.nix
+++ b/pkgs/indexed-list-literals.nix
@@ -19,4 +19,4 @@ mkDerivation {
   description = "Type safe indexed list literals";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/indexed-profunctors.nix b/pkgs/indexed-profunctors.nix
index f8f60ffefb047d75caafdd0c37c95b89fd412095..81663a5a4e489d7296d3ff7b2b89012d46834793 100644
--- a/pkgs/indexed-profunctors.nix
+++ b/pkgs/indexed-profunctors.nix
@@ -17,4 +17,4 @@ mkDerivation {
   description = "Utilities for indexed profunctors";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/infer-license.nix b/pkgs/infer-license.nix
index 4311179701cf15ab877e9c7a22d042e6037c9bde..aadf2c5b11765cfae7e515f0395d0c730b366314 100644
--- a/pkgs/infer-license.nix
+++ b/pkgs/infer-license.nix
@@ -1,10 +1,4 @@
-{ mkDerivation
-, base
-, directory
-, filepath
-, hspec
-, lib
-, text
+{ mkDerivation, base, directory, filepath, hspec, lib, text
 , text-metrics
 }:
 mkDerivation {
@@ -15,19 +9,10 @@ mkDerivation {
   isExecutable = false;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    base
-    directory
-    filepath
-    text
-    text-metrics
+    base directory filepath text text-metrics
   ];
   testHaskellDepends = [
-    base
-    directory
-    filepath
-    hspec
-    text
-    text-metrics
+    base directory filepath hspec text text-metrics
   ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
@@ -39,4 +24,4 @@ mkDerivation {
   description = "Infer software license from a given license file";
   license = lib.licenses.mit;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/ini.nix b/pkgs/ini.nix
index d59605062e0de3d9c5b442a960bbb6fda5afcc4f..16fc04f4f540ab7ef5cd029fc7a0405a2a2eb382 100644
--- a/pkgs/ini.nix
+++ b/pkgs/ini.nix
@@ -1,9 +1,4 @@
-{ mkDerivation
-, attoparsec
-, base
-, hspec
-, lib
-, text
+{ mkDerivation, attoparsec, base, hspec, lib, text
 , unordered-containers
 }:
 mkDerivation {
@@ -14,10 +9,7 @@ mkDerivation {
   isExecutable = false;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    attoparsec
-    base
-    text
-    unordered-containers
+    attoparsec base text unordered-containers
   ];
   testHaskellDepends = [ base hspec unordered-containers ];
   enableLibraryProfiling = true;
@@ -31,4 +23,4 @@ mkDerivation {
   description = "Configuration files in the INI format";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/inline-c.nix b/pkgs/inline-c.nix
index 274f0c2061ef83a6b5f595cb0f3a8073cc3f231b..d1320cbf7ccc8be39608e6d34aa60f050aa44c35 100644
--- a/pkgs/inline-c.nix
+++ b/pkgs/inline-c.nix
@@ -1,22 +1,7 @@
-{ mkDerivation
-, QuickCheck
-, ansi-wl-pprint
-, base
-, bytestring
-, containers
-, hashable
-, hspec
-, lib
-, mtl
-, parsec
-, parsers
-, raw-strings-qq
-, regex-posix
-, split
-, template-haskell
-, transformers
-, unordered-containers
-, vector
+{ mkDerivation, QuickCheck, ansi-wl-pprint, base, bytestring
+, containers, hashable, hspec, lib, mtl, parsec, parsers
+, raw-strings-qq, regex-posix, split, template-haskell
+, transformers, unordered-containers, vector
 }:
 mkDerivation {
   pname = "inline-c";
@@ -26,34 +11,13 @@ mkDerivation {
   isExecutable = true;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    ansi-wl-pprint
-    base
-    bytestring
-    containers
-    hashable
-    mtl
-    parsec
-    parsers
-    template-haskell
-    transformers
-    unordered-containers
-    vector
+    ansi-wl-pprint base bytestring containers hashable mtl parsec
+    parsers template-haskell transformers unordered-containers vector
   ];
   testHaskellDepends = [
-    ansi-wl-pprint
-    base
-    containers
-    hashable
-    hspec
-    parsers
-    QuickCheck
-    raw-strings-qq
-    regex-posix
-    split
-    template-haskell
-    transformers
-    unordered-containers
-    vector
+    ansi-wl-pprint base containers hashable hspec parsers QuickCheck
+    raw-strings-qq regex-posix split template-haskell transformers
+    unordered-containers vector
   ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
@@ -65,4 +29,4 @@ mkDerivation {
   description = "Write Haskell source files including C code inline. No FFI required.";
   license = lib.licenses.mit;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/insert-ordered-containers.nix b/pkgs/insert-ordered-containers.nix
index f0c43eff48a3a389fcc3bac34ca5a59c060ba37f..85032436b44c2ea56edf0ab02c9d329dc86f1be4 100644
--- a/pkgs/insert-ordered-containers.nix
+++ b/pkgs/insert-ordered-containers.nix
@@ -1,21 +1,7 @@
-{ mkDerivation
-, QuickCheck
-, aeson
-, base
-, base-compat
-, deepseq
-, hashable
-, indexed-traversable
-, lens
-, lib
-, optics-core
-, optics-extra
-, semigroupoids
-, tasty
-, tasty-quickcheck
-, text
-, transformers
-, unordered-containers
+{ mkDerivation, QuickCheck, aeson, base, base-compat, deepseq
+, hashable, indexed-traversable, lens, lib, optics-core
+, optics-extra, semigroupoids, tasty, tasty-quickcheck, text
+, transformers, unordered-containers
 }:
 mkDerivation {
   pname = "insert-ordered-containers";
@@ -27,31 +13,12 @@ mkDerivation {
   isExecutable = false;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    aeson
-    base
-    deepseq
-    hashable
-    indexed-traversable
-    lens
-    optics-core
-    optics-extra
-    semigroupoids
-    text
-    transformers
-    unordered-containers
+    aeson base deepseq hashable indexed-traversable lens optics-core
+    optics-extra semigroupoids text transformers unordered-containers
   ];
   testHaskellDepends = [
-    aeson
-    base
-    base-compat
-    hashable
-    lens
-    QuickCheck
-    semigroupoids
-    tasty
-    tasty-quickcheck
-    text
-    unordered-containers
+    aeson base base-compat hashable lens QuickCheck semigroupoids tasty
+    tasty-quickcheck text unordered-containers
   ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
@@ -64,4 +31,4 @@ mkDerivation {
   description = "Associative containers retaining insertion order for traversals";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/int-cast.nix b/pkgs/int-cast.nix
index a38227541e09c028499aad3233aa76629bfb068d..ccde8fdd28253b351a6a11b02fecfd5526805053 100644
--- a/pkgs/int-cast.nix
+++ b/pkgs/int-cast.nix
@@ -1,8 +1,4 @@
-{ mkDerivation
-, QuickCheck
-, base
-, lib
-, test-framework
+{ mkDerivation, QuickCheck, base, lib, test-framework
 , test-framework-quickcheck2
 }:
 mkDerivation {
@@ -16,10 +12,7 @@ mkDerivation {
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [ base ];
   testHaskellDepends = [
-    base
-    QuickCheck
-    test-framework
-    test-framework-quickcheck2
+    base QuickCheck test-framework test-framework-quickcheck2
   ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
@@ -32,4 +25,4 @@ mkDerivation {
   description = "Checked conversions between integral types";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/integer-logarithms.nix b/pkgs/integer-logarithms.nix
index cb50e3328c8ad38dfb14da97569ddcdd4ae1553e..e7b0f259288b3430b7b9beca654e1d9893c4b8eb 100644
--- a/pkgs/integer-logarithms.nix
+++ b/pkgs/integer-logarithms.nix
@@ -1,33 +1,19 @@
-{ mkDerivation
-, QuickCheck
-, array
-, base
-, ghc-bignum
-, ghc-prim
-, lib
-, smallcheck
-, tasty
-, tasty-hunit
-, tasty-quickcheck
+{ mkDerivation, QuickCheck, array, base, ghc-bignum, ghc-prim, lib
+, smallcheck, tasty, tasty-hunit, tasty-quickcheck
 , tasty-smallcheck
 }:
 mkDerivation {
   pname = "integer-logarithms";
   version = "1.0.3.1";
   sha256 = "9b0a9f9fab609b15cd015865721fb05f744a1bc77ae92fd133872de528bbea7f";
-  revision = "3";
-  editedCabalFile = "0z81yksgx20d0rva41blsjcp3jsp1qy9sy385fpig0l074fzv6ym";
+  revision = "4";
+  editedCabalFile = "1jml3fygxcbh9f6nl006mc2gmixlwkzpnnsfxgdmk6pi786b8vrk";
   isLibrary = true;
   isExecutable = false;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [ array base ghc-bignum ghc-prim ];
   testHaskellDepends = [
-    base
-    QuickCheck
-    smallcheck
-    tasty
-    tasty-hunit
-    tasty-quickcheck
+    base QuickCheck smallcheck tasty tasty-hunit tasty-quickcheck
     tasty-smallcheck
   ];
   enableLibraryProfiling = true;
@@ -41,4 +27,4 @@ mkDerivation {
   description = "Integer logarithms";
   license = lib.licenses.mit;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/integration.nix b/pkgs/integration.nix
index b8539858e51c21b9dc0ed18c6eb5531c47a5e32c..8d4f42a89a364943b4befb6e65dc3db5e4997009 100644
--- a/pkgs/integration.nix
+++ b/pkgs/integration.nix
@@ -18,4 +18,4 @@ mkDerivation {
   description = "Fast robust numeric integration via tanh-sinh quadrature";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/interpolate.nix b/pkgs/interpolate.nix
index 5b80e4c43f1fa7003918503baed2f5c3a394418a..5be289d8201575abe0480f7babce6178b278996e 100644
--- a/pkgs/interpolate.nix
+++ b/pkgs/interpolate.nix
@@ -1,14 +1,6 @@
-{ mkDerivation
-, QuickCheck
-, base
-, base-compat
-, bytestring
-, haskell-src-meta
-, hspec
-, lib
-, quickcheck-instances
-, template-haskell
-, text
+{ mkDerivation, QuickCheck, base, base-compat, bytestring
+, haskell-src-meta, hspec, lib, quickcheck-instances
+, template-haskell, text
 }:
 mkDerivation {
   pname = "interpolate";
@@ -19,15 +11,8 @@ mkDerivation {
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [ base haskell-src-meta template-haskell ];
   testHaskellDepends = [
-    base
-    base-compat
-    bytestring
-    haskell-src-meta
-    hspec
-    QuickCheck
-    quickcheck-instances
-    template-haskell
-    text
+    base base-compat bytestring haskell-src-meta hspec QuickCheck
+    quickcheck-instances template-haskell text
   ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
@@ -40,4 +25,4 @@ mkDerivation {
   description = "String interpolation done right";
   license = lib.licenses.mit;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/intervals.nix b/pkgs/intervals.nix
index 77d53dc3f52edea433d34b85117bfb8e5ffb301d..e9ef4f60188ec418bf52d7bb5103887d83736f4a 100644
--- a/pkgs/intervals.nix
+++ b/pkgs/intervals.nix
@@ -1,9 +1,4 @@
-{ mkDerivation
-, QuickCheck
-, array
-, base
-, distributive
-, ghc-prim
+{ mkDerivation, QuickCheck, array, base, distributive, ghc-prim
 , lib
 }:
 mkDerivation {
@@ -26,4 +21,4 @@ mkDerivation {
   description = "Interval Arithmetic";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/io-streams-haproxy.nix b/pkgs/io-streams-haproxy.nix
index e89139241c297f5a03c2bc430423df8b055b08e9..d115b9b29bfa06ea4e42b3b55d2370167cf8b61b 100644
--- a/pkgs/io-streams-haproxy.nix
+++ b/pkgs/io-streams-haproxy.nix
@@ -1,42 +1,21 @@
-{ mkDerivation
-, HUnit
-, attoparsec
-, base
-, bytestring
-, io-streams
-, lib
-, network
-, test-framework
-, test-framework-hunit
-, transformers
+{ mkDerivation, HUnit, attoparsec, base, bytestring, io-streams
+, lib, network, test-framework, test-framework-hunit, transformers
 }:
 mkDerivation {
   pname = "io-streams-haproxy";
   version = "1.0.1.0";
   sha256 = "b74eca9290fe838a0e3be857a38b62cf6fb7478acee400eac19e47471a2c96b5";
-  revision = "6";
-  editedCabalFile = "024aw98q1x3fb1xq07qki3z446w6lk5gyjl13shy0dbrd5aafh92";
+  revision = "7";
+  editedCabalFile = "0wib2mz6ifnixrcp9s1pkd00v9q7dvyka1z7zqc3pgif47hr1dbw";
   isLibrary = true;
   isExecutable = false;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    attoparsec
-    base
-    bytestring
-    io-streams
-    network
-    transformers
+    attoparsec base bytestring io-streams network transformers
   ];
   testHaskellDepends = [
-    attoparsec
-    base
-    bytestring
-    HUnit
-    io-streams
-    network
-    test-framework
-    test-framework-hunit
-    transformers
+    attoparsec base bytestring HUnit io-streams network test-framework
+    test-framework-hunit transformers
   ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
@@ -49,4 +28,4 @@ mkDerivation {
   description = "HAProxy protocol 1.5 support for io-streams";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/io-streams.nix b/pkgs/io-streams.nix
index cc49e5faa2f1881c0f882b3f89853eba17243d87..065bc00f5e7911e0490ec36d4714a429fc929c3e 100644
--- a/pkgs/io-streams.nix
+++ b/pkgs/io-streams.nix
@@ -1,70 +1,28 @@
-{ mkDerivation
-, HUnit
-, QuickCheck
-, attoparsec
-, base
-, bytestring
-, deepseq
-, directory
-, filepath
-, lib
-, mtl
-, network
-, primitive
-, process
-, test-framework
-, test-framework-hunit
-, test-framework-quickcheck2
-, text
-, time
-, transformers
-, vector
-, zlib
-, zlib-bindings
+{ mkDerivation, HUnit, QuickCheck, attoparsec, base, bytestring
+, deepseq, directory, filepath, lib, mtl, network, primitive
+, process, test-framework, test-framework-hunit
+, test-framework-quickcheck2, text, time, transformers, vector
+, zlib, zlib-bindings
 }:
 mkDerivation {
   pname = "io-streams";
   version = "1.5.2.2";
   sha256 = "d365d5051696c15414ebe23749fc67475a532234b7c7d77060323d149a8fc4fe";
+  revision = "1";
+  editedCabalFile = "1fkjzk7s99sb7h1lvandw9p8r05ly4206y3aiah0jg39zjvbi5az";
   configureFlags = [ "-fnointeractivetests" ];
   isLibrary = true;
   isExecutable = false;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    attoparsec
-    base
-    bytestring
-    network
-    primitive
-    process
-    text
-    time
-    transformers
-    vector
-    zlib-bindings
+    attoparsec base bytestring network primitive process text time
+    transformers vector zlib-bindings
   ];
   testHaskellDepends = [
-    attoparsec
-    base
-    bytestring
-    deepseq
-    directory
-    filepath
-    HUnit
-    mtl
-    network
-    primitive
-    process
-    QuickCheck
-    test-framework
-    test-framework-hunit
-    test-framework-quickcheck2
-    text
-    time
-    transformers
-    vector
-    zlib
-    zlib-bindings
+    attoparsec base bytestring deepseq directory filepath HUnit mtl
+    network primitive process QuickCheck test-framework
+    test-framework-hunit test-framework-quickcheck2 text time
+    transformers vector zlib zlib-bindings
   ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
@@ -76,4 +34,4 @@ mkDerivation {
   description = "Simple, composable, and easy-to-use stream I/O";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/iproute.nix b/pkgs/iproute.nix
index 744b444dee85f84e80a676f753ae9d6038494515..83fbb49fe5efe2bf1fabfbfffeff871ab34ed513 100644
--- a/pkgs/iproute.nix
+++ b/pkgs/iproute.nix
@@ -1,15 +1,5 @@
-{ mkDerivation
-, QuickCheck
-, appar
-, base
-, byteorder
-, bytestring
-, containers
-, doctest
-, hspec
-, lib
-, network
-, safe
+{ mkDerivation, QuickCheck, appar, base, byteorder, bytestring
+, containers, doctest, hspec, lib, network, safe
 }:
 mkDerivation {
   pname = "iproute";
@@ -19,24 +9,11 @@ mkDerivation {
   isExecutable = false;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    appar
-    base
-    byteorder
-    bytestring
-    containers
-    network
+    appar base byteorder bytestring containers network
   ];
   testHaskellDepends = [
-    appar
-    base
-    byteorder
-    bytestring
-    containers
-    doctest
-    hspec
-    network
-    QuickCheck
-    safe
+    appar base byteorder bytestring containers doctest hspec network
+    QuickCheck safe
   ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
@@ -49,4 +26,4 @@ mkDerivation {
   description = "IP Routing Table";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/ipynb.nix b/pkgs/ipynb.nix
index a95e9336e8baedb50a37ce16e745785e01313b66..b5167e83fba4e82f0356c5753d4c545ede3eaf45 100644
--- a/pkgs/ipynb.nix
+++ b/pkgs/ipynb.nix
@@ -1,18 +1,6 @@
-{ mkDerivation
-, aeson
-, base
-, base64-bytestring
-, bytestring
-, containers
-, directory
-, filepath
-, lib
-, microlens
-, microlens-aeson
-, tasty
-, tasty-hunit
-, text
-, unordered-containers
+{ mkDerivation, aeson, base, base64-bytestring, bytestring
+, containers, directory, filepath, lib, microlens, microlens-aeson
+, tasty, tasty-hunit, text, unordered-containers
 }:
 mkDerivation {
   pname = "ipynb";
@@ -24,25 +12,12 @@ mkDerivation {
   isExecutable = false;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    aeson
-    base
-    base64-bytestring
-    bytestring
-    containers
-    text
+    aeson base base64-bytestring bytestring containers text
     unordered-containers
   ];
   testHaskellDepends = [
-    aeson
-    base
-    bytestring
-    directory
-    filepath
-    microlens
-    microlens-aeson
-    tasty
-    tasty-hunit
-    text
+    aeson base bytestring directory filepath microlens microlens-aeson
+    tasty tasty-hunit text
   ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
@@ -54,4 +29,4 @@ mkDerivation {
   description = "Data structure for working with Jupyter notebooks (ipynb)";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/iso8601-time.nix b/pkgs/iso8601-time.nix
index 732de4f288c3e23ec145669889ef41a9338e938d..856e46ee0bc1ca70a5feaa48b28a76a3fe025c1f 100644
--- a/pkgs/iso8601-time.nix
+++ b/pkgs/iso8601-time.nix
@@ -19,4 +19,4 @@ mkDerivation {
   description = "Convert to/from the ISO 8601 time format";
   license = lib.licenses.mit;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/iwlib.nix b/pkgs/iwlib.nix
index 673e648e6bcdc96e6098bd6272a281d4ebfaf980..958fb2bd4e3b2b2eb621dc6f6ebce8d9badd7810 100644
--- a/pkgs/iwlib.nix
+++ b/pkgs/iwlib.nix
@@ -19,4 +19,4 @@ mkDerivation {
   description = "Bindings for the iw C library";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/jose.nix b/pkgs/jose.nix
index 948813586f34ced2b11ba1d7332f700e31112125..f35542af9104f5a384c5907c1f4da620c7e796fc 100644
--- a/pkgs/jose.nix
+++ b/pkgs/jose.nix
@@ -1,77 +1,24 @@
-{ mkDerivation
-, QuickCheck
-, aeson
-, base
-, base64-bytestring
-, bytestring
-, concise
-, containers
-, cryptonite
-, hspec
-, lens
-, lib
-, memory
-, monad-time
-, mtl
-, network-uri
-, pem
-, quickcheck-instances
-, tasty
-, tasty-hspec
-, tasty-quickcheck
-, template-haskell
-, text
-, time
-, x509
+{ mkDerivation, aeson, base, base64-bytestring, bytestring, concise
+, containers, cryptonite, hedgehog, hspec, lens, lib, memory
+, monad-time, mtl, network-uri, pem, tasty, tasty-hedgehog
+, tasty-hspec, template-haskell, text, time, x509
 }:
 mkDerivation {
   pname = "jose";
-  version = "0.9";
-  sha256 = "92f919239d02c9f3369d885ba9a3a9fdf14f352e2dc281c3f50a5993df00314e";
+  version = "0.10";
+  sha256 = "1f498a69edae67935216db65afc9990075469918670237d4dcc3b0e38d0a1242";
   isLibrary = true;
   isExecutable = true;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    aeson
-    base
-    base64-bytestring
-    bytestring
-    concise
-    containers
-    cryptonite
-    lens
-    memory
-    monad-time
-    mtl
-    network-uri
-    QuickCheck
-    quickcheck-instances
-    template-haskell
-    text
-    time
-    x509
+    aeson base base64-bytestring bytestring concise containers
+    cryptonite lens memory monad-time mtl network-uri template-haskell
+    text time x509
   ];
   testHaskellDepends = [
-    aeson
-    base
-    base64-bytestring
-    bytestring
-    concise
-    containers
-    cryptonite
-    hspec
-    lens
-    mtl
-    network-uri
-    pem
-    QuickCheck
-    quickcheck-instances
-    tasty
-    tasty-hspec
-    tasty-quickcheck
-    text
-    time
-    x509
+    aeson base base64-bytestring bytestring concise containers
+    cryptonite hedgehog hspec lens mtl network-uri pem tasty
+    tasty-hedgehog tasty-hspec text time x509
   ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
@@ -84,4 +31,4 @@ mkDerivation {
   description = "JSON Object Signing and Encryption (JOSE) and JSON Web Token (JWT) library";
   license = lib.licenses.asl20;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/js-chart.nix b/pkgs/js-chart.nix
index 112e46a617700b6bedfd313fdf74d3332c431459..00670ec0f027a18af8acd74d29c7670377445ecc 100644
--- a/pkgs/js-chart.nix
+++ b/pkgs/js-chart.nix
@@ -19,4 +19,4 @@ mkDerivation {
   description = "Obtain minified chart.js code";
   license = lib.licenses.mit;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/js-dgtable.nix b/pkgs/js-dgtable.nix
index 26fca4ed388fbe788108eef3ec79837145654a84..0413064ccbb87d49f6971b9478eaebb8c19e9b85 100644
--- a/pkgs/js-dgtable.nix
+++ b/pkgs/js-dgtable.nix
@@ -19,4 +19,4 @@ mkDerivation {
   description = "Obtain minified jquery.dgtable code";
   license = lib.licenses.mit;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/js-flot.nix b/pkgs/js-flot.nix
index 5309bf5e4fcccefdd5a2a73395ab1200961afb91..78b4f6aaddbd78ad4ae89e2236b833b35759b20e 100644
--- a/pkgs/js-flot.nix
+++ b/pkgs/js-flot.nix
@@ -19,4 +19,4 @@ mkDerivation {
   description = "Obtain minified flot code";
   license = lib.licenses.mit;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/js-jquery.nix b/pkgs/js-jquery.nix
index 4e99468c8ebd737fc912a0a8f93a73638aeafcc9..d13f722ec47ffb2c282ef1dc31f53859931225b0 100644
--- a/pkgs/js-jquery.nix
+++ b/pkgs/js-jquery.nix
@@ -19,4 +19,4 @@ mkDerivation {
   description = "Obtain minified jQuery code";
   license = lib.licenses.mit;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/kan-extensions.nix b/pkgs/kan-extensions.nix
index 8255adb1dea8cc6fcb3a1c601b9d31acb86dd7f6..b8c3024a6f7813e39957c715513610811e2939d9 100644
--- a/pkgs/kan-extensions.nix
+++ b/pkgs/kan-extensions.nix
@@ -1,44 +1,21 @@
-{ mkDerivation
-, adjunctions
-, array
-, base
-, comonad
-, containers
-, contravariant
-, distributive
-, free
-, invariant
-, lib
-, mtl
-, profunctors
-, semigroupoids
-, tagged
-, transformers
+{ mkDerivation, adjunctions, array, base, comonad, containers
+, contravariant, distributive, free, invariant, lib, mtl
+, profunctors, semigroupoids, tagged, transformers
 , transformers-compat
 }:
 mkDerivation {
   pname = "kan-extensions";
   version = "5.2.5";
   sha256 = "b914dccc040caf1d8764b99df1028dad3e4fdf46c262192e54b59c9da66ead22";
+  revision = "1";
+  editedCabalFile = "1rbcmvgkw714v3296pdkpk7726ghc43czsaxm8ygvanshzd87qi2";
   isLibrary = true;
   isExecutable = false;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    adjunctions
-    array
-    base
-    comonad
-    containers
-    contravariant
-    distributive
-    free
-    invariant
-    mtl
-    profunctors
-    semigroupoids
-    tagged
-    transformers
-    transformers-compat
+    adjunctions array base comonad containers contravariant
+    distributive free invariant mtl profunctors semigroupoids tagged
+    transformers transformers-compat
   ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
@@ -51,4 +28,4 @@ mkDerivation {
   description = "Kan extensions, Kan lifts, the Yoneda lemma, and (co)density (co)monads";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/katip.nix b/pkgs/katip.nix
index ed8397f51c7abdb539b1c17b4152376f5202e98b..f8f11111a0a260a6b0f945192c3dbafe57c859c4 100644
--- a/pkgs/katip.nix
+++ b/pkgs/katip.nix
@@ -1,45 +1,11 @@
-{ mkDerivation
-, aeson
-, async
-, auto-update
-, base
-, blaze-builder
-, bytestring
-, containers
-, criterion
-, deepseq
-, directory
-, either
-, filepath
-, hostname
-, lib
-, microlens
-, microlens-th
-, monad-control
-, mtl
-, old-locale
-, quickcheck-instances
-, regex-tdfa
-, resourcet
-, safe-exceptions
-, scientific
-, semigroups
-, stm
-, string-conv
-, tasty
-, tasty-golden
-, tasty-hunit
-, tasty-quickcheck
-, template-haskell
-, text
-, time
-, time-locale-compat
-, transformers
-, transformers-base
-, transformers-compat
-, unix
-, unliftio-core
-, unordered-containers
+{ mkDerivation, aeson, async, auto-update, base, blaze-builder
+, bytestring, containers, criterion, deepseq, directory, either
+, filepath, hostname, lib, microlens, microlens-th, monad-control
+, mtl, old-locale, quickcheck-instances, regex-tdfa, resourcet
+, safe-exceptions, scientific, semigroups, stm, string-conv, tasty
+, tasty-golden, tasty-hunit, tasty-quickcheck, template-haskell
+, text, time, time-locale-compat, transformers, transformers-base
+, transformers-compat, unix, unliftio-core, unordered-containers
 }:
 mkDerivation {
   pname = "katip";
@@ -49,70 +15,21 @@ mkDerivation {
   isExecutable = false;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    aeson
-    async
-    auto-update
-    base
-    bytestring
-    containers
-    either
-    hostname
-    microlens
-    microlens-th
-    monad-control
-    mtl
-    old-locale
-    resourcet
-    safe-exceptions
-    scientific
-    semigroups
-    stm
-    string-conv
-    template-haskell
-    text
-    time
-    transformers
-    transformers-base
-    transformers-compat
-    unix
-    unliftio-core
-    unordered-containers
+    aeson async auto-update base bytestring containers either hostname
+    microlens microlens-th monad-control mtl old-locale resourcet
+    safe-exceptions scientific semigroups stm string-conv
+    template-haskell text time transformers transformers-base
+    transformers-compat unix unliftio-core unordered-containers
   ];
   testHaskellDepends = [
-    aeson
-    base
-    bytestring
-    containers
-    directory
-    microlens
-    quickcheck-instances
-    regex-tdfa
-    safe-exceptions
-    stm
-    tasty
-    tasty-golden
-    tasty-hunit
-    tasty-quickcheck
-    template-haskell
-    text
-    time
-    time-locale-compat
-    unordered-containers
+    aeson base bytestring containers directory microlens
+    quickcheck-instances regex-tdfa safe-exceptions stm tasty
+    tasty-golden tasty-hunit tasty-quickcheck template-haskell text
+    time time-locale-compat unordered-containers
   ];
   benchmarkHaskellDepends = [
-    aeson
-    async
-    base
-    blaze-builder
-    criterion
-    deepseq
-    directory
-    filepath
-    safe-exceptions
-    text
-    time
-    transformers
-    unix
+    aeson async base blaze-builder criterion deepseq directory filepath
+    safe-exceptions text time transformers unix
   ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
@@ -125,4 +42,4 @@ mkDerivation {
   description = "A structured logging framework";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/keys.nix b/pkgs/keys.nix
index 6b6b2dbc1b7305ec73ee0c2eac3b1e11649bc0a5..13f2db0de3bc2efb6de128fdf98cab6b027c6b38 100644
--- a/pkgs/keys.nix
+++ b/pkgs/keys.nix
@@ -1,39 +1,19 @@
-{ mkDerivation
-, array
-, base
-, comonad
-, containers
-, free
-, hashable
-, lib
-, semigroupoids
-, semigroups
-, tagged
-, transformers
-, transformers-compat
-, unordered-containers
+{ mkDerivation, array, base, comonad, containers, free, hashable
+, lib, semigroupoids, semigroups, tagged, transformers
+, transformers-compat, unordered-containers
 }:
 mkDerivation {
   pname = "keys";
   version = "3.12.3";
   sha256 = "d51e4288a3cc89c5be3327a499212a651549a58af78d0dfeb2cd80e19ce66646";
-  revision = "2";
-  editedCabalFile = "1sb7ii9mhx77rhviqbmdc5r6wlimkmadxi1pyk7k3imdqcdzgjlp";
+  revision = "4";
+  editedCabalFile = "16s7yj70fms01ab8x2f3262p576lwqdxlkq798qf9pjxfg95jvy9";
   isLibrary = true;
   isExecutable = false;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    array
-    base
-    comonad
-    containers
-    free
-    hashable
-    semigroupoids
-    semigroups
-    tagged
-    transformers
-    transformers-compat
+    array base comonad containers free hashable semigroupoids
+    semigroups tagged transformers transformers-compat
     unordered-containers
   ];
   enableLibraryProfiling = true;
@@ -47,4 +27,4 @@ mkDerivation {
   description = "Keyed functors and containers";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/kvstore-effectful-cache.nix b/pkgs/kvstore-effectful-cache.nix
index f5e8542731d0f929cad27dd342cee01a32d939f1..2050fc5d8cdbab57528bf5f8e238be3d52731266 100644
--- a/pkgs/kvstore-effectful-cache.nix
+++ b/pkgs/kvstore-effectful-cache.nix
@@ -1,19 +1,6 @@
-{ mkDerivation
-, base
-, cache
-, containers
-, effectful
-, effectful-cache
-, effectful-core
-, fetchgit
-, hashable
-, hedgehog
-, kvstore-effectful
-, kvstore-effectful-spec
-, lib
-, tasty
-, tasty-hedgehog
-, transformers
+{ mkDerivation, base, cache, containers, effectful, effectful-cache
+, effectful-core, fetchgit, hashable, hedgehog, kvstore-effectful
+, kvstore-effectful-spec, lib, tasty, tasty-hedgehog, transformers
 }:
 mkDerivation {
   pname = "kvstore-effectful-cache";
@@ -29,28 +16,13 @@ mkDerivation {
   isExecutable = false;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    base
-    cache
-    containers
-    effectful
-    effectful-cache
-    hashable
+    base cache containers effectful effectful-cache hashable
     kvstore-effectful
   ];
   testHaskellDepends = [
-    base
-    cache
-    containers
-    effectful
-    effectful-cache
-    effectful-core
-    hashable
-    hedgehog
-    kvstore-effectful
-    kvstore-effectful-spec
-    tasty
-    tasty-hedgehog
-    transformers
+    base cache containers effectful effectful-cache effectful-core
+    hashable hedgehog kvstore-effectful kvstore-effectful-spec tasty
+    tasty-hedgehog transformers
   ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
@@ -61,4 +33,4 @@ mkDerivation {
   hyperlinkSource = false;
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/kvstore-effectful-spec.nix b/pkgs/kvstore-effectful-spec.nix
index d1da4f5129e133ef29f5bcf84d7657ece640df4a..c0db6b82322af51381d8f3a062aca675370b342b 100644
--- a/pkgs/kvstore-effectful-spec.nix
+++ b/pkgs/kvstore-effectful-spec.nix
@@ -1,14 +1,5 @@
-{ mkDerivation
-, base
-, containers
-, effectful
-, effectful-core
-, fetchgit
-, hedgehog
-, kvstore-effectful
-, lib
-, tasty
-, tasty-hedgehog
+{ mkDerivation, base, containers, effectful, effectful-core
+, fetchgit, hedgehog, kvstore-effectful, lib, tasty, tasty-hedgehog
 , transformers
 }:
 mkDerivation {
@@ -25,15 +16,8 @@ mkDerivation {
   isExecutable = false;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    base
-    containers
-    effectful
-    effectful-core
-    hedgehog
-    kvstore-effectful
-    tasty
-    tasty-hedgehog
-    transformers
+    base containers effectful effectful-core hedgehog kvstore-effectful
+    tasty tasty-hedgehog transformers
   ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
@@ -44,4 +28,4 @@ mkDerivation {
   hyperlinkSource = false;
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/kvstore-effectful-statemap.nix b/pkgs/kvstore-effectful-statemap.nix
index 70d12497d12caea2a0c81d0d343d1fc71ad4439d..b62cf46022b495a0eb4b0b6176f5b2034990f84c 100644
--- a/pkgs/kvstore-effectful-statemap.nix
+++ b/pkgs/kvstore-effectful-statemap.nix
@@ -1,16 +1,6 @@
-{ mkDerivation
-, base
-, containers
-, effectful
-, effectful-core
-, fetchgit
-, hedgehog
-, kvstore-effectful
-, kvstore-effectful-spec
-, lib
-, tasty
-, tasty-hedgehog
-, transformers
+{ mkDerivation, base, containers, effectful, effectful-core
+, fetchgit, hedgehog, kvstore-effectful, kvstore-effectful-spec
+, lib, tasty, tasty-hedgehog, transformers
 }:
 mkDerivation {
   pname = "kvstore-effectful-statemap";
@@ -26,22 +16,11 @@ mkDerivation {
   isExecutable = false;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    base
-    containers
-    effectful
-    kvstore-effectful
+    base containers effectful kvstore-effectful
   ];
   testHaskellDepends = [
-    base
-    containers
-    effectful
-    effectful-core
-    hedgehog
-    kvstore-effectful
-    kvstore-effectful-spec
-    tasty
-    tasty-hedgehog
-    transformers
+    base containers effectful effectful-core hedgehog kvstore-effectful
+    kvstore-effectful-spec tasty tasty-hedgehog transformers
   ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
@@ -52,4 +31,4 @@ mkDerivation {
   hyperlinkSource = false;
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/kvstore-effectful.nix b/pkgs/kvstore-effectful.nix
index 295d4a5458838bbb071be9b9596af46eeb308361..8aabe35dd72b189c8fbf5de6475375e4e50a9549 100644
--- a/pkgs/kvstore-effectful.nix
+++ b/pkgs/kvstore-effectful.nix
@@ -22,4 +22,4 @@ mkDerivation {
   hyperlinkSource = false;
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/language-haskell-extract.nix b/pkgs/language-haskell-extract.nix
index d966c163760c24bdb974a9e82204e515d0ca6cdf..22d290675d15a32b3d6f732dfac5ae6beadcf6d1 100644
--- a/pkgs/language-haskell-extract.nix
+++ b/pkgs/language-haskell-extract.nix
@@ -1,9 +1,4 @@
-{ mkDerivation
-, base
-, fetchgit
-, lib
-, regex-posix
-, template-haskell
+{ mkDerivation, base, fetchgit, lib, regex-posix, template-haskell
 }:
 mkDerivation {
   pname = "language-haskell-extract";
@@ -29,4 +24,4 @@ mkDerivation {
   description = "Module to automatically extract functions from the local code";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/language-nix.nix b/pkgs/language-nix.nix
index d897ff1a9031bb74e9624a4b526df961d391af15..bf926488897ced8f38ee56a62df7fc789fb43c72 100644
--- a/pkgs/language-nix.nix
+++ b/pkgs/language-nix.nix
@@ -1,10 +1,4 @@
-{ mkDerivation
-, QuickCheck
-, base
-, deepseq
-, lens
-, lib
-, parsec-class
+{ mkDerivation, QuickCheck, base, deepseq, lens, lib, parsec-class
 , pretty
 }:
 mkDerivation {
@@ -17,12 +11,7 @@ mkDerivation {
   isExecutable = false;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    base
-    deepseq
-    lens
-    parsec-class
-    pretty
-    QuickCheck
+    base deepseq lens parsec-class pretty QuickCheck
   ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
@@ -35,4 +24,4 @@ mkDerivation {
   description = "Data types and functions to represent the Nix language";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/lazy-search.nix b/pkgs/lazy-search.nix
index 1e41aa6a79f3f2ab7b90c878052c24bd8452efaa..5bcda140c3f795cf6db7f1517d167080cf7ff02d 100644
--- a/pkgs/lazy-search.nix
+++ b/pkgs/lazy-search.nix
@@ -17,4 +17,4 @@ mkDerivation {
   description = "Finds values satisfying a lazy predicate";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/lazysmallcheck.nix b/pkgs/lazysmallcheck.nix
index 638374f67e0a9dec88cb6cea557354263fc80dc9..56af56daa6f9105798558d8232858ce2190b0fb4 100644
--- a/pkgs/lazysmallcheck.nix
+++ b/pkgs/lazysmallcheck.nix
@@ -18,4 +18,4 @@ mkDerivation {
   description = "A library for demand-driven testing of Haskell programs";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/lens-family-core.nix b/pkgs/lens-family-core.nix
index 5c3186c268b8e296a2efbdd084947d93d0f2f56b..252fbad8e3b7edbb2e773b48cab3e0f96763b242 100644
--- a/pkgs/lens-family-core.nix
+++ b/pkgs/lens-family-core.nix
@@ -17,4 +17,4 @@ mkDerivation {
   description = "Haskell 2022 Lens Families";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/lens-family-th.nix b/pkgs/lens-family-th.nix
index bc5e93df8a9ebb634b453f0436bcf6e1caddcece..e9fa9f2b0488145c285e79ce5228e504852cf72b 100644
--- a/pkgs/lens-family-th.nix
+++ b/pkgs/lens-family-th.nix
@@ -19,4 +19,4 @@ mkDerivation {
   description = "Generate lens-family style lenses";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/lens-family.nix b/pkgs/lens-family.nix
index 2a2a29415b38de43ed2c2f7c5185f79f5748e5a5..bcb8701b29498d7b3d7f9f077cc7a690c97a9f3a 100644
--- a/pkgs/lens-family.nix
+++ b/pkgs/lens-family.nix
@@ -1,9 +1,4 @@
-{ mkDerivation
-, base
-, containers
-, lens-family-core
-, lib
-, mtl
+{ mkDerivation, base, containers, lens-family-core, lib, mtl
 , transformers
 }:
 mkDerivation {
@@ -14,11 +9,7 @@ mkDerivation {
   isExecutable = false;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    base
-    containers
-    lens-family-core
-    mtl
-    transformers
+    base containers lens-family-core mtl transformers
   ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
@@ -30,4 +21,4 @@ mkDerivation {
   description = "Lens Families";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/libsystemd-journal.nix b/pkgs/libsystemd-journal.nix
index 5858233c358789edf160a8e942ff6d340dde2242..48f432279348625b83d8c4218c2ae45253613ee7 100644
--- a/pkgs/libsystemd-journal.nix
+++ b/pkgs/libsystemd-journal.nix
@@ -1,20 +1,6 @@
-{ mkDerivation
-, base
-, bytestring
-, hashable
-, hsyslog
-, lib
-, pipes
-, pipes-safe
-, semigroups
-, systemd
-, text
-, transformers
-, uniplate
-, unix-bytestring
-, unordered-containers
-, uuid
-, vector
+{ mkDerivation, base, bytestring, hashable, hsyslog, lib, pipes
+, pipes-safe, semigroups, systemd, text, transformers, uniplate
+, unix-bytestring, unordered-containers, uuid, vector
 }:
 mkDerivation {
   pname = "libsystemd-journal";
@@ -24,19 +10,8 @@ mkDerivation {
   isExecutable = false;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    base
-    bytestring
-    hashable
-    hsyslog
-    pipes
-    pipes-safe
-    semigroups
-    text
-    transformers
-    uniplate
-    unix-bytestring
-    unordered-containers
-    uuid
+    base bytestring hashable hsyslog pipes pipes-safe semigroups text
+    transformers uniplate unix-bytestring unordered-containers uuid
     vector
   ];
   libraryPkgconfigDepends = [ systemd ];
@@ -51,4 +26,4 @@ mkDerivation {
   description = "Haskell bindings to libsystemd-journal";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/libxml.nix b/pkgs/libxml.nix
index c233cf9f5380f3cc72a6398b488e37b50bbc5da7..14c79a0c3f6d23d96af522c8d98a22481e940433 100644
--- a/pkgs/libxml.nix
+++ b/pkgs/libxml.nix
@@ -21,4 +21,4 @@ mkDerivation {
   description = "Binding to libxml2";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/libyaml.nix b/pkgs/libyaml.nix
index 5b339dfb7c7c38f4d3280151c9e4db7ac26c3c76..7738d30a37c57c44d6482ebe91ea17c6f3326cbe 100644
--- a/pkgs/libyaml.nix
+++ b/pkgs/libyaml.nix
@@ -20,4 +20,4 @@ mkDerivation {
   description = "Low-level, streaming YAML interface";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/lifted-base.nix b/pkgs/lifted-base.nix
index 2b8352d48df9ca2b48b89b69e0004326b62fb04f..2eaa55f933ae78ff4972ed66ee695395e7e7fd65 100644
--- a/pkgs/lifted-base.nix
+++ b/pkgs/lifted-base.nix
@@ -1,15 +1,6 @@
-{ mkDerivation
-, HUnit
-, base
-, criterion
-, lib
-, monad-control
-, monad-peel
-, test-framework
-, test-framework-hunit
-, transformers
-, transformers-base
-, transformers-compat
+{ mkDerivation, HUnit, base, criterion, lib, monad-control
+, monad-peel, test-framework, test-framework-hunit, transformers
+, transformers-base, transformers-compat
 }:
 mkDerivation {
   pname = "lifted-base";
@@ -20,21 +11,11 @@ mkDerivation {
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [ base monad-control transformers-base ];
   testHaskellDepends = [
-    base
-    HUnit
-    monad-control
-    test-framework
-    test-framework-hunit
-    transformers
-    transformers-base
-    transformers-compat
+    base HUnit monad-control test-framework test-framework-hunit
+    transformers transformers-base transformers-compat
   ];
   benchmarkHaskellDepends = [
-    base
-    criterion
-    monad-control
-    monad-peel
-    transformers
+    base criterion monad-control monad-peel transformers
   ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
@@ -47,4 +28,4 @@ mkDerivation {
   description = "lifted IO operations from the base library";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/list-transformer.nix b/pkgs/list-transformer.nix
index f6cd71836ed3d0fb541e15bcd886547d3fba2413..52c03d0211dbceca1993ac625eb6175184d38e36 100644
--- a/pkgs/list-transformer.nix
+++ b/pkgs/list-transformer.nix
@@ -21,4 +21,4 @@ mkDerivation {
   description = "List monad transformer";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/lockfree-queue.nix b/pkgs/lockfree-queue.nix
index 0994eb9ce657adcd35e89f681234d20f919fb4b1..e8e659f1dc63ca8c0bac5fcc3defd684f269d714 100644
--- a/pkgs/lockfree-queue.nix
+++ b/pkgs/lockfree-queue.nix
@@ -1,13 +1,5 @@
-{ mkDerivation
-, HUnit
-, abstract-deque
-, abstract-deque-tests
-, atomic-primops
-, base
-, bytestring
-, ghc-prim
-, lib
-, test-framework
+{ mkDerivation, HUnit, abstract-deque, abstract-deque-tests
+, atomic-primops, base, bytestring, ghc-prim, lib, test-framework
 , test-framework-hunit
 }:
 mkDerivation {
@@ -18,21 +10,11 @@ mkDerivation {
   isExecutable = false;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    abstract-deque
-    atomic-primops
-    base
-    ghc-prim
+    abstract-deque atomic-primops base ghc-prim
   ];
   testHaskellDepends = [
-    abstract-deque
-    abstract-deque-tests
-    atomic-primops
-    base
-    bytestring
-    ghc-prim
-    HUnit
-    test-framework
-    test-framework-hunit
+    abstract-deque abstract-deque-tests atomic-primops base bytestring
+    ghc-prim HUnit test-framework test-framework-hunit
   ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
@@ -45,4 +27,4 @@ mkDerivation {
   description = "Michael and Scott lock-free queues";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/log-effectful.nix b/pkgs/log-effectful.nix
index 17d089aa4d49f184c1bb4e4547f056365581be06..82ca61aa8ff09fdd2eaea95a6bcfaf293d733449 100644
--- a/pkgs/log-effectful.nix
+++ b/pkgs/log-effectful.nix
@@ -1,12 +1,5 @@
-{ mkDerivation
-, aeson
-, base
-, effectful-core
-, fetchgit
-, lib
-, log-base
-, text
-, time
+{ mkDerivation, aeson, base, effectful-core, fetchgit, lib
+, log-base, text, time
 }:
 mkDerivation {
   pname = "log-effectful";
@@ -32,4 +25,4 @@ mkDerivation {
   description = "Adaptation of the log library for the effectful ecosystem";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/logging-facade.nix b/pkgs/logging-facade.nix
index 5649fc80703794d8704622c7d682f7b93d508f39..747907e9a7f6479877ac76de270b0d9e1d352e1f 100644
--- a/pkgs/logging-facade.nix
+++ b/pkgs/logging-facade.nix
@@ -1,9 +1,4 @@
-{ mkDerivation
-, base
-, call-stack
-, hspec
-, hspec-discover
-, lib
+{ mkDerivation, base, call-stack, hspec, hspec-discover, lib
 , transformers
 }:
 mkDerivation {
@@ -27,4 +22,4 @@ mkDerivation {
   description = "Simple logging abstraction that allows multiple back-ends";
   license = lib.licenses.mit;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/logict.nix b/pkgs/logict.nix
index 8d221107a12405e62d88b221d52c2d28338937d7..f86c11caca74b5f03f5251ca78e5f32883233711 100644
--- a/pkgs/logict.nix
+++ b/pkgs/logict.nix
@@ -19,4 +19,4 @@ mkDerivation {
   description = "A backtracking logic-programming monad";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/loop.nix b/pkgs/loop.nix
index d494a2547489ec8687e7414bfeed4672acde1250..13fd8faeb906196f5f3d69a0ab1c0ab749e0e1bb 100644
--- a/pkgs/loop.nix
+++ b/pkgs/loop.nix
@@ -1,11 +1,4 @@
-{ mkDerivation
-, base
-, criterion
-, foldl
-, hspec
-, lib
-, mtl
-, random
+{ mkDerivation, base, criterion, foldl, hspec, lib, mtl, random
 , vector
 }:
 mkDerivation {
@@ -18,12 +11,7 @@ mkDerivation {
   libraryHaskellDepends = [ base ];
   testHaskellDepends = [ base hspec mtl ];
   benchmarkHaskellDepends = [
-    base
-    criterion
-    foldl
-    mtl
-    random
-    vector
+    base criterion foldl mtl random vector
   ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
@@ -36,4 +24,4 @@ mkDerivation {
   description = "Fast loops (for when GHC can't optimize forM_)";
   license = lib.licenses.mit;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/lrucache.nix b/pkgs/lrucache.nix
index dd9cf36d63d7ab2d2d95a2071b788f4bda6ddb0d..ae4df5efbec7e049a2dbd416d3259de6c765555b 100644
--- a/pkgs/lrucache.nix
+++ b/pkgs/lrucache.nix
@@ -18,4 +18,4 @@ mkDerivation {
   description = "a simple, pure LRU cache";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/lsp-test.nix b/pkgs/lsp-test.nix
index 5dfbe53c4dfb7881ab0323fbfc02ce8878f56441..bb29f007c1995091a4aa5c37f369ca6bff8aa6e3 100644
--- a/pkgs/lsp-test.nix
+++ b/pkgs/lsp-test.nix
@@ -1,35 +1,8 @@
-{ mkDerivation
-, Diff
-, Glob
-, aeson
-, aeson-pretty
-, ansi-terminal
-, async
-, base
-, bytestring
-, co-log-core
-, conduit
-, conduit-parse
-, containers
-, data-default
-, directory
-, exceptions
-, extra
-, filepath
-, hspec
-, lens
-, lib
-, lsp
-, lsp-types
-, mtl
-, parser-combinators
-, process
-, some
-, text
-, time
-, transformers
-, unix
-, unliftio
+{ mkDerivation, Diff, Glob, aeson, aeson-pretty, ansi-terminal
+, async, base, bytestring, co-log-core, conduit, conduit-parse
+, containers, data-default, directory, exceptions, extra, filepath
+, hspec, lens, lib, lsp, lsp-types, mtl, parser-combinators
+, process, some, text, time, transformers, unix, unliftio
 , unordered-containers
 }:
 mkDerivation {
@@ -40,50 +13,14 @@ mkDerivation {
   isExecutable = false;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    aeson
-    aeson-pretty
-    ansi-terminal
-    async
-    base
-    bytestring
-    co-log-core
-    conduit
-    conduit-parse
-    containers
-    data-default
-    Diff
-    directory
-    exceptions
-    filepath
-    Glob
-    lens
-    lsp
-    lsp-types
-    mtl
-    parser-combinators
-    process
-    some
-    text
-    time
-    transformers
-    unix
-    unordered-containers
+    aeson aeson-pretty ansi-terminal async base bytestring co-log-core
+    conduit conduit-parse containers data-default Diff directory
+    exceptions filepath Glob lens lsp lsp-types mtl parser-combinators
+    process some text time transformers unix unordered-containers
   ];
   testHaskellDepends = [
-    aeson
-    base
-    co-log-core
-    data-default
-    directory
-    filepath
-    hspec
-    lens
-    lsp
-    mtl
-    parser-combinators
-    process
-    text
-    unliftio
+    aeson base co-log-core data-default directory filepath hspec lens
+    lsp mtl parser-combinators process text unliftio
     unordered-containers
   ];
   testToolDepends = [ lsp ];
@@ -99,4 +36,4 @@ mkDerivation {
   description = "Functional test framework for LSP servers";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/lsp-types.nix b/pkgs/lsp-types.nix
index 9cfcfa13005c6bdd1c4ade298f6ffe0553a33a7b..da65c5f2e1c29ce78eea7772c012f8c8b2bdde97 100644
--- a/pkgs/lsp-types.nix
+++ b/pkgs/lsp-types.nix
@@ -1,31 +1,8 @@
-{ mkDerivation
-, Diff
-, QuickCheck
-, aeson
-, base
-, binary
-, containers
-, data-default
-, deepseq
-, dlist
-, exceptions
-, filepath
-, hashable
-, hspec
-, hspec-discover
-, lens
-, lib
-, mod
-, mtl
-, network-uri
-, quickcheck-instances
-, safe
-, scientific
-, some
-, template-haskell
-, text
-, tuple
-, unordered-containers
+{ mkDerivation, Diff, QuickCheck, aeson, base, binary, containers
+, data-default, deepseq, dlist, exceptions, filepath, hashable
+, hspec, hspec-discover, lens, lib, mod, mtl, network-uri
+, quickcheck-instances, safe, scientific, some, template-haskell
+, text, tuple, unordered-containers
 }:
 mkDerivation {
   pname = "lsp-types";
@@ -35,39 +12,13 @@ mkDerivation {
   isExecutable = false;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    aeson
-    base
-    binary
-    containers
-    data-default
-    deepseq
-    Diff
-    dlist
-    exceptions
-    filepath
-    hashable
-    lens
-    mod
-    mtl
-    network-uri
-    safe
-    scientific
-    some
-    template-haskell
-    text
-    unordered-containers
+    aeson base binary containers data-default deepseq Diff dlist
+    exceptions filepath hashable lens mod mtl network-uri safe
+    scientific some template-haskell text unordered-containers
   ];
   testHaskellDepends = [
-    aeson
-    base
-    filepath
-    hspec
-    lens
-    network-uri
-    QuickCheck
-    quickcheck-instances
-    text
-    tuple
+    aeson base filepath hspec lens network-uri QuickCheck
+    quickcheck-instances text tuple
   ];
   testToolDepends = [ hspec-discover ];
   enableLibraryProfiling = true;
@@ -81,4 +32,4 @@ mkDerivation {
   description = "Haskell library for the Microsoft Language Server Protocol, data types";
   license = lib.licenses.mit;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/lsp.nix b/pkgs/lsp.nix
index f56db85918b757cb418862714ef70e0409327788..d7c55258c17a9b1e59c69edbebbf5aaf42c76e84 100644
--- a/pkgs/lsp.nix
+++ b/pkgs/lsp.nix
@@ -1,32 +1,8 @@
-{ mkDerivation
-, aeson
-, async
-, attoparsec
-, base
-, bytestring
-, co-log-core
-, containers
-, data-default
-, directory
-, exceptions
-, filepath
-, hashable
-, hspec
-, hspec-discover
-, lens
-, lib
-, lsp-types
-, mtl
-, prettyprinter
-, random
-, sorted-list
-, stm
-, temporary
-, text
-, text-rope
-, transformers
-, unliftio-core
-, unordered-containers
+{ mkDerivation, aeson, async, attoparsec, base, bytestring
+, co-log-core, containers, data-default, directory, exceptions
+, filepath, hashable, hspec, hspec-discover, lens, lib, lsp-types
+, mtl, prettyprinter, random, sorted-list, stm, temporary, text
+, text-rope, transformers, unliftio-core, unordered-containers
 , uuid
 }:
 mkDerivation {
@@ -37,40 +13,13 @@ mkDerivation {
   isExecutable = true;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    aeson
-    async
-    attoparsec
-    base
-    bytestring
-    co-log-core
-    containers
-    data-default
-    directory
-    exceptions
-    filepath
-    hashable
-    lens
-    lsp-types
-    mtl
-    prettyprinter
-    random
-    sorted-list
-    stm
-    temporary
-    text
-    text-rope
-    transformers
-    unliftio-core
-    unordered-containers
-    uuid
+    aeson async attoparsec base bytestring co-log-core containers
+    data-default directory exceptions filepath hashable lens lsp-types
+    mtl prettyprinter random sorted-list stm temporary text text-rope
+    transformers unliftio-core unordered-containers uuid
   ];
   testHaskellDepends = [
-    base
-    containers
-    hspec
-    sorted-list
-    text
-    text-rope
+    base containers hspec sorted-list text text-rope
     unordered-containers
   ];
   testToolDepends = [ hspec-discover ];
@@ -85,4 +34,4 @@ mkDerivation {
   description = "Haskell library for the Microsoft Language Server Protocol";
   license = lib.licenses.mit;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/lucid-alpine.nix b/pkgs/lucid-alpine.nix
index 8d3fb2ccf5020ebc881d83b02185b8d5961efe06..6c6c861f6ff7ecd0c70777fbc5eda191570ae4c9 100644
--- a/pkgs/lucid-alpine.nix
+++ b/pkgs/lucid-alpine.nix
@@ -20,4 +20,4 @@ mkDerivation {
   description = "Use Alpine.js in your lucid templates";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/lucid-aria.nix b/pkgs/lucid-aria.nix
index 308a687de6d780d15e58a18d7efa9dfcc5fd7c63..9bd7d9c94f44291965a7e626cf918d26fd77da69 100644
--- a/pkgs/lucid-aria.nix
+++ b/pkgs/lucid-aria.nix
@@ -19,4 +19,4 @@ mkDerivation {
   description = "Provides ARIA attributes for Lucid templates";
   license = lib.licenses.asl20;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/lucid-svg.nix b/pkgs/lucid-svg.nix
index 4c15b19af6aa2224e32fe8b1a51a60aeebe64a8e..8d9be9baf1837e2b1971959c501988def869ab4c 100644
--- a/pkgs/lucid-svg.nix
+++ b/pkgs/lucid-svg.nix
@@ -1,10 +1,4 @@
-{ mkDerivation
-, base
-, blaze-builder
-, lib
-, lucid
-, text
-, transformers
+{ mkDerivation, base, blaze-builder, lib, lucid, text, transformers
 }:
 mkDerivation {
   pname = "lucid-svg";
@@ -14,11 +8,7 @@ mkDerivation {
   isExecutable = false;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    base
-    blaze-builder
-    lucid
-    text
-    transformers
+    base blaze-builder lucid text transformers
   ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
@@ -31,4 +21,4 @@ mkDerivation {
   description = "DSL for SVG using lucid for HTML";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/lucid.nix b/pkgs/lucid.nix
index 3b41979d31f0a0003d2fb406a8417aac59971472..f3e2d6bb1835be372116a7039e77db4dd0d6ce23 100644
--- a/pkgs/lucid.nix
+++ b/pkgs/lucid.nix
@@ -1,20 +1,6 @@
-{ mkDerivation
-, HUnit
-, base
-, bifunctors
-, blaze-builder
-, bytestring
-, containers
-, criterion
-, deepseq
-, hashable
-, hspec
-, lib
-, mmorph
-, mtl
-, parsec
-, text
-, transformers
+{ mkDerivation, HUnit, base, bifunctors, blaze-builder, bytestring
+, containers, criterion, deepseq, hashable, hspec, lib, mmorph, mtl
+, parsec, text, transformers
 }:
 mkDerivation {
   pname = "lucid";
@@ -26,33 +12,14 @@ mkDerivation {
   isExecutable = false;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    base
-    blaze-builder
-    bytestring
-    containers
-    hashable
-    mmorph
-    mtl
-    text
+    base blaze-builder bytestring containers hashable mmorph mtl text
     transformers
   ];
   testHaskellDepends = [
-    base
-    bifunctors
-    hspec
-    HUnit
-    mtl
-    parsec
-    text
+    base bifunctors hspec HUnit mtl parsec text
   ];
   benchmarkHaskellDepends = [
-    base
-    blaze-builder
-    bytestring
-    criterion
-    deepseq
-    text
-    transformers
+    base blaze-builder bytestring criterion deepseq text transformers
   ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
@@ -65,4 +32,4 @@ mkDerivation {
   description = "Clear to write, read and edit DSL for HTML";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/lukko.nix b/pkgs/lukko.nix
index 4d098add260615fd650d38c10ee7d3b451ffc661..25647480374db3c1176c90835494dd5d8a2c39ad 100644
--- a/pkgs/lukko.nix
+++ b/pkgs/lukko.nix
@@ -1,13 +1,5 @@
-{ mkDerivation
-, async
-, base
-, bytestring
-, filepath
-, lib
-, singleton-bool
-, tasty
-, tasty-expected-failure
-, tasty-hunit
+{ mkDerivation, async, base, bytestring, filepath, lib
+, singleton-bool, tasty, tasty-expected-failure, tasty-hunit
 , temporary
 }:
 mkDerivation {
@@ -21,15 +13,8 @@ mkDerivation {
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [ base ];
   testHaskellDepends = [
-    async
-    base
-    bytestring
-    filepath
-    singleton-bool
-    tasty
-    tasty-expected-failure
-    tasty-hunit
-    temporary
+    async base bytestring filepath singleton-bool tasty
+    tasty-expected-failure tasty-hunit temporary
   ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
@@ -41,4 +26,4 @@ mkDerivation {
   description = "File locking";
   license = "GPL-2.0-or-later AND BSD-3-Clause";
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/lvar.nix b/pkgs/lvar.nix
index c199338035c8aa65ed8434b208465a794e84e59a..6cfbbc3a2e81705d1fc6afcdf49e3f17b5c6bdd5 100644
--- a/pkgs/lvar.nix
+++ b/pkgs/lvar.nix
@@ -18,4 +18,4 @@ mkDerivation {
   description = "TMVar that can be listened to";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/lzma.nix b/pkgs/lzma.nix
index 7e861dae714aad8b36c22dc4b2179f412a1d8bb5..67f371ec46862c428bff945037c0e7e3052ec667 100644
--- a/pkgs/lzma.nix
+++ b/pkgs/lzma.nix
@@ -1,13 +1,5 @@
-{ mkDerivation
-, HUnit
-, QuickCheck
-, base
-, bytestring
-, lib
-, tasty
-, tasty-hunit
-, tasty-quickcheck
-, xz
+{ mkDerivation, HUnit, QuickCheck, base, bytestring, lib, tasty
+, tasty-hunit, tasty-quickcheck, xz
 }:
 mkDerivation {
   pname = "lzma";
@@ -19,13 +11,7 @@ mkDerivation {
   libraryHaskellDepends = [ base bytestring ];
   librarySystemDepends = [ xz ];
   testHaskellDepends = [
-    base
-    bytestring
-    HUnit
-    QuickCheck
-    tasty
-    tasty-hunit
-    tasty-quickcheck
+    base bytestring HUnit QuickCheck tasty tasty-hunit tasty-quickcheck
   ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
@@ -38,4 +24,4 @@ mkDerivation {
   description = "LZMA/XZ compression and decompression";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/markdown-unlit.nix b/pkgs/markdown-unlit.nix
index 55255bda909c33b29a2d631d594d721f10c8e6f0..ec238e779e1b7219f3546db2a78ac99ee120a6dd 100644
--- a/pkgs/markdown-unlit.nix
+++ b/pkgs/markdown-unlit.nix
@@ -1,14 +1,5 @@
-{ mkDerivation
-, QuickCheck
-, base
-, base-compat
-, directory
-, hspec
-, hspec-discover
-, lib
-, silently
-, stringbuilder
-, temporary
+{ mkDerivation, QuickCheck, base, base-compat, directory, hspec
+, hspec-discover, lib, silently, stringbuilder, temporary
 }:
 mkDerivation {
   pname = "markdown-unlit";
@@ -20,13 +11,7 @@ mkDerivation {
   libraryHaskellDepends = [ base base-compat ];
   executableHaskellDepends = [ base base-compat ];
   testHaskellDepends = [
-    base
-    base-compat
-    directory
-    hspec
-    QuickCheck
-    silently
-    stringbuilder
+    base base-compat directory hspec QuickCheck silently stringbuilder
     temporary
   ];
   testToolDepends = [ hspec-discover ];
@@ -41,4 +26,4 @@ mkDerivation {
   description = "Literate Haskell support for Markdown";
   license = lib.licenses.mit;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/markdown.nix b/pkgs/markdown.nix
index 6827a535675cd616e63f7e4d987275e55a2c0a56..d6144f469f58654e73c362eba1963e4f7ab5b89a 100644
--- a/pkgs/markdown.nix
+++ b/pkgs/markdown.nix
@@ -1,23 +1,7 @@
-{ mkDerivation
-, attoparsec
-, base
-, blaze-html
-, blaze-markup
-, bytestring
-, call-stack
-, conduit
-, conduit-extra
-, containers
-, data-default
-, directory
-, filepath
-, hspec
-, lib
-, text
-, transformers
-, xml-conduit
-, xml-types
-, xss-sanitize
+{ mkDerivation, attoparsec, base, blaze-html, blaze-markup
+, bytestring, call-stack, conduit, conduit-extra, containers
+, data-default, directory, filepath, hspec, lib, text, transformers
+, xml-conduit, xml-types, xss-sanitize
 }:
 mkDerivation {
   pname = "markdown";
@@ -27,34 +11,13 @@ mkDerivation {
   isExecutable = false;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    attoparsec
-    base
-    blaze-html
-    blaze-markup
-    conduit
-    conduit-extra
-    containers
-    data-default
-    text
-    transformers
-    xml-conduit
-    xml-types
+    attoparsec base blaze-html blaze-markup conduit conduit-extra
+    containers data-default text transformers xml-conduit xml-types
     xss-sanitize
   ];
   testHaskellDepends = [
-    base
-    blaze-html
-    bytestring
-    call-stack
-    conduit
-    conduit-extra
-    containers
-    directory
-    filepath
-    hspec
-    text
-    transformers
-    xss-sanitize
+    base blaze-html bytestring call-stack conduit conduit-extra
+    containers directory filepath hspec text transformers xss-sanitize
   ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
@@ -67,4 +30,4 @@ mkDerivation {
   description = "Convert Markdown to HTML, with XSS protection";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/markov-chain-usage-model.nix b/pkgs/markov-chain-usage-model.nix
index 5f612dc0e2a0fbc16157d0cf14add039d9b57f61..8e6b8009d1fca9fc3078171459bb84d670892b5d 100644
--- a/pkgs/markov-chain-usage-model.nix
+++ b/pkgs/markov-chain-usage-model.nix
@@ -1,12 +1,5 @@
-{ mkDerivation
-, base
-, doctest
-, lib
-, matrix
-, tasty
-, tasty-discover
-, tasty-hunit
-, vector
+{ mkDerivation, base, doctest, lib, matrix, tasty, tasty-discover
+, tasty-hunit, vector
 }:
 mkDerivation {
   pname = "markov-chain-usage-model";
@@ -17,13 +10,7 @@ mkDerivation {
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [ base matrix vector ];
   testHaskellDepends = [
-    base
-    doctest
-    matrix
-    tasty
-    tasty-discover
-    tasty-hunit
-    vector
+    base doctest matrix tasty tasty-discover tasty-hunit vector
   ];
   testToolDepends = [ tasty-discover ];
   enableLibraryProfiling = true;
@@ -37,4 +24,4 @@ mkDerivation {
   description = "Computations for Markov chain usage models";
   license = lib.licenses.bsd2;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/math-functions.nix b/pkgs/math-functions.nix
index c778213c13ba4ac7a85f722ade6535fe6967581a..01f325324fdcb1aacb8721e2f7a26faada2af523 100644
--- a/pkgs/math-functions.nix
+++ b/pkgs/math-functions.nix
@@ -1,18 +1,6 @@
-{ mkDerivation
-, QuickCheck
-, base
-, data-default-class
-, deepseq
-, erf
-, gauge
-, lib
-, primitive
-, random
-, tasty
-, tasty-hunit
-, tasty-quickcheck
-, vector
-, vector-th-unbox
+{ mkDerivation, QuickCheck, base, data-default-class, deepseq, erf
+, gauge, lib, primitive, random, tasty, tasty-hunit
+, tasty-quickcheck, vector, vector-th-unbox
 }:
 mkDerivation {
   pname = "math-functions";
@@ -22,31 +10,14 @@ mkDerivation {
   isExecutable = false;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    base
-    data-default-class
-    deepseq
-    primitive
-    vector
+    base data-default-class deepseq primitive vector
   ];
   testHaskellDepends = [
-    base
-    data-default-class
-    deepseq
-    erf
-    primitive
-    QuickCheck
-    tasty
-    tasty-hunit
-    tasty-quickcheck
-    vector
-    vector-th-unbox
+    base data-default-class deepseq erf primitive QuickCheck tasty
+    tasty-hunit tasty-quickcheck vector vector-th-unbox
   ];
   benchmarkHaskellDepends = [
-    base
-    data-default-class
-    gauge
-    random
-    vector
+    base data-default-class gauge random vector
   ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
@@ -59,4 +30,4 @@ mkDerivation {
   description = "Collection of tools for numeric computations";
   license = lib.licenses.bsd2;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/matrices.nix b/pkgs/matrices.nix
index eba5f6ed86e9f01e08e9f2152282c2d59a3aef7e..6d68f2086dfce66c677a9cb870bde4fe1249e621 100644
--- a/pkgs/matrices.nix
+++ b/pkgs/matrices.nix
@@ -1,13 +1,5 @@
-{ mkDerivation
-, base
-, criterion
-, deepseq
-, lib
-, primitive
-, tasty
-, tasty-hunit
-, tasty-quickcheck
-, vector
+{ mkDerivation, base, criterion, deepseq, lib, primitive, tasty
+, tasty-hunit, tasty-quickcheck, vector
 }:
 mkDerivation {
   pname = "matrices";
@@ -18,11 +10,7 @@ mkDerivation {
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [ base deepseq primitive vector ];
   testHaskellDepends = [
-    base
-    tasty
-    tasty-hunit
-    tasty-quickcheck
-    vector
+    base tasty tasty-hunit tasty-quickcheck vector
   ];
   benchmarkHaskellDepends = [ base criterion vector ];
   enableLibraryProfiling = true;
@@ -35,4 +23,4 @@ mkDerivation {
   description = "native matrix based on vector";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/matrix.nix b/pkgs/matrix.nix
index 93c841d826d504c440ffc7de8078f77bec99f918..07ce43702e669608547116a56febb89160871e6d 100644
--- a/pkgs/matrix.nix
+++ b/pkgs/matrix.nix
@@ -1,15 +1,5 @@
-{ mkDerivation
-, QuickCheck
-, base
-, criterion
-, deepseq
-, lib
-, loop
-, primitive
-, semigroups
-, tasty
-, tasty-quickcheck
-, vector
+{ mkDerivation, QuickCheck, base, criterion, deepseq, lib, loop
+, primitive, semigroups, tasty, tasty-quickcheck, vector
 }:
 mkDerivation {
   pname = "matrix";
@@ -21,12 +11,7 @@ mkDerivation {
   isExecutable = false;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    base
-    deepseq
-    loop
-    primitive
-    semigroups
-    vector
+    base deepseq loop primitive semigroups vector
   ];
   testHaskellDepends = [ base QuickCheck tasty tasty-quickcheck ];
   benchmarkHaskellDepends = [ base criterion ];
@@ -40,4 +25,4 @@ mkDerivation {
   description = "A native implementation of matrix operations";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/memory.nix b/pkgs/memory.nix
index f74f018a72349e8dea6e29f4f712e3d4c523136c..ab3c69230cbef987452bad222a21f46881ee32ba 100644
--- a/pkgs/memory.nix
+++ b/pkgs/memory.nix
@@ -1,11 +1,5 @@
-{ mkDerivation
-, base
-, basement
-, bytestring
-, deepseq
-, foundation
-, ghc-prim
-, lib
+{ mkDerivation, base, basement, bytestring, deepseq, foundation
+, ghc-prim, lib
 }:
 mkDerivation {
   pname = "memory";
@@ -15,11 +9,7 @@ mkDerivation {
   isExecutable = false;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    base
-    basement
-    bytestring
-    deepseq
-    ghc-prim
+    base basement bytestring deepseq ghc-prim
   ];
   testHaskellDepends = [ base basement bytestring foundation ];
   enableLibraryProfiling = true;
@@ -33,4 +23,4 @@ mkDerivation {
   description = "memory and related abstraction stuff";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/mersenne-random-pure64.nix b/pkgs/mersenne-random-pure64.nix
index 268a335a2ad66deca9282ecea0ca73b1e131d594..0e02e92af56d8a994132f0c9b84536ff7c21e7b4 100644
--- a/pkgs/mersenne-random-pure64.nix
+++ b/pkgs/mersenne-random-pure64.nix
@@ -20,4 +20,4 @@ mkDerivation {
   description = "Generate high quality pseudorandom numbers purely using a Mersenne Twister";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/mersenne-random.nix b/pkgs/mersenne-random.nix
index 647b9093dcce943b343d62c7701d8f630c556431..a26aa6dccc5f40ae908931bed52bbf19d66567dd 100644
--- a/pkgs/mersenne-random.nix
+++ b/pkgs/mersenne-random.nix
@@ -18,4 +18,4 @@ mkDerivation {
   description = "Generate high quality pseudorandom numbers using a SIMD Fast Mersenne Twister";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/mfsolve.nix b/pkgs/mfsolve.nix
index 09823fc40f81c640a5f668628dd6c0af08b848ee..403618b8429ad5c556857eb64bd4ec5a9e53c41d 100644
--- a/pkgs/mfsolve.nix
+++ b/pkgs/mfsolve.nix
@@ -1,12 +1,5 @@
-{ mkDerivation
-, base
-, hashable
-, lib
-, mtl
-, mtl-compat
-, tasty
-, tasty-hunit
-, unordered-containers
+{ mkDerivation, base, hashable, lib, mtl, mtl-compat, tasty
+, tasty-hunit, unordered-containers
 }:
 mkDerivation {
   pname = "mfsolve";
@@ -18,11 +11,7 @@ mkDerivation {
   isExecutable = false;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    base
-    hashable
-    mtl
-    mtl-compat
-    unordered-containers
+    base hashable mtl mtl-compat unordered-containers
   ];
   testHaskellDepends = [ base tasty tasty-hunit ];
   enableLibraryProfiling = true;
@@ -35,4 +24,4 @@ mkDerivation {
   description = "Equation solver and calculator à la metafont";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/microspec.nix b/pkgs/microspec.nix
index 3b2b36d17061950585d176d7f7dd27d09e946656..039339f950705d4a6eed6e6bf5bb250f513175eb 100644
--- a/pkgs/microspec.nix
+++ b/pkgs/microspec.nix
@@ -17,4 +17,4 @@ mkDerivation {
   description = "Tiny QuickCheck test library with minimal dependencies";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/mime-mail.nix b/pkgs/mime-mail.nix
index ff3830864e9c9f3ebe169e24f5bd2f8709897b1b..f5194bff84cf6b215d7797edfb4228debe913682 100644
--- a/pkgs/mime-mail.nix
+++ b/pkgs/mime-mail.nix
@@ -1,14 +1,5 @@
-{ mkDerivation
-, base
-, base64-bytestring
-, blaze-builder
-, bytestring
-, filepath
-, hspec
-, lib
-, process
-, random
-, text
+{ mkDerivation, base, base64-bytestring, blaze-builder, bytestring
+, filepath, hspec, lib, process, random, text
 }:
 mkDerivation {
   pname = "mime-mail";
@@ -18,14 +9,8 @@ mkDerivation {
   isExecutable = false;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    base
-    base64-bytestring
-    blaze-builder
-    bytestring
-    filepath
-    process
-    random
-    text
+    base base64-bytestring blaze-builder bytestring filepath process
+    random text
   ];
   testHaskellDepends = [ base blaze-builder bytestring hspec text ];
   enableLibraryProfiling = true;
@@ -39,4 +24,4 @@ mkDerivation {
   description = "Compose MIME email messages";
   license = lib.licenses.mit;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/mime-types.nix b/pkgs/mime-types.nix
index fa6b028a220941a1d93b65aa79928977481ddba6..1544fb88e03b98ac8a1f44557aa84eb3fbe78891 100644
--- a/pkgs/mime-types.nix
+++ b/pkgs/mime-types.nix
@@ -18,4 +18,4 @@ mkDerivation {
   description = "Basic mime-type handling types and functions";
   license = lib.licenses.mit;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/mmap.nix b/pkgs/mmap.nix
index 51fc8b4ea5bd4ef5705068647a4d608d4211b84a..3a187f2d6a3452763d9349d74bc44e7203ed1b1b 100644
--- a/pkgs/mmap.nix
+++ b/pkgs/mmap.nix
@@ -17,4 +17,4 @@ mkDerivation {
   description = "Memory mapped files for POSIX and Windows";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/mmark.nix b/pkgs/mmark.nix
index 3ac6563ba407ef96fa377d3c505da212950f5811..78c65160f11ddd5426635a77b1448ce4b3eb8c9c 100644
--- a/pkgs/mmark.nix
+++ b/pkgs/mmark.nix
@@ -1,31 +1,9 @@
-{ mkDerivation
-, QuickCheck
-, aeson
-, base
-, case-insensitive
-, containers
-, criterion
-, deepseq
-, dlist
-, email-validate
-, foldl
-, hashable
-, hspec
-, hspec-megaparsec
-, html-entity-map
-, lib
-, lucid
-, megaparsec
-, microlens
-, microlens-th
-, modern-uri
-, mtl
-, parser-combinators
-, text
-, text-metrics
-, unordered-containers
-, weigh
-, yaml
+{ mkDerivation, QuickCheck, aeson, base, case-insensitive
+, containers, criterion, deepseq, dlist, email-validate, foldl
+, hashable, hspec, hspec-megaparsec, html-entity-map, lib, lucid
+, megaparsec, microlens, microlens-th, modern-uri, mtl
+, parser-combinators, text, text-metrics, unordered-containers
+, weigh, yaml
 }:
 mkDerivation {
   pname = "mmark";
@@ -37,39 +15,14 @@ mkDerivation {
   isExecutable = false;
   enableSeparateDataOutput = true;
   libraryHaskellDepends = [
-    aeson
-    base
-    case-insensitive
-    containers
-    deepseq
-    dlist
-    email-validate
-    foldl
-    hashable
-    html-entity-map
-    lucid
-    megaparsec
-    microlens
-    microlens-th
-    modern-uri
-    mtl
-    parser-combinators
-    text
-    text-metrics
-    unordered-containers
-    yaml
+    aeson base case-insensitive containers deepseq dlist email-validate
+    foldl hashable html-entity-map lucid megaparsec microlens
+    microlens-th modern-uri mtl parser-combinators text text-metrics
+    unordered-containers yaml
   ];
   testHaskellDepends = [
-    aeson
-    base
-    foldl
-    hspec
-    hspec-megaparsec
-    lucid
-    megaparsec
-    modern-uri
-    QuickCheck
-    text
+    aeson base foldl hspec hspec-megaparsec lucid megaparsec modern-uri
+    QuickCheck text
   ];
   benchmarkHaskellDepends = [ base criterion text weigh ];
   enableLibraryProfiling = true;
@@ -83,4 +36,4 @@ mkDerivation {
   description = "Strict markdown processor for writers";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/mmorph.nix b/pkgs/mmorph.nix
index 732ebc4fb49619cdaff976185e9290a4fe548223..e38f2ae0c7341f95bd697834d57c1c3b36923942 100644
--- a/pkgs/mmorph.nix
+++ b/pkgs/mmorph.nix
@@ -1,9 +1,4 @@
-{ mkDerivation
-, base
-, lib
-, mtl
-, transformers
-, transformers-compat
+{ mkDerivation, base, lib, mtl, transformers, transformers-compat
 }:
 mkDerivation {
   pname = "mmorph";
@@ -15,10 +10,7 @@ mkDerivation {
   isExecutable = false;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    base
-    mtl
-    transformers
-    transformers-compat
+    base mtl transformers transformers-compat
   ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
@@ -30,4 +22,4 @@ mkDerivation {
   description = "Monad morphisms";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/mockery.nix b/pkgs/mockery.nix
index 6aa489208cb24ae43fb45d96e58b6d759b50fd10..ad42675a5ef5244f9b955b23e09ab47e1620035a 100644
--- a/pkgs/mockery.nix
+++ b/pkgs/mockery.nix
@@ -1,13 +1,5 @@
-{ mkDerivation
-, base
-, base-compat
-, bytestring
-, directory
-, filepath
-, hspec
-, lib
-, logging-facade
-, temporary
+{ mkDerivation, base, base-compat, bytestring, directory, filepath
+, hspec, lib, logging-facade, temporary
 }:
 mkDerivation {
   pname = "mockery";
@@ -17,22 +9,11 @@ mkDerivation {
   isExecutable = false;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    base
-    base-compat
-    bytestring
-    directory
-    filepath
-    logging-facade
+    base base-compat bytestring directory filepath logging-facade
     temporary
   ];
   testHaskellDepends = [
-    base
-    base-compat
-    bytestring
-    directory
-    filepath
-    hspec
-    logging-facade
+    base base-compat bytestring directory filepath hspec logging-facade
     temporary
   ];
   enableLibraryProfiling = true;
@@ -45,4 +26,4 @@ mkDerivation {
   description = "Support functions for automated testing";
   license = lib.licenses.mit;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/modern-uri.nix b/pkgs/modern-uri.nix
index 5a2747bac457814e58637916d2d869b711e80996..4015abf6ce2403843853797149eac777ae9ec264 100644
--- a/pkgs/modern-uri.nix
+++ b/pkgs/modern-uri.nix
@@ -1,25 +1,7 @@
-{ mkDerivation
-, QuickCheck
-, base
-, bytestring
-, containers
-, contravariant
-, criterion
-, deepseq
-, exceptions
-, hashable
-, hspec
-, hspec-discover
-, hspec-megaparsec
-, lib
-, megaparsec
-, mtl
-, profunctors
-, reflection
-, tagged
-, template-haskell
-, text
-, weigh
+{ mkDerivation, QuickCheck, base, bytestring, containers
+, contravariant, criterion, deepseq, exceptions, hashable, hspec
+, hspec-discover, hspec-megaparsec, lib, megaparsec, mtl
+, profunctors, reflection, tagged, template-haskell, text, weigh
 }:
 mkDerivation {
   pname = "modern-uri";
@@ -29,40 +11,16 @@ mkDerivation {
   isExecutable = false;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    base
-    bytestring
-    containers
-    contravariant
-    deepseq
-    exceptions
-    hashable
-    megaparsec
-    mtl
-    profunctors
-    QuickCheck
-    reflection
-    tagged
-    template-haskell
-    text
+    base bytestring containers contravariant deepseq exceptions
+    hashable megaparsec mtl profunctors QuickCheck reflection tagged
+    template-haskell text
   ];
   testHaskellDepends = [
-    base
-    bytestring
-    hspec
-    hspec-megaparsec
-    megaparsec
-    QuickCheck
-    text
+    base bytestring hspec hspec-megaparsec megaparsec QuickCheck text
   ];
   testToolDepends = [ hspec-discover ];
   benchmarkHaskellDepends = [
-    base
-    bytestring
-    criterion
-    deepseq
-    megaparsec
-    text
-    weigh
+    base bytestring criterion deepseq megaparsec text weigh
   ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
@@ -75,4 +33,4 @@ mkDerivation {
   description = "Modern library for working with URIs";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/monad-control.nix b/pkgs/monad-control.nix
index 97b17c4a81b0f408156e65efe3306f2758d4cfd8..8e7dbc74c84100d73eb6e41d771a44ee9c7996cb 100644
--- a/pkgs/monad-control.nix
+++ b/pkgs/monad-control.nix
@@ -1,9 +1,4 @@
-{ mkDerivation
-, base
-, lib
-, stm
-, transformers
-, transformers-base
+{ mkDerivation, base, lib, stm, transformers, transformers-base
 , transformers-compat
 }:
 mkDerivation {
@@ -14,11 +9,7 @@ mkDerivation {
   isExecutable = false;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    base
-    stm
-    transformers
-    transformers-base
-    transformers-compat
+    base stm transformers transformers-base transformers-compat
   ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
@@ -31,4 +22,4 @@ mkDerivation {
   description = "Lift control operations, like exception catching, through monad transformers";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/monad-logger-extras.nix b/pkgs/monad-logger-extras.nix
index 084f3eb0bc94a414198dbfd2277565fc554c64f4..9e4665fc5f331a07e17fdfa826246b8e44fc0c01 100644
--- a/pkgs/monad-logger-extras.nix
+++ b/pkgs/monad-logger-extras.nix
@@ -1,11 +1,5 @@
-{ mkDerivation
-, ansi-terminal
-, base
-, bytestring
-, hsyslog
-, lib
-, monad-logger
-, mtl
+{ mkDerivation, ansi-terminal, base, bytestring, hsyslog, lib
+, monad-logger, mtl
 }:
 mkDerivation {
   pname = "monad-logger-extras";
@@ -15,12 +9,7 @@ mkDerivation {
   isExecutable = true;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    ansi-terminal
-    base
-    bytestring
-    hsyslog
-    monad-logger
-    mtl
+    ansi-terminal base bytestring hsyslog monad-logger mtl
   ];
   executableHaskellDepends = [ base monad-logger ];
   enableLibraryProfiling = true;
@@ -34,4 +23,4 @@ mkDerivation {
   description = "Utilities for composing loggers, coloring output, plus a few orphan instances";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/monad-loops.nix b/pkgs/monad-loops.nix
index fd21bb61d65a108390b92cd977eb26393a8860e7..aa45a2dc955dd599973560636ea6720c510d44ee 100644
--- a/pkgs/monad-loops.nix
+++ b/pkgs/monad-loops.nix
@@ -19,4 +19,4 @@ mkDerivation {
   description = "Monadic loops";
   license = lib.licenses.publicDomain;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/monad-par-extras.nix b/pkgs/monad-par-extras.nix
index 78e5637352ebf5fdf9a06067e3d22a839555e9a5..86e652cbb7729c366cecf0653ec493e863d18985 100644
--- a/pkgs/monad-par-extras.nix
+++ b/pkgs/monad-par-extras.nix
@@ -1,12 +1,5 @@
-{ mkDerivation
-, abstract-par
-, base
-, cereal
-, deepseq
-, lib
-, mtl
-, random
-, transformers
+{ mkDerivation, abstract-par, base, cereal, deepseq, lib, mtl
+, random, transformers
 }:
 mkDerivation {
   pname = "monad-par-extras";
@@ -16,13 +9,7 @@ mkDerivation {
   isExecutable = false;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    abstract-par
-    base
-    cereal
-    deepseq
-    mtl
-    random
-    transformers
+    abstract-par base cereal deepseq mtl random transformers
   ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
@@ -35,4 +22,4 @@ mkDerivation {
   description = "Combinators and extra features for Par monads";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/monad-parallel.nix b/pkgs/monad-parallel.nix
index cbc27a2a22bfacee56f8e5802d26991d0b06f3b3..01bccbf8e42dbb3cf376b669b4139a50ad6f71b5 100644
--- a/pkgs/monad-parallel.nix
+++ b/pkgs/monad-parallel.nix
@@ -1,8 +1,4 @@
-{ mkDerivation
-, base
-, lib
-, parallel
-, transformers
+{ mkDerivation, base, lib, parallel, transformers
 , transformers-compat
 }:
 mkDerivation {
@@ -13,10 +9,7 @@ mkDerivation {
   isExecutable = false;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    base
-    parallel
-    transformers
-    transformers-compat
+    base parallel transformers transformers-compat
   ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
@@ -29,4 +22,4 @@ mkDerivation {
   description = "Parallel execution of monadic computations";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/monad-peel.nix b/pkgs/monad-peel.nix
index d9d0ea51c4116c068ac9cfdfa0e8736e4573ce6c..1a5ff7c7a2abeb909a1453c7692aff09a9fe4d6d 100644
--- a/pkgs/monad-peel.nix
+++ b/pkgs/monad-peel.nix
@@ -1,11 +1,5 @@
-{ mkDerivation
-, HUnit
-, base
-, extensible-exceptions
-, lib
-, test-framework
-, test-framework-hunit
-, transformers
+{ mkDerivation, HUnit, base, extensible-exceptions, lib
+, test-framework, test-framework-hunit, transformers
 }:
 mkDerivation {
   pname = "monad-peel";
@@ -15,17 +9,11 @@ mkDerivation {
   isExecutable = false;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    base
-    extensible-exceptions
-    transformers
+    base extensible-exceptions transformers
   ];
   testHaskellDepends = [
-    base
-    extensible-exceptions
-    HUnit
-    test-framework
-    test-framework-hunit
-    transformers
+    base extensible-exceptions HUnit test-framework
+    test-framework-hunit transformers
   ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
@@ -38,4 +26,4 @@ mkDerivation {
   description = "Lift control operations like exception catching through monad transformers";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/monad-primitive.nix b/pkgs/monad-primitive.nix
index 6b222747dd76909393b1a2f85debbf3d80c80434..676ab498ad0ec2ca7f79fbf4b6cf77c1d64d2acd 100644
--- a/pkgs/monad-primitive.nix
+++ b/pkgs/monad-primitive.nix
@@ -18,4 +18,4 @@ mkDerivation {
   description = "Type class for monad transformers stack with pirimitive base monad";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/monad-time.nix b/pkgs/monad-time.nix
index 6d33b2389763907672579d6436736ffcdfeb9be6..faaaabb7b6302b4341496d3992fa8a1c4c9b625c 100644
--- a/pkgs/monad-time.nix
+++ b/pkgs/monad-time.nix
@@ -19,4 +19,4 @@ mkDerivation {
   description = "Type class for monads which carry the notion of the current time";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/monadlist.nix b/pkgs/monadlist.nix
index 671e6380955e35eff8312abb93c8237a2b013c89..ff7d6cbd21390fd476fc6ef4862202f262fa8472 100644
--- a/pkgs/monadlist.nix
+++ b/pkgs/monadlist.nix
@@ -17,4 +17,4 @@ mkDerivation {
   description = "Monadic versions of list functions";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/monads-tf.nix b/pkgs/monads-tf.nix
index ece5c17adc030c9e0de5eb7e76adbfdba75f465a..336a9cd2a5e33f8305bebc5353c1b37476581a48 100644
--- a/pkgs/monads-tf.nix
+++ b/pkgs/monads-tf.nix
@@ -17,4 +17,4 @@ mkDerivation {
   description = "Monad classes, using type families";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/mono-traversable.nix b/pkgs/mono-traversable.nix
index 8be5377f9f113d87d45617b4b8893420a114589d..57cd0d2833a5f18d8d9a6a52ab3f1c3ba21a37f1 100644
--- a/pkgs/mono-traversable.nix
+++ b/pkgs/mono-traversable.nix
@@ -1,21 +1,6 @@
-{ mkDerivation
-, HUnit
-, QuickCheck
-, base
-, bytestring
-, containers
-, foldl
-, gauge
-, hashable
-, hspec
-, lib
-, mwc-random
-, split
-, text
-, transformers
-, unordered-containers
-, vector
-, vector-algorithms
+{ mkDerivation, HUnit, QuickCheck, base, bytestring, containers
+, foldl, gauge, hashable, hspec, lib, mwc-random, split, text
+, transformers, unordered-containers, vector, vector-algorithms
 }:
 mkDerivation {
   pname = "mono-traversable";
@@ -25,29 +10,12 @@ mkDerivation {
   isExecutable = false;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    base
-    bytestring
-    containers
-    hashable
-    split
-    text
-    transformers
-    unordered-containers
-    vector
-    vector-algorithms
+    base bytestring containers hashable split text transformers
+    unordered-containers vector vector-algorithms
   ];
   testHaskellDepends = [
-    base
-    bytestring
-    containers
-    foldl
-    hspec
-    HUnit
-    QuickCheck
-    text
-    transformers
-    unordered-containers
-    vector
+    base bytestring containers foldl hspec HUnit QuickCheck text
+    transformers unordered-containers vector
   ];
   benchmarkHaskellDepends = [ base gauge mwc-random vector ];
   enableLibraryProfiling = true;
@@ -61,4 +29,4 @@ mkDerivation {
   description = "Type classes for mapping, folding, and traversing monomorphic containers";
   license = lib.licenses.mit;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/monoid-extras.nix b/pkgs/monoid-extras.nix
index 3a3ea2d33872853c6d6b407507b2d5510f514b08..a28386d661e6c1d266abe412dbbe015fdd03096e 100644
--- a/pkgs/monoid-extras.nix
+++ b/pkgs/monoid-extras.nix
@@ -1,9 +1,4 @@
-{ mkDerivation
-, base
-, criterion
-, groups
-, lib
-, semigroupoids
+{ mkDerivation, base, criterion, groups, lib, semigroupoids
 , semigroups
 }:
 mkDerivation {
@@ -25,4 +20,4 @@ mkDerivation {
   description = "Various extra monoid-related definitions and utilities";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/mtl-compat.nix b/pkgs/mtl-compat.nix
index 0dba2892e1e9a7a6c4a51e3a8c99e91b7def2569..4fd885bdb490fcc8bc13c17596f8f48571c3f8ad 100644
--- a/pkgs/mtl-compat.nix
+++ b/pkgs/mtl-compat.nix
@@ -18,4 +18,4 @@ mkDerivation {
   description = "Backported Control.Monad.Except module from mtl";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/mtl-prelude.nix b/pkgs/mtl-prelude.nix
index 37ef55366060cab0e2915ea68dd94da773dd5ee9..8b80fb6205a9e3bbffc6bbb2c89c9644d8e0098e 100644
--- a/pkgs/mtl-prelude.nix
+++ b/pkgs/mtl-prelude.nix
@@ -18,4 +18,4 @@ mkDerivation {
   description = "Reexports of most definitions from \"mtl\" and \"transformers\"";
   license = lib.licenses.mit;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/multiset.nix b/pkgs/multiset.nix
index e5bbe8af1c117e92b2a24e78e5a8bde20907b778..39c3c1a485f6f6acf44b677bcce7b783b4d1c5c3 100644
--- a/pkgs/multiset.nix
+++ b/pkgs/multiset.nix
@@ -1,13 +1,5 @@
-{ mkDerivation
-, QuickCheck
-, base
-, checkers
-, containers
-, deepseq
-, doctest
-, lib
-, tasty
-, tasty-quickcheck
+{ mkDerivation, QuickCheck, base, checkers, containers, deepseq
+, doctest, lib, tasty, tasty-quickcheck
 }:
 mkDerivation {
   pname = "multiset";
@@ -18,12 +10,7 @@ mkDerivation {
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [ base containers deepseq ];
   testHaskellDepends = [
-    base
-    checkers
-    doctest
-    QuickCheck
-    tasty
-    tasty-quickcheck
+    base checkers doctest QuickCheck tasty tasty-quickcheck
   ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
@@ -35,4 +22,4 @@ mkDerivation {
   description = "The Data.MultiSet container type";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/mwc-random-monad.nix b/pkgs/mwc-random-monad.nix
index 92e5c8d502ad021f5c1a1b107ee1b8bb70dc2567..e8332e3839d51509a9dcc876ca6878314b46b1d4 100644
--- a/pkgs/mwc-random-monad.nix
+++ b/pkgs/mwc-random-monad.nix
@@ -1,11 +1,5 @@
-{ mkDerivation
-, base
-, lib
-, monad-primitive
-, mwc-random
-, primitive
-, transformers
-, vector
+{ mkDerivation, base, lib, monad-primitive, mwc-random, primitive
+, transformers, vector
 }:
 mkDerivation {
   pname = "mwc-random-monad";
@@ -15,12 +9,7 @@ mkDerivation {
   isExecutable = false;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    base
-    monad-primitive
-    mwc-random
-    primitive
-    transformers
-    vector
+    base monad-primitive mwc-random primitive transformers vector
   ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
@@ -32,4 +21,4 @@ mkDerivation {
   description = "Monadic interface for mwc-random";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/mwc-random.nix b/pkgs/mwc-random.nix
index 93eaa796f00ea61674205572480ad95ec8c0c8bd..b061cf22c2fb6bcb9687623425eae9a8138f7d35 100644
--- a/pkgs/mwc-random.nix
+++ b/pkgs/mwc-random.nix
@@ -1,19 +1,6 @@
-{ mkDerivation
-, QuickCheck
-, base
-, bytestring
-, doctest
-, gauge
-, lib
-, math-functions
-, mersenne-random
-, primitive
-, random
-, tasty
-, tasty-hunit
-, tasty-quickcheck
-, time
-, vector
+{ mkDerivation, QuickCheck, base, bytestring, doctest, gauge, lib
+, math-functions, mersenne-random, primitive, random, tasty
+, tasty-hunit, tasty-quickcheck, time, vector
 }:
 mkDerivation {
   pname = "mwc-random";
@@ -25,31 +12,14 @@ mkDerivation {
   isExecutable = false;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    base
-    math-functions
-    primitive
-    random
-    time
-    vector
+    base math-functions primitive random time vector
   ];
   testHaskellDepends = [
-    base
-    bytestring
-    doctest
-    primitive
-    QuickCheck
-    random
-    tasty
-    tasty-hunit
-    tasty-quickcheck
-    vector
+    base bytestring doctest primitive QuickCheck random tasty
+    tasty-hunit tasty-quickcheck vector
   ];
   benchmarkHaskellDepends = [
-    base
-    gauge
-    mersenne-random
-    random
-    vector
+    base gauge mersenne-random random vector
   ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
@@ -62,4 +32,4 @@ mkDerivation {
   description = "Fast, high quality pseudo random number generation";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/nanospec.nix b/pkgs/nanospec.nix
index 817490ac58b0a7030b444ddce059052cff943c0c..80f133262a5f15b9345c68ab462537ab5fa213d1 100644
--- a/pkgs/nanospec.nix
+++ b/pkgs/nanospec.nix
@@ -19,4 +19,4 @@ mkDerivation {
   description = "A lightweight implementation of a subset of Hspec's API";
   license = lib.licenses.mit;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/nats.nix b/pkgs/nats.nix
index 4fcec7b520d7bae24a2f2abdf3551f50a1b31de8..a85f59f4f14b07810bf231933f6f0c0793a4f36b 100644
--- a/pkgs/nats.nix
+++ b/pkgs/nats.nix
@@ -19,4 +19,4 @@ mkDerivation {
   description = "Natural numbers";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/natural-arithmetic.nix b/pkgs/natural-arithmetic.nix
index 10a7a2216d0a2c31aa28ec601e5e1de30ede9ab8..9e1fafbac3479c312bc7800cb0393735584bf132 100644
--- a/pkgs/natural-arithmetic.nix
+++ b/pkgs/natural-arithmetic.nix
@@ -18,4 +18,4 @@ mkDerivation {
   description = "Arithmetic of natural numbers";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/natural-transformation.nix b/pkgs/natural-transformation.nix
index a3e4e8fc6398d1db4b07bd4061fe3c64be31429a..926d5a9d6f6ef7384f66e7f328467a842cff1f4c 100644
--- a/pkgs/natural-transformation.nix
+++ b/pkgs/natural-transformation.nix
@@ -1,9 +1,4 @@
-{ mkDerivation
-, base
-, containers
-, lib
-, quickcheck-instances
-, tasty
+{ mkDerivation, base, containers, lib, quickcheck-instances, tasty
 , tasty-quickcheck
 }:
 mkDerivation {
@@ -17,11 +12,7 @@ mkDerivation {
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [ base ];
   testHaskellDepends = [
-    base
-    containers
-    quickcheck-instances
-    tasty
-    tasty-quickcheck
+    base containers quickcheck-instances tasty tasty-quickcheck
   ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
@@ -34,4 +25,4 @@ mkDerivation {
   description = "A natural transformation package";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/neat-interpolation.nix b/pkgs/neat-interpolation.nix
index 113f185a8352b9db2f8f4bc9ba74395ad3041faa..fceefd8607ae6b99dd938d9a25915f8422324f8c 100644
--- a/pkgs/neat-interpolation.nix
+++ b/pkgs/neat-interpolation.nix
@@ -1,15 +1,6 @@
-{ mkDerivation
-, QuickCheck
-, base
-, lib
-, megaparsec
-, quickcheck-instances
-, rerebase
-, tasty
-, tasty-hunit
-, tasty-quickcheck
-, template-haskell
-, text
+{ mkDerivation, QuickCheck, base, lib, megaparsec
+, quickcheck-instances, rerebase, tasty, tasty-hunit
+, tasty-quickcheck, template-haskell, text
 }:
 mkDerivation {
   pname = "neat-interpolation";
@@ -20,11 +11,7 @@ mkDerivation {
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [ base megaparsec template-haskell text ];
   testHaskellDepends = [
-    QuickCheck
-    quickcheck-instances
-    rerebase
-    tasty
-    tasty-hunit
+    QuickCheck quickcheck-instances rerebase tasty tasty-hunit
     tasty-quickcheck
   ];
   enableLibraryProfiling = true;
@@ -38,4 +25,4 @@ mkDerivation {
   description = "A quasiquoter for neat and simple multiline text interpolation";
   license = lib.licenses.mit;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/network-bsd.nix b/pkgs/network-bsd.nix
index aeac70b2cd1cbf75c73978bced5d777c5a63c991..df9dc41b412138dfe3baecf00db718d246520211 100644
--- a/pkgs/network-bsd.nix
+++ b/pkgs/network-bsd.nix
@@ -20,4 +20,4 @@ mkDerivation {
   description = "POSIX network database (<netdb.h>) API";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/network-byte-order.nix b/pkgs/network-byte-order.nix
index b5a0992da6efb0b6af0d9b7560b846630db58e3e..6e0a643783754edc414313d6067b564485ffc5eb 100644
--- a/pkgs/network-byte-order.nix
+++ b/pkgs/network-byte-order.nix
@@ -20,4 +20,4 @@ mkDerivation {
   description = "Network byte order utilities";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/network-conduit-tls.nix b/pkgs/network-conduit-tls.nix
index f1c42e9e9ebd7091ddcf7357c0aa215c3534e602..040c78d4253573c84db6261885cd0cce752b4c1f 100644
--- a/pkgs/network-conduit-tls.nix
+++ b/pkgs/network-conduit-tls.nix
@@ -1,18 +1,6 @@
-{ mkDerivation
-, HUnit
-, base
-, bytestring
-, conduit
-, conduit-extra
-, connection
-, data-default-class
-, lib
-, mtl
-, network
-, streaming-commons
-, tls
-, transformers
-, unliftio-core
+{ mkDerivation, HUnit, base, bytestring, conduit, conduit-extra
+, connection, data-default-class, lib, mtl, network
+, streaming-commons, tls, transformers, unliftio-core
 }:
 mkDerivation {
   pname = "network-conduit-tls";
@@ -22,26 +10,11 @@ mkDerivation {
   isExecutable = false;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    base
-    bytestring
-    conduit
-    conduit-extra
-    connection
-    data-default-class
-    network
-    streaming-commons
-    tls
-    transformers
-    unliftio-core
+    base bytestring conduit conduit-extra connection data-default-class
+    network streaming-commons tls transformers unliftio-core
   ];
   testHaskellDepends = [
-    base
-    bytestring
-    conduit
-    conduit-extra
-    connection
-    HUnit
-    mtl
+    base bytestring conduit conduit-extra connection HUnit mtl
   ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
@@ -54,4 +27,4 @@ mkDerivation {
   description = "Create TLS-aware network code with conduits";
   license = lib.licenses.mit;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/network-info.nix b/pkgs/network-info.nix
index 0c88ed827c575985e6a58a0a0bd9f2bec27a5e5f..26fd5d93db318fe98da9bb044831176a435e429a 100644
--- a/pkgs/network-info.nix
+++ b/pkgs/network-info.nix
@@ -18,4 +18,4 @@ mkDerivation {
   description = "Access the local computer's basic network configuration";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/network-run.nix b/pkgs/network-run.nix
index dcabb78d0644da548d462955cf9d3b52b1487a24..ad56dde30496d762ca9f27cecc465ea6f502ad50 100644
--- a/pkgs/network-run.nix
+++ b/pkgs/network-run.nix
@@ -17,4 +17,4 @@ mkDerivation {
   description = "Simple network runner library";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/newtype-generics.nix b/pkgs/newtype-generics.nix
index ea19c983ded8407f062a23e5a218e3cd3e1ebe35..2d818e694821535059153ba53b10edc122645539 100644
--- a/pkgs/newtype-generics.nix
+++ b/pkgs/newtype-generics.nix
@@ -1,10 +1,4 @@
-{ mkDerivation
-, base
-, gauge
-, hspec
-, hspec-discover
-, lib
-, semigroups
+{ mkDerivation, base, gauge, hspec, hspec-discover, lib, semigroups
 }:
 mkDerivation {
   pname = "newtype-generics";
@@ -30,4 +24,4 @@ mkDerivation {
   description = "A typeclass and set of functions for working with newtypes";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/newtype.nix b/pkgs/newtype.nix
index 9de5e8847e3b3de99b1fe9f82ba988453e187e3a..abe1b3f0fb264439045364828c0193d5a8edf22b 100644
--- a/pkgs/newtype.nix
+++ b/pkgs/newtype.nix
@@ -19,4 +19,4 @@ mkDerivation {
   description = "A typeclass and set of functions for working with newtypes";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/nix-derivation.nix b/pkgs/nix-derivation.nix
index 69fdc5824b79c9e5f9b27986ef34df0562349e87..77b8980b490ebced86281ce72aed03dbfb7c98a5 100644
--- a/pkgs/nix-derivation.nix
+++ b/pkgs/nix-derivation.nix
@@ -1,15 +1,5 @@
-{ mkDerivation
-, QuickCheck
-, attoparsec
-, base
-, containers
-, criterion
-, deepseq
-, filepath
-, lib
-, pretty-show
-, text
-, vector
+{ mkDerivation, QuickCheck, attoparsec, base, containers, criterion
+, deepseq, filepath, lib, pretty-show, text, vector
 }:
 mkDerivation {
   pname = "nix-derivation";
@@ -21,22 +11,11 @@ mkDerivation {
   isExecutable = true;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    attoparsec
-    base
-    containers
-    deepseq
-    filepath
-    text
-    vector
+    attoparsec base containers deepseq filepath text vector
   ];
   executableHaskellDepends = [ attoparsec base pretty-show text ];
   testHaskellDepends = [
-    attoparsec
-    base
-    filepath
-    QuickCheck
-    text
-    vector
+    attoparsec base filepath QuickCheck text vector
   ];
   benchmarkHaskellDepends = [ attoparsec base criterion text ];
   enableLibraryProfiling = true;
@@ -49,4 +28,4 @@ mkDerivation {
   description = "Parse and render *.drv files";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/non-negative.nix b/pkgs/non-negative.nix
index 6493d4db91293dfbf894975b7c4a2e70ad17db24..9b43fdcf9801ecb8bee617b045aeedd0ff09e042 100644
--- a/pkgs/non-negative.nix
+++ b/pkgs/non-negative.nix
@@ -19,4 +19,4 @@ mkDerivation {
   description = "Non-negative numbers";
   license = "GPL";
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/nothunks.nix b/pkgs/nothunks.nix
index 1dca96f25073e587b4b95b4e7d49759d1b6d5416..73df036643cbb6435eda1f05ea17303e1d328d28 100644
--- a/pkgs/nothunks.nix
+++ b/pkgs/nothunks.nix
@@ -1,45 +1,21 @@
-{ mkDerivation
-, base
-, bytestring
-, containers
-, ghc-heap
-, ghc-prim
-, hedgehog
-, lib
-, random
-, stm
-, tasty
-, tasty-hedgehog
-, text
-, time
+{ mkDerivation, base, bytestring, containers, ghc-heap, ghc-prim
+, hedgehog, lib, random, stm, tasty, tasty-hedgehog, text, time
 , vector
 }:
 mkDerivation {
   pname = "nothunks";
   version = "0.1.3";
   sha256 = "c191e9c3d86ca006bf8d85adfd936ff997759120b0fcfaf4960a56d8bd850e53";
+  revision = "1";
+  editedCabalFile = "0z82wai5sq6a7988dms7j412q9224kxnlhd00fp3k4ff6f9r0gpi";
   isLibrary = true;
   isExecutable = false;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    base
-    bytestring
-    containers
-    ghc-heap
-    stm
-    text
-    time
-    vector
+    base bytestring containers ghc-heap stm text time vector
   ];
   testHaskellDepends = [
-    base
-    containers
-    ghc-prim
-    hedgehog
-    random
-    stm
-    tasty
-    tasty-hedgehog
+    base containers ghc-prim hedgehog random stm tasty tasty-hedgehog
   ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
@@ -51,4 +27,4 @@ mkDerivation {
   description = "Examine values for unexpected thunks";
   license = lib.licenses.mit;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/numeric-extras.nix b/pkgs/numeric-extras.nix
index 8f2fd0c94e81b8025b8c6f59bb895a33d7af67c8..096a39370449622a015888cf284dae97a7cc5e88 100644
--- a/pkgs/numeric-extras.nix
+++ b/pkgs/numeric-extras.nix
@@ -18,4 +18,4 @@ mkDerivation {
   description = "Useful tools from the C standard library";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/numeric-prelude.nix b/pkgs/numeric-prelude.nix
index 66aa20d4035bfe31fbcf74d05b2b7679b77a3ba0..b209167a66dcfacadc575a71d919325042840fad 100644
--- a/pkgs/numeric-prelude.nix
+++ b/pkgs/numeric-prelude.nix
@@ -1,18 +1,6 @@
-{ mkDerivation
-, QuickCheck
-, array
-, base
-, containers
-, deepseq
-, doctest-exitcode-stdio
-, doctest-lib
-, lib
-, non-negative
-, parsec
-, random
-, semigroups
-, storable-record
-, utility-ht
+{ mkDerivation, QuickCheck, array, base, containers, deepseq
+, doctest-exitcode-stdio, doctest-lib, lib, non-negative, parsec
+, random, semigroups, storable-record, utility-ht
 }:
 mkDerivation {
   pname = "numeric-prelude";
@@ -22,24 +10,11 @@ mkDerivation {
   isExecutable = true;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    array
-    base
-    containers
-    deepseq
-    non-negative
-    parsec
-    QuickCheck
-    random
-    semigroups
-    storable-record
-    utility-ht
+    array base containers deepseq non-negative parsec QuickCheck random
+    semigroups storable-record utility-ht
   ];
   testHaskellDepends = [
-    base
-    doctest-exitcode-stdio
-    doctest-lib
-    QuickCheck
-    random
+    base doctest-exitcode-stdio doctest-lib QuickCheck random
     utility-ht
   ];
   enableLibraryProfiling = true;
@@ -53,4 +28,4 @@ mkDerivation {
   description = "An experimental alternative hierarchy of numeric type classes";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/numtype-dk.nix b/pkgs/numtype-dk.nix
index a1d937cadb73d83b851cfd1a25892f948930c026..8898283bcb1ef061a77e2ed2296c4147365c37da 100644
--- a/pkgs/numtype-dk.nix
+++ b/pkgs/numtype-dk.nix
@@ -18,4 +18,4 @@ mkDerivation {
   description = "Type-level integers, using TypeNats, Data Kinds, and Closed Type Families";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/odd-jobs.nix b/pkgs/odd-jobs.nix
index 3f8f3337b018c4d91b13e2df8553e04de950a18c..5b2c486e404c942ce9ff9a68ca4fde7c84d5230c 100644
--- a/pkgs/odd-jobs.nix
+++ b/pkgs/odd-jobs.nix
@@ -1,51 +1,13 @@
-{ mkDerivation
-, aeson
-, base
-, bytestring
-, containers
-, daemons
-, directory
-, either
-, fast-logger
-, fetchgit
-, filepath
-, foreign-store
-, friendly-time
-, generic-deriving
-, hedgehog
-, hostname
-, lib
-, lifted-async
-, lifted-base
-, lucid
-, mmorph
-, monad-control
-, monad-logger
-, mtl
-, optparse-applicative
-, postgresql-simple
-, random
-, resource-pool
-, safe
-, servant
-, servant-lucid
-, servant-server
-, servant-static-th
-, string-conv
-, tasty
-, tasty-discover
-, tasty-hedgehog
-, tasty-hunit
-, text
-, text-conversions
-, time
-, timing-convenience
-, unix
-, unliftio
-, unliftio-core
-, unordered-containers
-, wai
-, warp
+{ mkDerivation, aeson, base, bytestring, containers, daemons
+, directory, either, fast-logger, fetchgit, filepath, foreign-store
+, friendly-time, generic-deriving, hedgehog, hostname, lib
+, lifted-async, lifted-base, lucid, mmorph, monad-control
+, monad-logger, mtl, optparse-applicative, postgresql-simple
+, random, resource-pool, safe, servant, servant-lucid
+, servant-server, servant-static-th, string-conv, tasty
+, tasty-discover, tasty-hedgehog, tasty-hunit, text
+, text-conversions, time, timing-convenience, unix, unliftio
+, unliftio-core, unordered-containers, wai, warp
 }:
 mkDerivation {
   pname = "odd-jobs";
@@ -60,123 +22,32 @@ mkDerivation {
   isExecutable = true;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    aeson
-    base
-    bytestring
-    daemons
-    directory
-    either
-    fast-logger
-    filepath
-    friendly-time
-    generic-deriving
-    hostname
-    lucid
-    monad-control
-    monad-logger
-    mtl
-    optparse-applicative
-    postgresql-simple
-    resource-pool
-    safe
-    servant
-    servant-lucid
-    servant-server
-    servant-static-th
-    string-conv
-    text
-    text-conversions
-    time
-    timing-convenience
-    unix
-    unliftio
-    unliftio-core
-    unordered-containers
-    wai
-    warp
+    aeson base bytestring daemons directory either fast-logger filepath
+    friendly-time generic-deriving hostname lucid monad-control
+    monad-logger mtl optparse-applicative postgresql-simple
+    resource-pool safe servant servant-lucid servant-server
+    servant-static-th string-conv text text-conversions time
+    timing-convenience unix unliftio unliftio-core unordered-containers
+    wai warp
   ];
   executableHaskellDepends = [
-    aeson
-    base
-    bytestring
-    daemons
-    directory
-    either
-    fast-logger
-    filepath
-    foreign-store
-    friendly-time
-    generic-deriving
-    hostname
-    lucid
-    monad-control
-    monad-logger
-    mtl
-    optparse-applicative
-    postgresql-simple
-    resource-pool
-    safe
-    servant
-    servant-lucid
-    servant-server
-    servant-static-th
-    string-conv
-    text
-    text-conversions
-    time
-    timing-convenience
-    unix
-    unliftio
-    unliftio-core
-    unordered-containers
-    wai
-    warp
+    aeson base bytestring daemons directory either fast-logger filepath
+    foreign-store friendly-time generic-deriving hostname lucid
+    monad-control monad-logger mtl optparse-applicative
+    postgresql-simple resource-pool safe servant servant-lucid
+    servant-server servant-static-th string-conv text text-conversions
+    time timing-convenience unix unliftio unliftio-core
+    unordered-containers wai warp
   ];
   testHaskellDepends = [
-    aeson
-    base
-    bytestring
-    containers
-    daemons
-    directory
-    either
-    fast-logger
-    filepath
-    friendly-time
-    generic-deriving
-    hedgehog
-    hostname
-    lifted-async
-    lifted-base
-    lucid
-    mmorph
-    monad-control
-    monad-logger
-    mtl
-    optparse-applicative
-    postgresql-simple
-    random
-    resource-pool
-    safe
-    servant
-    servant-lucid
-    servant-server
-    servant-static-th
-    string-conv
-    tasty
-    tasty-discover
-    tasty-hedgehog
-    tasty-hunit
-    text
-    text-conversions
-    time
-    timing-convenience
-    unix
-    unliftio
-    unliftio-core
-    unordered-containers
-    wai
-    warp
+    aeson base bytestring containers daemons directory either
+    fast-logger filepath friendly-time generic-deriving hedgehog
+    hostname lifted-async lifted-base lucid mmorph monad-control
+    monad-logger mtl optparse-applicative postgresql-simple random
+    resource-pool safe servant servant-lucid servant-server
+    servant-static-th string-conv tasty tasty-discover tasty-hedgehog
+    tasty-hunit text text-conversions time timing-convenience unix
+    unliftio unliftio-core unordered-containers wai warp
   ];
   testToolDepends = [ tasty-discover ];
   enableLibraryProfiling = true;
@@ -190,4 +61,4 @@ mkDerivation {
   description = "A full-featured PostgreSQL-backed job queue (with an admin UI)";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/old-locale.nix b/pkgs/old-locale.nix
index 9815061ed5acfd990242166ad2886b21ae04fc50..a1d4b9bd04e5380b3dac7bc24ff08048b72ee131 100644
--- a/pkgs/old-locale.nix
+++ b/pkgs/old-locale.nix
@@ -19,4 +19,4 @@ mkDerivation {
   description = "locale library";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/old-time.nix b/pkgs/old-time.nix
index c4ce30b4321d9531d92cd122add588c76bb82355..2e20187616283df2e5a015e0009a69c5aa2fa3ec 100644
--- a/pkgs/old-time.nix
+++ b/pkgs/old-time.nix
@@ -19,4 +19,4 @@ mkDerivation {
   description = "Time library";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/one-liner.nix b/pkgs/one-liner.nix
index c512661ddd4b86cbe05b5ed9d2469e313e73f460..a19ee1e08983e75e88b23f93beb495441660af38 100644
--- a/pkgs/one-liner.nix
+++ b/pkgs/one-liner.nix
@@ -1,31 +1,18 @@
-{ mkDerivation
-, HUnit
-, base
-, bifunctors
-, contravariant
-, ghc-prim
-, lib
-, linear-base
-, profunctors
-, tagged
-, transformers
+{ mkDerivation, HUnit, base, bifunctors, contravariant, ghc-prim
+, lib, linear-base, profunctors, tagged, transformers
 }:
 mkDerivation {
   pname = "one-liner";
   version = "2.1";
   sha256 = "d0e51f172e8216fa587cde54d7cafc1e28f6ea4e2708a27b6b3a3634da8eed25";
+  revision = "1";
+  editedCabalFile = "1n6d74s0x91qi4fi6wv5yggjb1nvwk0ir580mkf67bca2x6f1cqn";
   isLibrary = true;
   isExecutable = false;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    base
-    bifunctors
-    contravariant
-    ghc-prim
-    linear-base
-    profunctors
-    tagged
-    transformers
+    base bifunctors contravariant ghc-prim linear-base profunctors
+    tagged transformers
   ];
   testHaskellDepends = [ base contravariant HUnit ];
   enableLibraryProfiling = true;
@@ -39,4 +26,4 @@ mkDerivation {
   description = "Constraint-based generics";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/openssl-streams.nix b/pkgs/openssl-streams.nix
index 14e2f765158fdf2beb8dec5974885bec58da2b27..1a6b1b3c0562056407b431560d65509be5008a16 100644
--- a/pkgs/openssl-streams.nix
+++ b/pkgs/openssl-streams.nix
@@ -1,13 +1,5 @@
-{ mkDerivation
-, HUnit
-, HsOpenSSL
-, base
-, bytestring
-, io-streams
-, lib
-, network
-, test-framework
-, test-framework-hunit
+{ mkDerivation, HUnit, HsOpenSSL, base, bytestring, io-streams, lib
+, network, test-framework, test-framework-hunit
 }:
 mkDerivation {
   pname = "openssl-streams";
@@ -19,20 +11,10 @@ mkDerivation {
   isExecutable = false;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    base
-    bytestring
-    HsOpenSSL
-    io-streams
-    network
+    base bytestring HsOpenSSL io-streams network
   ];
   testHaskellDepends = [
-    base
-    bytestring
-    HsOpenSSL
-    HUnit
-    io-streams
-    network
-    test-framework
+    base bytestring HsOpenSSL HUnit io-streams network test-framework
     test-framework-hunit
   ];
   enableLibraryProfiling = true;
@@ -45,4 +27,4 @@ mkDerivation {
   description = "OpenSSL network support for io-streams";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/opentelemetry.nix b/pkgs/opentelemetry.nix
index 4574eeb015df652c59be7fa330b0bda2a5086cf1..7f309bb3286d171eeac35cae1b95b94253b4e2a6 100644
--- a/pkgs/opentelemetry.nix
+++ b/pkgs/opentelemetry.nix
@@ -1,10 +1,5 @@
-{ mkDerivation
-, base
-, bytestring
-, exceptions
-, ghc-trace-events
-, hashable
-, lib
+{ mkDerivation, base, bytestring, exceptions, ghc-trace-events
+, hashable, lib
 }:
 mkDerivation {
   pname = "opentelemetry";
@@ -14,11 +9,7 @@ mkDerivation {
   isExecutable = false;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    base
-    bytestring
-    exceptions
-    ghc-trace-events
-    hashable
+    base bytestring exceptions ghc-trace-events hashable
   ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
@@ -29,4 +20,4 @@ mkDerivation {
   hyperlinkSource = false;
   license = lib.licenses.asl20;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/operational.nix b/pkgs/operational.nix
index 0876cb2a2c425a17495326f31921a038c204f3d2..57f505f2c6f6542996c24f30d5a017e0079f3573 100644
--- a/pkgs/operational.nix
+++ b/pkgs/operational.nix
@@ -19,4 +19,4 @@ mkDerivation {
   description = "Implementation of difficult monads made easy with operational semantics";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/optics-core.nix b/pkgs/optics-core.nix
index e0ab6f6d5fdb336caa50b406472da5aef457acfd..de60b096407d78f468e111eff1b3da8aa9b4978c 100644
--- a/pkgs/optics-core.nix
+++ b/pkgs/optics-core.nix
@@ -1,11 +1,5 @@
-{ mkDerivation
-, array
-, base
-, containers
-, indexed-profunctors
-, indexed-traversable
-, lib
-, transformers
+{ mkDerivation, array, base, containers, indexed-profunctors
+, indexed-traversable, lib, transformers
 }:
 mkDerivation {
   pname = "optics-core";
@@ -17,11 +11,7 @@ mkDerivation {
   isExecutable = false;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    array
-    base
-    containers
-    indexed-profunctors
-    indexed-traversable
+    array base containers indexed-profunctors indexed-traversable
     transformers
   ];
   enableLibraryProfiling = true;
@@ -34,4 +24,4 @@ mkDerivation {
   description = "Optics as an abstract interface: core definitions";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/optics-extra.nix b/pkgs/optics-extra.nix
index c60331190c447dc3f78b3ed5d567279bdf665fbd..2337ee9916420edad4fa7b094229686eff6b49d7 100644
--- a/pkgs/optics-extra.nix
+++ b/pkgs/optics-extra.nix
@@ -1,18 +1,6 @@
-{ mkDerivation
-, array
-, base
-, bytestring
-, containers
-, hashable
-, indexed-profunctors
-, indexed-traversable-instances
-, lib
-, mtl
-, optics-core
-, text
-, transformers
-, unordered-containers
-, vector
+{ mkDerivation, array, base, bytestring, containers, hashable
+, indexed-profunctors, indexed-traversable-instances, lib, mtl
+, optics-core, text, transformers, unordered-containers, vector
 }:
 mkDerivation {
   pname = "optics-extra";
@@ -24,19 +12,9 @@ mkDerivation {
   isExecutable = false;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    array
-    base
-    bytestring
-    containers
-    hashable
-    indexed-profunctors
-    indexed-traversable-instances
-    mtl
-    optics-core
-    text
-    transformers
-    unordered-containers
-    vector
+    array base bytestring containers hashable indexed-profunctors
+    indexed-traversable-instances mtl optics-core text transformers
+    unordered-containers vector
   ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
@@ -48,4 +26,4 @@ mkDerivation {
   description = "Extra utilities and instances for optics-core";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/optics-th.nix b/pkgs/optics-th.nix
index b1904ea169e28f14f21764f00f2553815c4c0bbc..4d3685f4b68a0ef185ea8c7dcef548d58e0b9ac2 100644
--- a/pkgs/optics-th.nix
+++ b/pkgs/optics-th.nix
@@ -1,30 +1,17 @@
-{ mkDerivation
-, base
-, containers
-, lib
-, mtl
-, optics-core
-, tagged
-, template-haskell
-, th-abstraction
-, transformers
+{ mkDerivation, base, containers, lib, mtl, optics-core, tagged
+, template-haskell, th-abstraction, transformers
 }:
 mkDerivation {
   pname = "optics-th";
   version = "0.4.1";
   sha256 = "d73857b79dcd8f7c7e70fa4727f134145b62902e8d3e448f8b25c38a9da4fd17";
-  revision = "2";
-  editedCabalFile = "1fl217q7s0g8a46p2smanhhdj0jqvc9n3lagcnpphkv3fzfgrcbz";
+  revision = "3";
+  editedCabalFile = "0hfx1ms0nmy57ik71r6bwlj3c5wwp48xf0mlr0pfi2c0wjl49azr";
   isLibrary = true;
   isExecutable = false;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    base
-    containers
-    mtl
-    optics-core
-    template-haskell
-    th-abstraction
+    base containers mtl optics-core template-haskell th-abstraction
     transformers
   ];
   testHaskellDepends = [ base optics-core tagged ];
@@ -38,4 +25,4 @@ mkDerivation {
   description = "Optics construction using TemplateHaskell";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/optics.nix b/pkgs/optics.nix
index fbc6d1a8178fa79b6f4fc3f428eb9a95684eb12a..35cea72775dc98a5a1d87dff5d77ed00a60188b4 100644
--- a/pkgs/optics.nix
+++ b/pkgs/optics.nix
@@ -1,26 +1,8 @@
-{ mkDerivation
-, QuickCheck
-, array
-, base
-, bytestring
-, containers
-, indexed-profunctors
-, inspection-testing
-, lens
-, lib
-, mtl
-, optics-core
-, optics-extra
-, optics-th
-, random
-, tasty
-, tasty-bench
-, tasty-hunit
-, tasty-quickcheck
-, template-haskell
-, transformers
-, unordered-containers
-, vector
+{ mkDerivation, QuickCheck, array, base, bytestring, containers
+, indexed-profunctors, inspection-testing, lens, lib, mtl
+, optics-core, optics-extra, optics-th, random, tasty, tasty-bench
+, tasty-hunit, tasty-quickcheck, template-haskell, transformers
+, unordered-containers, vector
 }:
 mkDerivation {
   pname = "optics";
@@ -30,38 +12,17 @@ mkDerivation {
   isExecutable = false;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    array
-    base
-    containers
-    mtl
-    optics-core
-    optics-extra
-    optics-th
+    array base containers mtl optics-core optics-extra optics-th
     transformers
   ];
   testHaskellDepends = [
-    base
-    containers
-    indexed-profunctors
-    inspection-testing
-    mtl
-    optics-core
-    QuickCheck
-    random
-    tasty
-    tasty-hunit
-    tasty-quickcheck
+    base containers indexed-profunctors inspection-testing mtl
+    optics-core QuickCheck random tasty tasty-hunit tasty-quickcheck
     template-haskell
   ];
   benchmarkHaskellDepends = [
-    base
-    bytestring
-    containers
-    lens
-    tasty-bench
-    transformers
-    unordered-containers
-    vector
+    base bytestring containers lens tasty-bench transformers
+    unordered-containers vector
   ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
@@ -73,4 +34,4 @@ mkDerivation {
   description = "Optics as an abstract interface";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/optional-args.nix b/pkgs/optional-args.nix
index b628d0794d080065b5070734db7903777384b698..280d2ba5bedec13d30a3ef1d2df1e160c6bbfe8e 100644
--- a/pkgs/optional-args.nix
+++ b/pkgs/optional-args.nix
@@ -19,4 +19,4 @@ mkDerivation {
   description = "Optional function arguments";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/options.nix b/pkgs/options.nix
index d7553b5d29e3a9f6eca1b07529a9310b014a77e6..6d979891f3e63e2b3f77fd5dfa2e5ce216f95baf 100644
--- a/pkgs/options.nix
+++ b/pkgs/options.nix
@@ -1,11 +1,5 @@
-{ mkDerivation
-, base
-, chell
-, chell-quickcheck
-, containers
-, lib
-, monads-tf
-, transformers
+{ mkDerivation, base, chell, chell-quickcheck, containers, lib
+, monads-tf, transformers
 }:
 mkDerivation {
   pname = "options";
@@ -16,12 +10,7 @@ mkDerivation {
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [ base containers monads-tf transformers ];
   testHaskellDepends = [
-    base
-    chell
-    chell-quickcheck
-    containers
-    monads-tf
-    transformers
+    base chell chell-quickcheck containers monads-tf transformers
   ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
@@ -34,4 +23,4 @@ mkDerivation {
   description = "A powerful and easy-to-use command-line option parser";
   license = lib.licenses.mit;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/optparse-applicative.nix b/pkgs/optparse-applicative.nix
index bf9dd0249d52a67fc5badd0baf298c098172f508..e17931576c843d215627c90cb6d21c8747515435 100644
--- a/pkgs/optparse-applicative.nix
+++ b/pkgs/optparse-applicative.nix
@@ -1,11 +1,5 @@
-{ mkDerivation
-, QuickCheck
-, ansi-wl-pprint
-, base
-, lib
-, process
-, transformers
-, transformers-compat
+{ mkDerivation, QuickCheck, ansi-wl-pprint, base, lib, process
+, transformers, transformers-compat
 }:
 mkDerivation {
   pname = "optparse-applicative";
@@ -15,11 +9,7 @@ mkDerivation {
   isExecutable = false;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    ansi-wl-pprint
-    base
-    process
-    transformers
-    transformers-compat
+    ansi-wl-pprint base process transformers transformers-compat
   ];
   testHaskellDepends = [ base QuickCheck ];
   enableLibraryProfiling = true;
@@ -33,4 +23,4 @@ mkDerivation {
   description = "Utilities and combinators for parsing command line options";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/optparse-simple.nix b/pkgs/optparse-simple.nix
index 088cb352ee60843e6e30efd0e03badba9fbae375..77f8e343ca84958edf00f435c8fce0bb217e90d5 100644
--- a/pkgs/optparse-simple.nix
+++ b/pkgs/optparse-simple.nix
@@ -1,13 +1,5 @@
-{ mkDerivation
-, base
-, bytestring
-, directory
-, githash
-, lib
-, optparse-applicative
-, template-haskell
-, th-compat
-, transformers
+{ mkDerivation, base, bytestring, directory, githash, lib
+, optparse-applicative, template-haskell, th-compat, transformers
 }:
 mkDerivation {
   pname = "optparse-simple";
@@ -17,11 +9,7 @@ mkDerivation {
   isExecutable = true;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    base
-    githash
-    optparse-applicative
-    template-haskell
-    th-compat
+    base githash optparse-applicative template-haskell th-compat
     transformers
   ];
   testHaskellDepends = [ base bytestring directory ];
@@ -36,4 +24,4 @@ mkDerivation {
   description = "Simple interface to optparse-applicative";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/ordered-containers.nix b/pkgs/ordered-containers.nix
index bdbce0e16cd8b02a57b0ced2dd2e062de8109756..cbb215b8767aaf2bd1c2f05985cdf8a06b20e89d 100644
--- a/pkgs/ordered-containers.nix
+++ b/pkgs/ordered-containers.nix
@@ -17,4 +17,4 @@ mkDerivation {
   description = "Set- and Map-like types that remember the order elements were inserted";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/parallel.nix b/pkgs/parallel.nix
index 04c6c33d6502348b854c541e6983eea74731ba23..8d223f9da5d109989cc958fc0a6c78a53aa225cd 100644
--- a/pkgs/parallel.nix
+++ b/pkgs/parallel.nix
@@ -3,8 +3,8 @@ mkDerivation {
   pname = "parallel";
   version = "3.2.2.0";
   sha256 = "170453a71a2a8b31cca63125533f7771d7debeb639700bdabdd779c34d8a6ef6";
-  revision = "5";
-  editedCabalFile = "1q45wzpf2sda0244l55gakl3g5zqhcb27m86nhl3vslcjc35mpbf";
+  revision = "6";
+  editedCabalFile = "1f14frciafrs63a581lm7s1zxv71wa04ydzf80gldfi7x73c6ln6";
   isLibrary = true;
   isExecutable = false;
   enableSeparateDataOutput = false;
@@ -19,4 +19,4 @@ mkDerivation {
   description = "Parallel programming library";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/parsec-class.nix b/pkgs/parsec-class.nix
index 08ef05636369b5f6556c7185a5e74d633a97fcd2..82eb5e6726535b8d3079b137fa6fa4259ba25cbe 100644
--- a/pkgs/parsec-class.nix
+++ b/pkgs/parsec-class.nix
@@ -18,4 +18,4 @@ mkDerivation {
   description = "Class of types that can be constructed from their text representation";
   license = lib.licenses.mit;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/parsec-numbers.nix b/pkgs/parsec-numbers.nix
index 18751a2b81b28492aa7e0b40e41d64a27cd61715..ea9cce03f32cd0a4884851ca976b81af4c8993f3 100644
--- a/pkgs/parsec-numbers.nix
+++ b/pkgs/parsec-numbers.nix
@@ -17,4 +17,4 @@ mkDerivation {
   description = "Utilities for parsing numbers from strings";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/parsec1.nix b/pkgs/parsec1.nix
index 79e13ee99eaac5fe5f89fec01811eb9d23177615..1d40048920ea0e2385613dbbe424e9f95b353830 100644
--- a/pkgs/parsec1.nix
+++ b/pkgs/parsec1.nix
@@ -17,4 +17,4 @@ mkDerivation {
   description = "Portable monadic parser combinators";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/parser-combinators.nix b/pkgs/parser-combinators.nix
index fe750e8a832aa027e6c8b40e4fe644186a0e6953..a08780229786c98e25cbaf40f1569ff03458ea88 100644
--- a/pkgs/parser-combinators.nix
+++ b/pkgs/parser-combinators.nix
@@ -18,4 +18,4 @@ mkDerivation {
   description = "Lightweight package providing commonly useful parser combinators";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/parsers-megaparsec.nix b/pkgs/parsers-megaparsec.nix
index 40dcf15e02611e32e953995990d439b1f99b5169..3763decbb4f5fda7db013d68b903b90c844f1e71 100644
--- a/pkgs/parsers-megaparsec.nix
+++ b/pkgs/parsers-megaparsec.nix
@@ -1,13 +1,5 @@
-{ mkDerivation
-, base
-, fail
-, lib
-, megaparsec
-, mtl
-, parsers
-, semigroups
-, text
-, transformers
+{ mkDerivation, base, fail, lib, megaparsec, mtl, parsers
+, semigroups, text, transformers
 }:
 mkDerivation {
   pname = "parsers-megaparsec";
@@ -19,14 +11,7 @@ mkDerivation {
   isExecutable = false;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    base
-    fail
-    megaparsec
-    mtl
-    parsers
-    semigroups
-    text
-    transformers
+    base fail megaparsec mtl parsers semigroups text transformers
   ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
@@ -39,4 +24,4 @@ mkDerivation {
   description = "`parsers` instances for Megaparsec";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/parsers.nix b/pkgs/parsers.nix
index 19beee1158427184aedc9e37874f5327eb6776ea..3c0a2c2205bf9af1592cca2cb8d4315a3124f5b3 100644
--- a/pkgs/parsers.nix
+++ b/pkgs/parsers.nix
@@ -1,19 +1,6 @@
-{ mkDerivation
-, QuickCheck
-, attoparsec
-, base
-, base-orphans
-, binary
-, bytestring
-, charset
-, containers
-, lib
-, mtl
-, parsec
-, quickcheck-instances
-, scientific
-, text
-, transformers
+{ mkDerivation, QuickCheck, attoparsec, base, base-orphans, binary
+, bytestring, charset, containers, lib, mtl, parsec
+, quickcheck-instances, scientific, text, transformers
 , unordered-containers
 }:
 mkDerivation {
@@ -24,26 +11,11 @@ mkDerivation {
   isExecutable = false;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    attoparsec
-    base
-    base-orphans
-    binary
-    charset
-    containers
-    mtl
-    parsec
-    scientific
-    text
-    transformers
-    unordered-containers
+    attoparsec base base-orphans binary charset containers mtl parsec
+    scientific text transformers unordered-containers
   ];
   testHaskellDepends = [
-    attoparsec
-    base
-    bytestring
-    parsec
-    QuickCheck
-    quickcheck-instances
+    attoparsec base bytestring parsec QuickCheck quickcheck-instances
   ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
@@ -56,4 +28,4 @@ mkDerivation {
   description = "Parsing combinators";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/partial-order.nix b/pkgs/partial-order.nix
index 9f3f5b78e18cb58396d764a9b4f48bfeab731456..66293b1eb2891eb3b49c40630194f6dd2ae94dac 100644
--- a/pkgs/partial-order.nix
+++ b/pkgs/partial-order.nix
@@ -1,11 +1,5 @@
-{ mkDerivation
-, HUnit
-, base
-, containers
-, lib
-, test-framework
-, test-framework-hunit
-, test-framework-quickcheck2
+{ mkDerivation, HUnit, base, containers, lib, test-framework
+, test-framework-hunit, test-framework-quickcheck2
 }:
 mkDerivation {
   pname = "partial-order";
@@ -16,11 +10,7 @@ mkDerivation {
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [ base containers ];
   testHaskellDepends = [
-    base
-    containers
-    HUnit
-    test-framework
-    test-framework-hunit
+    base containers HUnit test-framework test-framework-hunit
     test-framework-quickcheck2
   ];
   enableLibraryProfiling = true;
@@ -34,4 +24,4 @@ mkDerivation {
   description = "Provides typeclass suitable for types admitting a partial order";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/password-types.nix b/pkgs/password-types.nix
index dc1f97cf07640fadd2239fe89bad8b25f64529e9..2f4cc0edbb5aee37e14d4bb3fc2604e8726aa578 100644
--- a/pkgs/password-types.nix
+++ b/pkgs/password-types.nix
@@ -1,18 +1,6 @@
-{ mkDerivation
-, Cabal
-, QuickCheck
-, base
-, base-compat
-, bytestring
-, cabal-doctest
-, doctest
-, lib
-, memory
-, quickcheck-instances
-, tasty
-, tasty-quickcheck
-, template-haskell
-, text
+{ mkDerivation, Cabal, QuickCheck, base, base-compat, bytestring
+, cabal-doctest, doctest, lib, memory, quickcheck-instances, tasty
+, tasty-quickcheck, template-haskell, text
 }:
 mkDerivation {
   pname = "password-types";
@@ -26,15 +14,8 @@ mkDerivation {
   setupHaskellDepends = [ base Cabal cabal-doctest ];
   libraryHaskellDepends = [ base bytestring memory text ];
   testHaskellDepends = [
-    base
-    base-compat
-    doctest
-    QuickCheck
-    quickcheck-instances
-    tasty
-    tasty-quickcheck
-    template-haskell
-    text
+    base base-compat doctest QuickCheck quickcheck-instances tasty
+    tasty-quickcheck template-haskell text
   ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
@@ -47,4 +28,4 @@ mkDerivation {
   description = "Types for handling passwords";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/path-dhall-instance.nix b/pkgs/path-dhall-instance.nix
index 0b30ff6e7a7d1f34b96a6f6953133d497207efd3..e64161456b49d63bf520f140b200c76bcd670244 100644
--- a/pkgs/path-dhall-instance.nix
+++ b/pkgs/path-dhall-instance.nix
@@ -17,4 +17,4 @@ mkDerivation {
   description = "ToDhall and FromDhall instances for Path";
   license = lib.licenses.mit;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/path-pieces.nix b/pkgs/path-pieces.nix
index 81652e2323b66522edab2f44262d7feb81ea7348..dc93c5252299b78f2b6970d7acfff93ee79d3cf4 100644
--- a/pkgs/path-pieces.nix
+++ b/pkgs/path-pieces.nix
@@ -20,4 +20,4 @@ mkDerivation {
   description = "Components of paths";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/path.nix b/pkgs/path.nix
index 12af0f67951b2368ae91e6b24761fc2829289f48..4e62d49433d25663ba071ae6aa4a258fda277338 100644
--- a/pkgs/path.nix
+++ b/pkgs/path.nix
@@ -1,21 +1,7 @@
-{ mkDerivation
-, QuickCheck
-, aeson
-, base
-, bytestring
-, deepseq
-, exceptions
-, filepath
-, genvalidity
-, genvalidity-hspec
-, genvalidity-property
-, hashable
-, hspec
-, lib
-, mtl
-, template-haskell
-, text
-, validity
+{ mkDerivation, QuickCheck, aeson, base, bytestring, deepseq
+, exceptions, filepath, genvalidity, genvalidity-hspec
+, genvalidity-property, hashable, hspec, lib, mtl, template-haskell
+, text, validity
 }:
 mkDerivation {
   pname = "path";
@@ -25,28 +11,12 @@ mkDerivation {
   isExecutable = false;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    aeson
-    base
-    deepseq
-    exceptions
-    filepath
-    hashable
-    template-haskell
+    aeson base deepseq exceptions filepath hashable template-haskell
     text
   ];
   testHaskellDepends = [
-    aeson
-    base
-    bytestring
-    filepath
-    genvalidity
-    genvalidity-hspec
-    genvalidity-property
-    hspec
-    mtl
-    QuickCheck
-    template-haskell
-    validity
+    aeson base bytestring filepath genvalidity genvalidity-hspec
+    genvalidity-property hspec mtl QuickCheck template-haskell validity
   ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
@@ -58,4 +28,4 @@ mkDerivation {
   description = "Support for well-typed paths";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/patience.nix b/pkgs/patience.nix
index b98608bcd42ad18688640b4e7871d073519f2aa7..86cd80915473570a8f87eff7c460ba1807561823 100644
--- a/pkgs/patience.nix
+++ b/pkgs/patience.nix
@@ -18,4 +18,4 @@ mkDerivation {
   description = "Patience diff and longest increasing subsequence";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/pcg-random.nix b/pkgs/pcg-random.nix
index 5186af6c527ad11be893efa0acf3947d1ad57cf7..cc51caca74b78bd2ba7eba315b38f5ab4237548e 100644
--- a/pkgs/pcg-random.nix
+++ b/pkgs/pcg-random.nix
@@ -1,13 +1,5 @@
-{ mkDerivation
-, Cabal
-, base
-, bytestring
-, cabal-doctest
-, doctest
-, entropy
-, lib
-, primitive
-, random
+{ mkDerivation, Cabal, base, bytestring, cabal-doctest, doctest
+, entropy, lib, primitive, random
 }:
 mkDerivation {
   pname = "pcg-random";
@@ -18,11 +10,7 @@ mkDerivation {
   enableSeparateDataOutput = false;
   setupHaskellDepends = [ base Cabal cabal-doctest ];
   libraryHaskellDepends = [
-    base
-    bytestring
-    entropy
-    primitive
-    random
+    base bytestring entropy primitive random
   ];
   testHaskellDepends = [ base doctest ];
   enableLibraryProfiling = true;
@@ -36,4 +24,4 @@ mkDerivation {
   description = "Haskell bindings to the PCG random number generator";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/pcre-heavy.nix b/pkgs/pcre-heavy.nix
index a8414228e44c224fadf57287191c549781c35c5b..55fc3ba3aead8120f0883afc385a52375d60f5b4 100644
--- a/pkgs/pcre-heavy.nix
+++ b/pkgs/pcre-heavy.nix
@@ -1,14 +1,5 @@
-{ mkDerivation
-, Glob
-, base
-, base-compat
-, bytestring
-, doctest
-, lib
-, pcre-light
-, semigroups
-, string-conversions
-, template-haskell
+{ mkDerivation, Glob, base, base-compat, bytestring, doctest, lib
+, pcre-light, semigroups, string-conversions, template-haskell
 }:
 mkDerivation {
   pname = "pcre-heavy";
@@ -20,13 +11,8 @@ mkDerivation {
   isExecutable = false;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    base
-    base-compat
-    bytestring
-    pcre-light
-    semigroups
-    string-conversions
-    template-haskell
+    base base-compat bytestring pcre-light semigroups
+    string-conversions template-haskell
   ];
   testHaskellDepends = [ base doctest Glob ];
   enableLibraryProfiling = true;
@@ -40,4 +26,4 @@ mkDerivation {
   description = "A regexp (regex) library on top of pcre-light you can actually use";
   license = lib.licenses.publicDomain;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/pcre-light.nix b/pkgs/pcre-light.nix
index a0feea36e4ef5fb3cf14e932668088979cad85a1..1f0bd44b858323848cefc0b17ef5f10ac4d48cd4 100644
--- a/pkgs/pcre-light.nix
+++ b/pkgs/pcre-light.nix
@@ -1,11 +1,4 @@
-{ mkDerivation
-, HUnit
-, base
-, bytestring
-, containers
-, lib
-, mtl
-, pcre
+{ mkDerivation, HUnit, base, bytestring, containers, lib, mtl, pcre
 }:
 mkDerivation {
   pname = "pcre-light";
@@ -28,4 +21,4 @@ mkDerivation {
   description = "Portable regex library for Perl 5 compatible regular expressions";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/pcre2.nix b/pkgs/pcre2.nix
index 9abcecb3bc453f8159a951db7518ac692915e945..a5cde087ba507562c0ba7778441a6d026617d401 100644
--- a/pkgs/pcre2.nix
+++ b/pkgs/pcre2.nix
@@ -1,16 +1,6 @@
-{ mkDerivation
-, base
-, containers
-, criterion
-, hspec
-, lib
-, microlens
-, microlens-platform
-, mtl
-, pcre-light
-, regex-pcre-builtin
-, template-haskell
-, text
+{ mkDerivation, base, containers, criterion, hspec, lib, microlens
+, microlens-platform, mtl, pcre-light, regex-pcre-builtin
+, template-haskell, text
 }:
 mkDerivation {
   pname = "pcre2";
@@ -20,34 +10,15 @@ mkDerivation {
   isExecutable = false;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    base
-    containers
-    microlens
-    mtl
-    template-haskell
-    text
+    base containers microlens mtl template-haskell text
   ];
   testHaskellDepends = [
-    base
-    containers
-    hspec
-    microlens
-    microlens-platform
-    mtl
-    template-haskell
-    text
+    base containers hspec microlens microlens-platform mtl
+    template-haskell text
   ];
   benchmarkHaskellDepends = [
-    base
-    containers
-    criterion
-    microlens
-    microlens-platform
-    mtl
-    pcre-light
-    regex-pcre-builtin
-    template-haskell
-    text
+    base containers criterion microlens microlens-platform mtl
+    pcre-light regex-pcre-builtin template-haskell text
   ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
@@ -60,4 +31,4 @@ mkDerivation {
   description = "Regular expressions via the PCRE2 C library (included)";
   license = lib.licenses.asl20;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/pem.nix b/pkgs/pem.nix
index 199b6a1f3de8ec99bd160abb3a400c90266aec20..a1900cfab35e2a2920258ae430f4ae24e13335a4 100644
--- a/pkgs/pem.nix
+++ b/pkgs/pem.nix
@@ -1,13 +1,5 @@
-{ mkDerivation
-, HUnit
-, QuickCheck
-, base
-, basement
-, bytestring
-, lib
-, memory
-, test-framework
-, test-framework-hunit
+{ mkDerivation, HUnit, QuickCheck, base, basement, bytestring, lib
+, memory, test-framework, test-framework-hunit
 , test-framework-quickcheck2
 }:
 mkDerivation {
@@ -19,13 +11,8 @@ mkDerivation {
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [ base basement bytestring memory ];
   testHaskellDepends = [
-    base
-    bytestring
-    HUnit
-    QuickCheck
-    test-framework
-    test-framework-hunit
-    test-framework-quickcheck2
+    base bytestring HUnit QuickCheck test-framework
+    test-framework-hunit test-framework-quickcheck2
   ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
@@ -38,4 +25,4 @@ mkDerivation {
   description = "Privacy Enhanced Mail (PEM) format reader and writer";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/pg-transact-effectful.nix b/pkgs/pg-transact-effectful.nix
index 5068cf43751e5aa4d0a8046dc49b5a625458416b..c7191b25b5686ee4692d25faffc1edcb583c666b 100644
--- a/pkgs/pg-transact-effectful.nix
+++ b/pkgs/pg-transact-effectful.nix
@@ -1,12 +1,5 @@
-{ mkDerivation
-, base
-, effectful-core
-, fetchgit
-, lib
-, mtl
-, pg-transact
-, postgresql-simple
-, resource-pool
+{ mkDerivation, base, effectful-core, fetchgit, lib, mtl
+, pg-transact, postgresql-simple, resource-pool
 }:
 mkDerivation {
   pname = "pg-transact-effectful";
@@ -21,12 +14,7 @@ mkDerivation {
   isExecutable = false;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    base
-    effectful-core
-    mtl
-    pg-transact
-    postgresql-simple
-    resource-pool
+    base effectful-core mtl pg-transact postgresql-simple resource-pool
   ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
@@ -38,4 +26,4 @@ mkDerivation {
   homepage = "https://github.com/kleidukos/pg-transact-effectful/";
   license = lib.licenses.mit;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/pg-transact.nix b/pkgs/pg-transact.nix
index 6f48059f1240663dcb70d1394cdbfde61c4b48d9..f0d3de992e3bb1b84a630ce96fdd1d497743ca49 100644
--- a/pkgs/pg-transact.nix
+++ b/pkgs/pg-transact.nix
@@ -1,18 +1,6 @@
-{ mkDerivation
-, async
-, base
-, bytestring
-, criterion
-, deepseq
-, exceptions
-, hspec
-, hspec-expectations-lifted
-, lib
-, monad-control
-, postgresql-libpq
-, postgresql-simple
-, tmp-postgres
-, transformers
+{ mkDerivation, async, base, bytestring, criterion, deepseq
+, exceptions, hspec, hspec-expectations-lifted, lib, monad-control
+, postgresql-libpq, postgresql-simple, tmp-postgres, transformers
 }:
 mkDerivation {
   pname = "pg-transact";
@@ -22,30 +10,15 @@ mkDerivation {
   isExecutable = false;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    base
-    bytestring
-    exceptions
-    monad-control
-    postgresql-simple
+    base bytestring exceptions monad-control postgresql-simple
     transformers
   ];
   testHaskellDepends = [
-    async
-    base
-    bytestring
-    exceptions
-    hspec
-    hspec-expectations-lifted
-    postgresql-libpq
-    postgresql-simple
-    tmp-postgres
+    async base bytestring exceptions hspec hspec-expectations-lifted
+    postgresql-libpq postgresql-simple tmp-postgres
   ];
   benchmarkHaskellDepends = [
-    base
-    criterion
-    deepseq
-    postgresql-simple
-    tmp-postgres
+    base criterion deepseq postgresql-simple tmp-postgres
   ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
@@ -58,4 +31,4 @@ mkDerivation {
   description = "A postgresql-simple transaction monad";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/pgp-wordlist.nix b/pkgs/pgp-wordlist.nix
index db62ac0b7f9704beeca307449ff93ba10c2e0349..5152725f1652e3e460c261ce66e3310bd6d5d5aa 100644
--- a/pkgs/pgp-wordlist.nix
+++ b/pkgs/pgp-wordlist.nix
@@ -1,16 +1,5 @@
-{ mkDerivation
-, HUnit
-, base
-, bytestring
-, containers
-, deepseq
-, doctest
-, lib
-, tasty
-, tasty-hunit
-, tasty-quickcheck
-, text
-, vector
+{ mkDerivation, HUnit, base, bytestring, containers, deepseq
+, doctest, lib, tasty, tasty-hunit, tasty-quickcheck, text, vector
 }:
 mkDerivation {
   pname = "pgp-wordlist";
@@ -21,15 +10,8 @@ mkDerivation {
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [ base bytestring containers text vector ];
   testHaskellDepends = [
-    base
-    bytestring
-    deepseq
-    doctest
-    HUnit
-    tasty
-    tasty-hunit
-    tasty-quickcheck
-    text
+    base bytestring deepseq doctest HUnit tasty tasty-hunit
+    tasty-quickcheck text
   ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
@@ -42,4 +24,4 @@ mkDerivation {
   description = "Translate between binary data and a human-readable collection of words";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/pipes-safe.nix b/pkgs/pipes-safe.nix
index ad72fe2e7daccda32b4ff73533eb17f0c67343e2..34432f9be980734b789753d2110618982f0cec78 100644
--- a/pkgs/pipes-safe.nix
+++ b/pkgs/pipes-safe.nix
@@ -1,14 +1,5 @@
-{ mkDerivation
-, base
-, containers
-, exceptions
-, lib
-, monad-control
-, mtl
-, pipes
-, primitive
-, transformers
-, transformers-base
+{ mkDerivation, base, containers, exceptions, lib, monad-control
+, mtl, pipes, primitive, transformers, transformers-base
 }:
 mkDerivation {
   pname = "pipes-safe";
@@ -20,15 +11,8 @@ mkDerivation {
   isExecutable = false;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    base
-    containers
-    exceptions
-    monad-control
-    mtl
-    pipes
-    primitive
-    transformers
-    transformers-base
+    base containers exceptions monad-control mtl pipes primitive
+    transformers transformers-base
   ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
@@ -40,4 +24,4 @@ mkDerivation {
   description = "Safety for the pipes ecosystem";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/pipes.nix b/pkgs/pipes.nix
index f07a90fcb9b1af618e98566bddbf62400acf2635..8840af36339f61dbb08cf48eded265e9be3b2481 100644
--- a/pkgs/pipes.nix
+++ b/pkgs/pipes.nix
@@ -1,16 +1,6 @@
-{ mkDerivation
-, QuickCheck
-, base
-, criterion
-, exceptions
-, lib
-, mmorph
-, mtl
-, optparse-applicative
-, test-framework
-, test-framework-quickcheck2
-, transformers
-, void
+{ mkDerivation, QuickCheck, base, criterion, exceptions, lib
+, mmorph, mtl, optparse-applicative, test-framework
+, test-framework-quickcheck2, transformers, void
 }:
 mkDerivation {
   pname = "pipes";
@@ -22,27 +12,14 @@ mkDerivation {
   isExecutable = false;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    base
-    exceptions
-    mmorph
-    mtl
-    transformers
-    void
+    base exceptions mmorph mtl transformers void
   ];
   testHaskellDepends = [
-    base
-    mtl
-    QuickCheck
-    test-framework
-    test-framework-quickcheck2
+    base mtl QuickCheck test-framework test-framework-quickcheck2
     transformers
   ];
   benchmarkHaskellDepends = [
-    base
-    criterion
-    mtl
-    optparse-applicative
-    transformers
+    base criterion mtl optparse-applicative transformers
   ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
@@ -54,4 +31,4 @@ mkDerivation {
   description = "Compositional pipelines";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/polyparse.nix b/pkgs/polyparse.nix
index 30a60001efdbd2fd30a6acbc86bff8d9a94ad037..1a3c769cfaa0590c9c5579126c4144d54312b7b9 100644
--- a/pkgs/polyparse.nix
+++ b/pkgs/polyparse.nix
@@ -3,8 +3,8 @@ mkDerivation {
   pname = "polyparse";
   version = "1.13";
   sha256 = "1c4c72980e1e5a4f07fea65ca08b2399581d2a6aa21eb1078f7ad286c279707b";
-  revision = "5";
-  editedCabalFile = "05qrn5pfdy45x1nkx7dvhnxs9j6d6cssws4kwn2sl3n9qmagr8mc";
+  revision = "6";
+  editedCabalFile = "0xrmzz7p2akgdyr7gm54yvq83lm9qixcrk72ia2w9xcs2r4b76vz";
   isLibrary = true;
   isExecutable = false;
   enableSeparateDataOutput = false;
@@ -20,4 +20,4 @@ mkDerivation {
   description = "A variety of alternative parser combinator libraries";
   license = "LGPL";
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/polysemy-extra.nix b/pkgs/polysemy-extra.nix
index 0e4879a199d1d488a082d151bfb94429a4a25816..233421915cff42012b01bf240d2173bf2952c1f0 100644
--- a/pkgs/polysemy-extra.nix
+++ b/pkgs/polysemy-extra.nix
@@ -1,9 +1,4 @@
-{ mkDerivation
-, base
-, containers
-, lib
-, polysemy
-, polysemy-kvstore
+{ mkDerivation, base, containers, lib, polysemy, polysemy-kvstore
 }:
 mkDerivation {
   pname = "polysemy-extra";
@@ -13,10 +8,7 @@ mkDerivation {
   isExecutable = false;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    base
-    containers
-    polysemy
-    polysemy-kvstore
+    base containers polysemy polysemy-kvstore
   ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
@@ -28,4 +20,4 @@ mkDerivation {
   description = "Extra Input and Output functions for polysemy";
   license = lib.licenses.mit;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/polysemy-kvstore.nix b/pkgs/polysemy-kvstore.nix
index 650cdda38468f38840afd1ff6349cca2c01ccd5d..b3152dcfd384f4fd3d06db6548f34946b1267cf5 100644
--- a/pkgs/polysemy-kvstore.nix
+++ b/pkgs/polysemy-kvstore.nix
@@ -17,4 +17,4 @@ mkDerivation {
   description = "KVStore effect for polysemy";
   license = lib.licenses.mit;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/polysemy-path.nix b/pkgs/polysemy-path.nix
index 103100f49d3437ca5e3a1f042845a71b34f25427..4c6c695debfd9fc6f551d105c60cbf53d07c71b5 100644
--- a/pkgs/polysemy-path.nix
+++ b/pkgs/polysemy-path.nix
@@ -19,4 +19,4 @@ mkDerivation {
   description = "Polysemy versions of Path functions";
   license = lib.licenses.mit;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/polysemy-several.nix b/pkgs/polysemy-several.nix
index 156eb10808fbf0944a192c7281d104374e8a7449..0385c0102636cfb9f98c88be38b26bfdf7cadf1a 100644
--- a/pkgs/polysemy-several.nix
+++ b/pkgs/polysemy-several.nix
@@ -17,4 +17,4 @@ mkDerivation {
   description = "Run several effects at once, taken from the polysemy-zoo";
   license = lib.licenses.mit;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/polysemy-vinyl.nix b/pkgs/polysemy-vinyl.nix
index 7f4cd630df2fc9ca55741bb9ddef287aee7ae3ed..000b65a4b76c5d517535ac01c1128d54c66bd6b9 100644
--- a/pkgs/polysemy-vinyl.nix
+++ b/pkgs/polysemy-vinyl.nix
@@ -1,10 +1,5 @@
-{ mkDerivation
-, base
-, lib
-, polysemy
-, polysemy-extra
-, polysemy-several
-, vinyl
+{ mkDerivation, base, lib, polysemy, polysemy-extra
+, polysemy-several, vinyl
 }:
 mkDerivation {
   pname = "polysemy-vinyl";
@@ -16,11 +11,7 @@ mkDerivation {
   isExecutable = false;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    base
-    polysemy
-    polysemy-extra
-    polysemy-several
-    vinyl
+    base polysemy polysemy-extra polysemy-several vinyl
   ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
@@ -32,4 +23,4 @@ mkDerivation {
   description = "Functions for mapping vinyl records in polysemy";
   license = lib.licenses.mit;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/port-utils.nix b/pkgs/port-utils.nix
index d338d51a2fdb7c60b247b3069e56057b49830892..463ee0a6e887e345a0e1832ff74a5ac2ed213926 100644
--- a/pkgs/port-utils.nix
+++ b/pkgs/port-utils.nix
@@ -1,11 +1,4 @@
-{ mkDerivation
-, async
-, base
-, hspec
-, lib
-, network
-, stm
-, transformers
+{ mkDerivation, async, base, hspec, lib, network, stm, transformers
 }:
 mkDerivation {
   pname = "port-utils";
@@ -27,4 +20,4 @@ mkDerivation {
   description = "Utilities for creating and waiting on ports";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/postgres-options.nix b/pkgs/postgres-options.nix
index 8b51f23a84e83acf57e2558274c19f603e047d65..906d4caf4b98cdbd1fd71fe1f30b0f197cee4c80 100644
--- a/pkgs/postgres-options.nix
+++ b/pkgs/postgres-options.nix
@@ -1,10 +1,4 @@
-{ mkDerivation
-, base
-, bytestring
-, generic-monoid
-, hspec
-, lib
-, split
+{ mkDerivation, base, bytestring, generic-monoid, hspec, lib, split
 , uri-bytestring
 }:
 mkDerivation {
@@ -15,11 +9,7 @@ mkDerivation {
   isExecutable = false;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    base
-    bytestring
-    generic-monoid
-    split
-    uri-bytestring
+    base bytestring generic-monoid split uri-bytestring
   ];
   testHaskellDepends = [ base hspec ];
   enableLibraryProfiling = true;
@@ -33,4 +23,4 @@ mkDerivation {
   description = "An Options type representing options for postgres connections";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/pqueue.nix b/pkgs/pqueue.nix
index 51f2058cf667a9996be1fccc9dbd97b543540164..260ebd23da4fe96762feb22790f5ebfaae0b18bb 100644
--- a/pkgs/pqueue.nix
+++ b/pkgs/pqueue.nix
@@ -1,12 +1,5 @@
-{ mkDerivation
-, base
-, deepseq
-, indexed-traversable
-, lib
-, random
-, tasty
-, tasty-bench
-, tasty-quickcheck
+{ mkDerivation, base, deepseq, indexed-traversable, lib, random
+, tasty, tasty-bench, tasty-quickcheck
 }:
 mkDerivation {
   pname = "pqueue";
@@ -29,4 +22,4 @@ mkDerivation {
   description = "Reliable, persistent, fast priority queues";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/pretty-hex.nix b/pkgs/pretty-hex.nix
index 74dd336ea3cd6b888751f16d3a28d0ef666d5ff8..be4b7a13120b0949b4cfbde70624e8b70019a179 100644
--- a/pkgs/pretty-hex.nix
+++ b/pkgs/pretty-hex.nix
@@ -17,4 +17,4 @@ mkDerivation {
   description = "A library for hex dumps of ByteStrings";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/pretty-relative-time.nix b/pkgs/pretty-relative-time.nix
index cf33fc2f71022c2d8a74c187bc0ed4012726bfc8..a7aa55208bbf7166bdad9c4a77d20777ce9397b2 100644
--- a/pkgs/pretty-relative-time.nix
+++ b/pkgs/pretty-relative-time.nix
@@ -1,14 +1,5 @@
-{ mkDerivation
-, QuickCheck
-, base
-, genvalidity
-, genvalidity-hspec
-, genvalidity-time
-, hspec
-, lib
-, time
-, validity
-, validity-time
+{ mkDerivation, QuickCheck, base, genvalidity, genvalidity-hspec
+, genvalidity-time, hspec, lib, time, validity, validity-time
 }:
 mkDerivation {
   pname = "pretty-relative-time";
@@ -19,15 +10,8 @@ mkDerivation {
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [ base time validity validity-time ];
   testHaskellDepends = [
-    base
-    genvalidity
-    genvalidity-hspec
-    genvalidity-time
-    hspec
-    QuickCheck
-    time
-    validity
-    validity-time
+    base genvalidity genvalidity-hspec genvalidity-time hspec
+    QuickCheck time validity validity-time
   ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
@@ -40,4 +24,4 @@ mkDerivation {
   description = "Pretty relative time";
   license = lib.licenses.mit;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/pretty-show.nix b/pkgs/pretty-show.nix
index 8691ec1d76a2b2c44b679c857629a2668f01dd97..e7cf1a21183d525b5f7244e6f09b990e24fba72d 100644
--- a/pkgs/pretty-show.nix
+++ b/pkgs/pretty-show.nix
@@ -1,13 +1,5 @@
-{ mkDerivation
-, array
-, base
-, filepath
-, ghc-prim
-, happy
-, haskell-lexer
-, lib
-, pretty
-, text
+{ mkDerivation, array, base, filepath, ghc-prim, happy
+, haskell-lexer, lib, pretty, text
 }:
 mkDerivation {
   pname = "pretty-show";
@@ -17,13 +9,7 @@ mkDerivation {
   isExecutable = true;
   enableSeparateDataOutput = true;
   libraryHaskellDepends = [
-    array
-    base
-    filepath
-    ghc-prim
-    haskell-lexer
-    pretty
-    text
+    array base filepath ghc-prim haskell-lexer pretty text
   ];
   libraryToolDepends = [ happy ];
   executableHaskellDepends = [ base ];
@@ -38,4 +24,4 @@ mkDerivation {
   description = "Tools for working with derived `Show` instances and generic inspection of values";
   license = lib.licenses.mit;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/prettyprinter-ansi-terminal.nix b/pkgs/prettyprinter-ansi-terminal.nix
index c1ab140e7c40ec8663c77dc7a811778d9056680a..c94a49ed87b8434e2f5206835d76683887bd2404 100644
--- a/pkgs/prettyprinter-ansi-terminal.nix
+++ b/pkgs/prettyprinter-ansi-terminal.nix
@@ -1,15 +1,5 @@
-{ mkDerivation
-, QuickCheck
-, ansi-terminal
-, base
-, base-compat
-, containers
-, deepseq
-, doctest
-, gauge
-, lib
-, prettyprinter
-, text
+{ mkDerivation, QuickCheck, ansi-terminal, base, base-compat
+, containers, deepseq, doctest, gauge, lib, prettyprinter, text
 }:
 mkDerivation {
   pname = "prettyprinter-ansi-terminal";
@@ -21,13 +11,7 @@ mkDerivation {
   libraryHaskellDepends = [ ansi-terminal base prettyprinter text ];
   testHaskellDepends = [ base doctest ];
   benchmarkHaskellDepends = [
-    base
-    base-compat
-    containers
-    deepseq
-    gauge
-    prettyprinter
-    QuickCheck
+    base base-compat containers deepseq gauge prettyprinter QuickCheck
     text
   ];
   enableLibraryProfiling = true;
@@ -41,4 +25,4 @@ mkDerivation {
   description = "ANSI terminal backend for the »prettyprinter« package";
   license = lib.licenses.bsd2;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/prettyprinter.nix b/pkgs/prettyprinter.nix
index 8ad6c825ed2101a3e647eb842e8fbcc60c27ff5f..ec62c157829624577ccaff019f28cee96cdf506d 100644
--- a/pkgs/prettyprinter.nix
+++ b/pkgs/prettyprinter.nix
@@ -1,23 +1,7 @@
-{ mkDerivation
-, QuickCheck
-, ansi-wl-pprint
-, base
-, base-compat
-, bytestring
-, containers
-, deepseq
-, doctest
-, gauge
-, lib
-, mtl
-, pgp-wordlist
-, quickcheck-instances
-, random
-, tasty
-, tasty-hunit
-, tasty-quickcheck
-, text
-, transformers
+{ mkDerivation, QuickCheck, ansi-wl-pprint, base, base-compat
+, bytestring, containers, deepseq, doctest, gauge, lib, mtl
+, pgp-wordlist, quickcheck-instances, random, tasty, tasty-hunit
+, tasty-quickcheck, text, transformers
 }:
 mkDerivation {
   pname = "prettyprinter";
@@ -28,29 +12,12 @@ mkDerivation {
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [ base text ];
   testHaskellDepends = [
-    base
-    bytestring
-    doctest
-    pgp-wordlist
-    QuickCheck
-    quickcheck-instances
-    tasty
-    tasty-hunit
-    tasty-quickcheck
-    text
+    base bytestring doctest pgp-wordlist QuickCheck
+    quickcheck-instances tasty tasty-hunit tasty-quickcheck text
   ];
   benchmarkHaskellDepends = [
-    ansi-wl-pprint
-    base
-    base-compat
-    containers
-    deepseq
-    gauge
-    mtl
-    QuickCheck
-    random
-    text
-    transformers
+    ansi-wl-pprint base base-compat containers deepseq gauge mtl
+    QuickCheck random text transformers
   ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
@@ -63,4 +30,4 @@ mkDerivation {
   description = "A modern, easy to use, well-documented, extensible pretty-printer";
   license = lib.licenses.bsd2;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/primes.nix b/pkgs/primes.nix
index a33d16735264c400e600cf4e53eabd8dee7fcc6b..c0543565c5c63660a6b7e37feeea452ef633012c 100644
--- a/pkgs/primes.nix
+++ b/pkgs/primes.nix
@@ -18,4 +18,4 @@ mkDerivation {
   description = "Efficient, purely functional generation of prime numbers";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/process-extras.nix b/pkgs/process-extras.nix
index b829575a34715b5dc39673b3d049a271e3707701..5b83b130431e5900565d5c2985f086ff8202a753 100644
--- a/pkgs/process-extras.nix
+++ b/pkgs/process-extras.nix
@@ -1,15 +1,5 @@
-{ mkDerivation
-, HUnit
-, ListLike
-, base
-, bytestring
-, data-default
-, deepseq
-, generic-deriving
-, lib
-, mtl
-, process
-, text
+{ mkDerivation, HUnit, ListLike, base, bytestring, data-default
+, deepseq, generic-deriving, lib, mtl, process, text
 }:
 mkDerivation {
   pname = "process-extras";
@@ -19,15 +9,8 @@ mkDerivation {
   isExecutable = false;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    base
-    bytestring
-    data-default
-    deepseq
-    generic-deriving
-    ListLike
-    mtl
-    process
-    text
+    base bytestring data-default deepseq generic-deriving ListLike mtl
+    process text
   ];
   testHaskellDepends = [ base HUnit ];
   enableLibraryProfiling = true;
@@ -41,4 +24,4 @@ mkDerivation {
   description = "Process extras";
   license = lib.licenses.mit;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/procex.nix b/pkgs/procex.nix
index d02f3d90280d242acf05c6d9e452a9a316bc5caa..c7a917ee8f26dfd7d6edefb14fb8f195cd21619a 100644
--- a/pkgs/procex.nix
+++ b/pkgs/procex.nix
@@ -1,13 +1,5 @@
-{ mkDerivation
-, async
-, base
-, bytestring
-, containers
-, deepseq
-, hspec
-, lib
-, unix
-, utf8-string
+{ mkDerivation, async, base, bytestring, containers, deepseq, hspec
+, lib, unix, utf8-string
 }:
 mkDerivation {
   pname = "procex";
@@ -17,13 +9,7 @@ mkDerivation {
   isExecutable = false;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    async
-    base
-    bytestring
-    containers
-    deepseq
-    unix
-    utf8-string
+    async base bytestring containers deepseq unix utf8-string
   ];
   testHaskellDepends = [ async base bytestring hspec unix ];
   enableLibraryProfiling = true;
@@ -36,4 +22,4 @@ mkDerivation {
   description = "Ergonomic process launching with extreme flexibility and speed";
   license = lib.licenses.mit;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/profunctors.nix b/pkgs/profunctors.nix
index 8eaeea1ef56558e9730c6b0a4b50c1a58a8a6dbc..389a4797c04adce1ea284134589d3ae2846f4e27 100644
--- a/pkgs/profunctors.nix
+++ b/pkgs/profunctors.nix
@@ -1,32 +1,18 @@
-{ mkDerivation
-, base
-, base-orphans
-, bifunctors
-, comonad
-, contravariant
-, distributive
-, lib
-, tagged
-, transformers
+{ mkDerivation, base, base-orphans, bifunctors, comonad
+, contravariant, distributive, lib, tagged, transformers
 }:
 mkDerivation {
   pname = "profunctors";
   version = "5.6.2";
   sha256 = "65955d7b50525a4a3bccdab1d982d2ae342897fd38140d5a94b5ef3800d8c92a";
-  revision = "2";
-  editedCabalFile = "1dhg8bys9qnfbvhy4cm4fivanmnik4rg0spshkwyp9s3j88qadix";
+  revision = "3";
+  editedCabalFile = "0y2g5dhmvkbd8zsckpgxd1g4hr3g56g0iqi6crjjc8wqd12bly71";
   isLibrary = true;
   isExecutable = false;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    base
-    base-orphans
-    bifunctors
-    comonad
-    contravariant
-    distributive
-    tagged
-    transformers
+    base base-orphans bifunctors comonad contravariant distributive
+    tagged transformers
   ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
@@ -39,4 +25,4 @@ mkDerivation {
   description = "Profunctors";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/prometheus-client.nix b/pkgs/prometheus-client.nix
index b8f785b6c4130303c41d0567d97fbc0a922739e7..451bfe735b1fbdc5612df99feb2134772bba74d5 100644
--- a/pkgs/prometheus-client.nix
+++ b/pkgs/prometheus-client.nix
@@ -1,26 +1,7 @@
-{ mkDerivation
-, QuickCheck
-, atomic-primops
-, base
-, bytestring
-, clock
-, containers
-, criterion
-, data-sketches
-, deepseq
-, doctest
-, exceptions
-, hspec
-, lib
-, mtl
-, primitive
-, random
-, random-shuffle
-, stm
-, text
-, transformers
-, transformers-compat
-, utf8-string
+{ mkDerivation, QuickCheck, atomic-primops, base, bytestring, clock
+, containers, criterion, data-sketches, deepseq, doctest
+, exceptions, hspec, lib, mtl, primitive, random, random-shuffle
+, stm, text, transformers, transformers-compat, utf8-string
 }:
 mkDerivation {
   pname = "prometheus-client";
@@ -30,50 +11,18 @@ mkDerivation {
   isExecutable = false;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    atomic-primops
-    base
-    bytestring
-    clock
-    containers
-    data-sketches
-    deepseq
-    exceptions
-    mtl
-    primitive
-    stm
-    text
-    transformers
-    transformers-compat
-    utf8-string
+    atomic-primops base bytestring clock containers data-sketches
+    deepseq exceptions mtl primitive stm text transformers
+    transformers-compat utf8-string
   ];
   testHaskellDepends = [
-    atomic-primops
-    base
-    bytestring
-    clock
-    containers
-    data-sketches
-    deepseq
-    doctest
-    exceptions
-    hspec
-    mtl
-    primitive
-    QuickCheck
-    random-shuffle
-    stm
-    text
-    transformers
-    transformers-compat
+    atomic-primops base bytestring clock containers data-sketches
+    deepseq doctest exceptions hspec mtl primitive QuickCheck
+    random-shuffle stm text transformers transformers-compat
     utf8-string
   ];
   benchmarkHaskellDepends = [
-    base
-    bytestring
-    criterion
-    random
-    text
-    utf8-string
+    base bytestring criterion random text utf8-string
   ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
@@ -86,4 +35,4 @@ mkDerivation {
   description = "Haskell client library for http://prometheus.io.";
   license = lib.licenses.asl20;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/prometheus-metrics-ghc.nix b/pkgs/prometheus-metrics-ghc.nix
index f6840a81d8c888c2e7b79b9f9225ad14c41630e5..875ecf0531f1b60ac7e470fc2cc4f056ae48ce58 100644
--- a/pkgs/prometheus-metrics-ghc.nix
+++ b/pkgs/prometheus-metrics-ghc.nix
@@ -1,9 +1,4 @@
-{ mkDerivation
-, base
-, doctest
-, lib
-, prometheus-client
-, text
+{ mkDerivation, base, doctest, lib, prometheus-client, text
 , utf8-string
 }:
 mkDerivation {
@@ -14,10 +9,7 @@ mkDerivation {
   isExecutable = false;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    base
-    prometheus-client
-    text
-    utf8-string
+    base prometheus-client text utf8-string
   ];
   testHaskellDepends = [ base doctest prometheus-client ];
   enableLibraryProfiling = true;
@@ -31,4 +23,4 @@ mkDerivation {
   description = "Metrics exposing GHC runtime information for use with prometheus-client";
   license = lib.licenses.asl20;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/prometheus-proc.nix b/pkgs/prometheus-proc.nix
index 70f03868f5d1af1c8b7209c7ef42cfa129209f2c..c4e4ae6bf653e4afea352a17d8b5c034d8fe7274 100644
--- a/pkgs/prometheus-proc.nix
+++ b/pkgs/prometheus-proc.nix
@@ -1,13 +1,5 @@
-{ mkDerivation
-, base
-, directory
-, filepath
-, lib
-, prometheus-client
-, regex-applicative
-, text
-, unix
-, unix-memory
+{ mkDerivation, base, directory, filepath, lib, prometheus-client
+, regex-applicative, text, unix, unix-memory
 }:
 mkDerivation {
   pname = "prometheus-proc";
@@ -17,14 +9,8 @@ mkDerivation {
   isExecutable = false;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    base
-    directory
-    filepath
-    prometheus-client
-    regex-applicative
-    text
-    unix
-    unix-memory
+    base directory filepath prometheus-client regex-applicative text
+    unix unix-memory
   ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
@@ -37,4 +23,4 @@ mkDerivation {
   description = "Export metrics from /proc for the current process";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/psqueues.nix b/pkgs/psqueues.nix
index 9c8edf15fdee6c445c55ff8f1caf2be770593bc7..3b2e0f3cb77d7554636c0877abf81e983c644a96 100644
--- a/pkgs/psqueues.nix
+++ b/pkgs/psqueues.nix
@@ -1,22 +1,6 @@
-{ mkDerivation
-, HUnit
-, PSQueue
-, QuickCheck
-, array
-, base
-, containers
-, criterion
-, deepseq
-, fingertree-psqueue
-, ghc-prim
-, hashable
-, lib
-, mtl
-, random
-, tagged
-, tasty
-, tasty-hunit
-, tasty-quickcheck
+{ mkDerivation, HUnit, PSQueue, QuickCheck, array, base, containers
+, criterion, deepseq, fingertree-psqueue, ghc-prim, hashable, lib
+, mtl, random, tagged, tasty, tasty-hunit, tasty-quickcheck
 , unordered-containers
 }:
 mkDerivation {
@@ -28,30 +12,12 @@ mkDerivation {
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [ base deepseq ghc-prim hashable ];
   testHaskellDepends = [
-    array
-    base
-    deepseq
-    ghc-prim
-    hashable
-    HUnit
-    QuickCheck
-    tagged
-    tasty
-    tasty-hunit
-    tasty-quickcheck
+    array base deepseq ghc-prim hashable HUnit QuickCheck tagged tasty
+    tasty-hunit tasty-quickcheck
   ];
   benchmarkHaskellDepends = [
-    base
-    containers
-    criterion
-    deepseq
-    fingertree-psqueue
-    ghc-prim
-    hashable
-    mtl
-    PSQueue
-    random
-    unordered-containers
+    base containers criterion deepseq fingertree-psqueue ghc-prim
+    hashable mtl PSQueue random unordered-containers
   ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
@@ -63,4 +29,4 @@ mkDerivation {
   description = "Pure priority search queues";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/pureMD5.nix b/pkgs/pureMD5.nix
index 3c4fb72d5285dc95234e721ebf37609e8f7a493e..b950a183f89568317019022112e4245fc40e14da 100644
--- a/pkgs/pureMD5.nix
+++ b/pkgs/pureMD5.nix
@@ -1,16 +1,6 @@
-{ mkDerivation
-, QuickCheck
-, base
-, binary
-, bytestring
-, cereal
-, crypto-api
-, crypto-api-tests
-, lib
-, pretty-hex
-, tagged
-, test-framework
-, test-framework-quickcheck2
+{ mkDerivation, QuickCheck, base, binary, bytestring, cereal
+, crypto-api, crypto-api-tests, lib, pretty-hex, tagged
+, test-framework, test-framework-quickcheck2
 }:
 mkDerivation {
   pname = "pureMD5";
@@ -20,23 +10,11 @@ mkDerivation {
   isExecutable = false;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    base
-    binary
-    bytestring
-    cereal
-    crypto-api
-    tagged
+    base binary bytestring cereal crypto-api tagged
   ];
   testHaskellDepends = [
-    base
-    binary
-    bytestring
-    cereal
-    crypto-api-tests
-    pretty-hex
-    QuickCheck
-    test-framework
-    test-framework-quickcheck2
+    base binary bytestring cereal crypto-api-tests pretty-hex
+    QuickCheck test-framework test-framework-quickcheck2
   ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
@@ -48,4 +26,4 @@ mkDerivation {
   description = "A Haskell-only implementation of the MD5 digest (hash) algorithm";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/quickcheck-arbitrary-adt.nix b/pkgs/quickcheck-arbitrary-adt.nix
index 24220fa82f81f5192fbc77028dd4fc688f1aa7ee..143a318dcabe64a6e206616163921bf2f9ca992f 100644
--- a/pkgs/quickcheck-arbitrary-adt.nix
+++ b/pkgs/quickcheck-arbitrary-adt.nix
@@ -1,11 +1,5 @@
-{ mkDerivation
-, QuickCheck
-, base
-, hspec
-, lens
-, lib
-, template-haskell
-, transformers
+{ mkDerivation, QuickCheck, base, hspec, lens, lib
+, template-haskell, transformers
 }:
 mkDerivation {
   pname = "quickcheck-arbitrary-adt";
@@ -16,12 +10,7 @@ mkDerivation {
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [ base QuickCheck ];
   testHaskellDepends = [
-    base
-    hspec
-    lens
-    QuickCheck
-    template-haskell
-    transformers
+    base hspec lens QuickCheck template-haskell transformers
   ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
@@ -34,4 +23,4 @@ mkDerivation {
   description = "Generic typeclasses for generating arbitrary ADTs";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/quickcheck-assertions.nix b/pkgs/quickcheck-assertions.nix
index 28be5f0f94f0c4107cbf8da4ab38a5816914dfff..c399671872ca4b5b40e10f341ef3452b34817333 100644
--- a/pkgs/quickcheck-assertions.nix
+++ b/pkgs/quickcheck-assertions.nix
@@ -1,10 +1,4 @@
-{ mkDerivation
-, QuickCheck
-, base
-, hspec
-, ieee754
-, lib
-, pretty-show
+{ mkDerivation, QuickCheck, base, hspec, ieee754, lib, pretty-show
 }:
 mkDerivation {
   pname = "quickcheck-assertions";
@@ -26,4 +20,4 @@ mkDerivation {
   description = "HUnit like assertions for QuickCheck";
   license = lib.licenses.lgpl3Only;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/quickcheck-classes-base.nix b/pkgs/quickcheck-classes-base.nix
index ed6cc1d0acb0400ff65db18580befb96c35d1813..b308dd4cc278ce97a1dff1e3a28f8a6d337ceb52 100644
--- a/pkgs/quickcheck-classes-base.nix
+++ b/pkgs/quickcheck-classes-base.nix
@@ -7,10 +7,7 @@ mkDerivation {
   isExecutable = false;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    base
-    containers
-    QuickCheck
-    transformers
+    base containers QuickCheck transformers
   ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
@@ -23,4 +20,4 @@ mkDerivation {
   description = "QuickCheck common typeclasses from `base`";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/quickcheck-classes.nix b/pkgs/quickcheck-classes.nix
index a9170efa294239e59b9d7aaa3f04c8935d0e976e..535b90498c68573fc0826dfe453ae894f612b637 100644
--- a/pkgs/quickcheck-classes.nix
+++ b/pkgs/quickcheck-classes.nix
@@ -1,54 +1,24 @@
-{ mkDerivation
-, QuickCheck
-, aeson
-, base
-, base-orphans
-, containers
-, lib
-, primitive
-, primitive-addr
-, quickcheck-classes-base
-, semigroupoids
-, semirings
-, tagged
-, tasty
-, tasty-quickcheck
-, transformers
-, vector
+{ mkDerivation, QuickCheck, aeson, base, base-orphans, containers
+, lib, primitive, primitive-addr, quickcheck-classes-base
+, semigroupoids, semirings, tagged, tasty, tasty-quickcheck
+, transformers, vector
 }:
 mkDerivation {
   pname = "quickcheck-classes";
   version = "0.6.5.0";
   sha256 = "62e32ad01c194798ebfb1a39ea9c06ccd54bd6d21cf726e9d0fc9db56b093ca6";
+  revision = "1";
+  editedCabalFile = "1p52n2padxppj4wy3s4v8shs7zsd9hy9r4rdk21wg7l9dwbqss5a";
   isLibrary = true;
   isExecutable = false;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    aeson
-    base
-    containers
-    primitive
-    primitive-addr
-    QuickCheck
-    quickcheck-classes-base
-    semigroupoids
-    semirings
-    transformers
-    vector
+    aeson base containers primitive primitive-addr QuickCheck
+    quickcheck-classes-base semigroupoids semirings transformers vector
   ];
   testHaskellDepends = [
-    aeson
-    base
-    base-orphans
-    containers
-    primitive
-    QuickCheck
-    semigroupoids
-    tagged
-    tasty
-    tasty-quickcheck
-    transformers
-    vector
+    aeson base base-orphans containers primitive QuickCheck
+    semigroupoids tagged tasty tasty-quickcheck transformers vector
   ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
@@ -61,4 +31,4 @@ mkDerivation {
   description = "QuickCheck common typeclasses";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/quickcheck-io.nix b/pkgs/quickcheck-io.nix
index f742c7c689d6e8caa87838859aec456052644176..14bdc99fe1bc62c7deebac23725745b3031c9d36 100644
--- a/pkgs/quickcheck-io.nix
+++ b/pkgs/quickcheck-io.nix
@@ -18,4 +18,4 @@ mkDerivation {
   description = "Use HUnit assertions as QuickCheck properties";
   license = lib.licenses.mit;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/quickcheck-text.nix b/pkgs/quickcheck-text.nix
index 6f6bc8bc16fc8c7d05af821697cf10c67acf12d2..97c4727652ed24e6a99169c31bd2eb0c4f043c3d 100644
--- a/pkgs/quickcheck-text.nix
+++ b/pkgs/quickcheck-text.nix
@@ -19,4 +19,4 @@ mkDerivation {
   description = "Alternative arbitrary instance for Text";
   license = lib.licenses.mit;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/quickcheck-unicode.nix b/pkgs/quickcheck-unicode.nix
index 5a74068992f6df2c9657542902f0ab43805f2798..a070e660f2c04c38e5f38b368dc8bf8b18ad36d0 100644
--- a/pkgs/quickcheck-unicode.nix
+++ b/pkgs/quickcheck-unicode.nix
@@ -18,4 +18,4 @@ mkDerivation {
   description = "Generator and shrink functions for testing Unicode-related software";
   license = lib.licenses.bsd2;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/quiet.nix b/pkgs/quiet.nix
index 79fae976c77e7c46d019ef4487c8c7f13b8e2350..8b6f72fc0deeda5fc78d252681d9392b98356a11 100644
--- a/pkgs/quiet.nix
+++ b/pkgs/quiet.nix
@@ -19,4 +19,4 @@ mkDerivation {
   description = "Generic deriving of Read/Show with no record labels";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/random-bytestring.nix b/pkgs/random-bytestring.nix
index 9175e85e8b6e49c5447927ebb3fc02c906396a59..a09767ce82c0a3beb062225611c679a058135f16 100644
--- a/pkgs/random-bytestring.nix
+++ b/pkgs/random-bytestring.nix
@@ -1,16 +1,5 @@
-{ mkDerivation
-, async
-, base
-, bytestring
-, criterion
-, cryptonite
-, entropy
-, ghc-prim
-, lib
-, mwc-random
-, pcg-random
-, primitive
-, random
+{ mkDerivation, async, base, bytestring, criterion, cryptonite
+, entropy, ghc-prim, lib, mwc-random, pcg-random, primitive, random
 }:
 mkDerivation {
   pname = "random-bytestring";
@@ -21,17 +10,8 @@ mkDerivation {
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [ base bytestring mwc-random pcg-random ];
   benchmarkHaskellDepends = [
-    async
-    base
-    bytestring
-    criterion
-    cryptonite
-    entropy
-    ghc-prim
-    mwc-random
-    pcg-random
-    primitive
-    random
+    async base bytestring criterion cryptonite entropy ghc-prim
+    mwc-random pcg-random primitive random
   ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
@@ -44,4 +24,4 @@ mkDerivation {
   description = "Efficient generation of random bytestrings";
   license = lib.licenses.mit;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/random-fu.nix b/pkgs/random-fu.nix
index a600cf69ca327a04445f4cae5eaead9edc50040a..55ab10cf4e5564bb28ac2ed2c1472c3ffbaddd44 100644
--- a/pkgs/random-fu.nix
+++ b/pkgs/random-fu.nix
@@ -1,16 +1,5 @@
-{ mkDerivation
-, base
-, erf
-, lib
-, math-functions
-, monad-loops
-, mtl
-, random
-, random-shuffle
-, rvar
-, syb
-, template-haskell
-, transformers
+{ mkDerivation, base, erf, lib, math-functions, monad-loops, mtl
+, random, random-shuffle, rvar, syb, template-haskell, transformers
 , vector
 }:
 mkDerivation {
@@ -21,18 +10,8 @@ mkDerivation {
   isExecutable = false;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    base
-    erf
-    math-functions
-    monad-loops
-    mtl
-    random
-    random-shuffle
-    rvar
-    syb
-    template-haskell
-    transformers
-    vector
+    base erf math-functions monad-loops mtl random random-shuffle rvar
+    syb template-haskell transformers vector
   ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
@@ -45,4 +24,4 @@ mkDerivation {
   description = "Random number generation";
   license = lib.licenses.publicDomain;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/random-shuffle.nix b/pkgs/random-shuffle.nix
index 55fbce9245bae09907ed4c8cf93dc0ba740769be..5cef4c449eb61586a4a0b9a18dfacf21d1d3c528 100644
--- a/pkgs/random-shuffle.nix
+++ b/pkgs/random-shuffle.nix
@@ -17,4 +17,4 @@ mkDerivation {
   description = "Random shuffle implementation";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/random.nix b/pkgs/random.nix
index 284af2adfe1c6761c082783818318d0d3fbb4a8b..a53c9901ed0e50e001cbac4fe816efb02ef4a7e3 100644
--- a/pkgs/random.nix
+++ b/pkgs/random.nix
@@ -1,24 +1,7 @@
-{ mkDerivation
-, base
-, bytestring
-, containers
-, deepseq
-, doctest
-, lib
-, mtl
-, primitive
-, rdtsc
-, smallcheck
-, split
-, splitmix
-, stm
-, tasty
-, tasty-bench
-, tasty-hunit
-, tasty-inspection-testing
-, tasty-smallcheck
-, time
-, transformers
+{ mkDerivation, base, bytestring, containers, deepseq, doctest, lib
+, mtl, primitive, rdtsc, smallcheck, split, splitmix, stm, tasty
+, tasty-bench, tasty-hunit, tasty-inspection-testing
+, tasty-smallcheck, time, transformers
 }:
 mkDerivation {
   pname = "random";
@@ -29,27 +12,11 @@ mkDerivation {
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [ base bytestring deepseq mtl splitmix ];
   testHaskellDepends = [
-    base
-    bytestring
-    containers
-    doctest
-    smallcheck
-    stm
-    tasty
-    tasty-hunit
-    tasty-inspection-testing
-    tasty-smallcheck
-    transformers
+    base bytestring containers doctest smallcheck stm tasty tasty-hunit
+    tasty-inspection-testing tasty-smallcheck transformers
   ];
   benchmarkHaskellDepends = [
-    base
-    mtl
-    primitive
-    rdtsc
-    split
-    splitmix
-    tasty-bench
-    time
+    base mtl primitive rdtsc split splitmix tasty-bench time
   ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
@@ -61,4 +28,4 @@ mkDerivation {
   description = "Pseudo-random number generation";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/raven-haskell.nix b/pkgs/raven-haskell.nix
index 5bb060019bc8814aa14d4b4f42646ac4796fdd48..61682f5f0eea96ea554ce096284e0b93f80db6d7 100644
--- a/pkgs/raven-haskell.nix
+++ b/pkgs/raven-haskell.nix
@@ -1,16 +1,5 @@
-{ mkDerivation
-, aeson
-, base
-, bytestring
-, http-conduit
-, lib
-, mtl
-, network
-, random
-, resourcet
-, text
-, time
-, unordered-containers
+{ mkDerivation, aeson, base, bytestring, http-conduit, lib, mtl
+, network, random, resourcet, text, time, unordered-containers
 , uuid-types
 }:
 mkDerivation {
@@ -21,18 +10,8 @@ mkDerivation {
   isExecutable = false;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    aeson
-    base
-    bytestring
-    http-conduit
-    mtl
-    network
-    random
-    resourcet
-    text
-    time
-    unordered-containers
-    uuid-types
+    aeson base bytestring http-conduit mtl network random resourcet
+    text time unordered-containers uuid-types
   ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
@@ -45,4 +24,4 @@ mkDerivation {
   description = "Haskell client for Sentry logging service";
   license = lib.licenses.mit;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/raw-strings-qq.nix b/pkgs/raw-strings-qq.nix
index f18c3ec6a7d1bb07375d41f47f417acd8001eae1..d1b9ebf2d0100f77b47a29a9edff917d9ea50eab 100644
--- a/pkgs/raw-strings-qq.nix
+++ b/pkgs/raw-strings-qq.nix
@@ -19,4 +19,4 @@ mkDerivation {
   description = "Raw string literals for Haskell";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/rdtsc.nix b/pkgs/rdtsc.nix
index f97c31cb36f53d9ee9ca6fa8ddfe431d8413dbd4..4314cd13d6994d0c9637e5ee7be10ce4bfed3f90 100644
--- a/pkgs/rdtsc.nix
+++ b/pkgs/rdtsc.nix
@@ -18,4 +18,4 @@ mkDerivation {
   description = "Binding for the rdtsc machine instruction";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/readable.nix b/pkgs/readable.nix
index 290255e47d9d348a78efa3e5f9124e60a328b76b..fc2800a62153606e34a1ddfed5ca9b0ec7a91f70 100644
--- a/pkgs/readable.nix
+++ b/pkgs/readable.nix
@@ -20,4 +20,4 @@ mkDerivation {
   description = "Reading from Text and ByteString";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/reducers.nix b/pkgs/reducers.nix
index f1b6dabdccc8d157863a45172ad1b3bdb5755f52..278bfccd4aa3f96ec212ae0fe642653d65f7c9ea 100644
--- a/pkgs/reducers.nix
+++ b/pkgs/reducers.nix
@@ -1,36 +1,19 @@
-{ mkDerivation
-, array
-, base
-, bytestring
-, containers
-, fingertree
-, hashable
-, lib
-, semigroupoids
-, text
-, transformers
+{ mkDerivation, array, base, bytestring, containers, fingertree
+, hashable, lib, semigroupoids, text, transformers
 , unordered-containers
 }:
 mkDerivation {
   pname = "reducers";
   version = "3.12.4";
   sha256 = "c066f545df7947613217256d210ecb59ba709294e7b06dad8c4d8a9263635e43";
-  revision = "2";
-  editedCabalFile = "1ji6rp0f857d0vp2kjqcck7avrjgqvqjgwnhdcxs3zbjkwpqyhfb";
+  revision = "3";
+  editedCabalFile = "00xd4pyg0p4z0alyg1zy193jc3smq50y73dkafiphd73rzszxy9g";
   isLibrary = true;
   isExecutable = false;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    array
-    base
-    bytestring
-    containers
-    fingertree
-    hashable
-    semigroupoids
-    text
-    transformers
-    unordered-containers
+    array base bytestring containers fingertree hashable semigroupoids
+    text transformers unordered-containers
   ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
@@ -43,4 +26,4 @@ mkDerivation {
   description = "Semigroups, specialized containers and a general map/reduce framework";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/ref-tf.nix b/pkgs/ref-tf.nix
index 3fd9adbcce0f815f738e0b35faab409c0443d3e3..fe51671798c39890420b897a0cdaa035ebcf39a2 100644
--- a/pkgs/ref-tf.nix
+++ b/pkgs/ref-tf.nix
@@ -17,4 +17,4 @@ mkDerivation {
   description = "A type class for monads with references using type families";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/refact.nix b/pkgs/refact.nix
index 721abc4478b5e328664f12fb35c206bb696db28c..a39bac3cb028f0317f9e525330ac147fc3a897e7 100644
--- a/pkgs/refact.nix
+++ b/pkgs/refact.nix
@@ -17,4 +17,4 @@ mkDerivation {
   description = "Specify refactorings to perform with apply-refact";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/refined.nix b/pkgs/refined.nix
index 7f44b2dfa1b9eb2acdb4e5778a0e8d3d603c808e..a5fc0fa8a97c2a9ce700e425e18554af4fba5abb 100644
--- a/pkgs/refined.nix
+++ b/pkgs/refined.nix
@@ -1,15 +1,5 @@
-{ mkDerivation
-, QuickCheck
-, aeson
-, base
-, bytestring
-, deepseq
-, exceptions
-, hashable
-, lib
-, mtl
-, template-haskell
-, text
+{ mkDerivation, QuickCheck, aeson, base, bytestring, deepseq
+, exceptions, hashable, lib, mtl, template-haskell, text
 , these-skinny
 }:
 mkDerivation {
@@ -20,17 +10,8 @@ mkDerivation {
   isExecutable = false;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    aeson
-    base
-    bytestring
-    deepseq
-    exceptions
-    hashable
-    mtl
-    QuickCheck
-    template-haskell
-    text
-    these-skinny
+    aeson base bytestring deepseq exceptions hashable mtl QuickCheck
+    template-haskell text these-skinny
   ];
   testHaskellDepends = [ base QuickCheck ];
   enableLibraryProfiling = true;
@@ -44,4 +25,4 @@ mkDerivation {
   description = "Refinement types with static and runtime checking";
   license = lib.licenses.mit;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/regex-applicative.nix b/pkgs/regex-applicative.nix
index 9b5da33353cbf50c9728f69f9c38228d31f70bd4..1a465552081daad7a84f728acc545221eec1bd7c 100644
--- a/pkgs/regex-applicative.nix
+++ b/pkgs/regex-applicative.nix
@@ -1,21 +1,7 @@
-{ mkDerivation
-, attoparsec
-, base
-, bytestring
-, containers
-, criterion
-, deepseq
-, filtrable
-, lib
-, megaparsec
-, parsec
-, parsers
-, parsers-megaparsec
-, smallcheck
-, tasty
-, tasty-hunit
-, tasty-smallcheck
-, transformers
+{ mkDerivation, attoparsec, base, bytestring, containers, criterion
+, deepseq, filtrable, lib, megaparsec, parsec, parsers
+, parsers-megaparsec, smallcheck, tasty, tasty-hunit
+, tasty-smallcheck, transformers
 }:
 mkDerivation {
   pname = "regex-applicative";
@@ -26,25 +12,12 @@ mkDerivation {
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [ base containers filtrable transformers ];
   testHaskellDepends = [
-    base
-    containers
-    filtrable
-    smallcheck
-    tasty
-    tasty-hunit
-    tasty-smallcheck
-    transformers
+    base containers filtrable smallcheck tasty tasty-hunit
+    tasty-smallcheck transformers
   ];
   benchmarkHaskellDepends = [
-    attoparsec
-    base
-    bytestring
-    criterion
-    deepseq
-    megaparsec
-    parsec
-    parsers
-    parsers-megaparsec
+    attoparsec base bytestring criterion deepseq megaparsec parsec
+    parsers parsers-megaparsec
   ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
@@ -57,4 +30,4 @@ mkDerivation {
   description = "Regex-based parsing with applicative interface";
   license = lib.licenses.mit;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/regex-base.nix b/pkgs/regex-base.nix
index 072c96dc1e7cbc3c5d2a78bb9f3f59c557022bba..222d1832229bc3c87f87e200cf44414ee1076634 100644
--- a/pkgs/regex-base.nix
+++ b/pkgs/regex-base.nix
@@ -20,4 +20,4 @@ mkDerivation {
   description = "Common \"Text.Regex.*\" API for Regex matching";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/regex-compat.nix b/pkgs/regex-compat.nix
index 23f2080b120c8feb7587569cb1193913565f1083..faebfeb549b3eccd7a1bf9776ef866a0029f3995 100644
--- a/pkgs/regex-compat.nix
+++ b/pkgs/regex-compat.nix
@@ -20,4 +20,4 @@ mkDerivation {
   description = "Replaces/enhances \"Text.Regex\"";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/regex-pcre-builtin.nix b/pkgs/regex-pcre-builtin.nix
index d8a961bacf5e064c346acdcec6539f68d3f94b34..b77c68f36d29b5b22f28f903208955c93b422e74 100644
--- a/pkgs/regex-pcre-builtin.nix
+++ b/pkgs/regex-pcre-builtin.nix
@@ -1,28 +1,17 @@
-{ mkDerivation
-, array
-, base
-, bytestring
-, containers
-, lib
-, regex-base
-, text
+{ mkDerivation, array, base, bytestring, containers, lib
+, regex-base, text
 }:
 mkDerivation {
   pname = "regex-pcre-builtin";
   version = "0.95.2.3.8.44";
   sha256 = "cacea6a45faf93df8afbf50ecb09f87acabfed0477cba4746205649eb52ec55e";
-  revision = "2";
-  editedCabalFile = "19ryjv8va9bjwhfk4v81lsvi91aj7aw1cflggywjpmw001qr419d";
+  revision = "3";
+  editedCabalFile = "071s6k97z0wiqx5rga360awgj0a031gqm725835xxszdz36w0mbv";
   isLibrary = true;
   isExecutable = false;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    array
-    base
-    bytestring
-    containers
-    regex-base
-    text
+    array base bytestring containers regex-base text
   ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
@@ -34,4 +23,4 @@ mkDerivation {
   description = "PCRE Backend for \"Text.Regex\" (regex-base)";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/regex-posix.nix b/pkgs/regex-posix.nix
index 906e4275466b8da6f3c9cca9db30ac4119f12a6d..81b174c189586ec18af573df81426b339ee17223 100644
--- a/pkgs/regex-posix.nix
+++ b/pkgs/regex-posix.nix
@@ -1,9 +1,4 @@
-{ mkDerivation
-, array
-, base
-, bytestring
-, containers
-, lib
+{ mkDerivation, array, base, bytestring, containers, lib
 , regex-base
 }:
 mkDerivation {
@@ -16,11 +11,7 @@ mkDerivation {
   isExecutable = false;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    array
-    base
-    bytestring
-    containers
-    regex-base
+    array base bytestring containers regex-base
   ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
@@ -32,4 +23,4 @@ mkDerivation {
   description = "POSIX Backend for \"Text.Regex\" (regex-base)";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/regex-tdfa.nix b/pkgs/regex-tdfa.nix
index 514790f5ee5339ca54083bc7d91a73574a42d021..c265854084404af23ddf66cd27c8b4d87631f749 100644
--- a/pkgs/regex-tdfa.nix
+++ b/pkgs/regex-tdfa.nix
@@ -1,16 +1,5 @@
-{ mkDerivation
-, array
-, base
-, bytestring
-, containers
-, directory
-, doctest-parallel
-, filepath
-, lib
-, mtl
-, parsec
-, regex-base
-, text
+{ mkDerivation, array, base, bytestring, containers, directory
+, doctest-parallel, filepath, lib, mtl, parsec, regex-base, text
 , utf8-string
 }:
 mkDerivation {
@@ -21,27 +10,11 @@ mkDerivation {
   isExecutable = false;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    array
-    base
-    bytestring
-    containers
-    mtl
-    parsec
-    regex-base
-    text
+    array base bytestring containers mtl parsec regex-base text
   ];
   testHaskellDepends = [
-    array
-    base
-    bytestring
-    containers
-    directory
-    doctest-parallel
-    filepath
-    mtl
-    regex-base
-    text
-    utf8-string
+    array base bytestring containers directory doctest-parallel
+    filepath mtl regex-base text utf8-string
   ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
@@ -54,4 +27,4 @@ mkDerivation {
   description = "Pure Haskell Tagged DFA Backend for \"Text.Regex\" (regex-base)";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/replace-megaparsec.nix b/pkgs/replace-megaparsec.nix
index 63a9d9769c9c3ead3da39cb140c62575999b0599..e029fc4df0515aeb39f51c5a54f0255762b48f51 100644
--- a/pkgs/replace-megaparsec.nix
+++ b/pkgs/replace-megaparsec.nix
@@ -1,11 +1,5 @@
-{ mkDerivation
-, Cabal
-, base
-, bytestring
-, lib
-, megaparsec
-, parser-combinators
-, text
+{ mkDerivation, Cabal, base, bytestring, lib, megaparsec
+, parser-combinators, text
 }:
 mkDerivation {
   pname = "replace-megaparsec";
@@ -15,11 +9,7 @@ mkDerivation {
   isExecutable = false;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    base
-    bytestring
-    megaparsec
-    parser-combinators
-    text
+    base bytestring megaparsec parser-combinators text
   ];
   testHaskellDepends = [ base bytestring Cabal megaparsec text ];
   enableLibraryProfiling = true;
@@ -33,4 +23,4 @@ mkDerivation {
   description = "Find, replace, and split string patterns with Megaparsec parsers (instead of regex)";
   license = lib.licenses.bsd2;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/repline.nix b/pkgs/repline.nix
index f8e84ad285b61827edd4f207952b0b4cc010132e..86498e2e1fa3653ea8e71cd1fd4c8f76b789cfff 100644
--- a/pkgs/repline.nix
+++ b/pkgs/repline.nix
@@ -1,10 +1,4 @@
-{ mkDerivation
-, base
-, containers
-, exceptions
-, haskeline
-, lib
-, mtl
+{ mkDerivation, base, containers, exceptions, haskeline, lib, mtl
 , process
 }:
 mkDerivation {
@@ -15,12 +9,7 @@ mkDerivation {
   isExecutable = false;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    base
-    containers
-    exceptions
-    haskeline
-    mtl
-    process
+    base containers exceptions haskeline mtl process
   ];
   testHaskellDepends = [ base containers mtl process ];
   enableLibraryProfiling = true;
@@ -34,4 +23,4 @@ mkDerivation {
   description = "Haskeline wrapper for GHCi-like REPL interfaces";
   license = lib.licenses.mit;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/rere.nix b/pkgs/rere.nix
index a403901bb52c3384c99958cccdb6a9bf6ecd8608..7ad9a3c3a5acb33a7d437dea1d12db4c2925d2cd 100644
--- a/pkgs/rere.nix
+++ b/pkgs/rere.nix
@@ -1,21 +1,6 @@
-{ mkDerivation
-, QuickCheck
-, aeson
-, attoparsec
-, base
-, bytestring
-, clock
-, containers
-, criterion
-, derp
-, fin
-, lib
-, parsec
-, quickcheck-instances
-, tasty
-, tasty-quickcheck
-, transformers
-, vec
+{ mkDerivation, QuickCheck, aeson, attoparsec, base, bytestring
+, clock, containers, criterion, derp, fin, lib, parsec
+, quickcheck-instances, tasty, tasty-quickcheck, transformers, vec
 }:
 mkDerivation {
   pname = "rere";
@@ -27,34 +12,15 @@ mkDerivation {
   isExecutable = false;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    base
-    containers
-    fin
-    parsec
-    QuickCheck
-    transformers
-    vec
+    base containers fin parsec QuickCheck transformers vec
   ];
   testHaskellDepends = [
-    base
-    containers
-    QuickCheck
-    quickcheck-instances
-    tasty
+    base containers QuickCheck quickcheck-instances tasty
     tasty-quickcheck
   ];
   benchmarkHaskellDepends = [
-    aeson
-    attoparsec
-    base
-    bytestring
-    clock
-    containers
-    criterion
-    derp
-    fin
-    parsec
-    vec
+    aeson attoparsec base bytestring clock containers criterion derp
+    fin parsec vec
   ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
@@ -66,4 +32,4 @@ mkDerivation {
   description = "Regular-expressions extended with fixpoints for context-free powers";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/resolv.nix b/pkgs/resolv.nix
index 236d2b8c57f044fcb82f2e11fd138f427825fb8d..3e45d05f318c8cb5ed72552a2db517ef2d579935 100644
--- a/pkgs/resolv.nix
+++ b/pkgs/resolv.nix
@@ -1,38 +1,20 @@
-{ mkDerivation
-, base
-, base16-bytestring
-, binary
-, bytestring
-, containers
-, directory
-, filepath
-, lib
-, tasty
-, tasty-hunit
+{ mkDerivation, base, base16-bytestring, binary, bytestring
+, containers, directory, filepath, lib, tasty, tasty-hunit
 }:
 mkDerivation {
   pname = "resolv";
   version = "0.1.2.0";
   sha256 = "81a2bafad484db123cf8d17a02d98bb388a127fd0f822fa022589468a0e64671";
-  revision = "5";
-  editedCabalFile = "0df5y8bj9bxjmqnkvpwxvb17k70g1i174xs6vfrv9f1lys7xkqk1";
+  revision = "6";
+  editedCabalFile = "1qhl69hrvdby2wmk1ip0mr3ghq57zqk1n06qp768bbpdanrfvxx1";
   isLibrary = true;
   isExecutable = false;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    base
-    base16-bytestring
-    binary
-    bytestring
-    containers
+    base base16-bytestring binary bytestring containers
   ];
   testHaskellDepends = [
-    base
-    bytestring
-    directory
-    filepath
-    tasty
-    tasty-hunit
+    base bytestring directory filepath tasty tasty-hunit
   ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
@@ -44,4 +26,4 @@ mkDerivation {
   description = "Domain Name Service (DNS) lookup via the libresolv standard library routines";
   license = lib.licenses.gpl2Plus;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/resourcet.nix b/pkgs/resourcet.nix
index 64d827233b0d7f95c4700c1733f26db1a0e6079d..e03cf96593c9defbd23a55b232ce94fa523d5b0f 100644
--- a/pkgs/resourcet.nix
+++ b/pkgs/resourcet.nix
@@ -1,13 +1,5 @@
-{ mkDerivation
-, base
-, containers
-, exceptions
-, hspec
-, lib
-, mtl
-, primitive
-, transformers
-, unliftio-core
+{ mkDerivation, base, containers, exceptions, hspec, lib, mtl
+, primitive, transformers, unliftio-core
 }:
 mkDerivation {
   pname = "resourcet";
@@ -17,13 +9,7 @@ mkDerivation {
   isExecutable = false;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    base
-    containers
-    exceptions
-    mtl
-    primitive
-    transformers
-    unliftio-core
+    base containers exceptions mtl primitive transformers unliftio-core
   ];
   testHaskellDepends = [ base exceptions hspec transformers ];
   enableLibraryProfiling = true;
@@ -37,4 +23,4 @@ mkDerivation {
   description = "Deterministic allocation and freeing of scarce resources";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/retrie.nix b/pkgs/retrie.nix
index 04a6eb0c1f2b1ba25d2716bca876fcbb4f612431..cdabfeee11240d3f70ccb97ba1e2c03daeccb5be 100644
--- a/pkgs/retrie.nix
+++ b/pkgs/retrie.nix
@@ -1,83 +1,30 @@
-{ mkDerivation
-, HUnit
-, ansi-terminal
-, async
-, base
-, bytestring
-, containers
-, data-default
-, deepseq
-, directory
-, exceptions
-, filepath
-, ghc
-, ghc-exactprint
-, ghc-paths
-, haskell-src-exts
-, lib
-, list-t
-, mtl
-, optparse-applicative
-, process
-, random-shuffle
-, syb
-, tasty
-, tasty-hunit
-, temporary
-, text
-, transformers
+{ mkDerivation, HUnit, ansi-terminal, async, base, bytestring
+, containers, data-default, deepseq, directory, exceptions
+, filepath, ghc, ghc-exactprint, ghc-paths, haskell-src-exts, lib
+, list-t, mtl, optparse-applicative, process, random-shuffle, syb
+, tasty, tasty-hunit, temporary, text, transformers
 , unordered-containers
 }:
 mkDerivation {
   pname = "retrie";
   version = "1.2.1.1";
   sha256 = "74abc7b1968df4455cd104338a81a38f3db89ac963c8fd918f5c5273db14bfab";
+  revision = "1";
+  editedCabalFile = "1j5ppfzdcqbnik6cccqlwb62496z473y26r2ad763q0l5v6lhqfq";
   isLibrary = true;
   isExecutable = true;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    ansi-terminal
-    async
-    base
-    bytestring
-    containers
-    data-default
-    directory
-    filepath
-    ghc
-    ghc-exactprint
-    list-t
-    mtl
-    optparse-applicative
-    process
-    random-shuffle
-    syb
-    text
-    transformers
+    ansi-terminal async base bytestring containers data-default
+    directory filepath ghc ghc-exactprint list-t mtl
+    optparse-applicative process random-shuffle syb text transformers
     unordered-containers
   ];
   executableHaskellDepends = [ base ghc-paths haskell-src-exts ];
   testHaskellDepends = [
-    base
-    containers
-    data-default
-    deepseq
-    directory
-    exceptions
-    filepath
-    ghc
-    ghc-exactprint
-    ghc-paths
-    haskell-src-exts
-    HUnit
-    mtl
-    optparse-applicative
-    process
-    syb
-    tasty
-    tasty-hunit
-    temporary
-    text
+    base containers data-default deepseq directory exceptions filepath
+    ghc ghc-exactprint ghc-paths haskell-src-exts HUnit mtl
+    optparse-applicative process syb tasty tasty-hunit temporary text
     unordered-containers
   ];
   enableLibraryProfiling = true;
@@ -91,4 +38,4 @@ mkDerivation {
   description = "A powerful, easy-to-use codemodding tool for Haskell";
   license = lib.licenses.mit;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/retry.nix b/pkgs/retry.nix
index 1f9bec1516ad8d55d60ee50b6fbebb3f83626abc..fbf09fff96e3e49e76794ffe62c2ff6e6e3f2b75 100644
--- a/pkgs/retry.nix
+++ b/pkgs/retry.nix
@@ -1,20 +1,6 @@
-{ mkDerivation
-, HUnit
-, base
-, exceptions
-, ghc-prim
-, hedgehog
-, lib
-, mtl
-, mtl-compat
-, random
-, stm
-, tasty
-, tasty-hedgehog
-, tasty-hunit
-, time
-, transformers
-, unliftio-core
+{ mkDerivation, HUnit, base, exceptions, ghc-prim, hedgehog, lib
+, mtl, mtl-compat, random, stm, tasty, tasty-hedgehog, tasty-hunit
+, time, transformers, unliftio-core
 }:
 mkDerivation {
   pname = "retry";
@@ -24,31 +10,12 @@ mkDerivation {
   isExecutable = false;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    base
-    exceptions
-    ghc-prim
-    mtl
-    mtl-compat
-    random
-    transformers
+    base exceptions ghc-prim mtl mtl-compat random transformers
     unliftio-core
   ];
   testHaskellDepends = [
-    base
-    exceptions
-    ghc-prim
-    hedgehog
-    HUnit
-    mtl
-    mtl-compat
-    random
-    stm
-    tasty
-    tasty-hedgehog
-    tasty-hunit
-    time
-    transformers
-    unliftio-core
+    base exceptions ghc-prim hedgehog HUnit mtl mtl-compat random stm
+    tasty tasty-hedgehog tasty-hunit time transformers unliftio-core
   ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
@@ -61,4 +28,4 @@ mkDerivation {
   description = "Retry combinators for monadic actions that may fail";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/rope-utf16-splay.nix b/pkgs/rope-utf16-splay.nix
index 748358b675102837885bc27db9fec9282d20b286..360573ebbe77c05dc96c649c9e6f2467a5d5cc3a 100644
--- a/pkgs/rope-utf16-splay.nix
+++ b/pkgs/rope-utf16-splay.nix
@@ -1,11 +1,5 @@
-{ mkDerivation
-, QuickCheck
-, base
-, lib
-, tasty
-, tasty-hunit
-, tasty-quickcheck
-, text
+{ mkDerivation, QuickCheck, base, lib, tasty, tasty-hunit
+, tasty-quickcheck, text
 }:
 mkDerivation {
   pname = "rope-utf16-splay";
@@ -16,12 +10,7 @@ mkDerivation {
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [ base text ];
   testHaskellDepends = [
-    base
-    QuickCheck
-    tasty
-    tasty-hunit
-    tasty-quickcheck
-    text
+    base QuickCheck tasty tasty-hunit tasty-quickcheck text
   ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
@@ -34,4 +23,4 @@ mkDerivation {
   description = "Ropes optimised for updating using UTF-16 code units and row/column pairs";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/row-types.nix b/pkgs/row-types.nix
index f8b0a4dc329c9498477188aa1b03d4178d351efa..1dabf1773480074f7736ed3b3f08d9acb39d8599 100644
--- a/pkgs/row-types.nix
+++ b/pkgs/row-types.nix
@@ -1,14 +1,5 @@
-{ mkDerivation
-, base
-, constraints
-, deepseq
-, gauge
-, generic-lens
-, hashable
-, lib
-, profunctors
-, text
-, unordered-containers
+{ mkDerivation, base, constraints, deepseq, gauge, generic-lens
+, hashable, lib, profunctors, text, unordered-containers
 }:
 mkDerivation {
   pname = "row-types";
@@ -18,13 +9,7 @@ mkDerivation {
   isExecutable = false;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    base
-    constraints
-    deepseq
-    generic-lens
-    hashable
-    profunctors
-    text
+    base constraints deepseq generic-lens hashable profunctors text
     unordered-containers
   ];
   testHaskellDepends = [ base generic-lens ];
@@ -40,4 +25,4 @@ mkDerivation {
   description = "Open Records and Variants";
   license = lib.licenses.mit;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/rvar.nix b/pkgs/rvar.nix
index d8699bdb09409637afd5f19159db9f3bcd7bf315..e0d4315cb85078744b80f0ca758eed61d9c606da 100644
--- a/pkgs/rvar.nix
+++ b/pkgs/rvar.nix
@@ -1,10 +1,4 @@
-{ mkDerivation
-, MonadPrompt
-, base
-, bytestring
-, lib
-, mtl
-, random
+{ mkDerivation, MonadPrompt, base, bytestring, lib, mtl, random
 , transformers
 }:
 mkDerivation {
@@ -15,12 +9,7 @@ mkDerivation {
   isExecutable = false;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    base
-    bytestring
-    MonadPrompt
-    mtl
-    random
-    transformers
+    base bytestring MonadPrompt mtl random transformers
   ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
@@ -33,4 +22,4 @@ mkDerivation {
   description = "Random Variables";
   license = lib.licenses.publicDomain;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/safe-coloured-text-layout.nix b/pkgs/safe-coloured-text-layout.nix
index f099d4841a402eeef68ca4a5d4ce0a21c59d810f..c6fa398970f8afd02132fbe36bee0400d153553f 100644
--- a/pkgs/safe-coloured-text-layout.nix
+++ b/pkgs/safe-coloured-text-layout.nix
@@ -1,12 +1,5 @@
-{ mkDerivation
-, base
-, bytestring
-, lib
-, safe-coloured-text
-, sydtest
-, sydtest-discover
-, text
-, validity
+{ mkDerivation, base, bytestring, lib, safe-coloured-text, sydtest
+, sydtest-discover, text, validity
 }:
 mkDerivation {
   pname = "safe-coloured-text-layout";
@@ -17,11 +10,7 @@ mkDerivation {
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [ base safe-coloured-text text validity ];
   testHaskellDepends = [
-    base
-    bytestring
-    safe-coloured-text
-    sydtest
-    text
+    base bytestring safe-coloured-text sydtest text
   ];
   testToolDepends = [ sydtest-discover ];
   enableLibraryProfiling = true;
@@ -35,4 +24,4 @@ mkDerivation {
   description = "Safely layout output coloured text";
   license = lib.licenses.mit;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/safe-coloured-text-terminfo.nix b/pkgs/safe-coloured-text-terminfo.nix
index 6b6abee42708c7fd9e9c8dda9e65072ca58b9b2f..053df0844dc576a96502a04b0d1375a689a4dab8 100644
--- a/pkgs/safe-coloured-text-terminfo.nix
+++ b/pkgs/safe-coloured-text-terminfo.nix
@@ -18,4 +18,4 @@ mkDerivation {
   description = "Safely output coloured text";
   license = lib.licenses.mit;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/safe-coloured-text.nix b/pkgs/safe-coloured-text.nix
index 730cbb2476d5affca2ce0248f6246b99e5b8b1da..2a471e676268ee8af20d12b167e507f2d8b85315 100644
--- a/pkgs/safe-coloured-text.nix
+++ b/pkgs/safe-coloured-text.nix
@@ -1,11 +1,5 @@
-{ mkDerivation
-, base
-, bytestring
-, lib
-, text
-, validity
-, validity-bytestring
-, validity-text
+{ mkDerivation, base, bytestring, lib, text, validity
+, validity-bytestring, validity-text
 }:
 mkDerivation {
   pname = "safe-coloured-text";
@@ -15,12 +9,7 @@ mkDerivation {
   isExecutable = false;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    base
-    bytestring
-    text
-    validity
-    validity-bytestring
-    validity-text
+    base bytestring text validity validity-bytestring validity-text
   ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
@@ -33,4 +22,4 @@ mkDerivation {
   description = "Safely output coloured text";
   license = lib.licenses.mit;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/safe-exceptions.nix b/pkgs/safe-exceptions.nix
index f93f562cdd866cb47cbc93ad1f83216c7cf7f5e1..3e8c1400170719be7918d054e129a00dda55e936 100644
--- a/pkgs/safe-exceptions.nix
+++ b/pkgs/safe-exceptions.nix
@@ -1,10 +1,4 @@
-{ mkDerivation
-, base
-, deepseq
-, exceptions
-, hspec
-, lib
-, transformers
+{ mkDerivation, base, deepseq, exceptions, hspec, lib, transformers
 , void
 }:
 mkDerivation {
@@ -27,4 +21,4 @@ mkDerivation {
   description = "Safe, consistent, and easy exception handling";
   license = lib.licenses.mit;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/safe.nix b/pkgs/safe.nix
index 7edc0d1f445e85c3fd102f667eb7fd7bdb47c811..e75b5d4cbff499ac144c5af568f5559ce7804dc1 100644
--- a/pkgs/safe.nix
+++ b/pkgs/safe.nix
@@ -19,4 +19,4 @@ mkDerivation {
   description = "Library of safe (exception free) functions";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/say.nix b/pkgs/say.nix
index 5489950db2ec9b49a5276fdcc85d6fa2fbccfd60..e670ccfa2e5f00b57090aaa03a9f47edee258545 100644
--- a/pkgs/say.nix
+++ b/pkgs/say.nix
@@ -1,12 +1,5 @@
-{ mkDerivation
-, base
-, bytestring
-, gauge
-, hspec
-, lib
-, text
-, transformers
-, unliftio
+{ mkDerivation, base, bytestring, gauge, hspec, lib, text
+, transformers, unliftio
 }:
 mkDerivation {
   pname = "say";
@@ -17,20 +10,10 @@ mkDerivation {
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [ base bytestring text transformers ];
   testHaskellDepends = [
-    base
-    bytestring
-    hspec
-    text
-    transformers
-    unliftio
+    base bytestring hspec text transformers unliftio
   ];
   benchmarkHaskellDepends = [
-    base
-    bytestring
-    gauge
-    text
-    transformers
-    unliftio
+    base bytestring gauge text transformers unliftio
   ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
@@ -43,4 +26,4 @@ mkDerivation {
   description = "Send textual messages to a Handle in a thread-friendly way";
   license = lib.licenses.mit;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/scientific.nix b/pkgs/scientific.nix
index 57d13b957abdc4e65d35447cff34eb79c7105aa3..0f58c4e1a68513b2bd8d85a6f3583369a9b38215 100644
--- a/pkgs/scientific.nix
+++ b/pkgs/scientific.nix
@@ -1,55 +1,24 @@
-{ mkDerivation
-, QuickCheck
-, base
-, binary
-, bytestring
-, containers
-, criterion
-, deepseq
-, hashable
-, integer-logarithms
-, lib
-, primitive
-, smallcheck
-, tasty
-, tasty-hunit
-, tasty-quickcheck
-, tasty-smallcheck
-, template-haskell
-, text
+{ mkDerivation, QuickCheck, base, binary, bytestring, containers
+, criterion, deepseq, hashable, integer-logarithms, lib, primitive
+, smallcheck, tasty, tasty-hunit, tasty-quickcheck
+, tasty-smallcheck, template-haskell, text
 }:
 mkDerivation {
   pname = "scientific";
   version = "0.3.7.0";
   sha256 = "a3a121c4b3d68fb8b9f8c709ab012e48f090ed553609247a805ad070d6b343a9";
-  revision = "3";
-  editedCabalFile = "1n67w1b64q59nn4845z3kr8rm0x0p7bi3cyp6n1dpnfs8k4l8x2i";
+  revision = "5";
+  editedCabalFile = "149d776lnss2ggsv3qpsdbx1vvi57m2q2401d19k8fln0s8i1n16";
   isLibrary = true;
   isExecutable = false;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    base
-    binary
-    bytestring
-    containers
-    deepseq
-    hashable
-    integer-logarithms
-    primitive
-    template-haskell
-    text
+    base binary bytestring containers deepseq hashable
+    integer-logarithms primitive template-haskell text
   ];
   testHaskellDepends = [
-    base
-    binary
-    bytestring
-    QuickCheck
-    smallcheck
-    tasty
-    tasty-hunit
-    tasty-quickcheck
-    tasty-smallcheck
-    text
+    base binary bytestring QuickCheck smallcheck tasty tasty-hunit
+    tasty-quickcheck tasty-smallcheck text
   ];
   benchmarkHaskellDepends = [ base criterion ];
   enableLibraryProfiling = true;
@@ -63,4 +32,4 @@ mkDerivation {
   description = "Numbers represented using scientific notation";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/sdl2-gfx.nix b/pkgs/sdl2-gfx.nix
index 7965c571605f47592f741d695dec0ad5c67fbfe8..ef9d9217faf3206577de4506002b65f9641fc068 100644
--- a/pkgs/sdl2-gfx.nix
+++ b/pkgs/sdl2-gfx.nix
@@ -1,13 +1,5 @@
-{ mkDerivation
-, SDL2
-, SDL2_gfx
-, base
-, lib
-, lifted-base
-, monad-control
-, sdl2
-, template-haskell
-, vector
+{ mkDerivation, SDL2, SDL2_gfx, base, lib, lifted-base
+, monad-control, sdl2, template-haskell, vector
 }:
 mkDerivation {
   pname = "sdl2-gfx";
@@ -17,12 +9,7 @@ mkDerivation {
   isExecutable = true;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    base
-    lifted-base
-    monad-control
-    sdl2
-    template-haskell
-    vector
+    base lifted-base monad-control sdl2 template-haskell vector
   ];
   librarySystemDepends = [ SDL2_gfx ];
   libraryPkgconfigDepends = [ SDL2 SDL2_gfx ];
@@ -39,4 +26,4 @@ mkDerivation {
   description = "Haskell bindings to SDL2_gfx";
   license = lib.licenses.mit;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/sdl2-image.nix b/pkgs/sdl2-image.nix
index ffc876a280d59be9eb25d6cb456f5f28ded4821a..45a4063ad09bed8a4d3cb4a287ffdeb93e93c64e 100644
--- a/pkgs/sdl2-image.nix
+++ b/pkgs/sdl2-image.nix
@@ -1,12 +1,5 @@
-{ mkDerivation
-, SDL2
-, SDL2_image
-, base
-, bytestring
-, lib
-, sdl2
-, template-haskell
-, text
+{ mkDerivation, SDL2, SDL2_image, base, bytestring, lib, sdl2
+, template-haskell, text
 }:
 mkDerivation {
   pname = "sdl2-image";
@@ -16,11 +9,7 @@ mkDerivation {
   isExecutable = true;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    base
-    bytestring
-    sdl2
-    template-haskell
-    text
+    base bytestring sdl2 template-haskell text
   ];
   librarySystemDepends = [ SDL2_image ];
   libraryPkgconfigDepends = [ SDL2 SDL2_image ];
@@ -37,4 +26,4 @@ mkDerivation {
   description = "Haskell bindings to SDL2_image";
   license = lib.licenses.mit;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/sdl2-mixer.nix b/pkgs/sdl2-mixer.nix
index 236531a967d9555e4ebd3fd42d03e02e7ba50f30..d60edd127fad7023507c7c2a9cd83b8d6bbb4b99 100644
--- a/pkgs/sdl2-mixer.nix
+++ b/pkgs/sdl2-mixer.nix
@@ -1,14 +1,5 @@
-{ mkDerivation
-, SDL2_mixer
-, base
-, bytestring
-, data-default-class
-, lib
-, lifted-base
-, monad-control
-, sdl2
-, template-haskell
-, vector
+{ mkDerivation, SDL2_mixer, base, bytestring, data-default-class
+, lib, lifted-base, monad-control, sdl2, template-haskell, vector
 }:
 mkDerivation {
   pname = "sdl2-mixer";
@@ -18,14 +9,8 @@ mkDerivation {
   isExecutable = true;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    base
-    bytestring
-    data-default-class
-    lifted-base
-    monad-control
-    sdl2
-    template-haskell
-    vector
+    base bytestring data-default-class lifted-base monad-control sdl2
+    template-haskell vector
   ];
   librarySystemDepends = [ SDL2_mixer ];
   libraryPkgconfigDepends = [ SDL2_mixer ];
@@ -42,4 +27,4 @@ mkDerivation {
   description = "Haskell bindings to SDL2_mixer";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/sdl2-ttf.nix b/pkgs/sdl2-ttf.nix
index 6d942b7cbc7b7d213a2dbba861e82a468b99557d..6756dc22263cec9fa8288804e61ec884e51c3e74 100644
--- a/pkgs/sdl2-ttf.nix
+++ b/pkgs/sdl2-ttf.nix
@@ -1,14 +1,5 @@
-{ mkDerivation
-, SDL2
-, SDL2_ttf
-, base
-, bytestring
-, lib
-, sdl2
-, template-haskell
-, text
-, th-abstraction
-, transformers
+{ mkDerivation, SDL2, SDL2_ttf, base, bytestring, lib, sdl2
+, template-haskell, text, th-abstraction, transformers
 }:
 mkDerivation {
   pname = "sdl2-ttf";
@@ -18,12 +9,7 @@ mkDerivation {
   isExecutable = true;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    base
-    bytestring
-    sdl2
-    template-haskell
-    text
-    th-abstraction
+    base bytestring sdl2 template-haskell text th-abstraction
     transformers
   ];
   libraryPkgconfigDepends = [ SDL2 SDL2_ttf ];
@@ -37,4 +23,4 @@ mkDerivation {
   description = "Bindings to SDL2_ttf";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/semigroups.nix b/pkgs/semigroups.nix
index b752597206639ebbef76072dd72232b407d39545..b2ceebea1b9aad0c5b39d8df4dd6801b58c423c7 100644
--- a/pkgs/semigroups.nix
+++ b/pkgs/semigroups.nix
@@ -18,4 +18,4 @@ mkDerivation {
   description = "Anything that associates";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/semirings.nix b/pkgs/semirings.nix
index db23d3dd290ffbca1b0e92821a3cf4cb37064e5c..99e863bbacba21034dd705460aca5f7015efac28 100644
--- a/pkgs/semirings.nix
+++ b/pkgs/semirings.nix
@@ -1,10 +1,5 @@
-{ mkDerivation
-, base
-, base-compat-batteries
-, containers
-, hashable
-, lib
-, unordered-containers
+{ mkDerivation, base, base-compat-batteries, containers, hashable
+, lib, unordered-containers
 }:
 mkDerivation {
   pname = "semirings";
@@ -16,11 +11,7 @@ mkDerivation {
   isExecutable = false;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    base
-    base-compat-batteries
-    containers
-    hashable
-    unordered-containers
+    base base-compat-batteries containers hashable unordered-containers
   ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
@@ -33,4 +24,4 @@ mkDerivation {
   description = "two monoids as one, in holy haskimony";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/semver.nix b/pkgs/semver.nix
index a5ef5c5b7b151d37b7f7aa6a378a303e774625c7..43c316923152b32a3bea0c1325f233b8f602a39c 100644
--- a/pkgs/semver.nix
+++ b/pkgs/semver.nix
@@ -1,13 +1,5 @@
-{ mkDerivation
-, attoparsec
-, base
-, criterion
-, deepseq
-, hashable
-, lib
-, tasty
-, tasty-hunit
-, text
+{ mkDerivation, attoparsec, base, criterion, deepseq, hashable, lib
+, tasty, tasty-hunit, text
 }:
 mkDerivation {
   pname = "semver";
@@ -32,4 +24,4 @@ mkDerivation {
   description = "Representation, manipulation, and de/serialisation of Semantic Versions";
   license = lib.licenses.mpl20;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/serialise.nix b/pkgs/serialise.nix
index 7c4f5b95e3904c6c093077fcc0f4ce267b92a5ca..3cc7a24fd94a47bc4ce4e1ba0edf2f402250b191 100644
--- a/pkgs/serialise.nix
+++ b/pkgs/serialise.nix
@@ -1,109 +1,32 @@
-{ mkDerivation
-, QuickCheck
-, aeson
-, array
-, base
-, binary
-, bytestring
-, cborg
-, cereal
-, cereal-vector
-, containers
-, criterion
-, deepseq
-, directory
-, fail
-, filepath
-, ghc-prim
-, half
-, hashable
-, lib
-, pretty
-, primitive
-, quickcheck-instances
-, semigroups
-, store
-, strict
-, tar
-, tasty
-, tasty-hunit
-, tasty-quickcheck
-, text
-, these
-, time
-, unordered-containers
-, vector
-, zlib
+{ mkDerivation, QuickCheck, aeson, array, base, binary, bytestring
+, cborg, cereal, cereal-vector, containers, criterion, deepseq
+, directory, fail, filepath, ghc-prim, half, hashable, lib, pretty
+, primitive, quickcheck-instances, semigroups, store, strict, tar
+, tasty, tasty-hunit, tasty-quickcheck, text, these, time
+, unordered-containers, vector, zlib
 }:
 mkDerivation {
   pname = "serialise";
   version = "0.2.6.0";
   sha256 = "93ff1888e1972999f14663072b38efcfd0c1481b4ec8e30ddc9c5ce97681a516";
-  revision = "1";
-  editedCabalFile = "0rlsi4jq2d1dak2fps5flcn27lywjlhvsi0x2k2lvnjqawnfb3f9";
+  revision = "2";
+  editedCabalFile = "0ng4gjxwv2arm1ybqkfl66p1lmcwacym8ygi6nnkygysgchwqa3b";
   isLibrary = true;
   isExecutable = false;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    array
-    base
-    bytestring
-    cborg
-    containers
-    ghc-prim
-    half
-    hashable
-    primitive
-    strict
-    text
-    these
-    time
-    unordered-containers
-    vector
+    array base bytestring cborg containers ghc-prim half hashable
+    primitive strict text these time unordered-containers vector
   ];
   testHaskellDepends = [
-    base
-    bytestring
-    cborg
-    containers
-    directory
-    filepath
-    primitive
-    QuickCheck
-    quickcheck-instances
-    tasty
-    tasty-hunit
-    tasty-quickcheck
-    text
-    time
-    unordered-containers
-    vector
+    base bytestring cborg containers directory filepath primitive
+    QuickCheck quickcheck-instances tasty tasty-hunit tasty-quickcheck
+    text time unordered-containers vector
   ];
   benchmarkHaskellDepends = [
-    aeson
-    array
-    base
-    binary
-    bytestring
-    cborg
-    cereal
-    cereal-vector
-    containers
-    criterion
-    deepseq
-    directory
-    fail
-    filepath
-    ghc-prim
-    half
-    pretty
-    semigroups
-    store
-    tar
-    text
-    time
-    vector
-    zlib
+    aeson array base binary bytestring cborg cereal cereal-vector
+    containers criterion deepseq directory fail filepath ghc-prim half
+    pretty semigroups store tar text time vector zlib
   ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
@@ -116,4 +39,4 @@ mkDerivation {
   description = "A binary serialisation library for Haskell values";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/servant-auth-server.nix b/pkgs/servant-auth-server.nix
index 4724215cb927abb06660917eebf5c4175565f2a9..79117407716cdf2aab2fcb2e96bfdaa7728ebabf 100644
--- a/pkgs/servant-auth-server.nix
+++ b/pkgs/servant-auth-server.nix
@@ -1,16 +1,21 @@
 { mkDerivation, QuickCheck, aeson, base, base64-bytestring
 , blaze-builder, bytestring, case-insensitive, cookie
-, data-default-class, entropy, hspec, hspec-discover, http-client
-, http-types, jose, lens, lens-aeson, lib, markdown-unlit, memory
-, monad-time, mtl, servant, servant-auth, servant-server, tagged
-, text, time, transformers, unordered-containers, wai, warp, wreq
+, data-default-class, entropy, fetchgit, hspec, hspec-discover
+, http-client, http-types, jose, lens, lens-aeson, lib
+, markdown-unlit, memory, monad-time, mtl, servant, servant-auth
+, servant-server, tagged, text, time, transformers
+, unordered-containers, wai, warp, wreq
 }:
 mkDerivation {
   pname = "servant-auth-server";
   version = "0.4.7.0";
-  sha256 = "42da496b14f250495131d92280e007634dbed580cea7bc423cbe87877b2f24d4";
-  revision = "4";
-  editedCabalFile = "1qcgm2pqi5qjqk27632h69j8ishls6cby8gghvww73wi63fqii9n";
+  src = fetchgit {
+    url = "https://github.com/haskell-servant/servant";
+    sha256 = "0ay4q9jy3xkn5j1k91snfdndi6j91hlri9h79m429j0d8v5vnj7i";
+    rev = "0cda2d0ac87dc0dd47744134e44ab0b1647fe09a";
+    fetchSubmodules = true;
+  };
+  postUnpack = "sourceRoot+=/servant-auth/servant-auth-server/; echo source root reset to $sourceRoot";
   isLibrary = true;
   isExecutable = false;
   enableSeparateDataOutput = false;
@@ -23,7 +28,7 @@ mkDerivation {
   testHaskellDepends = [
     aeson base bytestring case-insensitive hspec http-client http-types
     jose lens lens-aeson mtl QuickCheck servant servant-auth
-    servant-server time transformers wai warp wreq
+    servant-server text time transformers wai warp wreq
   ];
   testToolDepends = [ hspec-discover markdown-unlit ];
   enableLibraryProfiling = true;
@@ -33,7 +38,7 @@ mkDerivation {
   doCheck = false;
   doBenchmark = false;
   hyperlinkSource = false;
-  homepage = "http://github.com/haskell-servant/servant/servant-auth#readme";
+  homepage = "https://github.com/haskell-servant/servant/tree/master/servant-auth#readme";
   description = "servant-server/servant-auth compatibility";
   license = lib.licenses.bsd3;
   broken = false;
diff --git a/pkgs/setenv.nix b/pkgs/setenv.nix
index a88578dbd78f89401f92100d15082f23899c0d72..e9e3cefbe78941be024c395e4bb3f0fd0723de82 100644
--- a/pkgs/setenv.nix
+++ b/pkgs/setenv.nix
@@ -19,4 +19,4 @@ mkDerivation {
   description = "A cross-platform library for setting environment variables";
   license = lib.licenses.mit;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/setlocale.nix b/pkgs/setlocale.nix
index 2b5851a50881fbaa5ccf24415cac42a2906128a3..e86e98b8afcd1fc83f9b4df2fddce835510ad421 100644
--- a/pkgs/setlocale.nix
+++ b/pkgs/setlocale.nix
@@ -20,4 +20,4 @@ mkDerivation {
   description = "Haskell bindings to setlocale";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/should-not-typecheck.nix b/pkgs/should-not-typecheck.nix
index 9e1ee26cd73223a2930b49be96a2c177d33fa14f..610c491b02d6ba6a64d92fc29637d4d276d95816 100644
--- a/pkgs/should-not-typecheck.nix
+++ b/pkgs/should-not-typecheck.nix
@@ -1,9 +1,4 @@
-{ mkDerivation
-, HUnit
-, base
-, deepseq
-, hspec
-, hspec-expectations
+{ mkDerivation, HUnit, base, deepseq, hspec, hspec-expectations
 , lib
 }:
 mkDerivation {
@@ -15,11 +10,7 @@ mkDerivation {
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [ base deepseq HUnit ];
   testHaskellDepends = [
-    base
-    deepseq
-    hspec
-    hspec-expectations
-    HUnit
+    base deepseq hspec hspec-expectations HUnit
   ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
@@ -32,4 +23,4 @@ mkDerivation {
   description = "A HUnit/hspec assertion library to verify that an expression does not typecheck";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/show-combinators.nix b/pkgs/show-combinators.nix
index 000bdaf939e3abbbbf36f412f9d54daadbbca8ff..0140a7209d3f5551489ae6732032e62fb0b0b134 100644
--- a/pkgs/show-combinators.nix
+++ b/pkgs/show-combinators.nix
@@ -21,4 +21,4 @@ mkDerivation {
   description = "Combinators to write Show instances";
   license = lib.licenses.mit;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/silently.nix b/pkgs/silently.nix
index 4d8c0438633a25e7657de5ed2bef06b59a91496a..442464ac7416311ff0dd07f0fcba260d9c6b4e72 100644
--- a/pkgs/silently.nix
+++ b/pkgs/silently.nix
@@ -1,10 +1,4 @@
-{ mkDerivation
-, base
-, deepseq
-, directory
-, lib
-, nanospec
-, temporary
+{ mkDerivation, base, deepseq, directory, lib, nanospec, temporary
 }:
 mkDerivation {
   pname = "silently";
@@ -26,4 +20,4 @@ mkDerivation {
   description = "Prevent or capture writing to stdout and other handles";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/simple-reflect.nix b/pkgs/simple-reflect.nix
index 8e7e055db8572805ae782ab2ccbb6152e1772f05..0be2bd9da87f2a4bdd05beff8bb573181f7409ed 100644
--- a/pkgs/simple-reflect.nix
+++ b/pkgs/simple-reflect.nix
@@ -18,4 +18,4 @@ mkDerivation {
   description = "Simple reflection of expressions containing variables";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/simple-sendfile.nix b/pkgs/simple-sendfile.nix
index 1cf01d1ea753f0243a81665b28a88695cf03b358..a4f9b1d4af0a7fb5a3a8c047974f91cbc56b2e97 100644
--- a/pkgs/simple-sendfile.nix
+++ b/pkgs/simple-sendfile.nix
@@ -1,16 +1,5 @@
-{ mkDerivation
-, HUnit
-, base
-, bytestring
-, conduit
-, conduit-extra
-, directory
-, hspec
-, lib
-, network
-, process
-, resourcet
-, unix
+{ mkDerivation, HUnit, base, bytestring, conduit, conduit-extra
+, directory, hspec, lib, network, process, resourcet, unix
 }:
 mkDerivation {
   pname = "simple-sendfile";
@@ -21,17 +10,8 @@ mkDerivation {
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [ base bytestring network unix ];
   testHaskellDepends = [
-    base
-    bytestring
-    conduit
-    conduit-extra
-    directory
-    hspec
-    HUnit
-    network
-    process
-    resourcet
-    unix
+    base bytestring conduit conduit-extra directory hspec HUnit network
+    process resourcet unix
   ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
@@ -43,4 +23,4 @@ mkDerivation {
   description = "Cross platform library for the sendfile system call";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/singleton-bool.nix b/pkgs/singleton-bool.nix
index 132bc6ec108841d66eff4609725e436a9d451bea..d5e8c295e739a543e7110d85ee31b5de734262cc 100644
--- a/pkgs/singleton-bool.nix
+++ b/pkgs/singleton-bool.nix
@@ -20,4 +20,4 @@ mkDerivation {
   description = "Type level booleans";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/singletons.nix b/pkgs/singletons.nix
index 621a5821edbf47cb95f42694c7eecd0b7fd4a6a0..89e5225db27dba048880156588c7117e24498c63 100644
--- a/pkgs/singletons.nix
+++ b/pkgs/singletons.nix
@@ -3,6 +3,8 @@ mkDerivation {
   pname = "singletons";
   version = "3.0.2";
   sha256 = "f568ee129ef6438a4325f145f17fa4a3074b3564c72fd35ba1f68dcee14d5e82";
+  revision = "1";
+  editedCabalFile = "1lp2qr5vwgr7qh0dwwa5fqz6rflx8hm6z7yyshqkmc2mn30fxhiy";
   isLibrary = true;
   isExecutable = false;
   enableSeparateDataOutput = false;
@@ -19,4 +21,4 @@ mkDerivation {
   description = "Basic singleton types and definitions";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/size-based.nix b/pkgs/size-based.nix
index 8b44aff455b1b3e5a2f86c9fbd8975747739d90b..160c11e5416b5d1b19529e45ebcdd3af403d8e2b 100644
--- a/pkgs/size-based.nix
+++ b/pkgs/size-based.nix
@@ -1,8 +1,4 @@
-{ mkDerivation
-, base
-, dictionary-sharing
-, lib
-, template-haskell
+{ mkDerivation, base, dictionary-sharing, lib, template-haskell
 , testing-type-modifiers
 }:
 mkDerivation {
@@ -13,10 +9,7 @@ mkDerivation {
   isExecutable = false;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    base
-    dictionary-sharing
-    template-haskell
-    testing-type-modifiers
+    base dictionary-sharing template-haskell testing-type-modifiers
   ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
@@ -28,4 +21,4 @@ mkDerivation {
   description = "Sized functors, for size-based enumerations";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/slugify.nix b/pkgs/slugify.nix
index f4c5d45aa85834bb16cbe2c7ce19cc88659b6c93..de8fcc6340c0954fc385f528d42a485081d1d066 100644
--- a/pkgs/slugify.nix
+++ b/pkgs/slugify.nix
@@ -1,10 +1,4 @@
-{ mkDerivation
-, QuickCheck
-, base
-, hspec
-, hspec-discover
-, lib
-, text
+{ mkDerivation, QuickCheck, base, hspec, hspec-discover, lib, text
 , unicode-transforms
 }:
 mkDerivation {
@@ -28,4 +22,4 @@ mkDerivation {
   description = "Convert text into slugs";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/smallcheck.nix b/pkgs/smallcheck.nix
index 90216b2d993d21df5a62e25cb706c9c56cace20b..c170090717bdcdf90552cd2c627bff2bbf783b7d 100644
--- a/pkgs/smallcheck.nix
+++ b/pkgs/smallcheck.nix
@@ -20,4 +20,4 @@ mkDerivation {
   description = "A property-based testing library";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/socks.nix b/pkgs/socks.nix
index 57870b37e0337c833c2ecd7198f03afb61d3f186..63c9ac6e32912be5227e6a9178a64c247d778e6d 100644
--- a/pkgs/socks.nix
+++ b/pkgs/socks.nix
@@ -7,11 +7,7 @@ mkDerivation {
   isExecutable = false;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    base
-    basement
-    bytestring
-    cereal
-    network
+    base basement bytestring cereal network
   ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
@@ -24,4 +20,4 @@ mkDerivation {
   description = "Socks proxy (ver 5)";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/sort.nix b/pkgs/sort.nix
index e7f57c36728f8030426a41f99e809249ceef9143..5dc77e43655e7454574f6ff4f403a8be7801bca7 100644
--- a/pkgs/sort.nix
+++ b/pkgs/sort.nix
@@ -18,4 +18,4 @@ mkDerivation {
   description = "A Haskell sorting toolkit";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/sorted-list.nix b/pkgs/sorted-list.nix
index 46086b9ef30cc7366415a010b91d66012b9e0ab2..7c00cb8f2ebbd4612870fe1611aab25e3b8189ee 100644
--- a/pkgs/sorted-list.nix
+++ b/pkgs/sorted-list.nix
@@ -19,4 +19,4 @@ mkDerivation {
   description = "Type-enforced sorted lists and related functions";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/special-values.nix b/pkgs/special-values.nix
index 0f83406c7a2125391d65abada6c7351ff6e7ee5d..a0c323319aac6b93edd49e291c238602bdf06f47 100644
--- a/pkgs/special-values.nix
+++ b/pkgs/special-values.nix
@@ -9,11 +9,7 @@ mkDerivation {
   isExecutable = false;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    base
-    bytestring
-    ieee754
-    scientific
-    text
+    base bytestring ieee754 scientific text
   ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
@@ -26,4 +22,4 @@ mkDerivation {
   description = "Typeclass providing special values";
   license = lib.licenses.mit;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/splitmix.nix b/pkgs/splitmix.nix
index 0e0e9d64cc7fdd55bf8ca4f82a1ae0ba7fe2cf0a..25381004710cc24ed273cc6ddff85dc8dfebf091 100644
--- a/pkgs/splitmix.nix
+++ b/pkgs/splitmix.nix
@@ -1,59 +1,26 @@
-{ mkDerivation
-, HUnit
-, async
-, base
-, base-compat
-, base-compat-batteries
-, bytestring
-, clock
-, containers
-, criterion
-, deepseq
-, lib
-, math-functions
-, process
-, random
-, test-framework
-, test-framework-hunit
-, testu01
-, tf-random
-, vector
+{ mkDerivation, HUnit, async, base, base-compat
+, base-compat-batteries, bytestring, clock, containers, criterion
+, deepseq, lib, math-functions, process, random, test-framework
+, test-framework-hunit, testu01, tf-random, vector
 }:
 mkDerivation {
   pname = "splitmix";
   version = "0.1.0.4";
   sha256 = "6d065402394e7a9117093dbb4530a21342c9b1e2ec509516c8a8d0ffed98ecaa";
-  revision = "1";
-  editedCabalFile = "1iqlg2d4mybqwzwp67c5a1yxzd47cbp4f7mrpa6d0ckypis2akl0";
+  revision = "2";
+  editedCabalFile = "13ixb8qfll9x26v0zdk2kajlqd1zpab1p2xb8rh6pak7g7hw49fv";
   isLibrary = true;
   isExecutable = false;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [ base deepseq ];
   testHaskellDepends = [
-    async
-    base
-    base-compat
-    base-compat-batteries
-    bytestring
-    containers
-    deepseq
-    HUnit
-    math-functions
-    process
-    random
-    test-framework
-    test-framework-hunit
-    tf-random
-    vector
+    async base base-compat base-compat-batteries bytestring containers
+    deepseq HUnit math-functions process random test-framework
+    test-framework-hunit tf-random vector
   ];
   testSystemDepends = [ testu01 ];
   benchmarkHaskellDepends = [
-    base
-    clock
-    containers
-    criterion
-    random
-    tf-random
+    base clock containers criterion random tf-random
   ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
@@ -65,4 +32,4 @@ mkDerivation {
   description = "Fast Splittable PRNG";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/spoon.nix b/pkgs/spoon.nix
index be57b3963f079600f7c1c33235bf156b686ee714..680f8451eb7fd80804927873bf3d94146d8b8067 100644
--- a/pkgs/spoon.nix
+++ b/pkgs/spoon.nix
@@ -19,4 +19,4 @@ mkDerivation {
   description = "Catch errors thrown from pure computations";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/sqlite-simple.nix b/pkgs/sqlite-simple.nix
index 51eddc446b46fd3421a7f7f2cc275e873250fd4e..c515cb84277b3e853d87971947c716b9269bc1ed 100644
--- a/pkgs/sqlite-simple.nix
+++ b/pkgs/sqlite-simple.nix
@@ -1,19 +1,6 @@
-{ mkDerivation
-, HUnit
-, Only
-, attoparsec
-, base
-, base16-bytestring
-, blaze-builder
-, blaze-textual
-, bytestring
-, containers
-, direct-sqlite
-, lib
-, template-haskell
-, text
-, time
-, transformers
+{ mkDerivation, HUnit, Only, attoparsec, base, base16-bytestring
+, blaze-builder, blaze-textual, bytestring, containers
+, direct-sqlite, lib, template-haskell, text, time, transformers
 }:
 mkDerivation {
   pname = "sqlite-simple";
@@ -23,27 +10,11 @@ mkDerivation {
   isExecutable = false;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    attoparsec
-    base
-    blaze-builder
-    blaze-textual
-    bytestring
-    containers
-    direct-sqlite
-    Only
-    template-haskell
-    text
-    time
-    transformers
+    attoparsec base blaze-builder blaze-textual bytestring containers
+    direct-sqlite Only template-haskell text time transformers
   ];
   testHaskellDepends = [
-    base
-    base16-bytestring
-    bytestring
-    direct-sqlite
-    HUnit
-    text
-    time
+    base base16-bytestring bytestring direct-sqlite HUnit text time
   ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
@@ -56,4 +27,4 @@ mkDerivation {
   description = "Mid-Level SQLite client library";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/statistics-linreg.nix b/pkgs/statistics-linreg.nix
index 676ab49937cb22cd2d36bac3ab5f3c93f709a9b0..e947c91f1c1f27d70d83e351c86fa7c1b0ebd3dc 100644
--- a/pkgs/statistics-linreg.nix
+++ b/pkgs/statistics-linreg.nix
@@ -1,12 +1,5 @@
-{ mkDerivation
-, MonadRandom
-, base
-, lib
-, random
-, random-shuffle
-, safe
-, statistics
-, vector
+{ mkDerivation, MonadRandom, base, lib, random, random-shuffle
+, safe, statistics, vector
 }:
 mkDerivation {
   pname = "statistics-linreg";
@@ -16,13 +9,7 @@ mkDerivation {
   isExecutable = false;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    base
-    MonadRandom
-    random
-    random-shuffle
-    safe
-    statistics
-    vector
+    base MonadRandom random random-shuffle safe statistics vector
   ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
@@ -35,4 +22,4 @@ mkDerivation {
   description = "Linear regression between two samples, based on the 'statistics' package";
   license = lib.licenses.mit;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/store-core.nix b/pkgs/store-core.nix
index 4ececb545d8696a8a5386fdea517780951797d87..338dc679816f2992e77fc008cca7e2848f2a7e24 100644
--- a/pkgs/store-core.nix
+++ b/pkgs/store-core.nix
@@ -1,10 +1,4 @@
-{ mkDerivation
-, base
-, bytestring
-, ghc-prim
-, lib
-, primitive
-, text
+{ mkDerivation, base, bytestring, ghc-prim, lib, primitive, text
 , transformers
 }:
 mkDerivation {
@@ -17,12 +11,7 @@ mkDerivation {
   isExecutable = false;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    base
-    bytestring
-    ghc-prim
-    primitive
-    text
-    transformers
+    base bytestring ghc-prim primitive text transformers
   ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
@@ -35,4 +24,4 @@ mkDerivation {
   description = "Fast and lightweight binary serialization";
   license = lib.licenses.mit;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/store.nix b/pkgs/store.nix
index 2ed4890866957aacfc6a35897295d0092e5f81b4..9c0a66e71cdad4379a975093ea9e3fc8bd4ea3f9 100644
--- a/pkgs/store.nix
+++ b/pkgs/store.nix
@@ -1,54 +1,13 @@
-{ mkDerivation
-, array
-, async
-, base
-, base-orphans
-, base64-bytestring
-, bifunctors
-, bytestring
-, cereal
-, cereal-vector
-, clock
-, containers
-, contravariant
-, criterion
-, cryptohash
-, deepseq
-, directory
-, filepath
-, free
-, ghc-prim
-, hashable
-, hspec
-, hspec-discover
-, hspec-smallcheck
-, integer-gmp
-, lib
-, lifted-base
-, monad-control
-, mono-traversable
-, nats
-, network
-, primitive
-, resourcet
-, safe
-, smallcheck
-, store-core
-, syb
-, template-haskell
-, text
-, th-lift
-, th-lift-instances
-, th-orphans
-, th-reify-many
-, th-utilities
-, time
-, transformers
-, unordered-containers
-, vector
-, vector-binary-instances
-, void
-, weigh
+{ mkDerivation, array, async, base, base-orphans, base64-bytestring
+, bifunctors, bytestring, cereal, cereal-vector, clock, containers
+, contravariant, criterion, cryptohash, deepseq, directory
+, filepath, free, ghc-prim, hashable, hspec, hspec-discover
+, hspec-smallcheck, integer-gmp, lib, lifted-base, monad-control
+, mono-traversable, nats, network, primitive, resourcet, safe
+, smallcheck, store-core, syb, template-haskell, text, th-lift
+, th-lift-instances, th-orphans, th-reify-many, th-utilities, time
+, transformers, unordered-containers, vector
+, vector-binary-instances, void, weigh
 }:
 mkDerivation {
   pname = "store";
@@ -58,143 +17,33 @@ mkDerivation {
   isExecutable = false;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    array
-    async
-    base
-    base-orphans
-    base64-bytestring
-    bifunctors
-    bytestring
-    containers
-    contravariant
-    cryptohash
-    deepseq
-    directory
-    filepath
-    free
-    ghc-prim
-    hashable
-    hspec
-    hspec-smallcheck
-    integer-gmp
-    lifted-base
-    monad-control
-    mono-traversable
-    nats
-    network
-    primitive
-    resourcet
-    safe
-    smallcheck
-    store-core
-    syb
-    template-haskell
-    text
-    th-lift
-    th-lift-instances
-    th-orphans
-    th-reify-many
-    th-utilities
-    time
-    transformers
-    unordered-containers
-    vector
-    void
+    array async base base-orphans base64-bytestring bifunctors
+    bytestring containers contravariant cryptohash deepseq directory
+    filepath free ghc-prim hashable hspec hspec-smallcheck integer-gmp
+    lifted-base monad-control mono-traversable nats network primitive
+    resourcet safe smallcheck store-core syb template-haskell text
+    th-lift th-lift-instances th-orphans th-reify-many th-utilities
+    time transformers unordered-containers vector void
   ];
   testHaskellDepends = [
-    array
-    async
-    base
-    base-orphans
-    base64-bytestring
-    bifunctors
-    bytestring
-    clock
-    containers
-    contravariant
-    cryptohash
-    deepseq
-    directory
-    filepath
-    free
-    ghc-prim
-    hashable
-    hspec
-    hspec-smallcheck
-    integer-gmp
-    lifted-base
-    monad-control
-    mono-traversable
-    nats
-    network
-    primitive
-    resourcet
-    safe
-    smallcheck
-    store-core
-    syb
-    template-haskell
-    text
-    th-lift
-    th-lift-instances
-    th-orphans
-    th-reify-many
-    th-utilities
-    time
-    transformers
-    unordered-containers
-    vector
-    void
+    array async base base-orphans base64-bytestring bifunctors
+    bytestring clock containers contravariant cryptohash deepseq
+    directory filepath free ghc-prim hashable hspec hspec-smallcheck
+    integer-gmp lifted-base monad-control mono-traversable nats network
+    primitive resourcet safe smallcheck store-core syb template-haskell
+    text th-lift th-lift-instances th-orphans th-reify-many
+    th-utilities time transformers unordered-containers vector void
   ];
   testToolDepends = [ hspec-discover ];
   benchmarkHaskellDepends = [
-    array
-    async
-    base
-    base-orphans
-    base64-bytestring
-    bifunctors
-    bytestring
-    cereal
-    cereal-vector
-    containers
-    contravariant
-    criterion
-    cryptohash
-    deepseq
-    directory
-    filepath
-    free
-    ghc-prim
-    hashable
-    hspec
-    hspec-smallcheck
-    integer-gmp
-    lifted-base
-    monad-control
-    mono-traversable
-    nats
-    network
-    primitive
-    resourcet
-    safe
-    smallcheck
-    store-core
-    syb
-    template-haskell
-    text
-    th-lift
-    th-lift-instances
-    th-orphans
-    th-reify-many
-    th-utilities
-    time
-    transformers
-    unordered-containers
-    vector
-    vector-binary-instances
-    void
-    weigh
+    array async base base-orphans base64-bytestring bifunctors
+    bytestring cereal cereal-vector containers contravariant criterion
+    cryptohash deepseq directory filepath free ghc-prim hashable hspec
+    hspec-smallcheck integer-gmp lifted-base monad-control
+    mono-traversable nats network primitive resourcet safe smallcheck
+    store-core syb template-haskell text th-lift th-lift-instances
+    th-orphans th-reify-many th-utilities time transformers
+    unordered-containers vector vector-binary-instances void weigh
   ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
@@ -207,4 +56,4 @@ mkDerivation {
   description = "Fast binary serialization";
   license = lib.licenses.mit;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/streaming-binary.nix b/pkgs/streaming-binary.nix
index 3aa638a8a782f405561030fcdd6a8f818e0befa7..b53f486fdb3553582f33cf8277bf2daeac133294 100644
--- a/pkgs/streaming-binary.nix
+++ b/pkgs/streaming-binary.nix
@@ -1,10 +1,4 @@
-{ mkDerivation
-, base
-, binary
-, bytestring
-, hspec
-, lib
-, streaming
+{ mkDerivation, base, binary, bytestring, hspec, lib, streaming
 , streaming-bytestring
 }:
 mkDerivation {
@@ -15,19 +9,10 @@ mkDerivation {
   isExecutable = false;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    base
-    binary
-    bytestring
-    streaming
-    streaming-bytestring
+    base binary bytestring streaming streaming-bytestring
   ];
   testHaskellDepends = [
-    base
-    binary
-    bytestring
-    hspec
-    streaming
-    streaming-bytestring
+    base binary bytestring hspec streaming streaming-bytestring
   ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
@@ -40,4 +25,4 @@ mkDerivation {
   description = "Streaming interface to binary";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/streaming-bytestring.nix b/pkgs/streaming-bytestring.nix
index 1685a7b24e2db1a46689ed1f128ca38bc7a0bbb7..0f94005a01a6c35a95d31ae8476f1d6e760b812b 100644
--- a/pkgs/streaming-bytestring.nix
+++ b/pkgs/streaming-bytestring.nix
@@ -1,20 +1,6 @@
-{ mkDerivation
-, base
-, bytestring
-, deepseq
-, exceptions
-, ghc-prim
-, lib
-, mmorph
-, mtl
-, resourcet
-, smallcheck
-, streaming
-, tasty
-, tasty-hunit
-, tasty-smallcheck
-, transformers
-, transformers-base
+{ mkDerivation, base, bytestring, deepseq, exceptions, ghc-prim
+, lib, mmorph, mtl, resourcet, smallcheck, streaming, tasty
+, tasty-hunit, tasty-smallcheck, transformers, transformers-base
 }:
 mkDerivation {
   pname = "streaming-bytestring";
@@ -24,28 +10,12 @@ mkDerivation {
   isExecutable = false;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    base
-    bytestring
-    deepseq
-    exceptions
-    ghc-prim
-    mmorph
-    mtl
-    resourcet
-    streaming
-    transformers
-    transformers-base
+    base bytestring deepseq exceptions ghc-prim mmorph mtl resourcet
+    streaming transformers transformers-base
   ];
   testHaskellDepends = [
-    base
-    bytestring
-    resourcet
-    smallcheck
-    streaming
-    tasty
-    tasty-hunit
-    tasty-smallcheck
-    transformers
+    base bytestring resourcet smallcheck streaming tasty tasty-hunit
+    tasty-smallcheck transformers
   ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
@@ -58,4 +28,4 @@ mkDerivation {
   description = "Fast, effectful byte streams";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/strict-list.nix b/pkgs/strict-list.nix
index 5df276ea9d218a42e4a953b04a2396eb7ed3b40d..f0811b353ddeac17ae6250ece0ced2a5eab8139d 100644
--- a/pkgs/strict-list.nix
+++ b/pkgs/strict-list.nix
@@ -1,14 +1,5 @@
-{ mkDerivation
-, QuickCheck
-, base
-, deepseq
-, hashable
-, lib
-, quickcheck-instances
-, rerebase
-, semigroupoids
-, tasty
-, tasty-hunit
+{ mkDerivation, QuickCheck, base, deepseq, hashable, lib
+, quickcheck-instances, rerebase, semigroupoids, tasty, tasty-hunit
 , tasty-quickcheck
 }:
 mkDerivation {
@@ -20,11 +11,7 @@ mkDerivation {
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [ base deepseq hashable semigroupoids ];
   testHaskellDepends = [
-    QuickCheck
-    quickcheck-instances
-    rerebase
-    tasty
-    tasty-hunit
+    QuickCheck quickcheck-instances rerebase tasty tasty-hunit
     tasty-quickcheck
   ];
   enableLibraryProfiling = true;
@@ -38,4 +25,4 @@ mkDerivation {
   description = "Strict linked list";
   license = lib.licenses.mit;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/string-conv.nix b/pkgs/string-conv.nix
index 5fc277b3f0650698a008ee15934144b588dc6a14..08503d37faf1114293d39696aa482ff2227b0f06 100644
--- a/pkgs/string-conv.nix
+++ b/pkgs/string-conv.nix
@@ -1,11 +1,5 @@
-{ mkDerivation
-, base
-, bytestring
-, lib
-, quickcheck-instances
-, tasty
-, tasty-quickcheck
-, text
+{ mkDerivation, base, bytestring, lib, quickcheck-instances, tasty
+, tasty-quickcheck, text
 }:
 mkDerivation {
   pname = "string-conv";
@@ -16,12 +10,7 @@ mkDerivation {
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [ base bytestring text ];
   testHaskellDepends = [
-    base
-    bytestring
-    quickcheck-instances
-    tasty
-    tasty-quickcheck
-    text
+    base bytestring quickcheck-instances tasty tasty-quickcheck text
   ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
@@ -34,4 +23,4 @@ mkDerivation {
   description = "Standardized conversion between string types";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/string-conversions.nix b/pkgs/string-conversions.nix
index 2d00b75249bd592565c69d80693fb7f01b474cbe..67dfd03599b32699d010cffefe7a1d7b46ed7164 100644
--- a/pkgs/string-conversions.nix
+++ b/pkgs/string-conversions.nix
@@ -1,30 +1,18 @@
-{ mkDerivation
-, QuickCheck
-, base
-, bytestring
-, deepseq
-, hspec
-, lib
-, quickcheck-instances
-, text
-, utf8-string
+{ mkDerivation, QuickCheck, base, bytestring, deepseq, hspec, lib
+, quickcheck-instances, text, utf8-string
 }:
 mkDerivation {
   pname = "string-conversions";
   version = "0.4.0.1";
   sha256 = "46bcce6d9ce62c558b7658a75d9c6a62f7259d6b0473d011d8078234ad6a1994";
+  revision = "1";
+  editedCabalFile = "1g3wxx579mhs2icxngi78pvjfybbk606a6vgns88pg6ws5hrvx4s";
   isLibrary = true;
   isExecutable = false;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [ base bytestring text utf8-string ];
   testHaskellDepends = [
-    base
-    bytestring
-    deepseq
-    hspec
-    QuickCheck
-    quickcheck-instances
-    text
+    base bytestring deepseq hspec QuickCheck quickcheck-instances text
     utf8-string
   ];
   enableLibraryProfiling = true;
@@ -38,4 +26,4 @@ mkDerivation {
   description = "Simplifies dealing with different types for strings";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/string-interpolate.nix b/pkgs/string-interpolate.nix
index e4d3465ecbbece6623afd2bccab47574ab2414d4..3c791e63abb7f37b440c0f134dab5cbbaed4d04f 100644
--- a/pkgs/string-interpolate.nix
+++ b/pkgs/string-interpolate.nix
@@ -1,70 +1,28 @@
-{ mkDerivation
-, QuickCheck
-, base
-, bytestring
-, criterion
-, deepseq
-, formatting
-, haskell-src-exts
-, haskell-src-meta
-, hspec
-, hspec-core
-, interpolate
-, lib
-, neat-interpolation
-, quickcheck-instances
-, quickcheck-text
-, quickcheck-unicode
-, split
-, template-haskell
-, text
-, text-conversions
-, unordered-containers
-, utf8-string
+{ mkDerivation, QuickCheck, base, bytestring, criterion, deepseq
+, formatting, haskell-src-exts, haskell-src-meta, hspec, hspec-core
+, interpolate, lib, neat-interpolation, quickcheck-instances
+, quickcheck-text, quickcheck-unicode, split, template-haskell
+, text, text-conversions, unordered-containers, utf8-string
 }:
 mkDerivation {
   pname = "string-interpolate";
-  version = "0.3.1.2";
-  sha256 = "17c214e2a644c433d79e3d6b9e5dab9077d79be9de4b9e208308e3196b82b73e";
-  revision = "1";
-  editedCabalFile = "1nrpng7r59a25z4qns8vy26rvp1wgn5f4bs8ism40q66ags8f2ad";
+  version = "0.3.2.0";
+  sha256 = "9a7713beeaea33d712f74377c57e036b337fb7da851c73f6c479fa9dc521ade9";
   isLibrary = true;
   isExecutable = false;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    base
-    bytestring
-    haskell-src-exts
-    haskell-src-meta
-    split
-    template-haskell
-    text
-    text-conversions
-    utf8-string
+    base bytestring haskell-src-exts haskell-src-meta split
+    template-haskell text text-conversions utf8-string
   ];
   testHaskellDepends = [
-    base
-    bytestring
-    hspec
-    hspec-core
-    QuickCheck
-    quickcheck-instances
-    quickcheck-text
-    quickcheck-unicode
-    template-haskell
-    text
+    base bytestring hspec hspec-core QuickCheck quickcheck-instances
+    quickcheck-text quickcheck-unicode template-haskell text
     unordered-containers
   ];
   benchmarkHaskellDepends = [
-    base
-    bytestring
-    criterion
-    deepseq
-    formatting
-    interpolate
-    neat-interpolation
-    QuickCheck
-    text
+    base bytestring criterion deepseq formatting interpolate
+    neat-interpolation QuickCheck text
   ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
@@ -77,4 +35,4 @@ mkDerivation {
   description = "Haskell string/text/bytestring interpolation that just works";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/string-qq.nix b/pkgs/string-qq.nix
index 20d816cf98199f0c99209a80cc087f7689885d38..994160d1d950268031099aacf549ae8d08236fdb 100644
--- a/pkgs/string-qq.nix
+++ b/pkgs/string-qq.nix
@@ -18,4 +18,4 @@ mkDerivation {
   description = "QuasiQuoter for non-interpolated strings, texts and bytestrings";
   license = lib.licenses.publicDomain;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/stringbuilder.nix b/pkgs/stringbuilder.nix
index 3c19bafffd011a01b475404f6705ebb548c01fed..4fd4949cb2be4249052e9e5679dd5095ac837e6a 100644
--- a/pkgs/stringbuilder.nix
+++ b/pkgs/stringbuilder.nix
@@ -18,4 +18,4 @@ mkDerivation {
   description = "A writer monad for multi-line string literals";
   license = lib.licenses.mit;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/stringsearch.nix b/pkgs/stringsearch.nix
index 8dc0f53710ae77ac340ecab1d75d0f0f77abb604..06086a43c986f3016e614ed7a6f95320516ce087 100644
--- a/pkgs/stringsearch.nix
+++ b/pkgs/stringsearch.nix
@@ -20,4 +20,4 @@ mkDerivation {
   description = "Fast searching, splitting and replacing of ByteStrings";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/sundown.nix b/pkgs/sundown.nix
index 5228731ca447b71997f030e6c9686521189f7e93..0db3bbee11040196141e17e673800c806cbce490 100644
--- a/pkgs/sundown.nix
+++ b/pkgs/sundown.nix
@@ -18,4 +18,4 @@ mkDerivation {
   description = "Bindings to the sundown markdown library";
   license = lib.licenses.publicDomain;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/svg-builder.nix b/pkgs/svg-builder.nix
index 82e4bb96d8c5b13a5e59a70428c359626a25fb55..9b83d7a673147443bf7bd3d28cca41427ef72db2 100644
--- a/pkgs/svg-builder.nix
+++ b/pkgs/svg-builder.nix
@@ -1,11 +1,5 @@
-{ mkDerivation
-, base
-, blaze-builder
-, bytestring
-, hashable
-, lib
-, text
-, unordered-containers
+{ mkDerivation, base, blaze-builder, bytestring, hashable, lib
+, text, unordered-containers
 }:
 mkDerivation {
   pname = "svg-builder";
@@ -17,12 +11,7 @@ mkDerivation {
   isExecutable = false;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    base
-    blaze-builder
-    bytestring
-    hashable
-    text
-    unordered-containers
+    base blaze-builder bytestring hashable text unordered-containers
   ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
@@ -35,4 +24,4 @@ mkDerivation {
   description = "DSL for building SVG";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/sydtest-discover.nix b/pkgs/sydtest-discover.nix
index 80576477a2b243614c7ed64cd71048423d37d2bb..6041e449594c0eb993c0a2bedbf138eb20f0ae1d 100644
--- a/pkgs/sydtest-discover.nix
+++ b/pkgs/sydtest-discover.nix
@@ -1,9 +1,4 @@
-{ mkDerivation
-, base
-, filepath
-, lib
-, optparse-applicative
-, path
+{ mkDerivation, base, filepath, lib, optparse-applicative, path
 , path-io
 }:
 mkDerivation {
@@ -14,11 +9,7 @@ mkDerivation {
   isExecutable = true;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    base
-    filepath
-    optparse-applicative
-    path
-    path-io
+    base filepath optparse-applicative path path-io
   ];
   executableHaskellDepends = [ base ];
   enableLibraryProfiling = true;
@@ -32,4 +23,4 @@ mkDerivation {
   description = "Automatic test suite discovery for sydtest";
   license = "unknown";
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/system-fileio.nix b/pkgs/system-fileio.nix
index 9b797ad9b0835a4931064a821e80a925e0f85961..1591f29318de94f08c2cfa57a38ddfac9b841395 100644
--- a/pkgs/system-fileio.nix
+++ b/pkgs/system-fileio.nix
@@ -1,14 +1,5 @@
-{ mkDerivation
-, base
-, bytestring
-, chell
-, lib
-, system-filepath
-, temporary
-, text
-, time
-, transformers
-, unix
+{ mkDerivation, base, bytestring, chell, lib, system-filepath
+, temporary, text, time, transformers, unix
 }:
 mkDerivation {
   pname = "system-fileio";
@@ -18,23 +9,11 @@ mkDerivation {
   isExecutable = false;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    base
-    bytestring
-    system-filepath
-    text
-    time
-    unix
+    base bytestring system-filepath text time unix
   ];
   testHaskellDepends = [
-    base
-    bytestring
-    chell
-    system-filepath
-    temporary
-    text
-    time
-    transformers
-    unix
+    base bytestring chell system-filepath temporary text time
+    transformers unix
   ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
@@ -47,4 +26,4 @@ mkDerivation {
   description = "Consistent filesystem interaction across GHC versions (deprecated)";
   license = lib.licenses.mit;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/system-filepath.nix b/pkgs/system-filepath.nix
index 12b50d65d0ffef9da574208113368c47a1bae060..02e7d36a7988a6aaee247fa89b54d216243e3f77 100644
--- a/pkgs/system-filepath.nix
+++ b/pkgs/system-filepath.nix
@@ -1,13 +1,5 @@
-{ mkDerivation
-, Cabal
-, QuickCheck
-, base
-, bytestring
-, chell
-, chell-quickcheck
-, deepseq
-, lib
-, text
+{ mkDerivation, Cabal, QuickCheck, base, bytestring, chell
+, chell-quickcheck, deepseq, lib, text
 }:
 mkDerivation {
   pname = "system-filepath";
@@ -21,12 +13,7 @@ mkDerivation {
   setupHaskellDepends = [ base Cabal ];
   libraryHaskellDepends = [ base bytestring deepseq text ];
   testHaskellDepends = [
-    base
-    bytestring
-    chell
-    chell-quickcheck
-    QuickCheck
-    text
+    base bytestring chell chell-quickcheck QuickCheck text
   ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
@@ -39,4 +26,4 @@ mkDerivation {
   description = "High-level, byte-based file and directory path manipulations (deprecated)";
   license = lib.licenses.mit;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/tabular.nix b/pkgs/tabular.nix
index 7c1c14d62d2e065be115eb1067205debd013bd13..af9bb3163991b69ab46b614af6c5350e36c398f2 100644
--- a/pkgs/tabular.nix
+++ b/pkgs/tabular.nix
@@ -18,4 +18,4 @@ mkDerivation {
   description = "Two-dimensional data tables with rendering functions";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/tagged.nix b/pkgs/tagged.nix
index 89d5f69b8c118ac27af6f795ff2583ad46dd716a..b13e78ee7738e6b9b5f9f6953dc3e47f192015f9 100644
--- a/pkgs/tagged.nix
+++ b/pkgs/tagged.nix
@@ -1,9 +1,4 @@
-{ mkDerivation
-, base
-, deepseq
-, lib
-, template-haskell
-, transformers
+{ mkDerivation, base, deepseq, lib, template-haskell, transformers
 }:
 mkDerivation {
   pname = "tagged";
@@ -13,10 +8,7 @@ mkDerivation {
   isExecutable = false;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    base
-    deepseq
-    template-haskell
-    transformers
+    base deepseq template-haskell transformers
   ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
@@ -29,4 +21,4 @@ mkDerivation {
   description = "Haskell 98 phantom types to avoid unsafely passing dummy arguments";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/tagsoup.nix b/pkgs/tagsoup.nix
index 1f4721d09499f8dcddcdc728fb8955076673f967..2d4600857e98dadea9169099aab60ff77e94cb2c 100644
--- a/pkgs/tagsoup.nix
+++ b/pkgs/tagsoup.nix
@@ -1,14 +1,5 @@
-{ mkDerivation
-, QuickCheck
-, base
-, bytestring
-, containers
-, deepseq
-, directory
-, lib
-, process
-, text
-, time
+{ mkDerivation, QuickCheck, base, bytestring, containers, deepseq
+, directory, lib, process, text, time
 }:
 mkDerivation {
   pname = "tagsoup";
@@ -19,13 +10,7 @@ mkDerivation {
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [ base bytestring containers text ];
   testHaskellDepends = [
-    base
-    bytestring
-    deepseq
-    directory
-    process
-    QuickCheck
-    time
+    base bytestring deepseq directory process QuickCheck time
   ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
@@ -38,4 +23,4 @@ mkDerivation {
   description = "Parsing and extracting information from (possibly malformed) HTML/XML documents";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/tar.nix b/pkgs/tar.nix
index 294d9ed9179300793a72313f31b29298cd6274c0..b64c1d1df5459b9ce14a6a8de52c1c25fe140b29 100644
--- a/pkgs/tar.nix
+++ b/pkgs/tar.nix
@@ -1,18 +1,6 @@
-{ mkDerivation
-, QuickCheck
-, array
-, base
-, bytestring
-, containers
-, deepseq
-, directory
-, fetchgit
-, filepath
-, lib
-, tasty
-, tasty-bench
-, tasty-quickcheck
-, time
+{ mkDerivation, QuickCheck, array, base, bytestring, containers
+, deepseq, directory, fetchgit, filepath, lib, tasty, tasty-bench
+, tasty-quickcheck, time
 }:
 mkDerivation {
   pname = "tar";
@@ -27,38 +15,15 @@ mkDerivation {
   isExecutable = false;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    array
-    base
-    bytestring
-    containers
-    deepseq
-    directory
-    filepath
-    time
+    array base bytestring containers deepseq directory filepath time
   ];
   testHaskellDepends = [
-    array
-    base
-    bytestring
-    containers
-    deepseq
-    directory
-    filepath
-    QuickCheck
-    tasty
-    tasty-quickcheck
-    time
+    array base bytestring containers deepseq directory filepath
+    QuickCheck tasty tasty-quickcheck time
   ];
   benchmarkHaskellDepends = [
-    array
-    base
-    bytestring
-    containers
-    deepseq
-    directory
-    filepath
-    tasty-bench
-    time
+    array base bytestring containers deepseq directory filepath
+    tasty-bench time
   ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
@@ -70,4 +35,4 @@ mkDerivation {
   description = "Reading, writing and manipulating \".tar\" archive files.";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/tdigest.nix b/pkgs/tdigest.nix
index 95ade132f136564c6d8a61fc93aa59aa92a972fc..6943b71b35b4eb15979ff5c4ff6217c9b5a1cb90 100644
--- a/pkgs/tdigest.nix
+++ b/pkgs/tdigest.nix
@@ -1,17 +1,6 @@
-{ mkDerivation
-, base
-, base-compat
-, binary
-, deepseq
-, lib
-, reducers
-, semigroupoids
-, semigroups
-, tasty
-, tasty-quickcheck
-, transformers
-, vector
-, vector-algorithms
+{ mkDerivation, base, base-compat, binary, deepseq, lib, reducers
+, semigroupoids, semigroups, tasty, tasty-quickcheck, transformers
+, vector, vector-algorithms
 }:
 mkDerivation {
   pname = "tdigest";
@@ -23,26 +12,12 @@ mkDerivation {
   isExecutable = false;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    base
-    base-compat
-    binary
-    deepseq
-    reducers
-    semigroupoids
-    transformers
-    vector
-    vector-algorithms
+    base base-compat binary deepseq reducers semigroupoids transformers
+    vector vector-algorithms
   ];
   testHaskellDepends = [
-    base
-    base-compat
-    binary
-    deepseq
-    semigroups
-    tasty
-    tasty-quickcheck
-    vector
-    vector-algorithms
+    base base-compat binary deepseq semigroups tasty tasty-quickcheck
+    vector vector-algorithms
   ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
@@ -55,4 +30,4 @@ mkDerivation {
   description = "On-line accumulation of rank-based statistics";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/temporary.nix b/pkgs/temporary.nix
index 7e0ba471016a3d62f1cb14599e87dc356e470f9b..c8de334c388bcf809558e2829ee0bb1b91d14387 100644
--- a/pkgs/temporary.nix
+++ b/pkgs/temporary.nix
@@ -1,15 +1,5 @@
-{ mkDerivation
-, base
-, base-compat
-, directory
-, exceptions
-, filepath
-, lib
-, random
-, tasty
-, tasty-hunit
-, transformers
-, unix
+{ mkDerivation, base, base-compat, directory, exceptions, filepath
+, lib, random, tasty, tasty-hunit, transformers, unix
 }:
 mkDerivation {
   pname = "temporary";
@@ -19,22 +9,10 @@ mkDerivation {
   isExecutable = false;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    base
-    directory
-    exceptions
-    filepath
-    random
-    transformers
-    unix
+    base directory exceptions filepath random transformers unix
   ];
   testHaskellDepends = [
-    base
-    base-compat
-    directory
-    filepath
-    tasty
-    tasty-hunit
-    unix
+    base base-compat directory filepath tasty tasty-hunit unix
   ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
@@ -47,4 +25,4 @@ mkDerivation {
   description = "Portable temporary file and directory support";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/test-framework-hunit.nix b/pkgs/test-framework-hunit.nix
index f952c5ea27c41aa24aab0944eb964ffac841572f..5f948531627c7e232865797de4e36c3ef410ee84 100644
--- a/pkgs/test-framework-hunit.nix
+++ b/pkgs/test-framework-hunit.nix
@@ -1,8 +1,4 @@
-{ mkDerivation
-, HUnit
-, base
-, extensible-exceptions
-, lib
+{ mkDerivation, HUnit, base, extensible-exceptions, lib
 , test-framework
 }:
 mkDerivation {
@@ -15,10 +11,7 @@ mkDerivation {
   isExecutable = false;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    base
-    extensible-exceptions
-    HUnit
-    test-framework
+    base extensible-exceptions HUnit test-framework
   ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
@@ -31,4 +24,4 @@ mkDerivation {
   description = "HUnit support for the test-framework package";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/test-framework-quickcheck2.nix b/pkgs/test-framework-quickcheck2.nix
index 3818b62b8061a3bc2cea802651716b793270b528..7d3d5455e725afe47a3245e773873ee1a111b2a9 100644
--- a/pkgs/test-framework-quickcheck2.nix
+++ b/pkgs/test-framework-quickcheck2.nix
@@ -1,10 +1,5 @@
-{ mkDerivation
-, QuickCheck
-, base
-, extensible-exceptions
-, lib
-, random
-, test-framework
+{ mkDerivation, QuickCheck, base, extensible-exceptions, lib
+, random, test-framework
 }:
 mkDerivation {
   pname = "test-framework-quickcheck2";
@@ -16,11 +11,7 @@ mkDerivation {
   isExecutable = false;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    base
-    extensible-exceptions
-    QuickCheck
-    random
-    test-framework
+    base extensible-exceptions QuickCheck random test-framework
   ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
@@ -33,4 +24,4 @@ mkDerivation {
   description = "QuickCheck-2 support for the test-framework package";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/test-framework-smallcheck.nix b/pkgs/test-framework-smallcheck.nix
index 93eb045e1bd0eca83cdd29166cec0185a86487aa..2b84164390227bc7dec33e846fd14eb62422b497 100644
--- a/pkgs/test-framework-smallcheck.nix
+++ b/pkgs/test-framework-smallcheck.nix
@@ -1,9 +1,4 @@
-{ mkDerivation
-, base
-, lib
-, smallcheck
-, test-framework
-, transformers
+{ mkDerivation, base, lib, smallcheck, test-framework, transformers
 }:
 mkDerivation {
   pname = "test-framework-smallcheck";
@@ -13,10 +8,7 @@ mkDerivation {
   isExecutable = false;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    base
-    smallcheck
-    test-framework
-    transformers
+    base smallcheck test-framework transformers
   ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
@@ -29,4 +21,4 @@ mkDerivation {
   description = "Support for SmallCheck tests in test-framework";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/test-framework-th.nix b/pkgs/test-framework-th.nix
index f2f99f2c00080436db7d2b859a9a2313f0e0e027..438caea70b1cd22372edb162941383dbaa2fc385 100644
--- a/pkgs/test-framework-th.nix
+++ b/pkgs/test-framework-th.nix
@@ -1,11 +1,5 @@
-{ mkDerivation
-, base
-, haskell-src-exts
-, language-haskell-extract
-, lib
-, regex-posix
-, template-haskell
-, test-framework
+{ mkDerivation, base, haskell-src-exts, language-haskell-extract
+, lib, regex-posix, template-haskell, test-framework
 }:
 mkDerivation {
   pname = "test-framework-th";
@@ -15,12 +9,8 @@ mkDerivation {
   isExecutable = false;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    base
-    haskell-src-exts
-    language-haskell-extract
-    regex-posix
-    template-haskell
-    test-framework
+    base haskell-src-exts language-haskell-extract regex-posix
+    template-haskell test-framework
   ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
@@ -33,4 +23,4 @@ mkDerivation {
   description = "Automagically generate the HUnit- and Quickcheck-bulk-code using Template Haskell";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/test-framework.nix b/pkgs/test-framework.nix
index 3a6d618cc8988b37530accf6cb7e82d2739e7ba7..94517a127a2330a75257aaa0d78dc8bd31520755 100644
--- a/pkgs/test-framework.nix
+++ b/pkgs/test-framework.nix
@@ -1,20 +1,6 @@
-{ mkDerivation
-, HUnit
-, QuickCheck
-, ansi-terminal
-, ansi-wl-pprint
-, base
-, bytestring
-, containers
-, hostname
-, lib
-, libxml
-, old-locale
-, random
-, regex-posix
-, semigroups
-, time
-, xml
+{ mkDerivation, HUnit, QuickCheck, ansi-terminal, ansi-wl-pprint
+, base, bytestring, containers, hostname, lib, libxml, old-locale
+, random, regex-posix, semigroups, time, xml
 }:
 mkDerivation {
   pname = "test-framework";
@@ -26,33 +12,13 @@ mkDerivation {
   isExecutable = false;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    ansi-terminal
-    ansi-wl-pprint
-    base
-    containers
-    hostname
-    old-locale
-    random
-    regex-posix
-    time
-    xml
+    ansi-terminal ansi-wl-pprint base containers hostname old-locale
+    random regex-posix time xml
   ];
   testHaskellDepends = [
-    ansi-terminal
-    ansi-wl-pprint
-    base
-    bytestring
-    containers
-    hostname
-    HUnit
-    libxml
-    old-locale
-    QuickCheck
-    random
-    regex-posix
-    semigroups
-    time
-    xml
+    ansi-terminal ansi-wl-pprint base bytestring containers hostname
+    HUnit libxml old-locale QuickCheck random regex-posix semigroups
+    time xml
   ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
@@ -65,4 +31,4 @@ mkDerivation {
   description = "Framework for running and organising tests, with HUnit and QuickCheck support";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/testing-feat.nix b/pkgs/testing-feat.nix
index c4d7ce033ebf53e948b113b52b5ecf34d90610dd..45e73b5099b8f82d10d55629bc536d4c48866e45 100644
--- a/pkgs/testing-feat.nix
+++ b/pkgs/testing-feat.nix
@@ -1,8 +1,4 @@
-{ mkDerivation
-, QuickCheck
-, base
-, lib
-, size-based
+{ mkDerivation, QuickCheck, base, lib, size-based
 , testing-type-modifiers
 }:
 mkDerivation {
@@ -13,10 +9,7 @@ mkDerivation {
   isExecutable = false;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    base
-    QuickCheck
-    size-based
-    testing-type-modifiers
+    base QuickCheck size-based testing-type-modifiers
   ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
@@ -29,4 +22,4 @@ mkDerivation {
   description = "Functional Enumeration of Algebraic Types";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/testing-type-modifiers.nix b/pkgs/testing-type-modifiers.nix
index b7d3177dd419224344013c79a3d9dbce9f003f7e..244b7ab8051ea175d907ad807cf54fbb63faec2f 100644
--- a/pkgs/testing-type-modifiers.nix
+++ b/pkgs/testing-type-modifiers.nix
@@ -17,4 +17,4 @@ mkDerivation {
   description = "Data type modifiers for property based testing";
   license = lib.licenses.publicDomain;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/text-conversions.nix b/pkgs/text-conversions.nix
index 105cc8563b3717fd6a29659ba0fb9cbea2cf13e2..64160d827dcfb8e4c43c71bf7a5c2e441e48e9d8 100644
--- a/pkgs/text-conversions.nix
+++ b/pkgs/text-conversions.nix
@@ -1,12 +1,5 @@
-{ mkDerivation
-, base
-, base16-bytestring
-, base64-bytestring
-, bytestring
-, hspec
-, hspec-discover
-, lib
-, text
+{ mkDerivation, base, base16-bytestring, base64-bytestring
+, bytestring, hspec, hspec-discover, lib, text
 }:
 mkDerivation {
   pname = "text-conversions";
@@ -16,11 +9,7 @@ mkDerivation {
   isExecutable = false;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    base
-    base16-bytestring
-    base64-bytestring
-    bytestring
-    text
+    base base16-bytestring base64-bytestring bytestring text
   ];
   testHaskellDepends = [ base bytestring hspec text ];
   testToolDepends = [ hspec-discover ];
@@ -35,4 +24,4 @@ mkDerivation {
   description = "Safe conversions between textual types";
   license = lib.licenses.isc;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/text-display.nix b/pkgs/text-display.nix
index 696958b9396db2919dd8d3d491a3757fc5be2501..b0b1ce7c4b48c4186f3c76fc62c9c98751a4980d 100644
--- a/pkgs/text-display.nix
+++ b/pkgs/text-display.nix
@@ -1,11 +1,5 @@
-{ mkDerivation
-, base
-, bytestring
-, hspec
-, lib
-, quickcheck-text
-, should-not-typecheck
-, text
+{ mkDerivation, base, bytestring, hspec, lib, quickcheck-text
+, should-not-typecheck, text
 }:
 mkDerivation {
   pname = "text-display";
@@ -16,12 +10,7 @@ mkDerivation {
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [ base bytestring text ];
   testHaskellDepends = [
-    base
-    bytestring
-    hspec
-    quickcheck-text
-    should-not-typecheck
-    text
+    base bytestring hspec quickcheck-text should-not-typecheck text
   ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
@@ -34,4 +23,4 @@ mkDerivation {
   description = "A typeclass for user-facing output";
   license = lib.licenses.mit;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/text-icu.nix b/pkgs/text-icu.nix
index 3c4a2209a2287a77468e484e27260232249f52f1..e7782495efc562671c3e4761f516b53870ec0101 100644
--- a/pkgs/text-icu.nix
+++ b/pkgs/text-icu.nix
@@ -1,21 +1,6 @@
-{ mkDerivation
-, HUnit
-, QuickCheck
-, array
-, base
-, bytestring
-, deepseq
-, directory
-, ghc-prim
-, icu
-, icu-i18n
-, lib
-, random
-, test-framework
-, test-framework-hunit
-, test-framework-quickcheck2
-, text
-, time
+{ mkDerivation, HUnit, QuickCheck, array, base, bytestring, deepseq
+, directory, ghc-prim, icu, icu-i18n, lib, random, test-framework
+, test-framework-hunit, test-framework-quickcheck2, text, time
 }:
 mkDerivation {
   pname = "text-icu";
@@ -28,19 +13,9 @@ mkDerivation {
   librarySystemDepends = [ icu ];
   libraryPkgconfigDepends = [ icu-i18n ];
   testHaskellDepends = [
-    array
-    base
-    bytestring
-    deepseq
-    directory
-    ghc-prim
-    HUnit
-    QuickCheck
-    random
-    test-framework
-    test-framework-hunit
-    test-framework-quickcheck2
-    text
+    array base bytestring deepseq directory ghc-prim HUnit QuickCheck
+    random test-framework test-framework-hunit
+    test-framework-quickcheck2 text
   ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
@@ -53,4 +28,4 @@ mkDerivation {
   description = "Bindings to the ICU library";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/text-manipulate.nix b/pkgs/text-manipulate.nix
index 9454b74001034a850a7a3a2bcf4ae3b7f883396d..cd6c9ec16eecf1ee4436ff1d2316045d8c372095 100644
--- a/pkgs/text-manipulate.nix
+++ b/pkgs/text-manipulate.nix
@@ -20,4 +20,4 @@ mkDerivation {
   description = "Case conversion, word boundary manipulation, and textual subjugation";
   license = lib.licenses.mpl20;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/text-metrics.nix b/pkgs/text-metrics.nix
index a3dee2183f9c91b4084322d1fef4758c63e7ab2b..4fc2d759d5347763b1e0ba80f60e93f35c7ce502 100644
--- a/pkgs/text-metrics.nix
+++ b/pkgs/text-metrics.nix
@@ -1,14 +1,5 @@
-{ mkDerivation
-, QuickCheck
-, base
-, containers
-, criterion
-, deepseq
-, hspec
-, lib
-, text
-, vector
-, weigh
+{ mkDerivation, QuickCheck, base, containers, criterion, deepseq
+, hspec, lib, text, vector, weigh
 }:
 mkDerivation {
   pname = "text-metrics";
@@ -33,4 +24,4 @@ mkDerivation {
   description = "Calculate various string metrics efficiently";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/text-rope.nix b/pkgs/text-rope.nix
index 1ffad92e7946e0c27d2feaffc3b8ea41021dc088..db910a67fa53ac113f89138bb51ffc2ac883421a 100644
--- a/pkgs/text-rope.nix
+++ b/pkgs/text-rope.nix
@@ -1,13 +1,5 @@
-{ mkDerivation
-, base
-, deepseq
-, lib
-, random
-, tasty
-, tasty-bench
-, tasty-quickcheck
-, text
-, vector
+{ mkDerivation, base, deepseq, lib, random, tasty, tasty-bench
+, tasty-quickcheck, text, vector
 }:
 mkDerivation {
   pname = "text-rope";
@@ -30,4 +22,4 @@ mkDerivation {
   description = "Text lines and ropes";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/text-short.nix b/pkgs/text-short.nix
index ac161b058176cf440cdbe6165d4995d47dddabe1..7b16d82f1d1d856ec42cc169c461947893901c30 100644
--- a/pkgs/text-short.nix
+++ b/pkgs/text-short.nix
@@ -1,45 +1,23 @@
-{ mkDerivation
-, base
-, binary
-, bytestring
-, deepseq
-, ghc-prim
-, hashable
-, lib
-, tasty
-, tasty-hunit
-, tasty-quickcheck
-, template-haskell
-, text
+{ mkDerivation, base, binary, bytestring, deepseq, ghc-prim
+, hashable, lib, tasty, tasty-hunit, tasty-quickcheck
+, template-haskell, text
 }:
 mkDerivation {
   pname = "text-short";
   version = "0.1.5";
   sha256 = "a35ec6cde2ada084c1a050dc5885be5ab01f851b93d744cf0facbc1c18002dda";
-  revision = "1";
-  editedCabalFile = "0gmmwwchy9312kz8kr5jhiamqrnjqxdqg1wkrww4289yfj1p7dzb";
+  revision = "2";
+  editedCabalFile = "0lkh1sl8vx11vjjkxs2fz3jmmw1fp1f2k74q2acz6nywi4ifp5n2";
   isLibrary = true;
   isExecutable = false;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    base
-    binary
-    bytestring
-    deepseq
-    ghc-prim
-    hashable
-    template-haskell
+    base binary bytestring deepseq ghc-prim hashable template-haskell
     text
   ];
   testHaskellDepends = [
-    base
-    binary
-    bytestring
-    tasty
-    tasty-hunit
-    tasty-quickcheck
-    template-haskell
-    text
+    base binary bytestring tasty tasty-hunit tasty-quickcheck
+    template-haskell text
   ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
@@ -51,4 +29,4 @@ mkDerivation {
   description = "Memory-efficient representation of Unicode text strings";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/tf-random.nix b/pkgs/tf-random.nix
index 646e46c2a394b25f9efd22c5d4a7481412a37633..19a6779315820585c288432c70d435ce1584ced0 100644
--- a/pkgs/tf-random.nix
+++ b/pkgs/tf-random.nix
@@ -17,4 +17,4 @@ mkDerivation {
   description = "High-quality splittable pseudorandom number generator";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/these-skinny.nix b/pkgs/these-skinny.nix
index b859173181d87804829a3f96cf7a3fffd8f7ada5..9e08819ccfab30c31b2caf96e5dc4c556d4846aa 100644
--- a/pkgs/these-skinny.nix
+++ b/pkgs/these-skinny.nix
@@ -20,4 +20,4 @@ mkDerivation {
   description = "A fork of the 'these' package without the dependency bloat";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/these.nix b/pkgs/these.nix
index 41a5eab5e57fde298c3434c77b2bf91fa4af91a9..ff2d76492e187246fb07e134986b4b7066b32cee 100644
--- a/pkgs/these.nix
+++ b/pkgs/these.nix
@@ -1,11 +1,5 @@
-{ mkDerivation
-, assoc
-, base
-, binary
-, deepseq
-, foldable1-classes-compat
-, hashable
-, lib
+{ mkDerivation, assoc, base, binary, deepseq
+, foldable1-classes-compat, hashable, lib
 }:
 mkDerivation {
   pname = "these";
@@ -15,12 +9,7 @@ mkDerivation {
   isExecutable = false;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    assoc
-    base
-    binary
-    deepseq
-    foldable1-classes-compat
-    hashable
+    assoc base binary deepseq foldable1-classes-compat hashable
   ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
@@ -33,4 +22,4 @@ mkDerivation {
   description = "An either-or-both data type";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/threads.nix b/pkgs/threads.nix
index f3cfa4072f5318a1dc1a4ae2f8d40ac39ff13aa8..e42dc6b5e8d67bca7e521fc7a7de94a8824ed04f 100644
--- a/pkgs/threads.nix
+++ b/pkgs/threads.nix
@@ -1,29 +1,19 @@
-{ mkDerivation
-, Cabal
-, HUnit
-, base
-, concurrent-extra
-, lib
-, stm
-, test-framework
-, test-framework-hunit
+{ mkDerivation, Cabal, HUnit, base, concurrent-extra, lib, stm
+, test-framework, test-framework-hunit
 }:
 mkDerivation {
   pname = "threads";
   version = "0.5.1.7";
   sha256 = "e0f6fea09b99a2f84c98089c27c011077bf43f1e1977a5c43997e226d23142d0";
+  revision = "1";
+  editedCabalFile = "18xxmb0x8lr6c90jc1vv078jm932aia9hm722l5wxmwly4a2n4wp";
   isLibrary = true;
   isExecutable = false;
   enableSeparateDataOutput = false;
   setupHaskellDepends = [ base Cabal ];
   libraryHaskellDepends = [ base stm ];
   testHaskellDepends = [
-    base
-    concurrent-extra
-    HUnit
-    stm
-    test-framework
-    test-framework-hunit
+    base concurrent-extra HUnit stm test-framework test-framework-hunit
   ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
@@ -36,4 +26,4 @@ mkDerivation {
   description = "Fork threads and wait for their result";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/time-compat.nix b/pkgs/time-compat.nix
index a2df91975f30ca73c3aefeecd95d9b59ddd541fd..9735193a02f09cfa3f53b079e7a61d19205c1a6a 100644
--- a/pkgs/time-compat.nix
+++ b/pkgs/time-compat.nix
@@ -1,46 +1,22 @@
-{ mkDerivation
-, HUnit
-, QuickCheck
-, base
-, base-compat
-, base-orphans
-, deepseq
-, hashable
-, lib
-, tagged
-, tasty
-, tasty-hunit
-, tasty-quickcheck
-, time
+{ mkDerivation, HUnit, QuickCheck, base, base-compat, base-orphans
+, deepseq, hashable, lib, tagged, tasty, tasty-hunit
+, tasty-quickcheck, time
 }:
 mkDerivation {
   pname = "time-compat";
   version = "1.9.6.1";
   sha256 = "ad07bb00eb9678c2136d3680752b00acc4cbc522654bb3199bf31c61ef1e6b80";
-  revision = "4";
-  editedCabalFile = "1n39yfk21xz8y1xvkh01651yysk2zp5qac22l5pq2hi7scczmxaw";
+  revision = "5";
+  editedCabalFile = "0ryv5p2hgq5a6iyvh2r30sdlr7jn70cw8ypw5sc0hwbb1pxf2kfx";
   isLibrary = true;
   isExecutable = false;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    base
-    base-orphans
-    deepseq
-    hashable
-    time
+    base base-orphans deepseq hashable time
   ];
   testHaskellDepends = [
-    base
-    base-compat
-    deepseq
-    hashable
-    HUnit
-    QuickCheck
-    tagged
-    tasty
-    tasty-hunit
-    tasty-quickcheck
-    time
+    base base-compat deepseq hashable HUnit QuickCheck tagged tasty
+    tasty-hunit tasty-quickcheck time
   ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
@@ -53,4 +29,4 @@ mkDerivation {
   description = "Compatibility package for time";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/time-effectful.nix b/pkgs/time-effectful.nix
index cec0bed6c487e8bd791322198882b00b361048a3..78693b6c5a97ccbd7566ce7257d1acfb685046f6 100644
--- a/pkgs/time-effectful.nix
+++ b/pkgs/time-effectful.nix
@@ -1,11 +1,5 @@
-{ mkDerivation
-, base
-, effectful-core
-, fetchgit
-, lib
-, tasty
-, tasty-hunit
-, time
+{ mkDerivation, base, effectful-core, fetchgit, lib, tasty
+, tasty-hunit, time
 }:
 mkDerivation {
   pname = "time-effectful";
@@ -21,11 +15,7 @@ mkDerivation {
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [ base effectful-core time ];
   testHaskellDepends = [
-    base
-    effectful-core
-    tasty
-    tasty-hunit
-    time
+    base effectful-core tasty tasty-hunit time
   ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
@@ -37,4 +27,4 @@ mkDerivation {
   homepage = "https://github.com/haskell-effectful/time-effectful#readme";
   license = lib.licenses.mit;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/time-locale-compat.nix b/pkgs/time-locale-compat.nix
index e7975bc1edcdb415e6a58d19fe532255969f376a..f80592e6787a56b5cb1591dfe4ee30baec8b2eba 100644
--- a/pkgs/time-locale-compat.nix
+++ b/pkgs/time-locale-compat.nix
@@ -18,4 +18,4 @@ mkDerivation {
   description = "Compatibile module for time-format locale";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/time-manager.nix b/pkgs/time-manager.nix
index 60feb2f17a3a0685dea174955031294993e40cd1..7db81e20664f63e9bd3771fc26e2a5c711f630fd 100644
--- a/pkgs/time-manager.nix
+++ b/pkgs/time-manager.nix
@@ -20,4 +20,4 @@ mkDerivation {
   description = "Scalable timer";
   license = lib.licenses.mit;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/time-units.nix b/pkgs/time-units.nix
index 98f0308ebb1e29f3db674c237a84e8b5de7f257a..fcd112e748d70335f33b046c1a90c358071fb559 100644
--- a/pkgs/time-units.nix
+++ b/pkgs/time-units.nix
@@ -18,4 +18,4 @@ mkDerivation {
   description = "A basic library for defining units of time as types";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/timeit.nix b/pkgs/timeit.nix
index 540b48193450e9ab1e0cccf2a06d1b02a5e542d9..85f19418dfb62c946d721dc193902ea4953a1125 100644
--- a/pkgs/timeit.nix
+++ b/pkgs/timeit.nix
@@ -20,4 +20,4 @@ mkDerivation {
   description = "Time monadic computations with an IO base";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/timing-convenience.nix b/pkgs/timing-convenience.nix
index a4e39a65f10c0d8ce013db038e328c8acd4fa5eb..8d8ecbb0b91ca3568823b5cf1032972d540caddb 100644
--- a/pkgs/timing-convenience.nix
+++ b/pkgs/timing-convenience.nix
@@ -17,4 +17,4 @@ mkDerivation {
   description = "Convenient functions for getting times";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/tls-session-manager.nix b/pkgs/tls-session-manager.nix
index 7a585839a9568ae9fba9ca424dcf3ef6ae38abc8..3eea5e2c4880dec122f83c98ff274f3e37e9030e 100644
--- a/pkgs/tls-session-manager.nix
+++ b/pkgs/tls-session-manager.nix
@@ -1,13 +1,5 @@
-{ mkDerivation
-, auto-update
-, base
-, basement
-, bytestring
-, clock
-, lib
-, memory
-, psqueues
-, tls
+{ mkDerivation, auto-update, base, basement, bytestring, clock, lib
+, memory, psqueues, tls
 }:
 mkDerivation {
   pname = "tls-session-manager";
@@ -17,14 +9,7 @@ mkDerivation {
   isExecutable = false;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    auto-update
-    base
-    basement
-    bytestring
-    clock
-    memory
-    psqueues
-    tls
+    auto-update base basement bytestring clock memory psqueues tls
   ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
@@ -36,4 +21,4 @@ mkDerivation {
   description = "In-memory TLS session manager";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/tls.nix b/pkgs/tls.nix
index f65763d5969edee0a62d18be3252313fc938e830..abe691006a65e92a84bf054950de88aeb6c9db50 100644
--- a/pkgs/tls.nix
+++ b/pkgs/tls.nix
@@ -1,25 +1,7 @@
-{ mkDerivation
-, QuickCheck
-, asn1-encoding
-, asn1-types
-, async
-, base
-, bytestring
-, cereal
-, cryptonite
-, data-default-class
-, gauge
-, hourglass
-, lib
-, memory
-, mtl
-, network
-, tasty
-, tasty-quickcheck
-, transformers
-, x509
-, x509-store
-, x509-validation
+{ mkDerivation, QuickCheck, asn1-encoding, asn1-types, async, base
+, bytestring, cereal, cryptonite, data-default-class, gauge
+, hourglass, lib, memory, mtl, network, tasty, tasty-quickcheck
+, transformers, x509, x509-store, x509-validation
 }:
 mkDerivation {
   pname = "tls";
@@ -29,50 +11,17 @@ mkDerivation {
   isExecutable = false;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    asn1-encoding
-    asn1-types
-    async
-    base
-    bytestring
-    cereal
-    cryptonite
-    data-default-class
-    hourglass
-    memory
-    mtl
-    network
-    transformers
-    x509
-    x509-store
-    x509-validation
+    asn1-encoding asn1-types async base bytestring cereal cryptonite
+    data-default-class hourglass memory mtl network transformers x509
+    x509-store x509-validation
   ];
   testHaskellDepends = [
-    asn1-types
-    async
-    base
-    bytestring
-    cryptonite
-    data-default-class
-    hourglass
-    QuickCheck
-    tasty
-    tasty-quickcheck
-    x509
-    x509-validation
+    asn1-types async base bytestring cryptonite data-default-class
+    hourglass QuickCheck tasty tasty-quickcheck x509 x509-validation
   ];
   benchmarkHaskellDepends = [
-    asn1-types
-    async
-    base
-    bytestring
-    cryptonite
-    data-default-class
-    gauge
-    hourglass
-    QuickCheck
-    tasty-quickcheck
-    x509
-    x509-validation
+    asn1-types async base bytestring cryptonite data-default-class
+    gauge hourglass QuickCheck tasty-quickcheck x509 x509-validation
   ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
@@ -85,4 +34,4 @@ mkDerivation {
   description = "TLS/SSL protocol native implementation (Server and Client)";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/tmp-postgres.nix b/pkgs/tmp-postgres.nix
index d2302bacc864e9081fb8c9da45b7f06b9f1e6b1d..f7a0199b48d6dc894f73eb1594af9593f86a2257 100644
--- a/pkgs/tmp-postgres.nix
+++ b/pkgs/tmp-postgres.nix
@@ -1,27 +1,8 @@
-{ mkDerivation
-, ansi-wl-pprint
-, async
-, base
-, base64-bytestring
-, bytestring
-, containers
-, criterion
-, cryptohash-sha1
-, deepseq
-, directory
-, generic-monoid
-, hspec
-, lib
-, mtl
-, network
-, port-utils
-, postgres-options
-, postgresql-simple
-, process
-, stm
-, temporary
-, transformers
-, unix
+{ mkDerivation, ansi-wl-pprint, async, base, base64-bytestring
+, bytestring, containers, criterion, cryptohash-sha1, deepseq
+, directory, generic-monoid, hspec, lib, mtl, network, port-utils
+, postgres-options, postgresql-simple, process, stm, temporary
+, transformers, unix
 }:
 mkDerivation {
   pname = "tmp-postgres";
@@ -31,57 +12,22 @@ mkDerivation {
   isExecutable = true;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    ansi-wl-pprint
-    async
-    base
-    base64-bytestring
-    bytestring
-    containers
-    cryptohash-sha1
-    deepseq
-    directory
-    generic-monoid
-    port-utils
-    postgres-options
-    postgresql-simple
-    process
-    stm
-    temporary
-    transformers
-    unix
+    ansi-wl-pprint async base base64-bytestring bytestring containers
+    cryptohash-sha1 deepseq directory generic-monoid port-utils
+    postgres-options postgresql-simple process stm temporary
+    transformers unix
   ];
   executableHaskellDepends = [
-    async
-    base
-    directory
-    postgres-options
-    postgresql-simple
-    process
+    async base directory postgres-options postgresql-simple process
     temporary
   ];
   testHaskellDepends = [
-    async
-    base
-    containers
-    directory
-    generic-monoid
-    hspec
-    mtl
-    network
-    port-utils
-    postgres-options
-    postgresql-simple
-    process
-    temporary
+    async base containers directory generic-monoid hspec mtl network
+    port-utils postgres-options postgresql-simple process temporary
     unix
   ];
   benchmarkHaskellDepends = [
-    base
-    criterion
-    deepseq
-    postgres-options
-    postgresql-simple
-    temporary
+    base criterion deepseq postgres-options postgresql-simple temporary
   ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
@@ -94,4 +40,4 @@ mkDerivation {
   description = "Start and stop a temporary postgres";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/torsor.nix b/pkgs/torsor.nix
index 90ebfa39b81a018de971d32a51945bd7b6d198aa..8ab491f24a2246a1a67d9c58a181e95ac421e910 100644
--- a/pkgs/torsor.nix
+++ b/pkgs/torsor.nix
@@ -18,4 +18,4 @@ mkDerivation {
   description = "Torsor Typeclass";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/transformers-base.nix b/pkgs/transformers-base.nix
index 45f3fdb5f2bc11ce3cdb5cafa3c792332c33a64c..cc7ec437ba99900f31f15c627334a0be1fa860f2 100644
--- a/pkgs/transformers-base.nix
+++ b/pkgs/transformers-base.nix
@@ -1,9 +1,4 @@
-{ mkDerivation
-, base
-, base-orphans
-, lib
-, stm
-, transformers
+{ mkDerivation, base, base-orphans, lib, stm, transformers
 , transformers-compat
 }:
 mkDerivation {
@@ -14,11 +9,7 @@ mkDerivation {
   isExecutable = false;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    base
-    base-orphans
-    stm
-    transformers
-    transformers-compat
+    base base-orphans stm transformers transformers-compat
   ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
@@ -31,4 +22,4 @@ mkDerivation {
   description = "Lift computations from the bottom of a transformer stack";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/transformers-compat.nix b/pkgs/transformers-compat.nix
index 8d42abedf6b5693b5888a9977e571d1c18b5f318..c18a85340c4579e4164f9614e82ba4107796ba59 100644
--- a/pkgs/transformers-compat.nix
+++ b/pkgs/transformers-compat.nix
@@ -18,4 +18,4 @@ mkDerivation {
   description = "A small compatibility shim for the transformers library";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/trifecta.nix b/pkgs/trifecta.nix
index be775fe839958643fbdbe149fe145c9edf487cb9..a3927247f2eb80dde26ebf2c1c8cd5bc3d59e335 100644
--- a/pkgs/trifecta.nix
+++ b/pkgs/trifecta.nix
@@ -1,31 +1,9 @@
-{ mkDerivation
-, QuickCheck
-, ansi-terminal
-, array
-, base
-, blaze-builder
-, blaze-html
-, blaze-markup
-, bytestring
-, charset
-, comonad
-, containers
-, deepseq
-, fingertree
-, ghc-prim
-, hashable
-, indexed-traversable
-, lens
-, lib
-, mtl
-, parsers
-, prettyprinter
-, prettyprinter-ansi-terminal
-, profunctors
-, reducers
-, transformers
-, unordered-containers
-, utf8-string
+{ mkDerivation, QuickCheck, ansi-terminal, array, base
+, blaze-builder, blaze-html, blaze-markup, bytestring, charset
+, comonad, containers, deepseq, fingertree, ghc-prim, hashable
+, indexed-traversable, lens, lib, mtl, parsers, prettyprinter
+, prettyprinter-ansi-terminal, profunctors, reducers, transformers
+, unordered-containers, utf8-string
 }:
 mkDerivation {
   pname = "trifecta";
@@ -37,31 +15,11 @@ mkDerivation {
   isExecutable = false;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    ansi-terminal
-    array
-    base
-    blaze-builder
-    blaze-html
-    blaze-markup
-    bytestring
-    charset
-    comonad
-    containers
-    deepseq
-    fingertree
-    ghc-prim
-    hashable
-    indexed-traversable
-    lens
-    mtl
-    parsers
-    prettyprinter
-    prettyprinter-ansi-terminal
-    profunctors
-    reducers
-    transformers
-    unordered-containers
-    utf8-string
+    ansi-terminal array base blaze-builder blaze-html blaze-markup
+    bytestring charset comonad containers deepseq fingertree ghc-prim
+    hashable indexed-traversable lens mtl parsers prettyprinter
+    prettyprinter-ansi-terminal profunctors reducers transformers
+    unordered-containers utf8-string
   ];
   testHaskellDepends = [ base parsers QuickCheck ];
   enableLibraryProfiling = true;
@@ -75,4 +33,4 @@ mkDerivation {
   description = "A modern parser combinator library with convenient diagnostics";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/tuple.nix b/pkgs/tuple.nix
index 17c46d34c414ee2beabfb4eb9cab13ae7ccda82f..6c3aa3cce550e6c1f238ebf5ae625016c90cba9e 100644
--- a/pkgs/tuple.nix
+++ b/pkgs/tuple.nix
@@ -17,4 +17,4 @@ mkDerivation {
   description = "Various functions on tuples";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/turtle.nix b/pkgs/turtle.nix
index 0aabe2339e9ced0ef6774143438870cb88ff9214..f1b90cd2cdac7508ab1255eeb8fda577463f33f1 100644
--- a/pkgs/turtle.nix
+++ b/pkgs/turtle.nix
@@ -1,74 +1,26 @@
-{ mkDerivation
-, ansi-wl-pprint
-, async
-, base
-, bytestring
-, clock
-, containers
-, directory
-, doctest
-, exceptions
-, filepath
-, foldl
-, hostname
-, lib
-, managed
-, optional-args
-, optparse-applicative
-, process
-, stm
-, streaming-commons
-, tasty
-, tasty-bench
-, tasty-hunit
-, temporary
-, text
-, time
-, transformers
-, unix
-, unix-compat
+{ mkDerivation, ansi-wl-pprint, async, base, bytestring, clock
+, containers, directory, doctest, exceptions, filepath, foldl
+, hostname, lib, managed, optional-args, optparse-applicative
+, process, stm, streaming-commons, tasty, tasty-bench, tasty-hunit
+, temporary, text, time, transformers, unix, unix-compat
 }:
 mkDerivation {
   pname = "turtle";
   version = "1.6.1";
   sha256 = "2795445c93a4b646dd02b68ebf4006f8ec3588c85ccfe9d47810597e638e3b9c";
-  revision = "1";
-  editedCabalFile = "1x4hk9kk8ra855jkzs7dc9691pk14xydixswbx2srs3r9rc6dpjb";
+  revision = "3";
+  editedCabalFile = "00jxvvpffllwcaw2sg0rymj66963ihifpjn4m94mgscqwl25cfqs";
   isLibrary = true;
   isExecutable = false;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    ansi-wl-pprint
-    async
-    base
-    bytestring
-    clock
-    containers
-    directory
-    exceptions
-    filepath
-    foldl
-    hostname
-    managed
-    optional-args
-    optparse-applicative
-    process
-    stm
-    streaming-commons
-    temporary
-    text
-    time
-    transformers
-    unix
-    unix-compat
+    ansi-wl-pprint async base bytestring clock containers directory
+    exceptions filepath foldl hostname managed optional-args
+    optparse-applicative process stm streaming-commons temporary text
+    time transformers unix unix-compat
   ];
   testHaskellDepends = [
-    base
-    doctest
-    filepath
-    tasty
-    tasty-hunit
-    temporary
+    base doctest filepath tasty tasty-hunit temporary
   ];
   benchmarkHaskellDepends = [ base tasty-bench text ];
   enableLibraryProfiling = true;
@@ -81,4 +33,4 @@ mkDerivation {
   description = "Shell programming, Haskell-style";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/type-equality.nix b/pkgs/type-equality.nix
index d279319bc7fb77ae8f5c7d98a112e504c0f73a37..df6fc79478c8a709b1d39f83c9aee2ea492fc6b2 100644
--- a/pkgs/type-equality.nix
+++ b/pkgs/type-equality.nix
@@ -3,8 +3,8 @@ mkDerivation {
   pname = "type-equality";
   version = "1";
   sha256 = "4728b502a211454ef682a10d7a3e817c22d06ba509df114bb267ef9d43a08ce8";
-  revision = "4";
-  editedCabalFile = "0sajw67mmk5syhbrwx4bz82j5cjhm04n4kjl0pp3dnphxg1m5nbw";
+  revision = "5";
+  editedCabalFile = "0mhvj82l6nvxz3majr7kza4j7nxi0rqjx0ci8m1s9abkcirhcq2m";
   isLibrary = true;
   isExecutable = false;
   enableSeparateDataOutput = false;
@@ -20,4 +20,4 @@ mkDerivation {
   description = "Data.Type.Equality compat package";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/type-errors-pretty.nix b/pkgs/type-errors-pretty.nix
index 9e755fea1bfe5f51458850a0251ad484bea9c98a..450345ab86d40f0a8c27705b06c91ae7316f1586 100644
--- a/pkgs/type-errors-pretty.nix
+++ b/pkgs/type-errors-pretty.nix
@@ -19,4 +19,4 @@ mkDerivation {
   description = "Combinators for writing pretty type errors easily";
   license = lib.licenses.mpl20;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/typerep-map.nix b/pkgs/typerep-map.nix
index 51d5f0a358b8fe3302d6b70d59f0f21389f4257c..ebc766cd486e3ed386c457b2931f59535044f773 100644
--- a/pkgs/typerep-map.nix
+++ b/pkgs/typerep-map.nix
@@ -1,18 +1,6 @@
-{ mkDerivation
-, base
-, containers
-, criterion
-, deepseq
-, dependent-map
-, dependent-sum
-, ghc-prim
-, ghc-typelits-knownnat
-, hedgehog
-, hspec
-, hspec-hedgehog
-, lib
-, primitive
-, vector
+{ mkDerivation, base, containers, criterion, deepseq, dependent-map
+, dependent-sum, ghc-prim, ghc-typelits-knownnat, hedgehog, hspec
+, hspec-hedgehog, lib, primitive, vector
 }:
 mkDerivation {
   pname = "typerep-map";
@@ -22,26 +10,13 @@ mkDerivation {
   isExecutable = false;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    base
-    containers
-    deepseq
-    ghc-prim
-    primitive
-    vector
+    base containers deepseq ghc-prim primitive vector
   ];
   testHaskellDepends = [
-    base
-    ghc-typelits-knownnat
-    hedgehog
-    hspec
-    hspec-hedgehog
+    base ghc-typelits-knownnat hedgehog hspec hspec-hedgehog
   ];
   benchmarkHaskellDepends = [
-    base
-    criterion
-    deepseq
-    dependent-map
-    dependent-sum
+    base criterion deepseq dependent-map dependent-sum
     ghc-typelits-knownnat
   ];
   enableLibraryProfiling = true;
@@ -55,4 +30,4 @@ mkDerivation {
   description = "Efficient implementation of a dependent map with types as keys";
   license = lib.licenses.mpl20;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/uglymemo.nix b/pkgs/uglymemo.nix
index 7902595d7bcc4cc517b3ec096eebe8360e53a503..f7d9b782895f640bbb1b24c952918d738605e9d7 100644
--- a/pkgs/uglymemo.nix
+++ b/pkgs/uglymemo.nix
@@ -17,4 +17,4 @@ mkDerivation {
   description = "A simple (but internally ugly) memoization function";
   license = lib.licenses.publicDomain;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/unagi-chan.nix b/pkgs/unagi-chan.nix
index e585cf3bdafc1bcdc29c2df514864a25b4f7f2ad..adf89f8d652e6c1c669e65592ecfcca9067cca5e 100644
--- a/pkgs/unagi-chan.nix
+++ b/pkgs/unagi-chan.nix
@@ -1,12 +1,5 @@
-{ mkDerivation
-, async
-, atomic-primops
-, base
-, containers
-, criterion
-, ghc-prim
-, lib
-, primitive
+{ mkDerivation, async, atomic-primops, base, containers, criterion
+, ghc-prim, lib, primitive
 }:
 mkDerivation {
   pname = "unagi-chan";
@@ -17,11 +10,7 @@ mkDerivation {
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [ atomic-primops base ghc-prim primitive ];
   testHaskellDepends = [
-    atomic-primops
-    base
-    containers
-    ghc-prim
-    primitive
+    atomic-primops base containers ghc-prim primitive
   ];
   benchmarkHaskellDepends = [ async base criterion ];
   enableLibraryProfiling = true;
@@ -34,4 +23,4 @@ mkDerivation {
   description = "Fast concurrent queues with a Chan-like API, and more";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/unbounded-delays.nix b/pkgs/unbounded-delays.nix
index 08ee75e731b11dcc407617473ad6c183adde45d1..7d125975aac0971ec8a0ecc14e40e1ccbe889671 100644
--- a/pkgs/unbounded-delays.nix
+++ b/pkgs/unbounded-delays.nix
@@ -18,4 +18,4 @@ mkDerivation {
   description = "Unbounded thread delays and timeouts";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/uniplate.nix b/pkgs/uniplate.nix
index a8c1159daa6a48c74dcd7c1747a9c0737b7eded8..80c0b4f48a30b1407fae8952615077160e4c6bb7 100644
--- a/pkgs/uniplate.nix
+++ b/pkgs/uniplate.nix
@@ -1,10 +1,4 @@
-{ mkDerivation
-, base
-, containers
-, ghc-prim
-, hashable
-, lib
-, syb
+{ mkDerivation, base, containers, ghc-prim, hashable, lib, syb
 , unordered-containers
 }:
 mkDerivation {
@@ -17,12 +11,7 @@ mkDerivation {
   isExecutable = false;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    base
-    containers
-    ghc-prim
-    hashable
-    syb
-    unordered-containers
+    base containers ghc-prim hashable syb unordered-containers
   ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
@@ -35,4 +24,4 @@ mkDerivation {
   description = "Help writing simple, concise and fast generic operations";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/universe-reverse-instances.nix b/pkgs/universe-reverse-instances.nix
index ca7b63d02e708b4bfef6e50d3e424abaeac5531d..20e55b6805267d52131b09a4d2ca4667162ded15 100644
--- a/pkgs/universe-reverse-instances.nix
+++ b/pkgs/universe-reverse-instances.nix
@@ -3,8 +3,8 @@ mkDerivation {
   pname = "universe-reverse-instances";
   version = "1.1.1";
   sha256 = "c4127e12a6af8d8e05f87e546a57fdc0bd7b7f47eaf85d4a0f1826c998cdfb73";
-  revision = "2";
-  editedCabalFile = "1mp9222337rdcc6x5kg6hm14npbmq2igg0h6gmyvn1jd4x5cg9dx";
+  revision = "3";
+  editedCabalFile = "1skyr1b7jvlbphlnf373qx78qd41cz643cn7ssyncwbv30ndbs23";
   isLibrary = true;
   isExecutable = false;
   enableSeparateDataOutput = false;
@@ -20,4 +20,4 @@ mkDerivation {
   description = "Instances of standard classes that are made possible by enumerations";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/unix-bytestring.nix b/pkgs/unix-bytestring.nix
index 6d565e1ab23d08197f96fff3c2eb9e3bd9a89b5f..f7396c50e5d95c4bac2b0a23de48feea6c37ddff 100644
--- a/pkgs/unix-bytestring.nix
+++ b/pkgs/unix-bytestring.nix
@@ -18,4 +18,4 @@ mkDerivation {
   description = "Unix/Posix-specific functions for ByteStrings";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/unix-memory.nix b/pkgs/unix-memory.nix
index aa98f21d6b185fed249348fe7d099e99f5c46301..b5b3514e7a5213ca06c8c3779418dab158356eda 100644
--- a/pkgs/unix-memory.nix
+++ b/pkgs/unix-memory.nix
@@ -1,12 +1,5 @@
-{ mkDerivation
-, QuickCheck
-, base
-, lib
-, mtl
-, tasty
-, tasty-hunit
-, tasty-quickcheck
-, unix
+{ mkDerivation, QuickCheck, base, lib, mtl, tasty, tasty-hunit
+, tasty-quickcheck, unix
 }:
 mkDerivation {
   pname = "unix-memory";
@@ -17,13 +10,7 @@ mkDerivation {
   enableSeparateDataOutput = true;
   libraryHaskellDepends = [ base ];
   testHaskellDepends = [
-    base
-    mtl
-    QuickCheck
-    tasty
-    tasty-hunit
-    tasty-quickcheck
-    unix
+    base mtl QuickCheck tasty tasty-hunit tasty-quickcheck unix
   ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
@@ -36,4 +23,4 @@ mkDerivation {
   description = "Unix memory syscalls";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/unordered-containers.nix b/pkgs/unordered-containers.nix
index eedcc265c0f09fed51caf8b722d5f6e56bfb9355..a74eefcc6a9704cb9a82ba50f9a4f246faa77e2e 100644
--- a/pkgs/unordered-containers.nix
+++ b/pkgs/unordered-containers.nix
@@ -1,55 +1,24 @@
-{ mkDerivation
-, ChasingBottoms
-, HUnit
-, QuickCheck
-, base
-, bytestring
-, containers
-, deepseq
-, hashable
-, hashmap
-, lib
-, mtl
-, nothunks
-, random
-, tasty
-, tasty-bench
-, tasty-hunit
-, tasty-quickcheck
+{ mkDerivation, ChasingBottoms, HUnit, QuickCheck, base, bytestring
+, containers, deepseq, hashable, hashmap, lib, mtl, nothunks
+, random, tasty, tasty-bench, tasty-hunit, tasty-quickcheck
 , template-haskell
 }:
 mkDerivation {
   pname = "unordered-containers";
   version = "0.2.19.1";
   sha256 = "1b27bec5e0d522b27a6029ebf4c4a6d40acbc083c787008e32fb55c4b1d128d2";
-  revision = "1";
-  editedCabalFile = "0fcax3apnpxxy9maymclr6s2b4c28d3pkl3plbg0lv1mn0mh84fv";
+  revision = "2";
+  editedCabalFile = "005avgikg676gc2pw1sqia61nypx2wajdqghsjqkfg4i5qn9gn4s";
   isLibrary = true;
   isExecutable = false;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [ base deepseq hashable template-haskell ];
   testHaskellDepends = [
-    base
-    ChasingBottoms
-    containers
-    hashable
-    HUnit
-    nothunks
-    QuickCheck
-    random
-    tasty
-    tasty-hunit
-    tasty-quickcheck
+    base ChasingBottoms containers hashable HUnit nothunks QuickCheck
+    random tasty tasty-hunit tasty-quickcheck
   ];
   benchmarkHaskellDepends = [
-    base
-    bytestring
-    containers
-    deepseq
-    hashable
-    hashmap
-    mtl
-    random
+    base bytestring containers deepseq hashable hashmap mtl random
     tasty-bench
   ];
   enableLibraryProfiling = true;
@@ -63,4 +32,4 @@ mkDerivation {
   description = "Efficient hashing-based container types";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/uri-bytestring.nix b/pkgs/uri-bytestring.nix
index b294470a006923fd677b849d634dded6c8468fb1..8d2f661146b5ca8f00ec7872c69df72c316c9ebe 100644
--- a/pkgs/uri-bytestring.nix
+++ b/pkgs/uri-bytestring.nix
@@ -1,24 +1,7 @@
-{ mkDerivation
-, HUnit
-, attoparsec
-, base
-, base-compat
-, blaze-builder
-, bytestring
-, containers
-, criterion
-, deepseq
-, deepseq-generics
-, hedgehog
-, lib
-, network-uri
-, safe
-, tasty
-, tasty-hedgehog
-, tasty-hunit
-, template-haskell
-, th-lift-instances
-, transformers
+{ mkDerivation, HUnit, attoparsec, base, base-compat, blaze-builder
+, bytestring, containers, criterion, deepseq, deepseq-generics
+, hedgehog, lib, network-uri, safe, tasty, tasty-hedgehog
+, tasty-hunit, template-haskell, th-lift-instances, transformers
 }:
 mkDerivation {
   pname = "uri-bytestring";
@@ -28,36 +11,15 @@ mkDerivation {
   isExecutable = false;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    attoparsec
-    base
-    blaze-builder
-    bytestring
-    containers
-    template-haskell
-    th-lift-instances
+    attoparsec base blaze-builder bytestring containers
+    template-haskell th-lift-instances
   ];
   testHaskellDepends = [
-    attoparsec
-    base
-    base-compat
-    blaze-builder
-    bytestring
-    containers
-    hedgehog
-    HUnit
-    safe
-    tasty
-    tasty-hedgehog
-    tasty-hunit
-    transformers
+    attoparsec base base-compat blaze-builder bytestring containers
+    hedgehog HUnit safe tasty tasty-hedgehog tasty-hunit transformers
   ];
   benchmarkHaskellDepends = [
-    base
-    blaze-builder
-    bytestring
-    criterion
-    deepseq
-    deepseq-generics
+    base blaze-builder bytestring criterion deepseq deepseq-generics
     network-uri
   ];
   enableLibraryProfiling = true;
@@ -71,4 +33,4 @@ mkDerivation {
   description = "Haskell URI parsing as ByteStrings";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/uri-encode.nix b/pkgs/uri-encode.nix
index 638c25dd0e407719dacf5c72668df59c01948559..0387aa373d303eb4ab859b6a626577e4e8aa1a39 100644
--- a/pkgs/uri-encode.nix
+++ b/pkgs/uri-encode.nix
@@ -1,9 +1,4 @@
-{ mkDerivation
-, base
-, bytestring
-, lib
-, network-uri
-, text
+{ mkDerivation, base, bytestring, lib, network-uri, text
 , utf8-string
 }:
 mkDerivation {
@@ -16,11 +11,7 @@ mkDerivation {
   isExecutable = true;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    base
-    bytestring
-    network-uri
-    text
-    utf8-string
+    base bytestring network-uri text utf8-string
   ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
@@ -32,4 +23,4 @@ mkDerivation {
   description = "Unicode aware uri-encoding";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/url-slug.nix b/pkgs/url-slug.nix
index 89f4da3b68227c03ece2349a6085ea37d820bd74..db45d3fee0074d0e7a7cb98eb2c1f437c3ffdd76 100644
--- a/pkgs/url-slug.nix
+++ b/pkgs/url-slug.nix
@@ -1,10 +1,4 @@
-{ mkDerivation
-, aeson
-, base
-, lib
-, relude
-, text
-, unicode-transforms
+{ mkDerivation, aeson, base, lib, relude, text, unicode-transforms
 , uri-encode
 }:
 mkDerivation {
@@ -15,12 +9,7 @@ mkDerivation {
   isExecutable = false;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    aeson
-    base
-    relude
-    text
-    unicode-transforms
-    uri-encode
+    aeson base relude text unicode-transforms uri-encode
   ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
@@ -32,4 +21,4 @@ mkDerivation {
   description = "Encoding and decoding of URL slugs";
   license = lib.licenses.mit;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/utf8-string.nix b/pkgs/utf8-string.nix
index 9a16b54cbc85003d03bc0aa5e0ad866d485fe330..7f9b64f116410bf6d6d10978b1d094dc11c1317b 100644
--- a/pkgs/utf8-string.nix
+++ b/pkgs/utf8-string.nix
@@ -19,4 +19,4 @@ mkDerivation {
   description = "Support for reading and writing UTF8 Strings";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/utility-ht.nix b/pkgs/utility-ht.nix
index 995ecacf239b036753f709c86f14ac98a99e9a9f..0b953a9835d3d691d25bc02b275cf12639101da7 100644
--- a/pkgs/utility-ht.nix
+++ b/pkgs/utility-ht.nix
@@ -1,9 +1,5 @@
-{ mkDerivation
-, QuickCheck
-, base
-, doctest-exitcode-stdio
-, doctest-lib
-, lib
+{ mkDerivation, QuickCheck, base, doctest-exitcode-stdio
+, doctest-lib, lib
 }:
 mkDerivation {
   pname = "utility-ht";
@@ -14,10 +10,7 @@ mkDerivation {
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [ base ];
   testHaskellDepends = [
-    base
-    doctest-exitcode-stdio
-    doctest-lib
-    QuickCheck
+    base doctest-exitcode-stdio doctest-lib QuickCheck
   ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
@@ -29,4 +22,4 @@ mkDerivation {
   description = "Various small helper functions for Lists, Maybes, Tuples, Functions";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/uuid-types.nix b/pkgs/uuid-types.nix
index 0b078e7eadb7dd9f3b0112f2e82a71c2ac2b2fca..df2c6eb196c255176e94af4bbb8a1a21c0e57902 100644
--- a/pkgs/uuid-types.nix
+++ b/pkgs/uuid-types.nix
@@ -1,48 +1,23 @@
-{ mkDerivation
-, QuickCheck
-, base
-, binary
-, bytestring
-, deepseq
-, ghc-byteorder
-, hashable
-, lib
-, random
-, tasty
-, tasty-hunit
-, tasty-quickcheck
-, template-haskell
-, text
+{ mkDerivation, QuickCheck, base, binary, bytestring, deepseq
+, ghc-byteorder, hashable, lib, random, tasty, tasty-hunit
+, tasty-quickcheck, template-haskell, text
 }:
 mkDerivation {
   pname = "uuid-types";
   version = "1.0.5";
   sha256 = "ad68b89b7a64c07dd5c250a11be2033ee929318ff51ec7b4e4b54e1b4deba7dd";
-  revision = "3";
-  editedCabalFile = "10hpjshw6z8xnjpga47cazfdd4i27qvy4ash13lza2lmwf36k9ww";
+  revision = "4";
+  editedCabalFile = "08anv4hc75n1npjl4b8hrww97imgh6bsm1mfqn33n29ga84jcrp4";
   isLibrary = true;
   isExecutable = false;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    base
-    binary
-    bytestring
-    deepseq
-    hashable
-    random
-    template-haskell
+    base binary bytestring deepseq hashable random template-haskell
     text
   ];
   testHaskellDepends = [
-    base
-    binary
-    bytestring
-    ghc-byteorder
-    QuickCheck
-    tasty
-    tasty-hunit
-    tasty-quickcheck
-    template-haskell
+    base binary bytestring ghc-byteorder QuickCheck tasty tasty-hunit
+    tasty-quickcheck template-haskell
   ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
@@ -55,4 +30,4 @@ mkDerivation {
   description = "Type definitions for Universally Unique Identifiers";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/uuid.nix b/pkgs/uuid.nix
index e6d29de629c1c4c86e0db9932e3988acf8b06e52..65ebac5c6baeefbd58db96d90b97acf06d578969 100644
--- a/pkgs/uuid.nix
+++ b/pkgs/uuid.nix
@@ -1,19 +1,6 @@
-{ mkDerivation
-, QuickCheck
-, base
-, binary
-, bytestring
-, cryptohash-md5
-, cryptohash-sha1
-, entropy
-, lib
-, network-info
-, random
-, tasty
-, tasty-hunit
-, tasty-quickcheck
-, text
-, time
+{ mkDerivation, QuickCheck, base, binary, bytestring
+, cryptohash-md5, cryptohash-sha1, entropy, lib, network-info
+, random, tasty, tasty-hunit, tasty-quickcheck, text, time
 , uuid-types
 }:
 mkDerivation {
@@ -26,25 +13,11 @@ mkDerivation {
   isExecutable = false;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    base
-    binary
-    bytestring
-    cryptohash-md5
-    cryptohash-sha1
-    entropy
-    network-info
-    random
-    text
-    time
-    uuid-types
+    base binary bytestring cryptohash-md5 cryptohash-sha1 entropy
+    network-info random text time uuid-types
   ];
   testHaskellDepends = [
-    base
-    bytestring
-    QuickCheck
-    random
-    tasty
-    tasty-hunit
+    base bytestring QuickCheck random tasty tasty-hunit
     tasty-quickcheck
   ];
   enableLibraryProfiling = true;
@@ -58,4 +31,4 @@ mkDerivation {
   description = "For creating, comparing, parsing and printing Universally Unique Identifiers";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/validation.nix b/pkgs/validation.nix
index 7313b0969c7d4880267e0b879e5c93d5b9ddf695..7f628fbdcba3cc861bb92ed8b1aa21c44a84e4b6 100644
--- a/pkgs/validation.nix
+++ b/pkgs/validation.nix
@@ -1,14 +1,5 @@
-{ mkDerivation
-, HUnit
-, assoc
-, base
-, bifunctors
-, deepseq
-, hedgehog
-, lens
-, lib
-, semigroupoids
-, semigroups
+{ mkDerivation, HUnit, assoc, base, bifunctors, deepseq, hedgehog
+, lens, lib, semigroupoids, semigroups
 }:
 mkDerivation {
   pname = "validation";
@@ -18,13 +9,7 @@ mkDerivation {
   isExecutable = false;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    assoc
-    base
-    bifunctors
-    deepseq
-    lens
-    semigroupoids
-    semigroups
+    assoc base bifunctors deepseq lens semigroupoids semigroups
   ];
   testHaskellDepends = [ base hedgehog HUnit lens semigroups ];
   enableLibraryProfiling = true;
@@ -38,4 +23,4 @@ mkDerivation {
   description = "A data-type like Either but with an accumulating Applicative";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/validity-aeson.nix b/pkgs/validity-aeson.nix
index 356f6743e341aec329d226d530c672d4e7e7301b..b95028c4e02f5d83c62c78480a6bff61e4c91b84 100644
--- a/pkgs/validity-aeson.nix
+++ b/pkgs/validity-aeson.nix
@@ -1,12 +1,5 @@
-{ mkDerivation
-, aeson
-, base
-, hspec
-, lib
-, validity
-, validity-scientific
-, validity-text
-, validity-unordered-containers
+{ mkDerivation, aeson, base, hspec, lib, validity
+, validity-scientific, validity-text, validity-unordered-containers
 , validity-vector
 }:
 mkDerivation {
@@ -17,13 +10,8 @@ mkDerivation {
   isExecutable = false;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    aeson
-    base
-    validity
-    validity-scientific
-    validity-text
-    validity-unordered-containers
-    validity-vector
+    aeson base validity validity-scientific validity-text
+    validity-unordered-containers validity-vector
   ];
   testHaskellDepends = [ aeson base hspec validity ];
   enableLibraryProfiling = true;
@@ -37,4 +25,4 @@ mkDerivation {
   description = "Validity instances for aeson";
   license = lib.licenses.mit;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/validity-bytestring.nix b/pkgs/validity-bytestring.nix
index 2f72db4c832825e69ef87e30d57500ad9f0a9bf6..dc5be16dd3f34d063aba67903d837d1ad79b011d 100644
--- a/pkgs/validity-bytestring.nix
+++ b/pkgs/validity-bytestring.nix
@@ -18,4 +18,4 @@ mkDerivation {
   description = "Validity instances for bytestring";
   license = lib.licenses.mit;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/validity-case-insensitive.nix b/pkgs/validity-case-insensitive.nix
index 5273d4b1c7b9315cf0260f6206f40600bab572e3..c11bffe004352c692a3532789cbf37ab74869169 100644
--- a/pkgs/validity-case-insensitive.nix
+++ b/pkgs/validity-case-insensitive.nix
@@ -1,10 +1,5 @@
-{ mkDerivation
-, base
-, case-insensitive
-, genvalidity-hspec
-, hspec
-, lib
-, validity
+{ mkDerivation, base, case-insensitive, genvalidity-hspec, hspec
+, lib, validity
 }:
 mkDerivation {
   pname = "validity-case-insensitive";
@@ -15,11 +10,7 @@ mkDerivation {
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [ base case-insensitive validity ];
   testHaskellDepends = [
-    base
-    case-insensitive
-    genvalidity-hspec
-    hspec
-    validity
+    base case-insensitive genvalidity-hspec hspec validity
   ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
@@ -32,4 +23,4 @@ mkDerivation {
   description = "Validity instances for case-insensitive";
   license = lib.licenses.mit;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/validity-containers.nix b/pkgs/validity-containers.nix
index 24c10be3c8c1f4b022af0d10cf855afc080e6094..85e1d0d5ff84ef0ecbced8683ec36bac9e39b2c5 100644
--- a/pkgs/validity-containers.nix
+++ b/pkgs/validity-containers.nix
@@ -18,4 +18,4 @@ mkDerivation {
   description = "Validity instances for containers";
   license = lib.licenses.mit;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/validity-path.nix b/pkgs/validity-path.nix
index 9518e465e37249335125ad34025e38da03907eb9..9e0c6503a38f958966254c2fd86a993380b3d2ed 100644
--- a/pkgs/validity-path.nix
+++ b/pkgs/validity-path.nix
@@ -1,10 +1,4 @@
-{ mkDerivation
-, base
-, filepath
-, genvalidity-hspec
-, hspec
-, lib
-, path
+{ mkDerivation, base, filepath, genvalidity-hspec, hspec, lib, path
 , validity
 }:
 mkDerivation {
@@ -16,12 +10,7 @@ mkDerivation {
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [ base filepath path validity ];
   testHaskellDepends = [
-    base
-    filepath
-    genvalidity-hspec
-    hspec
-    path
-    validity
+    base filepath genvalidity-hspec hspec path validity
   ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
@@ -34,4 +23,4 @@ mkDerivation {
   description = "Validity instances for Path";
   license = lib.licenses.mit;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/validity-persistent.nix b/pkgs/validity-persistent.nix
index 97681c446a728dd7c36c83cfdbdaddaa977fc55c..7a432fd1f0ed85197a22c9d05b2b48b3d3f9e42f 100644
--- a/pkgs/validity-persistent.nix
+++ b/pkgs/validity-persistent.nix
@@ -18,4 +18,4 @@ mkDerivation {
   description = "Validity instances for persistent-related types";
   license = lib.licenses.mit;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/validity-primitive.nix b/pkgs/validity-primitive.nix
index e72ef3a81d32a62112f5012480c649e4590791d7..ccbbe0ee4b0f303dcec6eedda428b0c8358e47c7 100644
--- a/pkgs/validity-primitive.nix
+++ b/pkgs/validity-primitive.nix
@@ -18,4 +18,4 @@ mkDerivation {
   description = "Validity instances for primitive";
   license = lib.licenses.mit;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/validity-scientific.nix b/pkgs/validity-scientific.nix
index daef4665fab9ffd80b911e46b80daf9c81d137a7..28988ac7dbb1dac51806691fd0c8e81226325d1f 100644
--- a/pkgs/validity-scientific.nix
+++ b/pkgs/validity-scientific.nix
@@ -18,4 +18,4 @@ mkDerivation {
   description = "Validity instances for scientific";
   license = lib.licenses.mit;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/validity-text.nix b/pkgs/validity-text.nix
index ab29c313f109c654a380281d0905f76f0d4b6f6b..13874d127c431f48b389418e7e25740453a42811 100644
--- a/pkgs/validity-text.nix
+++ b/pkgs/validity-text.nix
@@ -18,4 +18,4 @@ mkDerivation {
   description = "Validity instances for text";
   license = lib.licenses.mit;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/validity-time.nix b/pkgs/validity-time.nix
index 3e774492a9af3260b99505d6fde3936538993946..a04026cf8210d4092bd5d90bc03f3db1fea1426b 100644
--- a/pkgs/validity-time.nix
+++ b/pkgs/validity-time.nix
@@ -18,4 +18,4 @@ mkDerivation {
   description = "Validity instances for time";
   license = lib.licenses.mit;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/validity-unordered-containers.nix b/pkgs/validity-unordered-containers.nix
index b64862abecb55aee46df6ab2c2314b228489d41a..7f6abbfc6d8f3a52826553189935df13da7e32d3 100644
--- a/pkgs/validity-unordered-containers.nix
+++ b/pkgs/validity-unordered-containers.nix
@@ -1,9 +1,4 @@
-{ mkDerivation
-, base
-, hashable
-, lib
-, unordered-containers
-, validity
+{ mkDerivation, base, hashable, lib, unordered-containers, validity
 }:
 mkDerivation {
   pname = "validity-unordered-containers";
@@ -13,10 +8,7 @@ mkDerivation {
   isExecutable = false;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    base
-    hashable
-    unordered-containers
-    validity
+    base hashable unordered-containers validity
   ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
@@ -29,4 +21,4 @@ mkDerivation {
   description = "Validity instances for unordered-containers";
   license = lib.licenses.mit;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/validity-uuid.nix b/pkgs/validity-uuid.nix
index e9ff59f51775f25ae91e04ddbbac0c3b0c2709ed..431af53a5c9d41f218e15676f26f72da8010786b 100644
--- a/pkgs/validity-uuid.nix
+++ b/pkgs/validity-uuid.nix
@@ -18,4 +18,4 @@ mkDerivation {
   description = "Validity instances for uuid";
   license = lib.licenses.mit;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/validity-vector.nix b/pkgs/validity-vector.nix
index 74db3c031a0176c899e4d815e93c46ae376b8928..d120ce1a2623eb8a8be560918535abab9ba002ba 100644
--- a/pkgs/validity-vector.nix
+++ b/pkgs/validity-vector.nix
@@ -18,4 +18,4 @@ mkDerivation {
   description = "Validity instances for vector";
   license = lib.licenses.mit;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/validity.nix b/pkgs/validity.nix
index e37f572ba3508aec008dc8fbeafab759a3ce6275..b10a63442d0e4e65df69163b9e03daeb9bd433c7 100644
--- a/pkgs/validity.nix
+++ b/pkgs/validity.nix
@@ -19,4 +19,4 @@ mkDerivation {
   description = "Validity typeclass";
   license = lib.licenses.mit;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/vault.nix b/pkgs/vault.nix
index 90d8de2d37af3d1962ff33e85312fb8eeaac0269..289248662083bd410f36be31b60c08b554c32df4 100644
--- a/pkgs/vault.nix
+++ b/pkgs/vault.nix
@@ -1,24 +1,17 @@
-{ mkDerivation
-, base
-, containers
-, hashable
-, lib
+{ mkDerivation, base, containers, hashable, lib
 , unordered-containers
 }:
 mkDerivation {
   pname = "vault";
   version = "0.3.1.5";
   sha256 = "ac2a6b6adf58598c5c8faa931ae961a8a2aa50ddb2f0f7a2044ff6e8c3d433a0";
-  revision = "2";
-  editedCabalFile = "1bjwv3nv8jfhrdxa5kn3gvgxmyalpq7592bvyl7bpvcc7bbkfkf3";
+  revision = "3";
+  editedCabalFile = "0avlxhj4m8sb1b9rh203jsaapw6q55bpgy4jnhjyq6an8dhnsg9i";
   isLibrary = true;
   isExecutable = false;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    base
-    containers
-    hashable
-    unordered-containers
+    base containers hashable unordered-containers
   ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
@@ -31,4 +24,4 @@ mkDerivation {
   description = "a persistent store for values of arbitrary types";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/vec.nix b/pkgs/vec.nix
index a4faae1ec569614af98291f09f637ef0cb881e3f..99a4d7bfe5d59e7dde5524427bdae9e5b4e66491 100644
--- a/pkgs/vec.nix
+++ b/pkgs/vec.nix
@@ -1,21 +1,7 @@
-{ mkDerivation
-, QuickCheck
-, adjunctions
-, base
-, base-compat
-, boring
-, criterion
-, deepseq
-, distributive
-, fin
-, hashable
-, indexed-traversable
-, inspection-testing
-, lib
-, semigroupoids
-, tagged
-, transformers
-, vector
+{ mkDerivation, QuickCheck, adjunctions, base, base-compat, boring
+, criterion, deepseq, distributive, fin, hashable
+, indexed-traversable, inspection-testing, lib, semigroupoids
+, tagged, transformers, vector
 }:
 mkDerivation {
   pname = "vec";
@@ -27,24 +13,11 @@ mkDerivation {
   isExecutable = false;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    adjunctions
-    base
-    boring
-    deepseq
-    distributive
-    fin
-    hashable
-    indexed-traversable
-    QuickCheck
-    semigroupoids
-    transformers
+    adjunctions base boring deepseq distributive fin hashable
+    indexed-traversable QuickCheck semigroupoids transformers
   ];
   testHaskellDepends = [
-    base
-    base-compat
-    fin
-    inspection-testing
-    tagged
+    base base-compat fin inspection-testing tagged
   ];
   benchmarkHaskellDepends = [ base criterion fin vector ];
   enableLibraryProfiling = true;
@@ -58,4 +31,4 @@ mkDerivation {
   description = "Vec: length-indexed (sized) list";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/vector-algorithms.nix b/pkgs/vector-algorithms.nix
index 54e5d89dda008fe6574672b7915aae2d278f08a7..a660f5c526f1fe1d698f32dac6934a523e9edbc2 100644
--- a/pkgs/vector-algorithms.nix
+++ b/pkgs/vector-algorithms.nix
@@ -1,36 +1,20 @@
-{ mkDerivation
-, QuickCheck
-, base
-, bitvec
-, bytestring
-, containers
-, lib
-, mwc-random
-, primitive
-, vector
+{ mkDerivation, QuickCheck, base, bitvec, bytestring, containers
+, lib, mwc-random, primitive, vector
 }:
 mkDerivation {
   pname = "vector-algorithms";
   version = "0.9.0.1";
   sha256 = "2ba7c0d3a8f26ef3ada24ff4abe81609225ecbab3b5754f048f8a0a3ecc33841";
-  revision = "1";
-  editedCabalFile = "1bma0m4g7770y4xnqsinspqkgf4swpdwddfbcby81szjxd8mik1l";
+  revision = "2";
+  editedCabalFile = "081adj7krcfv2i0cmy6k59jcp2f9j7ywl5r1fvglxa99amlwdrgk";
   isLibrary = true;
   isExecutable = false;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    base
-    bitvec
-    bytestring
-    primitive
-    vector
+    base bitvec bytestring primitive vector
   ];
   testHaskellDepends = [
-    base
-    bytestring
-    containers
-    QuickCheck
-    vector
+    base bytestring containers QuickCheck vector
   ];
   benchmarkHaskellDepends = [ base mwc-random vector ];
   enableLibraryProfiling = true;
@@ -44,4 +28,4 @@ mkDerivation {
   description = "Efficient algorithms for vector arrays";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/vector-binary-instances.nix b/pkgs/vector-binary-instances.nix
index 8553cb7da7f4f351511c4017070273af59bad5c6..71141c29809774c387ae22a9e90f7833562d0532 100644
--- a/pkgs/vector-binary-instances.nix
+++ b/pkgs/vector-binary-instances.nix
@@ -1,13 +1,5 @@
-{ mkDerivation
-, base
-, binary
-, bytestring
-, deepseq
-, lib
-, tasty
-, tasty-bench
-, tasty-quickcheck
-, vector
+{ mkDerivation, base, binary, bytestring, deepseq, lib, tasty
+, tasty-bench, tasty-quickcheck, vector
 }:
 mkDerivation {
   pname = "vector-binary-instances";
@@ -21,12 +13,7 @@ mkDerivation {
   libraryHaskellDepends = [ base binary vector ];
   testHaskellDepends = [ base binary tasty tasty-quickcheck vector ];
   benchmarkHaskellDepends = [
-    base
-    binary
-    bytestring
-    deepseq
-    tasty-bench
-    vector
+    base binary bytestring deepseq tasty-bench vector
   ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
@@ -39,4 +26,4 @@ mkDerivation {
   description = "Instances of Data.Binary for vector";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/vector-instances.nix b/pkgs/vector-instances.nix
index f0a64b9afe3a802140d399cf3b62d59ba9a428d9..ff1b9e36e8efa08216ac41eac8a7e4eb00fbc26a 100644
--- a/pkgs/vector-instances.nix
+++ b/pkgs/vector-instances.nix
@@ -1,13 +1,5 @@
-{ mkDerivation
-, base
-, comonad
-, hashable
-, keys
-, lib
-, pointed
-, semigroupoids
-, semigroups
-, vector
+{ mkDerivation, base, comonad, hashable, keys, lib, pointed
+, semigroupoids, semigroups, vector
 }:
 mkDerivation {
   pname = "vector-instances";
@@ -19,14 +11,7 @@ mkDerivation {
   isExecutable = false;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    base
-    comonad
-    hashable
-    keys
-    pointed
-    semigroupoids
-    semigroups
-    vector
+    base comonad hashable keys pointed semigroupoids semigroups vector
   ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
@@ -39,4 +24,4 @@ mkDerivation {
   description = "Orphan Instances for 'Data.Vector'";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/vector-sized.nix b/pkgs/vector-sized.nix
index 20a2f7098207c2fad07689ec6837d556806e867f..d6d52f59c6f5722b3f291f6c0acf00e4decc3dc5 100644
--- a/pkgs/vector-sized.nix
+++ b/pkgs/vector-sized.nix
@@ -1,16 +1,6 @@
-{ mkDerivation
-, adjunctions
-, base
-, binary
-, comonad
-, deepseq
-, distributive
-, finite-typelits
-, hashable
-, indexed-list-literals
-, lib
-, primitive
-, vector
+{ mkDerivation, adjunctions, base, binary, comonad, deepseq
+, distributive, finite-typelits, hashable, indexed-list-literals
+, lib, primitive, vector
 }:
 mkDerivation {
   pname = "vector-sized";
@@ -22,17 +12,8 @@ mkDerivation {
   isExecutable = false;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    adjunctions
-    base
-    binary
-    comonad
-    deepseq
-    distributive
-    finite-typelits
-    hashable
-    indexed-list-literals
-    primitive
-    vector
+    adjunctions base binary comonad deepseq distributive
+    finite-typelits hashable indexed-list-literals primitive vector
   ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
@@ -45,4 +26,4 @@ mkDerivation {
   description = "Size tagged vectors";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/vector-space.nix b/pkgs/vector-space.nix
index b36a5913e8ec9d340b8ef55c1c9c4a836050c1b3..ff98ff650f2048ee0010f00e8dfc2633def0719e 100644
--- a/pkgs/vector-space.nix
+++ b/pkgs/vector-space.nix
@@ -17,4 +17,4 @@ mkDerivation {
   description = "Vector & affine spaces, linear maps, and derivatives";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/vector-stream.nix b/pkgs/vector-stream.nix
index 35813e1776f82d96473e67e6b65da1a147318329..c012354967fab998df857a8d611c6a4291e05330 100644
--- a/pkgs/vector-stream.nix
+++ b/pkgs/vector-stream.nix
@@ -3,8 +3,8 @@ mkDerivation {
   pname = "vector-stream";
   version = "0.1.0.0";
   sha256 = "a888210f6467f155090653734be5cc920406a07227e0d3adb59096716fdb806c";
-  revision = "1";
-  editedCabalFile = "18sm3vd1qim9r3m40wgvnmcrfz1zl051yy84dffnp4si9vfgic09";
+  revision = "2";
+  editedCabalFile = "1jldm2bh9d0y7vmyv3l85ilps4n8ypqr6da0cgqg5dfi3hlxbmpm";
   isLibrary = true;
   isExecutable = false;
   enableSeparateDataOutput = false;
@@ -20,4 +20,4 @@ mkDerivation {
   description = "Efficient Streams";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/vector-th-unbox.nix b/pkgs/vector-th-unbox.nix
index 4c04b75c8a70c842aa3a3088797048fc9503dd6b..20b1c14820ce7a4cddc2e61976bfe7cb187dd4bb 100644
--- a/pkgs/vector-th-unbox.nix
+++ b/pkgs/vector-th-unbox.nix
@@ -1,16 +1,11 @@
-{ mkDerivation
-, base
-, data-default
-, lib
-, template-haskell
-, vector
+{ mkDerivation, base, data-default, lib, template-haskell, vector
 }:
 mkDerivation {
   pname = "vector-th-unbox";
   version = "0.2.2";
   sha256 = "8aa4ca464e842706e5b5234b8242d1aafec9ee755659b0e3ff44ecde13a80149";
-  revision = "3";
-  editedCabalFile = "0ki133sixq8pkfys36nl25jzdvnw40qq2bnskdmk2zyjhckdjcna";
+  revision = "4";
+  editedCabalFile = "08pvbwy6cb2hb15wczqp9056rxj86f2kc972py4sj5adkmf9mzrj";
   isLibrary = true;
   isExecutable = false;
   enableSeparateDataOutput = false;
@@ -27,4 +22,4 @@ mkDerivation {
   description = "Deriver for Data.Vector.Unboxed using Template Haskell";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/vector.nix b/pkgs/vector.nix
index 009f720c7c83458696631d2ddd2546a2494a7800..070ae6b60135792d2ae0dd5d36589dca4a12d6a4 100644
--- a/pkgs/vector.nix
+++ b/pkgs/vector.nix
@@ -1,46 +1,22 @@
-{ mkDerivation
-, HUnit
-, QuickCheck
-, base
-, base-orphans
-, deepseq
-, doctest
-, lib
-, primitive
-, random
-, tasty
-, tasty-bench
-, tasty-hunit
-, tasty-inspection-testing
-, tasty-quickcheck
-, template-haskell
-, transformers
-, vector-stream
+{ mkDerivation, HUnit, QuickCheck, base, base-orphans, deepseq
+, doctest, lib, primitive, random, tasty, tasty-bench, tasty-hunit
+, tasty-inspection-testing, tasty-quickcheck, template-haskell
+, transformers, vector-stream
 }:
 mkDerivation {
   pname = "vector";
   version = "0.13.0.0";
   sha256 = "c5d3167d15e12f52e00879ddf304a591672a74e369cc47bc5c7fa1d5a8d15b4f";
-  revision = "1";
-  editedCabalFile = "12cwdaqsy9dv7j7cwq6r6kdyfxqiya8khm6ccaabjhhpa2aqwljl";
+  revision = "3";
+  editedCabalFile = "0k14l1r84gxjv385crq8f1kvdcr4kjwyi4k7f64g6nksl60sqp7s";
   isLibrary = true;
   isExecutable = false;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [ base deepseq primitive vector-stream ];
   testHaskellDepends = [
-    base
-    base-orphans
-    doctest
-    HUnit
-    primitive
-    QuickCheck
-    random
-    tasty
-    tasty-hunit
-    tasty-inspection-testing
-    tasty-quickcheck
-    template-haskell
-    transformers
+    base base-orphans doctest HUnit primitive QuickCheck random tasty
+    tasty-hunit tasty-inspection-testing tasty-quickcheck
+    template-haskell transformers
   ];
   benchmarkHaskellDepends = [ base random tasty tasty-bench ];
   enableLibraryProfiling = true;
@@ -54,4 +30,4 @@ mkDerivation {
   description = "Efficient Arrays";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/vinyl.nix b/pkgs/vinyl.nix
index 274046cce59d7408612b7cc17af9383dcfc903e0..a494aeef1e859991dafbc5f315422c9b92121ad3 100644
--- a/pkgs/vinyl.nix
+++ b/pkgs/vinyl.nix
@@ -1,24 +1,7 @@
-{ mkDerivation
-, aeson
-, array
-, base
-, criterion
-, deepseq
-, ghc-prim
-, hspec
-, lens
-, lens-aeson
-, lib
-, linear
-, microlens
-, mtl
-, mwc-random
-, primitive
-, should-not-typecheck
-, tagged
-, text
-, unordered-containers
-, vector
+{ mkDerivation, aeson, array, base, criterion, deepseq, ghc-prim
+, hspec, lens, lens-aeson, lib, linear, microlens, mtl, mwc-random
+, primitive, should-not-typecheck, tagged, text
+, unordered-containers, vector
 }:
 mkDerivation {
   pname = "vinyl";
@@ -29,27 +12,11 @@ mkDerivation {
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [ array base deepseq ghc-prim ];
   testHaskellDepends = [
-    aeson
-    base
-    hspec
-    lens
-    lens-aeson
-    microlens
-    mtl
-    should-not-typecheck
-    text
-    unordered-containers
-    vector
+    aeson base hspec lens lens-aeson microlens mtl should-not-typecheck
+    text unordered-containers vector
   ];
   benchmarkHaskellDepends = [
-    base
-    criterion
-    linear
-    microlens
-    mwc-random
-    primitive
-    tagged
-    vector
+    base criterion linear microlens mwc-random primitive tagged vector
   ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
@@ -61,4 +28,4 @@ mkDerivation {
   description = "Extensible Records";
   license = lib.licenses.mit;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/void.nix b/pkgs/void.nix
index ae328a2b4eda95d6359c4a4060761f9a9a406d2d..f7d00f7c4067a73fe401a302ba7d588d74e21ccc 100644
--- a/pkgs/void.nix
+++ b/pkgs/void.nix
@@ -18,4 +18,4 @@ mkDerivation {
   description = "A Haskell 98 logically uninhabited data type";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/wai-app-static.nix b/pkgs/wai-app-static.nix
index ae3cd64a28170be97e848f979a3b7af8e6e58a32..1520defaa555ce47d7348bdf528f880a7f27776b 100644
--- a/pkgs/wai-app-static.nix
+++ b/pkgs/wai-app-static.nix
@@ -1,34 +1,9 @@
-{ mkDerivation
-, base
-, blaze-html
-, blaze-markup
-, bytestring
-, containers
-, cryptonite
-, directory
-, file-embed
-, filepath
-, hspec
-, http-date
-, http-types
-, lib
-, memory
-, mime-types
-, mockery
-, network
-, old-locale
-, optparse-applicative
-, template-haskell
-, temporary
-, text
-, time
-, transformers
-, unix-compat
-, unordered-containers
-, wai
-, wai-extra
-, warp
-, zlib
+{ mkDerivation, base, blaze-html, blaze-markup, bytestring
+, containers, cryptonite, directory, file-embed, filepath, hspec
+, http-date, http-types, lib, memory, mime-types, mockery, 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";
@@ -38,59 +13,19 @@ mkDerivation {
   isExecutable = true;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    base
-    blaze-html
-    blaze-markup
-    bytestring
-    containers
-    cryptonite
-    directory
-    file-embed
-    filepath
-    http-date
-    http-types
-    memory
-    mime-types
-    old-locale
-    optparse-applicative
-    template-haskell
-    text
-    time
-    transformers
-    unix-compat
-    unordered-containers
-    wai
-    wai-extra
-    warp
-    zlib
+    base blaze-html blaze-markup bytestring containers cryptonite
+    directory file-embed filepath http-date http-types memory
+    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
+    base bytestring containers directory mime-types text
   ];
   testHaskellDepends = [
-    base
-    bytestring
-    filepath
-    hspec
-    http-date
-    http-types
-    mime-types
-    mockery
-    network
-    old-locale
-    temporary
-    text
-    time
-    transformers
-    unix-compat
-    wai
-    wai-extra
-    zlib
+    base bytestring filepath hspec http-date http-types mime-types
+    mockery network old-locale temporary text time transformers
+    unix-compat wai wai-extra zlib
   ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
@@ -103,4 +38,4 @@ mkDerivation {
   description = "WAI application for static serving";
   license = lib.licenses.mit;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/wai-conduit.nix b/pkgs/wai-conduit.nix
index 5aa7021e816005ae938265ffe77eb4dd2716089c..990bb102d1832bc390411cf9771fd1a349dd24af 100644
--- a/pkgs/wai-conduit.nix
+++ b/pkgs/wai-conduit.nix
@@ -1,11 +1,5 @@
-{ mkDerivation
-, base
-, bytestring
-, conduit
-, http-types
-, lib
-, transformers
-, wai
+{ mkDerivation, base, bytestring, conduit, http-types, lib
+, transformers, wai
 }:
 mkDerivation {
   pname = "wai-conduit";
@@ -15,12 +9,7 @@ mkDerivation {
   isExecutable = false;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    base
-    bytestring
-    conduit
-    http-types
-    transformers
-    wai
+    base bytestring conduit http-types transformers wai
   ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
@@ -33,4 +22,4 @@ mkDerivation {
   description = "conduit wrappers for WAI";
   license = lib.licenses.mit;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/wai-extra.nix b/pkgs/wai-extra.nix
index af70f3c15e38788a6102db0b7df92e1e373405c5..ebb54852e2155ebe4ce663228cb57d6484b069db 100644
--- a/pkgs/wai-extra.nix
+++ b/pkgs/wai-extra.nix
@@ -1,36 +1,9 @@
-{ mkDerivation
-, HUnit
-, aeson
-, ansi-terminal
-, base
-, base64-bytestring
-, bytestring
-, call-stack
-, case-insensitive
-, containers
-, cookie
-, data-default-class
-, directory
-, fast-logger
-, hspec
-, hspec-discover
-, http-types
-, iproute
-, lib
-, network
-, resourcet
-, streaming-commons
-, temporary
-, text
-, time
-, transformers
-, unix
-, vault
-, wai
-, wai-logger
-, warp
-, word8
-, zlib
+{ mkDerivation, HUnit, aeson, ansi-terminal, base
+, base64-bytestring, bytestring, call-stack, case-insensitive
+, containers, cookie, data-default-class, directory, fast-logger
+, hspec, hspec-discover, http-types, iproute, lib, network
+, resourcet, streaming-commons, temporary, text, time, transformers
+, unix, vault, wai, wai-logger, warp, word8, zlib
 }:
 mkDerivation {
   pname = "wai-extra";
@@ -42,53 +15,16 @@ mkDerivation {
   isExecutable = true;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    aeson
-    ansi-terminal
-    base
-    base64-bytestring
-    bytestring
-    call-stack
-    case-insensitive
-    containers
-    cookie
-    data-default-class
-    directory
-    fast-logger
-    http-types
-    HUnit
-    iproute
-    network
-    resourcet
-    streaming-commons
-    text
-    time
-    transformers
-    unix
-    vault
-    wai
-    wai-logger
-    warp
-    word8
+    aeson ansi-terminal base base64-bytestring bytestring call-stack
+    case-insensitive containers cookie data-default-class directory
+    fast-logger http-types HUnit iproute network resourcet
+    streaming-commons text time transformers unix vault wai wai-logger
+    warp word8
   ];
   testHaskellDepends = [
-    aeson
-    base
-    bytestring
-    case-insensitive
-    cookie
-    directory
-    fast-logger
-    hspec
-    http-types
-    HUnit
-    iproute
-    resourcet
-    temporary
-    text
-    time
-    wai
-    warp
-    zlib
+    aeson base bytestring case-insensitive cookie directory fast-logger
+    hspec http-types HUnit iproute resourcet temporary text time wai
+    warp zlib
   ];
   testToolDepends = [ hspec-discover ];
   enableLibraryProfiling = true;
@@ -102,4 +38,4 @@ mkDerivation {
   description = "Provides some basic WAI handlers and middleware";
   license = lib.licenses.mit;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/wai-log.nix b/pkgs/wai-log.nix
index aa7e0d38553975f712aeff9da95be6a00c992779..962a31aa697a39402da76933272b9baee62cc709 100644
--- a/pkgs/wai-log.nix
+++ b/pkgs/wai-log.nix
@@ -1,15 +1,5 @@
-{ mkDerivation
-, aeson
-, base
-, bytestring
-, http-types
-, lib
-, log-base
-, string-conversions
-, text
-, time
-, uuid
-, wai
+{ mkDerivation, aeson, base, bytestring, http-types, lib, log-base
+, string-conversions, text, time, uuid, wai
 }:
 mkDerivation {
   pname = "wai-log";
@@ -19,16 +9,8 @@ mkDerivation {
   isExecutable = false;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    aeson
-    base
-    bytestring
-    http-types
-    log-base
-    string-conversions
-    text
-    time
-    uuid
-    wai
+    aeson base bytestring http-types log-base string-conversions text
+    time uuid wai
   ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
@@ -41,4 +23,4 @@ mkDerivation {
   description = "A logging middleware for WAI applications";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/wai-logger.nix b/pkgs/wai-logger.nix
index 5b6cc69ae5868d0ea8b866798a59a77b460207aa..9a26ab082a856677e61813fcee095f21a55641c0 100644
--- a/pkgs/wai-logger.nix
+++ b/pkgs/wai-logger.nix
@@ -1,15 +1,5 @@
-{ mkDerivation
-, Cabal
-, base
-, byteorder
-, bytestring
-, cabal-doctest
-, doctest
-, fast-logger
-, http-types
-, lib
-, network
-, wai
+{ mkDerivation, Cabal, base, byteorder, bytestring, cabal-doctest
+, doctest, fast-logger, http-types, lib, network, wai
 }:
 mkDerivation {
   pname = "wai-logger";
@@ -20,13 +10,7 @@ mkDerivation {
   enableSeparateDataOutput = false;
   setupHaskellDepends = [ base Cabal cabal-doctest ];
   libraryHaskellDepends = [
-    base
-    byteorder
-    bytestring
-    fast-logger
-    http-types
-    network
-    wai
+    base byteorder bytestring fast-logger http-types network wai
   ];
   testHaskellDepends = [ base doctest ];
   enableLibraryProfiling = true;
@@ -39,4 +23,4 @@ mkDerivation {
   description = "A logging system for WAI";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/wai-middleware-heartbeat.nix b/pkgs/wai-middleware-heartbeat.nix
index 96f685208e76e3c3d1ead8c89d3762474c444ad2..288e5fa05e76af0ad387b5b899f0edbfab0b287d 100644
--- a/pkgs/wai-middleware-heartbeat.nix
+++ b/pkgs/wai-middleware-heartbeat.nix
@@ -22,4 +22,4 @@ mkDerivation {
   description = "Heartbeat middleware for the WAI ecosystem";
   license = lib.licenses.mit;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/wai-middleware-prometheus.nix b/pkgs/wai-middleware-prometheus.nix
index ce0cdd1dd9063b6f9a80b23292f31eaab9567cb3..24ca7a08935873c43fb350421908be143ae256f3 100644
--- a/pkgs/wai-middleware-prometheus.nix
+++ b/pkgs/wai-middleware-prometheus.nix
@@ -1,14 +1,5 @@
-{ mkDerivation
-, base
-, bytestring
-, clock
-, data-default
-, doctest
-, http-types
-, lib
-, prometheus-client
-, text
-, wai
+{ mkDerivation, base, bytestring, clock, data-default, doctest
+, http-types, lib, prometheus-client, text, wai
 }:
 mkDerivation {
   pname = "wai-middleware-prometheus";
@@ -18,14 +9,8 @@ mkDerivation {
   isExecutable = false;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    base
-    bytestring
-    clock
-    data-default
-    http-types
-    prometheus-client
-    text
-    wai
+    base bytestring clock data-default http-types prometheus-client
+    text wai
   ];
   testHaskellDepends = [ base doctest prometheus-client ];
   enableLibraryProfiling = true;
@@ -39,4 +24,4 @@ mkDerivation {
   description = "WAI middlware for exposing http://prometheus.io metrics.";
   license = lib.licenses.asl20;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/wai-middleware-static.nix b/pkgs/wai-middleware-static.nix
index 2eedf6981e33aa5a040d6342d16942bfb89109cf..4afbbba532159b1fae8f19936088d8df657be273 100644
--- a/pkgs/wai-middleware-static.nix
+++ b/pkgs/wai-middleware-static.nix
@@ -1,27 +1,8 @@
-{ mkDerivation
-, base
-, base16-bytestring
-, bytestring
-, containers
-, cryptohash-sha1
-, directory
-, expiring-cache-map
-, filepath
-, hspec
-, hspec-discover
-, hspec-expectations-lifted
-, hspec-wai
-, http-types
-, lib
-, mime-types
-, mockery
-, old-locale
-, scotty
-, semigroups
-, text
-, time
-, wai
-, wai-extra
+{ mkDerivation, base, base16-bytestring, bytestring, containers
+, cryptohash-sha1, directory, expiring-cache-map, filepath, hspec
+, hspec-discover, hspec-expectations-lifted, hspec-wai, http-types
+, lib, mime-types, mockery, old-locale, scotty, semigroups, text
+, time, wai, wai-extra
 }:
 mkDerivation {
   pname = "wai-middleware-static";
@@ -33,31 +14,13 @@ mkDerivation {
   isExecutable = false;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    base
-    base16-bytestring
-    bytestring
-    containers
-    cryptohash-sha1
-    directory
-    expiring-cache-map
-    filepath
-    http-types
-    mime-types
-    old-locale
-    semigroups
-    text
-    time
-    wai
+    base base16-bytestring bytestring containers cryptohash-sha1
+    directory expiring-cache-map filepath http-types mime-types
+    old-locale semigroups text time wai
   ];
   testHaskellDepends = [
-    base
-    hspec
-    hspec-expectations-lifted
-    hspec-wai
-    http-types
-    mockery
-    scotty
-    wai-extra
+    base hspec hspec-expectations-lifted hspec-wai http-types mockery
+    scotty wai-extra
   ];
   testToolDepends = [ hspec-discover ];
   enableLibraryProfiling = true;
@@ -71,4 +34,4 @@ mkDerivation {
   description = "WAI middleware that serves requests to static files";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/wai-websockets.nix b/pkgs/wai-websockets.nix
index 4c8c64680fd97d443d17f0f204b5817fa5fcf059..588fc665392539565392f78e9093cbd9e79df35b 100644
--- a/pkgs/wai-websockets.nix
+++ b/pkgs/wai-websockets.nix
@@ -1,17 +1,6 @@
-{ mkDerivation
-, base
-, bytestring
-, case-insensitive
-, file-embed
-, http-types
-, lib
-, network
-, text
-, transformers
-, wai
-, wai-app-static
-, warp
-, websockets
+{ mkDerivation, base, bytestring, case-insensitive, file-embed
+, http-types, lib, network, text, transformers, wai, wai-app-static
+, warp, websockets
 }:
 mkDerivation {
   pname = "wai-websockets";
@@ -21,28 +10,12 @@ mkDerivation {
   isExecutable = true;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    base
-    bytestring
-    case-insensitive
-    http-types
-    network
-    transformers
-    wai
-    websockets
+    base bytestring case-insensitive http-types network transformers
+    wai websockets
   ];
   executableHaskellDepends = [
-    base
-    bytestring
-    case-insensitive
-    file-embed
-    http-types
-    network
-    text
-    transformers
-    wai
-    wai-app-static
-    warp
-    websockets
+    base bytestring case-insensitive file-embed http-types network text
+    transformers wai wai-app-static warp websockets
   ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
@@ -55,4 +28,4 @@ mkDerivation {
   description = "Provide a bridge between WAI and the websockets package";
   license = lib.licenses.mit;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/wai.nix b/pkgs/wai.nix
index 7ec82bd1e048ba44d21ceade1dd51811ae311883..791fed1257f4dc0a391bbd99541e43a7a6b7531d 100644
--- a/pkgs/wai.nix
+++ b/pkgs/wai.nix
@@ -1,13 +1,5 @@
-{ mkDerivation
-, base
-, bytestring
-, hspec
-, hspec-discover
-, http-types
-, lib
-, network
-, text
-, vault
+{ mkDerivation, base, bytestring, hspec, hspec-discover, http-types
+, lib, network, text, vault
 }:
 mkDerivation {
   pname = "wai";
@@ -17,12 +9,7 @@ mkDerivation {
   isExecutable = false;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    base
-    bytestring
-    http-types
-    network
-    text
-    vault
+    base bytestring http-types network text vault
   ];
   testHaskellDepends = [ base bytestring hspec ];
   testToolDepends = [ hspec-discover ];
@@ -37,4 +24,4 @@ mkDerivation {
   description = "Web Application Interface";
   license = lib.licenses.mit;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/websockets.nix b/pkgs/websockets.nix
index e266570448a80ebbff42f98c0e6e95edf89057da..21cf7157ec72d3e302bf07badec3b5ece1f1805d 100644
--- a/pkgs/websockets.nix
+++ b/pkgs/websockets.nix
@@ -1,95 +1,33 @@
-{ mkDerivation
-, HUnit
-, QuickCheck
-, SHA
-, async
-, attoparsec
-, base
-, base64-bytestring
-, binary
-, bytestring
-, bytestring-builder
-, case-insensitive
-, clock
-, containers
-, criterion
-, entropy
-, lib
-, network
-, random
-, streaming-commons
-, test-framework
-, test-framework-hunit
-, test-framework-quickcheck2
-, text
+{ mkDerivation, HUnit, QuickCheck, SHA, async, attoparsec, base
+, base64-bytestring, binary, bytestring, bytestring-builder
+, case-insensitive, clock, containers, criterion, entropy, lib
+, network, random, streaming-commons, test-framework
+, test-framework-hunit, test-framework-quickcheck2, text
 }:
 mkDerivation {
   pname = "websockets";
   version = "0.12.7.3";
   sha256 = "d3b0a8a0df7ac7c39c2572152ff903af2d5f009627dde4dada6fb81c89057f3c";
-  revision = "1";
-  editedCabalFile = "1yx97y6jl74vy200y43vjxfyzx338kh10dx8vxkjhr0mfh36wldq";
+  revision = "2";
+  editedCabalFile = "045dsjhhwv73wrs6f91az9hvxygznmx14g6f3fv69yhz9s6lbkry";
   isLibrary = true;
   isExecutable = true;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    async
-    attoparsec
-    base
-    base64-bytestring
-    binary
-    bytestring
-    bytestring-builder
-    case-insensitive
-    clock
-    containers
-    entropy
-    network
-    random
-    SHA
-    streaming-commons
-    text
+    async attoparsec base base64-bytestring binary bytestring
+    bytestring-builder case-insensitive clock containers entropy
+    network random SHA streaming-commons text
   ];
   testHaskellDepends = [
-    async
-    attoparsec
-    base
-    base64-bytestring
-    binary
-    bytestring
-    bytestring-builder
-    case-insensitive
-    clock
-    containers
-    entropy
-    HUnit
-    network
-    QuickCheck
-    random
-    SHA
-    streaming-commons
-    test-framework
-    test-framework-hunit
-    test-framework-quickcheck2
-    text
+    async attoparsec base base64-bytestring binary bytestring
+    bytestring-builder case-insensitive clock containers entropy HUnit
+    network QuickCheck random SHA streaming-commons test-framework
+    test-framework-hunit test-framework-quickcheck2 text
   ];
   benchmarkHaskellDepends = [
-    async
-    attoparsec
-    base
-    base64-bytestring
-    binary
-    bytestring
-    bytestring-builder
-    case-insensitive
-    clock
-    containers
-    criterion
-    entropy
-    network
-    random
-    SHA
-    text
+    async attoparsec base base64-bytestring binary bytestring
+    bytestring-builder case-insensitive clock containers criterion
+    entropy network random SHA text
   ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
@@ -102,4 +40,4 @@ mkDerivation {
   description = "A sensible and clean way to write WebSocket-capable servers in Haskell";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/weigh.nix b/pkgs/weigh.nix
index 182e6cc1f16e4dc33e49cb8e836324af7339443b..60ee668d4b37e342f0fb526081de03edfae041b3 100644
--- a/pkgs/weigh.nix
+++ b/pkgs/weigh.nix
@@ -1,11 +1,4 @@
-{ mkDerivation
-, base
-, deepseq
-, ghc
-, lib
-, mtl
-, process
-, split
+{ mkDerivation, base, deepseq, ghc, lib, mtl, process, split
 , temporary
 }:
 mkDerivation {
@@ -18,13 +11,7 @@ mkDerivation {
   isExecutable = false;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    base
-    deepseq
-    ghc
-    mtl
-    process
-    split
-    temporary
+    base deepseq ghc mtl process split temporary
   ];
   testHaskellDepends = [ base deepseq ];
   enableLibraryProfiling = true;
@@ -38,4 +25,4 @@ mkDerivation {
   description = "Measure allocations of a Haskell functions/values";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/with-utf8.nix b/pkgs/with-utf8.nix
index 0fed113b7777a140dc0914d1f8be376055ffa077..c33d70eaec151a0eb2d1ec3a2a929f5d3ff7b59d 100644
--- a/pkgs/with-utf8.nix
+++ b/pkgs/with-utf8.nix
@@ -1,21 +1,6 @@
-{ mkDerivation
-, HUnit
-, base
-, deepseq
-, directory
-, filepath
-, hedgehog
-, lib
-, process
-, safe-exceptions
-, tasty
-, tasty-discover
-, tasty-hedgehog
-, tasty-hunit
-, temporary
-, text
-, th-env
-, unix
+{ mkDerivation, HUnit, base, deepseq, directory, filepath, hedgehog
+, lib, process, safe-exceptions, tasty, tasty-discover
+, tasty-hedgehog, tasty-hunit, temporary, text, th-env, unix
 }:
 mkDerivation {
   pname = "with-utf8";
@@ -26,26 +11,11 @@ mkDerivation {
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [ base safe-exceptions text ];
   executableHaskellDepends = [
-    base
-    directory
-    filepath
-    process
-    safe-exceptions
-    text
-    th-env
+    base directory filepath process safe-exceptions text th-env
   ];
   testHaskellDepends = [
-    base
-    deepseq
-    hedgehog
-    HUnit
-    safe-exceptions
-    tasty
-    tasty-hedgehog
-    tasty-hunit
-    temporary
-    text
-    unix
+    base deepseq hedgehog HUnit safe-exceptions tasty tasty-hedgehog
+    tasty-hunit temporary text unix
   ];
   testToolDepends = [ tasty-discover ];
   enableLibraryProfiling = true;
@@ -59,4 +29,4 @@ mkDerivation {
   description = "Get your IO right on the first try";
   license = lib.licenses.mpl20;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/witherable.nix b/pkgs/witherable.nix
index 7c88af1f144e55ee9eaca0e3ba3e05a86086a0fd..d85f6a3a94226c4db6f0c3c37ae5e42bf99eff0c 100644
--- a/pkgs/witherable.nix
+++ b/pkgs/witherable.nix
@@ -1,50 +1,25 @@
-{ mkDerivation
-, QuickCheck
-, base
-, base-orphans
-, containers
-, hashable
-, indexed-traversable
-, indexed-traversable-instances
-, lib
-, quickcheck-instances
-, tasty
-, tasty-quickcheck
-, transformers
-, unordered-containers
-, vector
+{ mkDerivation, QuickCheck, base, base-orphans, containers
+, hashable, indexed-traversable, indexed-traversable-instances, lib
+, quickcheck-instances, tasty, tasty-quickcheck, transformers
+, unordered-containers, vector
 }:
 mkDerivation {
   pname = "witherable";
   version = "0.4.2";
   sha256 = "790d2bb274283419173bd89104439860675a9410f70f21912973ecd9098b4104";
-  revision = "3";
-  editedCabalFile = "1f2bvl41by904lnr0dk6qgasqwadq2w48l7fj51bp2h8bqbkdjyc";
+  revision = "4";
+  editedCabalFile = "1f6kb8cslgqq4x3mbg1gcxfbd9qb5a8hmrv802mm7zzhbnridiff";
   isLibrary = true;
   isExecutable = false;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    base
-    base-orphans
-    containers
-    hashable
-    indexed-traversable
-    indexed-traversable-instances
-    transformers
-    unordered-containers
+    base base-orphans containers hashable indexed-traversable
+    indexed-traversable-instances transformers unordered-containers
     vector
   ];
   testHaskellDepends = [
-    base
-    containers
-    hashable
-    QuickCheck
-    quickcheck-instances
-    tasty
-    tasty-quickcheck
-    transformers
-    unordered-containers
-    vector
+    base containers hashable QuickCheck quickcheck-instances tasty
+    tasty-quickcheck transformers unordered-containers vector
   ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
@@ -57,4 +32,4 @@ mkDerivation {
   description = "filterable traversable";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/wizards.nix b/pkgs/wizards.nix
index 3aa4381c5006628afb9e044960da56a721fe013b..5dac9ceec1f8e6e97deb015f76b768b0cd0a8434 100644
--- a/pkgs/wizards.nix
+++ b/pkgs/wizards.nix
@@ -1,11 +1,5 @@
-{ mkDerivation
-, base
-, containers
-, control-monad-free
-, haskeline
-, lib
-, mtl
-, transformers
+{ mkDerivation, base, containers, control-monad-free, haskeline
+, lib, mtl, transformers
 }:
 mkDerivation {
   pname = "wizards";
@@ -17,12 +11,7 @@ mkDerivation {
   isExecutable = false;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    base
-    containers
-    control-monad-free
-    haskeline
-    mtl
-    transformers
+    base containers control-monad-free haskeline mtl transformers
   ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
@@ -34,4 +23,4 @@ mkDerivation {
   description = "High level, generic library for interrogative user interfaces";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/wl-pprint-annotated.nix b/pkgs/wl-pprint-annotated.nix
index bb57b61ee6a3ecc568b4938dd147bb67efc763c9..44c8547d04b7510a44f337103617c2e16dc1e9ba 100644
--- a/pkgs/wl-pprint-annotated.nix
+++ b/pkgs/wl-pprint-annotated.nix
@@ -1,10 +1,4 @@
-{ mkDerivation
-, base
-, containers
-, deepseq
-, lib
-, tasty
-, tasty-hunit
+{ mkDerivation, base, containers, deepseq, lib, tasty, tasty-hunit
 , text
 }:
 mkDerivation {
@@ -18,12 +12,7 @@ mkDerivation {
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [ base containers deepseq text ];
   testHaskellDepends = [
-    base
-    containers
-    deepseq
-    tasty
-    tasty-hunit
-    text
+    base containers deepseq tasty tasty-hunit text
   ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
@@ -36,4 +25,4 @@ mkDerivation {
   description = "Pretty printer with annotation support";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/word-compat.nix b/pkgs/word-compat.nix
index 532f36e603ab40d1d148a779fdb5c69dc3fbb5ed..9e1d735736f8e1b6a41cd0326e6fc77c809336de 100644
--- a/pkgs/word-compat.nix
+++ b/pkgs/word-compat.nix
@@ -18,4 +18,4 @@ mkDerivation {
   description = "Compatibility shim for the Int/Word internal change in GHC 9.2";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/word-wrap.nix b/pkgs/word-wrap.nix
index 26b37b9a7cfb06914e4fa8c748c46d141b1c1eae..8ec6ac1ad61b6d4b27fdeb4972b6bdef202078e9 100644
--- a/pkgs/word-wrap.nix
+++ b/pkgs/word-wrap.nix
@@ -20,4 +20,4 @@ mkDerivation {
   description = "A library for word-wrapping";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/word8.nix b/pkgs/word8.nix
index 0af85fa8b381a2a3d8993b47986e27eeefdb8624..cfd312d87b85ba027fb7f26ebcf1f1db9bd21eef 100644
--- a/pkgs/word8.nix
+++ b/pkgs/word8.nix
@@ -19,4 +19,4 @@ mkDerivation {
   description = "Word8 library";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/x509-store.nix b/pkgs/x509-store.nix
index 122432c91b6604c72cf26a7ec55e28c16991c6c7..147fd0df253fb064a2d00fd99dd47ed32c6d7aed 100644
--- a/pkgs/x509-store.nix
+++ b/pkgs/x509-store.nix
@@ -1,18 +1,6 @@
-{ mkDerivation
-, asn1-encoding
-, asn1-types
-, base
-, bytestring
-, containers
-, cryptonite
-, directory
-, filepath
-, lib
-, mtl
-, pem
-, tasty
-, tasty-hunit
-, x509
+{ mkDerivation, asn1-encoding, asn1-types, base, bytestring
+, containers, cryptonite, directory, filepath, lib, mtl, pem, tasty
+, tasty-hunit, x509
 }:
 mkDerivation {
   pname = "x509-store";
@@ -22,17 +10,8 @@ mkDerivation {
   isExecutable = false;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    asn1-encoding
-    asn1-types
-    base
-    bytestring
-    containers
-    cryptonite
-    directory
-    filepath
-    mtl
-    pem
-    x509
+    asn1-encoding asn1-types base bytestring containers cryptonite
+    directory filepath mtl pem x509
   ];
   testHaskellDepends = [ base bytestring tasty tasty-hunit x509 ];
   enableLibraryProfiling = true;
@@ -46,4 +25,4 @@ mkDerivation {
   description = "X.509 collection accessing and storing methods";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/x509-system.nix b/pkgs/x509-system.nix
index 76403f2b1d4f354f5ab9420185c5cc6a94726f39..d0d7184007bba46682d7717aac3ff48196ac0eb0 100644
--- a/pkgs/x509-system.nix
+++ b/pkgs/x509-system.nix
@@ -1,15 +1,5 @@
-{ mkDerivation
-, base
-, bytestring
-, containers
-, directory
-, filepath
-, lib
-, mtl
-, pem
-, process
-, x509
-, x509-store
+{ mkDerivation, base, bytestring, containers, directory, filepath
+, lib, mtl, pem, process, x509, x509-store
 }:
 mkDerivation {
   pname = "x509-system";
@@ -19,15 +9,7 @@ mkDerivation {
   isExecutable = false;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    base
-    bytestring
-    containers
-    directory
-    filepath
-    mtl
-    pem
-    process
-    x509
+    base bytestring containers directory filepath mtl pem process x509
     x509-store
   ];
   enableLibraryProfiling = true;
@@ -41,4 +23,4 @@ mkDerivation {
   description = "Handle per-operating-system X.509 accessors and storage";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/x509-validation.nix b/pkgs/x509-validation.nix
index fce5a398a0975b6f90ae31ee51c253fcec2f3f15..4b3743c8cf837c9978004854978845f0aa735543 100644
--- a/pkgs/x509-validation.nix
+++ b/pkgs/x509-validation.nix
@@ -1,20 +1,6 @@
-{ mkDerivation
-, asn1-encoding
-, asn1-types
-, base
-, bytestring
-, containers
-, cryptonite
-, data-default-class
-, hourglass
-, lib
-, memory
-, mtl
-, pem
-, tasty
-, tasty-hunit
-, x509
-, x509-store
+{ mkDerivation, asn1-encoding, asn1-types, base, bytestring
+, containers, cryptonite, data-default-class, hourglass, lib
+, memory, mtl, pem, tasty, tasty-hunit, x509, x509-store
 }:
 mkDerivation {
   pname = "x509-validation";
@@ -24,32 +10,12 @@ mkDerivation {
   isExecutable = false;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    asn1-encoding
-    asn1-types
-    base
-    bytestring
-    containers
-    cryptonite
-    data-default-class
-    hourglass
-    memory
-    mtl
-    pem
-    x509
-    x509-store
+    asn1-encoding asn1-types base bytestring containers cryptonite
+    data-default-class hourglass memory mtl pem x509 x509-store
   ];
   testHaskellDepends = [
-    asn1-encoding
-    asn1-types
-    base
-    bytestring
-    cryptonite
-    data-default-class
-    hourglass
-    memory
-    tasty
-    tasty-hunit
-    x509
+    asn1-encoding asn1-types base bytestring cryptonite
+    data-default-class hourglass memory tasty tasty-hunit x509
     x509-store
   ];
   enableLibraryProfiling = true;
@@ -63,4 +29,4 @@ mkDerivation {
   description = "X.509 Certificate and CRL validation";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/x509.nix b/pkgs/x509.nix
index 19f4d200548b381a22700a46a4bcbf0ce226a861..b35f1c0bd41f3e3c022746f5ec9e70f2a35ac758 100644
--- a/pkgs/x509.nix
+++ b/pkgs/x509.nix
@@ -1,19 +1,6 @@
-{ mkDerivation
-, asn1-encoding
-, asn1-parse
-, asn1-types
-, base
-, bytestring
-, containers
-, cryptonite
-, hourglass
-, lib
-, memory
-, mtl
-, pem
-, tasty
-, tasty-quickcheck
-, transformers
+{ mkDerivation, asn1-encoding, asn1-parse, asn1-types, base
+, bytestring, containers, cryptonite, hourglass, lib, memory, mtl
+, pem, tasty, tasty-quickcheck, transformers
 }:
 mkDerivation {
   pname = "x509";
@@ -23,26 +10,11 @@ mkDerivation {
   isExecutable = false;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    asn1-encoding
-    asn1-parse
-    asn1-types
-    base
-    bytestring
-    containers
-    cryptonite
-    hourglass
-    memory
-    pem
-    transformers
+    asn1-encoding asn1-parse asn1-types base bytestring containers
+    cryptonite hourglass memory pem transformers
   ];
   testHaskellDepends = [
-    asn1-types
-    base
-    bytestring
-    cryptonite
-    hourglass
-    mtl
-    tasty
+    asn1-types base bytestring cryptonite hourglass mtl tasty
     tasty-quickcheck
   ];
   enableLibraryProfiling = true;
@@ -56,4 +28,4 @@ mkDerivation {
   description = "X509 reader and writer";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/xml-conduit-writer.nix b/pkgs/xml-conduit-writer.nix
index c4841d6d148b23943f70574a86a007265495654c..798669b20d9ea7bef2cf5a87669081ec7aba8638 100644
--- a/pkgs/xml-conduit-writer.nix
+++ b/pkgs/xml-conduit-writer.nix
@@ -1,13 +1,5 @@
-{ mkDerivation
-, base
-, containers
-, data-default
-, dlist
-, lib
-, mtl
-, text
-, xml-conduit
-, xml-types
+{ mkDerivation, base, containers, data-default, dlist, lib, mtl
+, text, xml-conduit, xml-types
 }:
 mkDerivation {
   pname = "xml-conduit-writer";
@@ -17,14 +9,7 @@ mkDerivation {
   isExecutable = false;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    base
-    containers
-    data-default
-    dlist
-    mtl
-    text
-    xml-conduit
-    xml-types
+    base containers data-default dlist mtl text xml-conduit xml-types
   ];
   testHaskellDepends = [ base text ];
   enableLibraryProfiling = true;
@@ -38,4 +23,4 @@ mkDerivation {
   description = "Warm and fuzzy creation of XML documents";
   license = lib.licenses.mit;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/xml-conduit.nix b/pkgs/xml-conduit.nix
index 3d67cb188ec5b007ed8679af7ed4d5f80a1be9c8..36b64a76af4dbc0f4b12bc9f1125c8d8df04050d 100644
--- a/pkgs/xml-conduit.nix
+++ b/pkgs/xml-conduit.nix
@@ -1,24 +1,7 @@
-{ mkDerivation
-, Cabal
-, HUnit
-, attoparsec
-, base
-, blaze-html
-, blaze-markup
-, bytestring
-, cabal-doctest
-, conduit
-, conduit-extra
-, containers
-, data-default-class
-, deepseq
-, doctest
-, hspec
-, lib
-, resourcet
-, text
-, transformers
-, xml-types
+{ mkDerivation, Cabal, HUnit, attoparsec, base, blaze-html
+, blaze-markup, bytestring, cabal-doctest, conduit, conduit-extra
+, containers, data-default-class, deepseq, doctest, hspec, lib
+, resourcet, text, transformers, xml-types
 }:
 mkDerivation {
   pname = "xml-conduit";
@@ -31,35 +14,13 @@ mkDerivation {
   enableSeparateDataOutput = false;
   setupHaskellDepends = [ base Cabal cabal-doctest ];
   libraryHaskellDepends = [
-    attoparsec
-    base
-    blaze-html
-    blaze-markup
-    bytestring
-    conduit
-    conduit-extra
-    containers
-    data-default-class
-    deepseq
-    resourcet
-    text
-    transformers
-    xml-types
+    attoparsec base blaze-html blaze-markup bytestring conduit
+    conduit-extra containers data-default-class deepseq resourcet text
+    transformers xml-types
   ];
   testHaskellDepends = [
-    base
-    blaze-markup
-    bytestring
-    conduit
-    conduit-extra
-    containers
-    doctest
-    hspec
-    HUnit
-    resourcet
-    text
-    transformers
-    xml-types
+    base blaze-markup bytestring conduit conduit-extra containers
+    doctest hspec HUnit resourcet text transformers xml-types
   ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
@@ -72,4 +33,4 @@ mkDerivation {
   description = "Pure-Haskell utilities for dealing with XML with the conduit package";
   license = lib.licenses.mit;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/xml-types.nix b/pkgs/xml-types.nix
index 0410f47695feed01beae63cc6b20cfb4343feaae..0ae1173a4134b2171e5f712a85a13cd704b69e40 100644
--- a/pkgs/xml-types.nix
+++ b/pkgs/xml-types.nix
@@ -18,4 +18,4 @@ mkDerivation {
   description = "Basic types for representing XML";
   license = lib.licenses.mit;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/xml.nix b/pkgs/xml.nix
index 5abf46e4bcc9f79ef31f71ba8b9385a229d8605f..47e3dc5d13397004c36dd52d363d50ab6aee4c7f 100644
--- a/pkgs/xml.nix
+++ b/pkgs/xml.nix
@@ -20,4 +20,4 @@ mkDerivation {
   description = "A simple XML library";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/xmlgen.nix b/pkgs/xmlgen.nix
index 6fd2b68bdc834d9ce40691ec55bf57dd7b7faaef..25e39413e0219c43dcb92af635417b14164a2116 100644
--- a/pkgs/xmlgen.nix
+++ b/pkgs/xmlgen.nix
@@ -1,17 +1,5 @@
-{ mkDerivation
-, HUnit
-, QuickCheck
-, base
-, blaze-builder
-, bytestring
-, containers
-, criterion
-, filepath
-, hxt
-, lib
-, mtl
-, process
-, text
+{ mkDerivation, HUnit, QuickCheck, base, blaze-builder, bytestring
+, containers, criterion, filepath, hxt, lib, mtl, process, text
 , unix
 }:
 mkDerivation {
@@ -24,24 +12,11 @@ mkDerivation {
   isExecutable = false;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    base
-    blaze-builder
-    bytestring
-    containers
-    mtl
-    text
+    base blaze-builder bytestring containers mtl text
   ];
   testHaskellDepends = [
-    base
-    bytestring
-    containers
-    filepath
-    HUnit
-    hxt
-    process
-    QuickCheck
-    text
-    unix
+    base bytestring containers filepath HUnit hxt process QuickCheck
+    text unix
   ];
   benchmarkHaskellDepends = [ base bytestring criterion text ];
   enableLibraryProfiling = true;
@@ -54,4 +29,4 @@ mkDerivation {
   description = "Fast XML generation library";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/xmonad-contrib.nix b/pkgs/xmonad-contrib.nix
index c3acbe193a912379929e24c51248524367e67e45..d450a2a4d51103dbc96cedd6f7f3f41d0660a31b 100644
--- a/pkgs/xmonad-contrib.nix
+++ b/pkgs/xmonad-contrib.nix
@@ -1,22 +1,6 @@
-{ mkDerivation
-, QuickCheck
-, X11
-, X11-xft
-, base
-, bytestring
-, containers
-, deepseq
-, directory
-, filepath
-, hspec
-, lib
-, mtl
-, process
-, random
-, time
-, unix
-, utf8-string
-, xmonad
+{ mkDerivation, QuickCheck, X11, X11-xft, base, bytestring
+, containers, deepseq, directory, filepath, hspec, lib, mtl
+, process, random, time, unix, utf8-string, xmonad
 }:
 mkDerivation {
   pname = "xmonad-contrib";
@@ -28,38 +12,12 @@ mkDerivation {
   isExecutable = false;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    base
-    bytestring
-    containers
-    deepseq
-    directory
-    filepath
-    mtl
-    process
-    random
-    time
-    unix
-    utf8-string
-    X11
-    X11-xft
-    xmonad
+    base bytestring containers deepseq directory filepath mtl process
+    random time unix utf8-string X11 X11-xft xmonad
   ];
   testHaskellDepends = [
-    base
-    bytestring
-    containers
-    deepseq
-    directory
-    hspec
-    mtl
-    process
-    QuickCheck
-    random
-    time
-    unix
-    utf8-string
-    X11
-    xmonad
+    base bytestring containers deepseq directory hspec mtl process
+    QuickCheck random time unix utf8-string X11 xmonad
   ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
@@ -72,4 +30,4 @@ mkDerivation {
   description = "Community-maintained extensions for xmonad";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/xmonad.nix b/pkgs/xmonad.nix
index 9edee4b02bb4a39682e0f1bc926f216fc5a53a4c..f06cbdc0d0ac06d9f208ca1ecac62a0446feb94b 100644
--- a/pkgs/xmonad.nix
+++ b/pkgs/xmonad.nix
@@ -1,19 +1,6 @@
-{ mkDerivation
-, QuickCheck
-, X11
-, base
-, containers
-, data-default-class
-, directory
-, filepath
-, lib
-, mtl
-, process
-, quickcheck-classes
-, setlocale
-, time
-, transformers
-, unix
+{ mkDerivation, QuickCheck, X11, base, containers
+, data-default-class, directory, filepath, lib, mtl, process
+, quickcheck-classes, setlocale, time, transformers, unix
 }:
 mkDerivation {
   pname = "xmonad";
@@ -25,26 +12,12 @@ mkDerivation {
   isExecutable = true;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    base
-    containers
-    data-default-class
-    directory
-    filepath
-    mtl
-    process
-    setlocale
-    time
-    transformers
-    unix
-    X11
+    base containers data-default-class directory filepath mtl process
+    setlocale time transformers unix X11
   ];
   executableHaskellDepends = [ base ];
   testHaskellDepends = [
-    base
-    containers
-    QuickCheck
-    quickcheck-classes
-    X11
+    base containers QuickCheck quickcheck-classes X11
   ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
@@ -61,4 +34,4 @@ mkDerivation {
   description = "A tiling window manager";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/xss-sanitize.nix b/pkgs/xss-sanitize.nix
index dd798fa868d2760a7209b9a0a39fc2cdac1558f7..aa9ecafe57f98b5872ee40ee1c322671c51c14fd 100644
--- a/pkgs/xss-sanitize.nix
+++ b/pkgs/xss-sanitize.nix
@@ -1,15 +1,5 @@
-{ mkDerivation
-, HUnit
-, attoparsec
-, base
-, containers
-, css-text
-, hspec
-, lib
-, network-uri
-, tagsoup
-, text
-, utf8-string
+{ mkDerivation, HUnit, attoparsec, base, containers, css-text
+, hspec, lib, network-uri, tagsoup, text, utf8-string
 }:
 mkDerivation {
   pname = "xss-sanitize";
@@ -19,26 +9,12 @@ mkDerivation {
   isExecutable = false;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    attoparsec
-    base
-    containers
-    css-text
-    network-uri
-    tagsoup
-    text
+    attoparsec base containers css-text network-uri tagsoup text
     utf8-string
   ];
   testHaskellDepends = [
-    attoparsec
-    base
-    containers
-    css-text
-    hspec
-    HUnit
-    network-uri
-    tagsoup
-    text
-    utf8-string
+    attoparsec base containers css-text hspec HUnit network-uri tagsoup
+    text utf8-string
   ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
@@ -51,4 +27,4 @@ mkDerivation {
   description = "sanitize untrusted HTML to prevent XSS attacks";
   license = lib.licenses.bsd2;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/zlib-bindings.nix b/pkgs/zlib-bindings.nix
index 78e5552365a4e05a2081dcb43a678921738303fa..0d232194788efa2f337af047da0fa5aed98e8411 100644
--- a/pkgs/zlib-bindings.nix
+++ b/pkgs/zlib-bindings.nix
@@ -21,4 +21,4 @@ mkDerivation {
   description = "Low-level bindings to the zlib package";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file
diff --git a/pkgs/zlib.nix b/pkgs/zlib.nix
index 4c0616c79f7383ae45d62e11528972395e059818..d43b2366499609706dea8d6dd922ecdd6b915f38 100644
--- a/pkgs/zlib.nix
+++ b/pkgs/zlib.nix
@@ -1,27 +1,19 @@
-{ mkDerivation
-, QuickCheck
-, base
-, bytestring
-, lib
-, tasty
-, tasty-quickcheck
-, zlib
+{ mkDerivation, QuickCheck, base, bytestring, lib, tasty
+, tasty-quickcheck, zlib
 }:
 mkDerivation {
   pname = "zlib";
   version = "0.6.3.0";
   sha256 = "9eaa989ad4534438b5beb51c1d3a4c8f6a088fdff0b259a5394fbf39aaee04da";
+  revision = "1";
+  editedCabalFile = "1z2dyphqmjb9akzqrqh8k82mfv416hqj82nz8mysidx09jgf7p4s";
   isLibrary = true;
   isExecutable = false;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [ base bytestring ];
   librarySystemDepends = [ zlib ];
   testHaskellDepends = [
-    base
-    bytestring
-    QuickCheck
-    tasty
-    tasty-quickcheck
+    base bytestring QuickCheck tasty tasty-quickcheck
   ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
@@ -33,4 +25,4 @@ mkDerivation {
   description = "Compression and decompression in the gzip and zlib formats";
   license = lib.licenses.bsd3;
   broken = false;
-}
+}
\ No newline at end of file