diff --git a/README.md b/README.md
index 24becbdd6abe0257cad00faa7e9880cf4ca704ec..a718035ebdb59a7b88794b6ad3d13cbc67d80f02 100644
--- a/README.md
+++ b/README.md
@@ -9,13 +9,13 @@ Horizon is a haskell package set targetting new builds of GHC.
 The package set is generated from the `horizon.dhall` using the following command:
 
 ```
-nix run .#horizon-gen-nix make-package-set
+nix run .#horizon-gen-nix
 ```
 
-This will generate both the `pkgs` folder and the `initial-packages.nix`. If
-you want to regenerate a particular package in `pkgs`, delete that file from
-`pkgs`. To regenerate the entire package set from scratch, delete the `pkgs`
-folder.
+This will generate both the packages folder and the package set file. If you
+want to regenerate a particular package in the packages folder, delete that file
+from the packages folder. To regenerate the entire package set from scratch,
+delete the packages folder.
 
 If you need to do additional manual overrides to the nix code, such as
 `addPkgconfigDepends`, edit the `configuration.nix` overlay, which is applied
diff --git a/feedback.yaml b/feedback.yaml
index 5c342942cc9e10130d1a61626691cd86d95f53d1..c3d40cd23259b2da871e0ae346cb68a88b8239c9 100644
--- a/feedback.yaml
+++ b/feedback.yaml
@@ -5,6 +5,6 @@ loops:
       find: '*.nix'
   check: nix flake check -L
   gen:
-    command: nix run .#horizon-gen-nix make-package-set
+    command: nix run .#horizon-gen-nix
     filter:
       find: horizon.dhall
diff --git a/flake.lock b/flake.lock
index b7c767adfe9984b1ee6109b9000b0b69b4d3d618..37d07a85f442ff054d8070fefec6b2ea42e50af3 100644
--- a/flake.lock
+++ b/flake.lock
@@ -47,16 +47,15 @@
     "horizon-gen-nix": {
       "flake": false,
       "locked": {
-        "lastModified": 1668875420,
-        "narHash": "sha256-7t+XGc6dyLlqi1lwLyRAOp0BIyllrZkuCyWOAye/c0U=",
-        "ref": "refs/heads/master",
-        "rev": "066b21b5b0c3b7b2bee1b5954f89ae0b7845ade9",
-        "revCount": 87,
+        "lastModified": 1670944091,
+        "narHash": "sha256-WFj0uQqaEIURuZpfsb8yy/iqyzN8Lrc9BpWloL5a4R0=",
+        "rev": "8eb5ffc81cd8331f340546d746a786c7b2f021a6",
+        "revCount": 109,
         "type": "git",
         "url": "https://gitlab.homotopic.tech/horizon/horizon-gen-nix"
       },
       "original": {
-        "rev": "066b21b5b0c3b7b2bee1b5954f89ae0b7845ade9",
+        "rev": "8eb5ffc81cd8331f340546d746a786c7b2f021a6",
         "type": "git",
         "url": "https://gitlab.homotopic.tech/horizon/horizon-gen-nix"
       }
diff --git a/flake.nix b/flake.nix
index f98d4956e7aa7b73442e94149fc62fc5df60908e..d41d81652d1a272c4115622d031415d896c7478c 100644
--- a/flake.nix
+++ b/flake.nix
@@ -3,7 +3,7 @@
     get-flake.url = "github:ursi/get-flake";
     lint-utils.url = "git+https://gitlab.homotopic.tech/nix/lint-utils";
     horizon-gen-nix = {
-      url = "git+https://gitlab.homotopic.tech/horizon/horizon-gen-nix?rev=066b21b5b0c3b7b2bee1b5954f89ae0b7845ade9";
+      url = "git+https://gitlab.homotopic.tech/horizon/horizon-gen-nix?rev=8eb5ffc81cd8331f340546d746a786c7b2f021a6";
       flake = false;
     };
     nixpkgs.url = "github:nixos/nixpkgs/nixpkgs-unstable";
@@ -59,10 +59,10 @@
         command = ''
           export PATH=$PATH:${pkgs.nix-prefetch-git}/bin:${pkgs.cabal-install}/bin
           cabal update
-          rm pkgs -rf && nix run .#horizon-gen-nix make-package-set;
+          rm pkgs -rf && nix run .#horizon-gen-nix;
           nixpkgs-fmt pkgs/*
         '';
-        advice = "Try removing the offending packages from pkgs/ and running nix run .#horizon-gen-nix make-package-set";
+        advice = "Try removing the offending packages from pkgs/ and running nix run .#horizon-gen-nix";
       };
 
       run-impure-tests-app = {
diff --git a/horizon.dhall b/horizon.dhall
index e3b7fa19a0c2a99a71adbd6d4d6551fac90a9d44..a0bf145fa29f0a5ceb466bec87c833266476ec1f 100644
--- a/horizon.dhall
+++ b/horizon.dhall
@@ -1,932 +1,938 @@
-let H = https://gitlab.homotopic.tech/horizon/horizon-spec/-/raw/0.2.1/dhall/package.dhall
-  sha256:cfa9ee0679c61d8ac9daef43581b8edd61219afbbea9b74627057e33fe5d1abb
+let H =
+      https://gitlab.homotopic.tech/horizon/horizon-spec/-/raw/0.4.1/dhall/package.dhall
+        sha256:9f2def711ea8796cdb24fa837da6681f9a7e752f87aeff08eee9b494c6e3374c
 
 let callHorizonAdopted
     : H.Name → H.Revision → H.Attr H.HaskellPackage.Type
     = λ(name : H.Name) →
       λ(revision : H.Revision) →
-        H.callCabal2nix
+        H.callGit
           name
           ("https://gitlab.homotopic.tech/horizon/adopted/" ++ name)
           revision
           (None Text)
 
-in  { compiler = "ghc-9.4.2"
-    , packages =
-      [ H.callHackage "Cabal" "3.8.1.0"
-      , H.callCabal2nix
-          "Cabal-QuickCheck"
-          "https://gitlab.haskell.org/ghc/packages/Cabal"
-          "e9fdb85427ad1ef11a25c8b1f2286614c86a65ff"
-          (Some "Cabal-QuickCheck")
-      , H.callCabal2nix
-          "Cabal-described"
-          "https://gitlab.haskell.org/ghc/packages/Cabal"
-          "e9fdb85427ad1ef11a25c8b1f2286614c86a65ff"
-          (Some "Cabal-described")
-      , H.callCabal2nix
-          "Cabal-syntax"
-          "https://gitlab.haskell.org/ghc/packages/Cabal"
-          "e9fdb85427ad1ef11a25c8b1f2286614c86a65ff"
-          (Some "Cabal-syntax")
-      , H.callCabal2nix
-          "Cabal-tree-diff"
-          "https://gitlab.haskell.org/ghc/packages/Cabal"
-          "e9fdb85427ad1ef11a25c8b1f2286614c86a65ff"
-          (Some "Cabal-tree-diff")
-      , H.callHackage "ChasingBottoms" "1.3.1.12"
-      , H.callHackage "Decimal" "0.5.2"
-      , H.callHackage "Diff" "0.4.1"
-      , H.callHackage "Glob" "0.10.2"
-      , H.callHackage "HTTP" "4000.4.1"
-      , H.callHackage "HsYAML" "0.2.1.1"
-      , H.callHackage "HUnit" "1.6.2.0"
-      , H.callHackage "ListLike" "4.7.7"
-      , H.callHackage "JuicyPixels" "3.3.8"
-      , H.callHackage "MonadRandom" "0.5.3"
-      , H.callHackage "OneTuple" "0.3.1"
-      , H.callHackage "Only" "0.1"
-      , H.callHackage "OpenGLRaw" "3.3.4.1"
-      , H.callHackage "PSQueue" "1.1.1"
-      , H.callHackage "PyF" "0.11.1.0"
-      , H.callHackage "QuickCheck" "2.14.2"
-      , H.callHackage "SHA" "1.6.4.4"
-      , H.callHackage "StateVar" "1.2.2"
-      , H.callHackage "abstract-deque" "0.3"
-      , H.callHackage "abstract-par" "0.3.3"
-      , H.callHackage "adjunctions" "4.4.2"
-      , H.callHackage "aeson" "2.1.0.0"
-      , H.callHackage "aeson-pretty" "0.8.9"
-      , H.callHackage "aeson-yaml" "1.1.0.1"
-      , H.callHackage "alex" "3.2.7.1"
-      , H.callHackage "algebraic-graphs" "0.7"
-      , H.callHackage "ansi-terminal" "0.11.3"
-      , H.callHackage "ansi-wl-pprint" "0.6.9"
-      , H.callHackage "appar" "0.1.8"
-      , H.callHackage "apecs" "0.9.4"
-      , H.callHackage "asn1-encoding" "0.9.6"
-      , H.callHackage "asn1-parse" "0.9.5"
-      , H.callHackage "asn1-types" "0.3.4"
-      , H.callHackage "assoc" "1.0.2"
-      , H.callHackage "async" "2.2.4"
-      , H.callHackage "atomic-primops" "0.8.4"
-      , H.callHackage "atomic-write" "0.2.0.7"
-      , H.callHackage "attoparsec-binary" "0.2"
-      , H.callHackage "attoparsec-iso8601" "1.1.0.0"
-      , H.callHackage "attoparsec" "0.14.4"
-      , H.callHackage "auto-update" "0.1.6"
-      , H.callHackage "autodocodec" "0.2.0.1"
-      , H.callHackage "autodocodec-schema" "0.1.0.2"
-      , H.callHackage "autodocodec-servant-multipart" "0.0.0.0"
-      , H.callHackage "autodocodec-yaml" "0.2.0.2"
-      , H.callHackage "barbies" "2.0.3.1"
-      , H.callHackage "base-orphans" "0.8.7"
-      , H.callHackage "basement" "0.0.15"
-      , H.callHackage "base16-bytestring" "1.0.2.0"
-      , H.callHackage "base64-bytestring" "1.2.1.0"
-      , H.callHackage "base64" "0.4.2.4"
-      , H.callHackage "base-compat" "0.12.2"
-      , H.callHackage "base-compat-batteries" "0.12.2"
-      , H.callHackage "bifunctors" "5.5.13"
-      , H.callHackage "bimap" "0.5.0"
-      , H.callHackage "binary-orphans" "1.0.3"
-      , H.callHackage "bitvec" "1.1.3.0"
-      , H.callHackage "blaze-builder" "0.4.2.2"
-      , H.callHackage "blaze-html" "0.9.1.2"
-      , H.callHackage "blaze-markup" "0.8.2.8"
-      , H.callHackage "blaze-textual" "0.2.2.1"
-      , H.callHackage "boring" "0.2"
-      , H.callHackage "breakpoint" "0.1.1.1"
-      , H.callHackage "brick" "1.3"
-      , H.callHackage "bsb-http-chunked" "0.0.0.4"
-      , H.callHackage "byteable" "0.1.1"
-      , H.callHackage "byteorder" "1.0.4"
-      , H.callHackage "bytestring-builder" "0.10.8.2.0"
-      , H.callHackage "bytes" "0.17.2"
-      , H.callHackage "c2hs" "0.28.8"
-      , H.callHackage "cabal-doctest" "1.0.9"
-      , H.callHackage "cabal-install" "3.8.1.0"
-      , H.callHackage "cabal-install-solver" "3.8.1.0"
-      , H.callCabal2nix
-          "cabal2nix"
-          "https://github.com/NixOS/cabal2nix"
-          "8e97f51e4bd4e5b9ff79391aa599ed8547771954"
-          (Some "cabal2nix")
-      , H.callHackage "cache" "0.1.3.0"
-      , H.callHackage "call-stack" "0.4.0"
-      , H.callHackage "case-insensitive" "1.2.1.0"
-      , H.callHackage "cassava" "0.5.3.0"
-      , H.callHackage "cassava-megaparsec" "2.0.4"
-      , H.callHackage "cborg" "0.2.8.0"
-      , H.callHackage "cborg-json" "0.2.5.0"
-      , H.callHackage "cereal-vector" "0.2.0.1"
-      , H.callHackage "cereal" "0.5.8.3"
-      , H.callHackage "charset" "0.3.9"
-      , H.callHackage "checkers" "0.6.0"
-      , H.callHackage "chell-quickcheck" "0.2.5.3"
-      , H.callHackage "chell" "0.5.0.1"
-      , H.callHackage "citeproc" "0.8.0.1"
-      , H.callHackage "clock" "0.8.3"
-      , H.callHackage "cmdargs" "0.10.21"
-      , H.callHackage "co-log-core" "0.3.1.0"
-      , H.callHackage "co-log-polysemy" "0.0.1.3"
-      , H.callHackage "code-page" "0.2.1"
-      , H.callHackage "colour" "2.3.6"
-      , H.callHackage "colourista" "0.1.0.1"
-      , H.callHackage "commonmark-extensions" "0.2.3.3"
-      , H.callHackage "commonmark-pandoc" "0.2.1.2"
-      , H.callHackage "commonmark" "0.2.2"
-      , H.callHackage "comonad" "5.0.8"
-      , H.callCabal2nix
-          "compactable"
-          "https://gitlab.com/fresheyeball/Compactable"
-          "f63927b1e438c267f0d12f36e5b3735cfaebeeb4"
-          (None Text)
-      , H.callHackage "compact" "0.2.0.0"
-      , H.callHackage "composite-base" "0.8.1.0"
-      , H.callHackage "composite-cassava" "0.0.3.1"
-      , H.callHackage "composite-dhall" "0.1.0.1"
-      , H.callHackage "composite-lens-extra" "0.1.0.0"
-      , H.callHackage "composite-tuple" "0.1.2.0"
-      , H.callHackage "concurrent-output" "1.10.16"
-      , H.callHackage "conduit" "1.3.4.2"
-      , H.callHackage "conduit-extra" "1.3.6"
-      , H.callHackage "config-ini" "0.2.5.0"
-      , H.callHackage "connection" "0.3.1"
-      , H.callHackage "constraints-extras" "0.3.2.1"
-      , H.callHackage "constraints" "0.13.4"
-      , H.callHackage "contravariant" "1.5.5"
-      , H.callHackage "control-monad-free" "0.6.2"
-      , H.callHackage "cookie" "0.4.5"
-      , H.callHackage "cpphs" "1.20.9.1"
-      , H.callHackage "criterion-measurement" "0.2.0.0"
-      , H.callHackage "criterion" "1.5.13.0"
-      , callHorizonAdopted "csv" "d02b89bbad79136b52fd1197f087466cf51573dd"
-      , H.callHackage "cursor-brick" "0.1.0.1"
-      , H.callCabal2nix
-          "cursor-dirforest"
-          "https://github.com/NorfairKing/cursor-dirforest"
-          "6ad5b168e26eb4e647df9f007d812aaf59338d40"
-          (Some "cursor-dirforest")
-      , H.callCabal2nix
-          "cursor-dirforest-brick"
-          "https://github.com/NorfairKing/cursor-dirforest"
-          "6ad5b168e26eb4e647df9f007d812aaf59338d40"
-          (Some "cursor-dirforest-brick")
-      , H.callCabal2nix
-          "cursor-dirforest-gen"
-          "https://github.com/NorfairKing/cursor-dirforest"
-          "6ad5b168e26eb4e647df9f007d812aaf59338d40"
-          (Some "cursor-dirforest-gen")
-      , H.callHackage "cursor-gen" "0.4.0.0"
-      , H.callHackage "cursor" "0.3.2.0"
-      , H.callHackage "cryptonite" "0.30"
-      , H.callHackage "cryptohash-md5" "0.11.101.0"
-      , H.callHackage "cryptohash-sha1" "0.11.101.0"
-      , H.callHackage "cryptohash-sha256" "0.11.102.1"
-      , H.callHackage "cryptohash" "0.11.9"
-      , H.callHackage "crypto-api-tests" "0.3"
-      , H.callHackage "crypto-api" "0.13.3"
-      , H.callHackage "daemons" "0.3.0"
-      , H.callHackage "data-binary-ieee754" "0.4.4"
-      , H.callHackage "data-clist" "0.2"
-      , H.callHackage "data-default-class" "0.1.2.0"
-      , H.callHackage "data-default-instances-containers" "0.0.1"
-      , H.callHackage "data-default-instances-dlist" "0.0.1"
-      , H.callHackage "data-default-instances-old-locale" "0.0.1"
-      , H.callHackage "data-default" "0.7.1.1"
-      , H.callHackage "data-fix" "0.3.2"
-      , H.callHackage "data-sketches" "0.3.1.0"
-      , H.callHackage "data-sketches-core" "0.1.0.0"
-      , H.callHackage "dec" "0.0.5"
-      , H.callHackage "deepseq-generics" "0.2.0.0"
-      , H.callHackage "dense-linear-algebra" "0.1.0.0"
-      , H.callHackage "dependent-map" "0.4.0.0"
-      , H.callHackage "dependent-sum" "0.7.1.0"
-      , H.callHackage "derp" "0.1.6"
-      , H.callHackage "deriving-aeson" "0.2.8"
-      , H.callHackage "dhall" "1.41.2"
-      , H.callHackage "dhall-json" "1.7.11"
-      , H.callHackage "digest" "0.0.1.3"
-      , H.callHackage "dimensional" "1.5"
-      , H.callHackage "direct-sqlite" "2.3.27"
-      , H.callCabal2nix
-          "dirforest"
-          "https://github.com/NorfairKing/dirforest"
-          "69e8ae036b047fae105c1fe990e175a7572a3eba"
-          (Some "dirforest")
-      , H.callHackage "distribution-nixpkgs" "1.7.0"
-      , H.callHackage "distributive" "0.6.2.1"
-      , H.callHackage "dlist" "1.0"
-      , H.callHackage "doclayout" "0.4"
-      , H.callHackage "doctest-exitcode-stdio" "0.0"
-      , H.callHackage "doctest-lib" "0.1"
-      , H.callCabal2nix
-          "doctest"
-          "https://github.com/sol/doctest"
-          "4eb97c213acf7abe965a3a1b67397199ed155f3c"
-          (None Text)
-      , H.callHackage "doctemplates" "0.10.0.2"
-      , H.callHackage "doctest-parallel" "0.2.5"
-      , H.callHackage "dotgen" "0.4.3"
-      , H.callCabal2nix
-          "double-conversion"
-          "https://github.com/haskell/double-conversion"
-          "5d092e0664442eaac8ae1d101dba57ce9b1c9b03"
-          (None Text)
-      , H.callHackage "easy-file" "0.2.2"
-      , H.callHackage "echo" "0.1.4"
-      , H.callCabal2nix
-          "ed25519"
-          "https://gitlab.homotopic.tech/horizon/adopted/ed25519"
-          "faf8fe90aa1cd2492ea1e64c55f5c59fc0322210"
-          (None Text)
-      , H.callHackage "edit-distance" "0.2.2.1"
-      , H.callHackage "either" "5.0.2"
-      , H.callHackage "email-validate" "2.3.2.16"
-      , H.callCabal2nix
-          "effectful-cache"
-          "https://github.com/haskell-effectful/cache-effectful"
-          "0a5581da7c21a05a9ab1762a6da6997090fe311d"
-          (None Text)
-      , H.callHackage "effectful-core" "2.1.0.0"
-      , H.callHackage "effectful-th" "1.0.0.0"
-      , H.callHackage "effectful" "2.1.0.0"
-      , H.callHackage "emojis" "0.1.2"
-      , H.callHackage "enclosed-exceptions" "1.0.3"
-      , H.callHackage "entropy" "0.4.1.10"
-      , H.callHackage "envparse" "0.5.0"
-      , H.callHackage "erf" "2.0.0.0"
-      , H.callHackage "exact-pi" "0.5.0.2"
-      , H.callHackage "extensible-effects" "5.0.0.1"
-      , H.callHackage "extensible-exceptions" "0.1.1.4"
-      , H.callHackage "extra" "1.7.12"
-      , H.callHackage "expiring-cache-map" "0.0.6.1"
-      , H.callHackage "fail" "4.9.0.0"
-      , H.callHackage "fast-logger" "3.1.1"
-      , H.callHackage "fcf-containers" "0.7.1"
-      , H.callHackage "feedback" "0.1.0.1"
-      , H.callHackage "file-embed-lzma" "0.0.1"
-      , H.callHackage "file-embed" "0.0.15.0"
-      , H.callHackage "filemanip" "0.3.6.3"
-      , H.callHackage "filepattern" "0.1.3"
-      , H.callHackage "filtrable" "0.1.6.0"
-      , H.callCabal2nix
-          "fingertree-psqueue"
-          "https://gitlab.homotopic.tech/horizon/adopted/fingertree-psqueue"
-          "d466b18e18d706dc1373ed2894c1e20ea2826329"
-          (None Text)
-      , H.callHackage "fingertree" "0.1.5.0"
-      , H.callHackage "finite-field" "0.10.0"
-      , H.callHackage "first-class-families" "0.8.0.1"
-      , H.callHackage "fin" "0.2.1"
-      , H.callHackage "fixed" "0.3"
-      , H.callHackage "fmlist" "0.9.4"
-      , H.callHackage "foldl" "1.4.12"
-      , H.callHackage "foreign-store" "0.2"
-      , H.callHackage "formatting" "7.1.3"
-      , H.callHackage "foundation" "0.0.29"
-      , H.callHackage "free" "5.1.9"
-      , H.callHackage "freer-simple" "1.2.1.2"
-      , H.callHackage "friendly-time" "0.4.1"
-      , H.callHackage "fsnotify" "0.4.1.0"
-      , H.callHackage "fuzzy-time" "0.2.0.3"
-      , H.callHackage "generically" "0.1"
-      , H.callHackage "generic-deriving" "1.14.2"
-      , H.callHackage "generic-lens-core" "2.2.1.0"
-      , H.callHackage "generic-lens-lite" "0.1"
-      , H.callHackage "generic-monoid" "0.1.0.1"
-      , H.callHackage "generic-optics-lite" "0.1"
-      , H.callHackage "generic-optics" "2.2.1.0"
-      , H.callHackage "generic-random" "1.5.0.1"
-      , H.callHackage "generics-sop" "0.5.1.2"
-      , H.callHackage "genvalidity" "1.1.0.0"
-      , H.callHackage "genvalidity-aeson" "1.0.0.1"
-      , H.callHackage "genvalidity-bytestring" "1.0.0.1"
-      , H.callHackage "genvalidity-case-insensitive" "0.0.0.1"
-      , H.callHackage "genvalidity-containers" "1.0.0.1"
-      , H.callHackage "genvalidity-criterion" "1.1.0.0"
-      , H.callCabal2nix
-          "genvalidity-dirforest"
-          "https://github.com/NorfairKing/dirforest"
-          "69e8ae036b047fae105c1fe990e175a7572a3eba"
-          (Some "genvalidity-dirforest")
-      , H.callHackage "genvalidity-hspec" "1.0.0.2"
-      , H.callHackage "genvalidity-hspec-aeson" "1.0.0.0"
-      , H.callHackage "genvalidity-hspec-optics" "1.0.0.0"
-      , H.callHackage "genvalidity-path" "1.0.0.1"
-      , H.callHackage "genvalidity-persistent" "1.0.0.1"
-      , H.callHackage "genvalidity-property" "1.0.0.0"
-      , H.callHackage "genvalidity-scientific" "1.0.0.0"
-      , H.callHackage "genvalidity-sydtest" "1.0.0.0"
-      , H.callHackage "genvalidity-sydtest-aeson" "1.0.0.0"
-      , H.callHackage "genvalidity-sydtest-hashable" "1.0.0.0"
-      , H.callHackage "genvalidity-sydtest-lens" "1.0.0.0"
-      , H.callHackage "genvalidity-sydtest-persistent" "1.0.0.0"
-      , H.callHackage "genvalidity-text" "1.0.0.1"
-      , H.callHackage "genvalidity-time" "1.0.0.1"
-      , H.callHackage "genvalidity-unordered-containers" "1.0.0.0"
-      , H.callHackage "genvalidity-uuid" "1.0.0.1"
-      , H.callHackage "genvalidity-vector" "1.0.0.0"
-      , H.callHackage "ghc-byteorder" "4.11.0.0.10"
-      , H.callHackage "ghc-check" "0.5.0.8"
-      , H.callHackage "ghc-exactprint" "1.6.0"
-      , H.callHackage "ghc-lib-parser" "9.4.2.20220822"
-      , H.callHackage "ghc-lib-parser-ex" "9.4.0.0"
-      , H.callHackage "ghc-paths" "0.1.0.12"
-      , H.callHackage "ghc-tcplugins-extra" "0.4.3"
-      , H.callHackage "ghc-typelits-knownnat" "0.7.7"
-      , H.callHackage "ghc-typelits-natnormalise" "0.7.7"
-      , H.callHackage "ghcid" "0.8.8"
-      , H.callHackage "githash" "0.1.6.3"
-      , H.callHackage "gitrev" "1.3.1"
-      , H.callHackage "gridtables" "0.1.0.0"
-      , H.callHackage "groups" "0.5.3"
-      , H.callHackage "hackage-db" "2.1.2"
-      , H.callHackage "hackage-security" "0.6.2.2"
-      , H.callHackage "haddock-library" "1.11.0"
-      , H.callHackage "half" "0.3.1"
-      , H.callHackage "happy" "1.20.0"
-      , H.callHackage "hashable" "1.4.1.0"
-      , H.callHackage "hashing" "0.1.0.1"
-      , H.callHackage "hashmap" "1.3.3"
-      , H.callHackage "hashtables" "1.3"
-      , H.callHackage "haskell-lexer" "1.1"
-      , H.callHackage "haskell-src-exts" "1.23.1"
-      , H.callHackage "haskell-src-meta" "0.8.11"
-      , H.callHackage "heaps" "0.4"
-      , H.callCabal2nix
-          "hedgehog-golden"
-          "https://github.com/maybe-hedgehog-later/hedgehog-golden"
-          "4ab2906b3f0be5e31ee5a8585e45d43392694246"
-          (None Text)
-      , H.callHackage "hedgehog" "1.2"
-      , H.callHackage "hie-bios" "0.11.0"
-      , H.callHackage "hie-compat" "0.3.0.0"
-      , H.callHackage "hinotify" "0.4.1"
-      , H.callHackage "hledger-lib" "1.27.1"
-      , H.callHackage "hledger" "1.27.1"
-      , H.callHackage "hlint" "3.5"
-      , H.callHackage "hopenssl" "2.2.4"
-      , H.callHackage "hosc" "0.19.1"
-      , H.callHackage "hostname" "1.0"
-      , H.callHackage "hourglass" "0.2.12"
-      , H.callHackage "hpack-dhall" "0.5.7"
-      , H.callHackage "hpack" "0.35.0"
-      , H.callCabal2nix
-          "horizon-gen-nix"
-          "https://gitlab.homotopic.tech/horizon/horizon-gen-nix"
-          "918df757ce5c9244232c1e3a1e05e9d9e3ab4f09"
-          (None Text)
-      , H.callHackage "hscolour" "1.24.4"
-      , H.callHackage "hslua-aeson" "2.2.1"
-      , H.callHackage "hslua-core" "2.2.1"
-      , H.callHackage "hslua-classes" "2.2.0"
-      , H.callHackage "hslua-marshalling" "2.2.1"
-      , H.callHackage "hslua-module-doclayout" "1.0.4"
-      , H.callHackage "hslua-module-path" "1.0.3"
-      , H.callHackage "hslua-module-system" "1.0.2"
-      , H.callHackage "hslua-module-text" "1.0.2"
-      , H.callHackage "hslua-module-version" "1.0.3"
-      , H.callHackage "hslua-objectorientation" "2.2.1"
-      , H.callHackage "hslua-packaging" "2.2.1"
-      , H.callHackage "hslua" "2.2.1"
-      , H.callHackage "hspec-contrib" "0.5.1.1"
-      , H.callHackage "hspec-core" "2.10.0.1"
-      , H.callHackage "hspec-discover" "2.10.0.1"
-      , H.callHackage "hspec-expectations-lifted" "0.10.0"
-      , H.callHackage "hspec-expectations" "0.8.2"
-      , H.callHackage "hspec-hedgehog" "0.0.1.2"
-      , H.callHackage "hspec-megaparsec" "2.2.0"
-      , H.callHackage "hspec-meta" "2.9.3"
-      , H.callHackage "hspec-smallcheck" "0.5.3"
-      , H.callHackage "hspec-wai" "0.11.1"
-      , H.callHackage "hspec" "2.10.3"
-      , H.callHackage "html" "1.0.1.2"
-      , H.callHackage "httpd-shed" "0.4.1.1"
-      , H.callHackage "http-api-data" "0.5"
-      , H.callHackage "http-client-tls" "0.3.6.1"
-      , H.callHackage "http-client" "0.7.13.1"
-      , H.callHackage "http-date" "0.0.11"
-      , H.callHackage "http-media" "0.8.0.0"
-      , H.callHackage "http-types" "0.12.3"
-      , H.callHackage "http2" "3.0.3"
-      , H.callHackage "ieee754" "0.8.0"
-      , H.callHackage "incipit-base" "0.3.0.0"
-      , H.callHackage "incipit-core" "0.3.0.0"
-      , H.callHackage "indexed-profunctors" "0.1.1"
-      , H.callHackage "indexed-traversable-instances" "0.1.1.1"
-      , H.callHackage "indexed-traversable" "0.1.2"
-      , H.callHackage "infer-license" "0.2.0"
-      , H.callHackage "ini" "0.4.2"
-      , H.callHackage "insert-ordered-containers" "0.2.5.1"
-      , H.callHackage "inspection-testing" "0.5"
-      , H.callHackage "integer-logarithms" "1.0.3.1"
-      , H.callHackage "interpolate" "0.2.1"
-      , H.callHackage "invariant" "0.6"
-      , H.callHackage "ipynb" "0.2"
-      , H.callHackage "iproute" "1.7.12"
-      , H.callHackage "jira-wiki-markup" "1.4.0"
-      , H.callHackage "js-chart" "2.9.4.1"
-      , H.callHackage "js-dgtable" "0.5.2"
-      , H.callHackage "js-flot" "0.8.3"
-      , H.callHackage "js-jquery" "3.3.1"
-      , H.callHackage "kan-extensions" "5.2.5"
-      , H.callHackage "keys" "3.12.3"
-      , H.callCabal2nix
-          "kvstore-effectful"
-          "https://github.com/haskell-effectful/kvstore-effectful"
-          "3502825423aea3a1af9384e9d751feea4599c60b"
-          (Some "kvstore-effectful")
-      , H.callCabal2nix
-          "kvstore-effectful-cache"
-          "https://github.com/haskell-effectful/kvstore-effectful"
-          "3502825423aea3a1af9384e9d751feea4599c60b"
-          (Some "kvstore-effectful-cache")
-      , H.callCabal2nix
-          "kvstore-effectful-spec"
-          "https://github.com/haskell-effectful/kvstore-effectful"
-          "3502825423aea3a1af9384e9d751feea4599c60b"
-          (Some "kvstore-effectful-spec")
-      , H.callCabal2nix
-          "kvstore-effectful-statemap"
-          "https://github.com/haskell-effectful/kvstore-effectful"
-          "3502825423aea3a1af9384e9d751feea4599c60b"
-          (Some "kvstore-effectful-statemap")
-      , H.callHackage "language-c" "0.9.1"
-      , H.callCabal2nix
-          "language-haskell-extract"
-          "https://github.com/chessai/template-helper"
-          "f654f1e7ef47c591bb5ea23f1234289f99d09d05"
-          (None Text)
-      , H.callHackage "language-nix" "2.2.0"
-      , H.callHackage "lens-aeson" "1.2.1"
-      , H.callHackage "lens-family-core" "2.1.2"
-      , H.callHackage "lens-family-th" "0.5.2.1"
-      , H.callHackage "lens" "5.2"
-      , H.callHackage "libsodium" "1.0.18.2"
-      , H.callHackage "libxml" "0.1.1"
-      , H.callHackage "libyaml" "0.1.2"
-      , H.callHackage "lift-type" "0.1.0.1"
-      , H.callHackage "lifted-async" "0.10.2.1"
-      , H.callHackage "lifted-base" "0.2.3.12"
-      , H.callHackage "linear" "1.21.10"
-      , H.callHackage "logging-facade" "0.3.1"
-      , H.callHackage "logict" "0.8.0.0"
-      , H.callHackage "log-base" "0.12.0.0"
-      , H.callCabal2nix
-          "log-effectful"
-          "https://github.com/haskell-effectful/log-effectful/"
-          "910c79e10d5ac3353f2a1551103a2b63229c3f57"
-          (None Text)
-      , H.callHackage "lpeg" "1.0.3"
-      , H.callHackage "lsp-types" "1.6.0.0"
-      , H.callHackage "lsp" "1.6.0.0"
-      , H.callHackage "lua-arbitrary" "1.0.1"
-      , H.callHackage "lua" "2.2.1"
-      , H.callHackage "lucid-alpine" "0.1.0.7"
-      , H.callHackage "lucid-aria" "0.1.0.1"
-      , H.callHackage "lucid-svg" "0.7.1"
-      , H.callHackage "lucid" "2.11.1"
-      , H.callHackage "lukko" "0.1.1.3"
-      , H.callHackage "lzma" "0.0.0.4"
-      , H.callHackage "neat-interpolation" "0.5.1.3"
-      , H.callHackage "net-mqtt" "0.8.2.2"
-      , H.callHackage "managed" "1.0.9"
-      , H.callHackage "markdown-unlit" "0.5.1"
-      , H.callHackage "math-functions" "0.3.4.2"
-      , H.callHackage "megaparsec" "9.2.2"
-      , H.callHackage "memory" "0.18.0"
-      , H.callHackage "mersenne-random" "1.0.0.1"
-      , H.callHackage "microlens-aeson" "2.5.0"
-      , H.callHackage "microlens-ghc" "0.4.14.0"
-      , H.callHackage "microlens-mtl" "0.2.0.2"
-      , H.callHackage "microlens-platform" "0.4.3.2"
-      , H.callHackage "microlens-th" "0.4.3.10"
-      , H.callHackage "microlens" "0.4.13.0"
-      , H.callHackage "microspec" "0.2.1.3"
-      , H.callHackage "microstache" "1.0.2.2"
-      , H.callHackage "mime-types" "0.1.1.0"
-      , H.callHackage "mmorph" "1.2.0"
-      , H.callHackage "mockery" "0.3.5"
-      , H.callHackage "mod" "0.1.2.2"
-      , H.callHackage "monads-tf" "0.1.0.3"
-      , H.callHackage "monad-control" "1.0.3.1"
-      , H.callHackage "monad-logger" "0.3.37"
-      , H.callHackage "monad-loops" "0.4.3"
-      , H.callHackage "monad-time" "0.4.0.0"
-      , H.callHackage "monad-parallel" "0.8"
-      , H.callHackage "monad-par-extras" "0.3.3"
-      , H.callHackage "monad-par" "0.3.5"
-      , H.callHackage "monad-peel" "0.2.1.2"
-      , H.callHackage "mono-traversable" "1.0.15.3"
-      , H.callHackage "monoid-subclasses" "1.1.3"
-      , H.callHackage "mtl-compat" "0.2.2"
-      , H.callHackage "mwc-random" "0.15.0.2"
-      , H.callHackage "nanospec" "0.2.2"
-      , H.callHackage "nats" "1.1.2"
-      , H.callHackage "natural-transformation" "0.4"
-      , H.callHackage "network-bsd" "2.8.1.0"
-      , H.callHackage "network-byte-order" "0.1.6"
-      , H.callHackage "network-conduit-tls" "1.3.2"
-      , H.callHackage "network-info" "0.2.1"
-      , H.callHackage "network-run" "0.2.4"
-      , H.callHackage "network-uri" "2.6.4.1"
-      , H.callHackage "network" "3.1.2.7"
-      , H.callHackage "newtype-generics" "0.6.2"
-      , H.callHackage "nothunks" "0.1.3"
-      , H.callHackage "numtype-dk" "0.5.0.3"
-      , H.callCabal2nix
-          "odd-jobs"
-          "https://github.com/saurabhnanda/odd-jobs"
-          "f6c7bbbcdb383d2eb487ad7fe427ec05a747c14f"
-          (None Text)
-      , H.callHackage "old-locale" "1.0.0.7"
-      , H.callHackage "old-time" "1.1.0.3"
-      , H.callHackage "optics-core" "0.4.1"
-      , H.callHackage "optics-extra" "0.4.2.1"
-      , H.callHackage "optics-th" "0.4.1"
-      , H.callHackage "optics" "0.4.2"
-      , H.callHackage "optional-args" "1.0.2"
-      , H.callHackage "options" "1.2.1.1"
-      , H.callHackage "optparse-applicative" "0.17.0.0"
-      , H.callHackage "ordered-containers" "0.2.3"
-      , H.callHackage "pandoc-lua-marshal" "0.1.7"
-      , H.callHackage "pandoc-types" "1.22.2.1"
-      , H.callHackage "pandoc" "2.19.2"
-      , H.callHackage "parallel" "3.2.2.0"
-      , H.callHackage "parsec-class" "1.0.0.0"
-      , H.callHackage "parsec" "3.1.15.1"
-      , H.callHackage "parsers-megaparsec" "0.1.0.1"
-      , H.callHackage "parsers" "0.12.11"
-      , H.callHackage "parser-combinators" "1.3.0"
-      , H.callHackage "password-types" "1.0.0.0"
-      , H.callHackage "password" "3.0.2.0"
-      , H.callHackage "path-dhall-instance" "0.2.1.0"
-      , H.callHackage "path-pieces" "0.2.1"
-      , H.callHackage "path-io" "1.7.0"
-      , H.callHackage "path" "0.9.2"
-      , H.callHackage "patience" "0.3"
-      , H.callHackage "pcg-random" "0.1.3.7"
-      , H.callHackage "pcre-light" "0.4.1.0"
-      , H.callHackage "pcre2" "2.2.1"
-      , H.callHackage "pem" "0.2.4"
-      , H.callHackage "persistent-template" "2.12.0.0"
-      , H.callHackage "persistent" "2.14.3.0"
-      , H.callHackage "pipes" "4.3.16"
-      , H.callHackage "pg-entity" "0.0.2.0"
-      , H.callHackage "pg-transact" "0.3.2.0"
-      , H.callCabal2nix
-          "pg-transact-effectful"
-          "https://github.com/Kleidukos/pg-transact-effectful"
-          "45730b124c7c21f1dcfd85667fda1c19b8ec9723"
-          (None Text)
-      , H.callHackage "pgp-wordlist" "0.1.0.3"
-      , H.callHackage "pointed" "5.0.4"
-      , H.callHackage "polyparse" "1.13"
-      , H.callHackage "polysemy-extra" "0.2.1.0"
-      , H.callHackage "polysemy-kvstore" "0.1.3.0"
-      , H.callHackage "polysemy-methodology" "0.2.1.0"
-      , H.callHackage "polysemy-path" "0.2.1.0"
-      , H.callCabal2nix
-          "polysemy-plugin"
-          "https://github.com/locallycompact/polysemy"
-          "bd944ca000c1ca69602d4723e3859af431b9d0c4"
-          (Some "polysemy-plugin")
-      , H.callHackage "polysemy-several" "0.1.1.0"
-      , H.callHackage "polysemy-test" "0.6.0.0"
-      , H.callHackage "polysemy-time" "0.5.1.0"
-      , H.callHackage "polysemy-vinyl" "0.1.5.0"
-      , H.callHackage "polysemy-zoo" "0.8.0.0"
-      , H.callHackage "polysemy" "1.7.1.0"
-      , H.callHackage "port-utils" "0.2.1.0"
-      , H.callHackage "postgresql-libpq" "0.9.4.3"
-      , H.callHackage "postgresql-migration" "0.2.1.4"
-      , H.callHackage "postgresql-simple" "0.6.4"
-      , H.callHackage "postgresql-simple-migration" "0.1.15.0"
-      , H.callHackage "postgres-options" "0.2.0.0"
-      , H.callHackage "pretty-hex" "1.1"
-      , H.callHackage "pretty-show" "1.10"
-      , H.callHackage "pretty-simple" "4.1.1.0"
-      , H.callHackage "prettyprinter-ansi-terminal" "1.1.3"
-      , H.callHackage "prettyprinter" "1.7.1"
-      , H.callHackage "primes" "0.2.1.0"
-      , H.callHackage "primitive" "0.7.4.0"
-      , H.callHackage "primitive-addr" "0.1.0.2"
-      , H.callHackage "profunctors" "5.6.2"
-      , H.callHackage "prometheus-client" "1.1.0"
-      , H.callHackage "prometheus-proc" "0.1.4.0"
-      , H.callHackage "process-extras" "0.7.4"
-      , H.callHackage "proteaaudio-sdl" "0.9.2"
-      , H.callHackage "psqueues" "0.2.7.3"
-      , H.callHackage "pureMD5" "2.1.4"
-      , H.callHackage "quickcheck-assertions" "0.3.0"
-      , H.callHackage "quickcheck-classes-base" "0.6.2.0"
-      , H.callHackage "quickcheck-classes" "0.6.5.0"
-      , H.callHackage "quickcheck-dynamic" "2.0.0"
-      , H.callHackage "quickcheck-instances" "0.3.28"
-      , H.callHackage "quickcheck-io" "0.2.0"
-      , H.callHackage "quickcheck-text" "0.1.2.1"
-      , H.callHackage "quickcheck-unicode" "1.0.1.0"
-      , H.callHackage "random-bytestring" "0.1.4"
-      , H.callHackage "random-shuffle" "0.0.4"
-      , H.callHackage "random" "1.2.1.1"
-      , H.callHackage "raw-strings-qq" "1.1"
-      , H.callHackage "rdtsc" "1.3.0.1"
-      , H.callHackage "rebase" "1.16"
-      , H.callHackage "reducers" "3.12.4"
-      , H.callHackage "refact" "0.3.0.2"
-      , H.callHackage "regex-applicative" "0.3.4"
-      , H.callHackage "regex-base" "0.94.0.2"
-      , H.callHackage "regex-compat" "0.95.2.1"
-      , H.callHackage "regex-pcre-builtin" "0.95.2.3.8.44"
-      , H.callHackage "regex-posix" "0.96.0.1"
-      , H.callHackage "regex-tdfa" "1.3.2"
-      , H.callHackage "refined" "0.8"
-      , H.callHackage "reflection" "2.1.6"
-      , H.callHackage "relude" "1.1.0.0"
-      , H.callHackage "repline" "0.4.2.0"
-      , H.callHackage "rerebase" "1.15.0.3"
-      , H.callHackage "rere" "0.2"
-      , H.callHackage "resolv" "0.1.2.0"
-      , H.callHackage "resource-pool" "0.3.1.0"
-      , H.callHackage "resourcet" "1.3.0"
-      , H.callHackage "retry" "0.9.3.0"
-      , H.callHackage "rope-utf16-splay" "0.4.0.0"
-      , H.callHackage "safe-coloured-text-layout" "0.0.0.0"
-      , H.callHackage "safe-coloured-text-terminfo" "0.1.0.0"
-      , H.callHackage "safe-coloured-text" "0.2.0.1"
-      , H.callHackage "safe-exceptions" "0.1.7.3"
-      , H.callHackage "safe" "0.3.19"
-      , H.callHackage "saltine" "0.2.0.1"
-      , H.callHackage "sandwich" "0.1.1.2"
-      , H.callHackage "scotty" "0.12"
-      , H.callHackage "scientific" "0.3.7.0"
-      , H.callHackage "sdl2" "2.5.3.3"
-      , H.callHackage "sdl2-gfx" "0.3.0.0"
-      , H.callHackage "sdl2-image" "2.1.0.0"
-      , H.callHackage "sdl2-mixer" "1.2.0.0"
-      , H.callHackage "sdl2-ttf" "2.1.3"
-      , H.callHackage "selective" "0.5"
-      , H.callHackage "semialign" "1.2.0.1"
-      , H.callHackage "semigroups" "0.20"
-      , H.callHackage "semigroupoids" "5.3.7"
-      , H.callHackage "semirings" "0.6"
-      , H.callHackage "serialise" "0.2.6.0"
-      , H.callCabal2nix
-          "servant"
-          "https://github.com/TeofilC/servant"
-          "76fc90a51f915230bbe1e0d1dbe9727fcdc7a0fc"
-          (Some "servant")
-      , H.callHackage "servant-blaze" "0.9.1"
-      , H.callCabal2nix
-          "servant-client-core"
-          "https://github.com/TeofilC/servant"
-          "76fc90a51f915230bbe1e0d1dbe9727fcdc7a0fc"
-          (Some "servant-client-core")
-      , H.callCabal2nix
-          "servant-client"
-          "https://github.com/TeofilC/servant"
-          "76fc90a51f915230bbe1e0d1dbe9727fcdc7a0fc"
-          (Some "servant-client")
-      , H.callHackage "servant-docs" "0.12"
-      , H.callCabal2nix
-          "servant-effectful"
-          "https://github.com/kleidukos/servant-effectful"
-          "65e3041c6cfbc315b20ad22ca18f61dda104eec8"
-          (None Text)
-      , H.callCabal2nix
-          "servant-foreign"
-          "https://github.com/TeofilC/servant"
-          "76fc90a51f915230bbe1e0d1dbe9727fcdc7a0fc"
-          (Some "servant-foreign")
-      , H.callHackage "servant-lucid" "0.9.0.5"
-      , H.callHackage "servant-multipart" "0.12.1"
-      , H.callHackage "servant-multipart-api" "0.12.1"
-      , H.callHackage "servant-polysemy" "0.1.3"
-      , H.callCabal2nix
-          "servant-server"
-          "https://github.com/TeofilC/servant"
-          "76fc90a51f915230bbe1e0d1dbe9727fcdc7a0fc"
-          (Some "servant-server")
-      , H.callHackage "servant-swagger" "1.1.11"
-      , H.callHackage "servant-swagger-ui" "0.3.5.4.5.0"
-      , H.callHackage "servant-swagger-ui-core" "0.3.5"
-      , H.callHackage "servant-static-th" "1.0.0.0"
-      , H.callHackage "setenv" "0.1.1.3"
-      , H.callHackage "shakespeare" "2.0.30"
-      , H.callHackage "shake" "0.19.6"
-      , H.callHackage "shelly" "1.10.0"
-      , H.callHackage "should-not-typecheck" "2.1.0"
-      , H.callHackage "silently" "1.2.5.3"
-      , H.callHackage "simple-reflect" "0.3.3"
-      , H.callHackage "simple-sendfile" "0.2.30"
-      , H.callHackage "singleton-bool" "0.1.6"
-      , H.callHackage "singletons" "3.0.2"
-      , H.callHackage "slugify" "0.1.0.1"
-      , H.callHackage "skylighting" "0.13.1.1"
-      , H.callHackage "skylighting-core" "0.13.1.1"
-      , H.callHackage "skylighting-format-ansi" "0.1"
-      , H.callHackage "skylighting-format-blaze-html" "0.1"
-      , H.callHackage "skylighting-format-latex" "0.1"
-      , H.callHackage "smallcheck" "1.2.1"
-      , H.callHackage "socks" "0.6.1"
-      , H.callHackage "some" "1.0.4"
-      , H.callHackage "sop-core" "0.5.0.1"
-      , H.callHackage "sorted-list" "0.2.1.0"
-      , H.callHackage "souffle-haskell" "3.5.0"
-      , H.callHackage "special-values" "0.1.0.0"
-      , H.callHackage "splitmix" "0.1.0.4"
-      , H.callHackage "split" "0.2.3.3"
-      , H.callHackage "spoon" "0.3.1"
-      , H.callHackage "sqlite-simple" "0.4.18.2"
-      , H.callHackage "statistics" "0.16.1.0"
-      , H.callHackage "stm-chans" "3.0.0.6"
-      , H.callHackage "streaming-commons" "0.2.2.4"
-      , H.callHackage "streaming" "0.2.3.1"
-      , H.callHackage "store-core" "0.4.4.4"
-      , H.callHackage "store" "0.7.16"
-      , H.callHackage "strict" "0.4.0.1"
-      , H.callHackage "string-conversions" "0.4.0.1"
-      , H.callHackage "string-conv" "0.2.0"
-      , H.callHackage "string-interpolate" "0.3.1.2"
-      , H.callHackage "string-qq" "0.0.4"
-      , H.callHackage "stringbuilder" "0.5.1"
-      , H.callHackage "swagger2" "2.8.5"
-      , H.callHackage "syb" "0.7.2.1"
-      , H.callHackage "sydtest" "0.13.0.0"
-      , H.callHackage "sydtest-discover" "0.0.0.2"
-      , H.callHackage "system-filepath" "0.4.14"
-      , H.callHackage "tabular" "0.2.2.8"
-      , H.callHackage "tagged" "0.8.6.1"
-      , H.callHackage "tagsoup" "0.14.8"
-      , H.callCabal2nix
-          "tar"
-          "https://github.com/locallycompact/tar"
-          "107c0b78524acfd0e77e767b83073492008bea0c"
-          (None Text)
-      , H.callCabal2nix
-          "tasty"
-          "https://github.com/UnkindPartition/tasty"
-          "207d3453a64b414593512c1e968171d64a8dbe61"
-          (Some "core")
-      , H.callHackage "tasty-bench" "0.3.2"
-      , H.callHackage "tasty-discover" "5.0.0"
-      , H.callHackage "tasty-expected-failure" "0.12.3"
-      , H.callHackage "tasty-golden" "2.3.5"
-      , H.callCabal2nix
-          "tasty-hedgehog"
-          "https://github.com/locallycompact/tasty-hedgehog"
-          "4a3477578ed21aa82e5b74f387d08e5d750635d6"
-          (None Text)
-      , H.callHackage "tasty-hslua" "1.0.2"
-      , H.callHackage "tasty-hspec" "1.2.0.1"
-      , H.callCabal2nix
-          "tasty-hunit"
-          "https://github.com/UnkindPartition/tasty"
-          "207d3453a64b414593512c1e968171d64a8dbe61"
-          (Some "hunit")
-      , H.callHackage "tasty-inspection-testing" "0.2"
-      , H.callHackage "tasty-kat" "0.0.3"
-      , H.callHackage "tasty-lua" "1.0.2"
-      , H.callHackage "tasty-silver" "3.3.1.1"
-      , H.callHackage "tasty-smallcheck" "0.8.2"
-      , H.callHackage "tasty-th" "0.1.7"
-      , H.callHackage "tasty-quickcheck" "0.10.2"
-      , H.callHackage "tasty-wai" "0.1.2.0"
-      , H.callHackage "tdigest" "0.2.1.1"
-      , H.callHackage "temporary" "1.3"
-      , H.callHackage "terminal-size" "0.3.3"
-      , H.callHackage "test-framework" "0.8.2.0"
-      , H.callHackage "test-framework-hunit" "0.3.0.2"
-      , H.callHackage "test-framework-th" "0.2.4"
-      , H.callHackage "test-framework-quickcheck2" "0.3.0.5"
-      , H.callHackage "test-framework-smallcheck" "0.2"
-      , H.callHackage "texmath" "0.12.5.4"
-      , H.callHackage "text-conversions" "0.3.1.1"
-      , H.callHackage "text-display" "0.0.3.0"
-      , H.callHackage "text-icu" "0.8.0.2"
-      , H.callHackage "text-manipulate" "0.3.1.0"
-      , H.callHackage "text-metrics" "0.3.2"
-      , H.callHackage "text-rope" "0.2"
-      , H.callHackage "text-short" "0.1.5"
-      , H.callHackage "text-zipper" "0.12"
-      , H.callHackage "these" "1.1.1.1"
-      , H.callHackage "these-skinny" "0.7.5"
-      , H.callHackage "tf-random" "0.5"
-      , H.callHackage "th-abstraction" "0.4.5.0"
-      , H.callHackage "th-compat" "0.1.4"
-      , H.callHackage "th-env" "0.1.1"
-      , H.callHackage "th-expand-syns" "0.4.10.0"
-      , H.callHackage "th-extras" "0.0.0.6"
-      , H.callHackage "th-lift-instances" "0.1.20"
-      , H.callHackage "th-lift" "0.8.2"
-      , H.callHackage "th-orphans" "0.13.14"
-      , H.callHackage "th-reify-many" "0.1.10"
-      , H.callHackage "th-utilities" "0.2.5.0"
-      , H.callHackage "tidal" "1.8.1"
-      , H.callHackage "timing-convenience" "0.1"
-      , H.callHackage "timeit" "2.0"
-      , H.callHackage "time-compat" "1.9.6.1"
-      , H.callCabal2nix
-          "time-effectful"
-          "https://github.com/haskell-effectful/time-effectful"
-          "e212239b685e1ecf7ee95dd1e944cc563351907f"
-          (None Text)
-      , H.callHackage "time-manager" "0.0.0"
-      , H.callHackage "tls-session-manager" "0.0.4"
-      , H.callHackage "tls" "1.6.0"
-      , H.callHackage "tmp-postgres" "1.34.1.0"
-      , H.callHackage "torsor" "0.1"
-      , H.callHackage "transformers-base" "0.4.6"
-      , H.callHackage "transformers-compat" "0.7.2"
-      , H.callHackage "tree-diff" "0.2.2"
-      , H.callHackage "trifecta" "2.1.2"
-      , H.callHackage "tuple" "0.3.0.2"
-      , H.callHackage "turtle" "1.6.1"
-      , H.callHackage "typed-process" "0.2.10.1"
-      , H.callHackage "type-errors-pretty" "0.0.1.2"
-      , H.callHackage "type-errors" "0.2.0.0"
-      , H.callHackage "type-equality" "1"
-      , H.callCabal2nix
-          "typerep-map"
-          "https://github.com/parsonsmatt/typerep-map"
-          "75b7cd5d45986be07420a6821d352ad2adc0b697"
-          (None Text)
-      , H.callHackage "uglymemo" "0.1.0.1"
-      , H.callHackage "unagi-chan" "0.4.1.4"
-      , H.callHackage "unbounded-delays" "0.1.1.1"
-      , H.callHackage "unicode-collation" "0.1.3.2"
-      , H.callHackage "unicode-data" "0.4.0"
-      , H.callHackage "unicode-transforms" "0.4.0.1"
-      , H.callHackage "uniplate" "1.6.13"
-      , H.callHackage "universe-base" "1.1.3"
-      , H.callHackage "unix-compat" "0.6"
-      , H.callHackage "unix-memory" "0.1.2"
-      , H.callHackage "unix-time" "0.4.8"
-      , H.callHackage "unliftio-core" "0.2.0.1"
-      , H.callHackage "unliftio" "0.2.23.0"
-      , H.callHackage "unordered-containers" "0.2.19.1"
-      , H.callHackage "uri-bytestring" "0.3.3.1"
-      , H.callHackage "uri-encode" "1.5.0.7"
-      , H.callHackage "utf8-string" "1.0.2"
-      , H.callHackage "utility-ht" "0.0.16"
-      , H.callHackage "uuid-types" "1.0.5"
-      , H.callHackage "uuid" "1.3.15"
-      , H.callHackage "validity" "0.12.0.1"
-      , H.callHackage "validity-aeson" "0.2.0.5"
-      , H.callHackage "validity-bytestring" "0.4.1.1"
-      , H.callHackage "validity-case-insensitive" "0.0.0.0"
-      , H.callHackage "validity-containers" "0.5.0.4"
-      , H.callHackage "validity-path" "0.4.0.1"
-      , H.callHackage "validity-persistent" "0.0.0.0"
-      , H.callHackage "validity-primitive" "0.0.0.1"
-      , H.callHackage "validity-scientific" "0.2.0.3"
-      , H.callHackage "validity-text" "0.3.1.3"
-      , H.callHackage "validity-time" "0.5.0.0"
-      , H.callHackage "validity-unordered-containers" "0.2.0.3"
-      , H.callHackage "validity-uuid" "0.1.0.3"
-      , H.callHackage "validity-vector" "0.2.0.3"
-      , H.callHackage "vault" "0.3.1.5"
-      , H.callHackage "vector" "0.13.0.0"
-      , H.callHackage "vector-algorithms" "0.9.0.1"
-      , H.callHackage "vector-binary-instances" "0.2.5.2"
-      , H.callHackage "vector-instances" "3.4"
-      , H.callHackage "vector-stream" "0.1.0.0"
-      , H.callHackage "vector-th-unbox" "0.2.2"
-      , H.callHackage "vec" "0.4.1"
-      , H.callHackage "vinyl" "0.14.3"
-      , H.callHackage "void" "0.7.3"
-      , H.callHackage "vty" "5.37"
-      , H.callHackage "wai-app-static" "3.1.7.4"
-      , H.callHackage "wai-extra" "3.1.13.0"
-      , H.callCabal2nix
-          "wai-middleware-heartbeat"
-          "https://github.com/flora-pm/wai-middleware-heartbeat"
-          "bd7dbbe83d25c00fcd2cf5c77736af904910c596"
-          (None Text)
-      , H.callHackage "wai-logger" "2.4.0"
-      , H.callHackage "wai-middleware-static" "0.9.2"
-      , H.callHackage "wai" "3.2.3"
-      , H.callHackage "warp" "3.3.22"
-      , H.callHackage "warp-tls" "3.3.3"
-      , H.callHackage "websockets" "0.12.7.3"
-      , H.callHackage "weigh" "0.0.16"
-      , H.callHackage "witherable" "0.4.2"
-      , H.callHackage "with-utf8" "1.0.2.3"
-      , H.callHackage "wizards" "1.0.3"
-      , H.callHackage "wl-pprint-annotated" "0.1.0.1"
-      , H.callHackage "word-wrap" "0.5"
-      , H.callHackage "word8" "0.1.3"
-      , H.callHackage "x509-store" "1.6.9"
-      , H.callHackage "x509-system" "1.6.7"
-      , H.callHackage "x509-validation" "1.6.12"
-      , H.callHackage "x509" "1.7.7"
-      , H.callHackage "xml-conduit" "1.9.1.1"
-      , H.callHackage "xml-types" "0.3.8"
-      , H.callHackage "xml" "1.3.14"
-      , H.callHackage "yaml" "0.11.8.0"
-      , H.callHackage "zip-archive" "0.4.2.2"
-      , H.callHackage "zlib" "0.6.3.0"
-      ]
-    }
+in  H.HorizonExport.MakePackageSet
+      { packagesDir = "pkgs"
+      , packageSetFile = "initial-packages.nix"
+      , packageSet =
+        { compiler = "ghc-9.4.2"
+        , packages =
+          [ H.callHackage "Cabal" "3.8.1.0"
+          , H.callGit
+              "Cabal-QuickCheck"
+              "https://gitlab.haskell.org/ghc/packages/Cabal"
+              "e9fdb85427ad1ef11a25c8b1f2286614c86a65ff"
+              (Some "Cabal-QuickCheck")
+          , H.callGit
+              "Cabal-described"
+              "https://gitlab.haskell.org/ghc/packages/Cabal"
+              "e9fdb85427ad1ef11a25c8b1f2286614c86a65ff"
+              (Some "Cabal-described")
+          , H.callGit
+              "Cabal-syntax"
+              "https://gitlab.haskell.org/ghc/packages/Cabal"
+              "e9fdb85427ad1ef11a25c8b1f2286614c86a65ff"
+              (Some "Cabal-syntax")
+          , H.callGit
+              "Cabal-tree-diff"
+              "https://gitlab.haskell.org/ghc/packages/Cabal"
+              "e9fdb85427ad1ef11a25c8b1f2286614c86a65ff"
+              (Some "Cabal-tree-diff")
+          , H.callHackage "ChasingBottoms" "1.3.1.12"
+          , H.callHackage "Decimal" "0.5.2"
+          , H.callHackage "Diff" "0.4.1"
+          , H.callHackage "Glob" "0.10.2"
+          , H.callHackage "HTTP" "4000.4.1"
+          , H.callHackage "HsYAML" "0.2.1.1"
+          , H.callHackage "HUnit" "1.6.2.0"
+          , H.callHackage "ListLike" "4.7.7"
+          , H.callHackage "JuicyPixels" "3.3.8"
+          , H.callHackage "MonadRandom" "0.5.3"
+          , H.callHackage "OneTuple" "0.3.1"
+          , H.callHackage "Only" "0.1"
+          , H.callHackage "OpenGLRaw" "3.3.4.1"
+          , H.callHackage "PSQueue" "1.1.1"
+          , H.callHackage "PyF" "0.11.1.0"
+          , H.callHackage "QuickCheck" "2.14.2"
+          , H.callHackage "SHA" "1.6.4.4"
+          , H.callHackage "StateVar" "1.2.2"
+          , H.callHackage "abstract-deque" "0.3"
+          , H.callHackage "abstract-par" "0.3.3"
+          , H.callHackage "adjunctions" "4.4.2"
+          , H.callHackage "aeson" "2.1.0.0"
+          , H.callHackage "aeson-pretty" "0.8.9"
+          , H.callHackage "aeson-yaml" "1.1.0.1"
+          , H.callHackage "alex" "3.2.7.1"
+          , H.callHackage "algebraic-graphs" "0.7"
+          , H.callHackage "ansi-terminal" "0.11.3"
+          , H.callHackage "ansi-wl-pprint" "0.6.9"
+          , H.callHackage "appar" "0.1.8"
+          , H.callHackage "apecs" "0.9.4"
+          , H.callHackage "asn1-encoding" "0.9.6"
+          , H.callHackage "asn1-parse" "0.9.5"
+          , H.callHackage "asn1-types" "0.3.4"
+          , H.callHackage "assoc" "1.0.2"
+          , H.callHackage "async" "2.2.4"
+          , H.callHackage "atomic-primops" "0.8.4"
+          , H.callHackage "atomic-write" "0.2.0.7"
+          , H.callHackage "attoparsec-binary" "0.2"
+          , H.callHackage "attoparsec-iso8601" "1.1.0.0"
+          , H.callHackage "attoparsec" "0.14.4"
+          , H.callHackage "auto-update" "0.1.6"
+          , H.callHackage "autodocodec" "0.2.0.1"
+          , H.callHackage "autodocodec-schema" "0.1.0.2"
+          , H.callHackage "autodocodec-servant-multipart" "0.0.0.0"
+          , H.callHackage "autodocodec-yaml" "0.2.0.2"
+          , H.callHackage "barbies" "2.0.3.1"
+          , H.callHackage "base-orphans" "0.8.7"
+          , H.callHackage "basement" "0.0.15"
+          , H.callHackage "base16-bytestring" "1.0.2.0"
+          , H.callHackage "base64-bytestring" "1.2.1.0"
+          , H.callHackage "base64" "0.4.2.4"
+          , H.callHackage "base-compat" "0.12.2"
+          , H.callHackage "base-compat-batteries" "0.12.2"
+          , H.callHackage "bifunctors" "5.5.13"
+          , H.callHackage "bimap" "0.5.0"
+          , H.callHackage "binary-orphans" "1.0.3"
+          , H.callHackage "bitvec" "1.1.3.0"
+          , H.callHackage "blaze-builder" "0.4.2.2"
+          , H.callHackage "blaze-html" "0.9.1.2"
+          , H.callHackage "blaze-markup" "0.8.2.8"
+          , H.callHackage "blaze-textual" "0.2.2.1"
+          , H.callHackage "boring" "0.2"
+          , H.callHackage "breakpoint" "0.1.1.1"
+          , H.callHackage "brick" "1.3"
+          , H.callHackage "bsb-http-chunked" "0.0.0.4"
+          , H.callHackage "byteable" "0.1.1"
+          , H.callHackage "byteorder" "1.0.4"
+          , H.callHackage "bytestring-builder" "0.10.8.2.0"
+          , H.callHackage "bytes" "0.17.2"
+          , H.callHackage "c2hs" "0.28.8"
+          , H.callHackage "cabal-doctest" "1.0.9"
+          , H.callHackage "cabal-install" "3.8.1.0"
+          , H.callHackage "cabal-install-solver" "3.8.1.0"
+          , H.callGit
+              "cabal2nix"
+              "https://github.com/NixOS/cabal2nix"
+              "8e97f51e4bd4e5b9ff79391aa599ed8547771954"
+              (Some "cabal2nix")
+          , H.callHackage "cache" "0.1.3.0"
+          , H.callHackage "call-stack" "0.4.0"
+          , H.callHackage "case-insensitive" "1.2.1.0"
+          , H.callHackage "cassava" "0.5.3.0"
+          , H.callHackage "cassava-megaparsec" "2.0.4"
+          , H.callHackage "cborg" "0.2.8.0"
+          , H.callHackage "cborg-json" "0.2.5.0"
+          , H.callHackage "cereal-vector" "0.2.0.1"
+          , H.callHackage "cereal" "0.5.8.3"
+          , H.callHackage "charset" "0.3.9"
+          , H.callHackage "checkers" "0.6.0"
+          , H.callHackage "chell-quickcheck" "0.2.5.3"
+          , H.callHackage "chell" "0.5.0.1"
+          , H.callHackage "citeproc" "0.8.0.1"
+          , H.callHackage "clock" "0.8.3"
+          , H.callHackage "cmdargs" "0.10.21"
+          , H.callHackage "co-log-core" "0.3.1.0"
+          , H.callHackage "co-log-polysemy" "0.0.1.3"
+          , H.callHackage "code-page" "0.2.1"
+          , H.callHackage "colour" "2.3.6"
+          , H.callHackage "colourista" "0.1.0.1"
+          , H.callHackage "commonmark-extensions" "0.2.3.3"
+          , H.callHackage "commonmark-pandoc" "0.2.1.2"
+          , H.callHackage "commonmark" "0.2.2"
+          , H.callHackage "comonad" "5.0.8"
+          , H.callGit
+              "compactable"
+              "https://gitlab.com/fresheyeball/Compactable"
+              "f63927b1e438c267f0d12f36e5b3735cfaebeeb4"
+              (None Text)
+          , H.callHackage "compact" "0.2.0.0"
+          , H.callHackage "composite-base" "0.8.1.0"
+          , H.callHackage "composite-cassava" "0.0.3.1"
+          , H.callHackage "composite-dhall" "0.1.0.1"
+          , H.callHackage "composite-lens-extra" "0.1.0.0"
+          , H.callHackage "composite-tuple" "0.1.2.0"
+          , H.callHackage "concurrent-output" "1.10.16"
+          , H.callHackage "conduit" "1.3.4.2"
+          , H.callHackage "conduit-extra" "1.3.6"
+          , H.callHackage "config-ini" "0.2.5.0"
+          , H.callHackage "connection" "0.3.1"
+          , H.callHackage "constraints-extras" "0.3.2.1"
+          , H.callHackage "constraints" "0.13.4"
+          , H.callHackage "contravariant" "1.5.5"
+          , H.callHackage "control-monad-free" "0.6.2"
+          , H.callHackage "cookie" "0.4.5"
+          , H.callHackage "cpphs" "1.20.9.1"
+          , H.callHackage "criterion-measurement" "0.2.0.0"
+          , H.callHackage "criterion" "1.5.13.0"
+          , callHorizonAdopted "csv" "d02b89bbad79136b52fd1197f087466cf51573dd"
+          , H.callHackage "cursor-brick" "0.1.0.1"
+          , H.callGit
+              "cursor-dirforest"
+              "https://github.com/NorfairKing/cursor-dirforest"
+              "6ad5b168e26eb4e647df9f007d812aaf59338d40"
+              (Some "cursor-dirforest")
+          , H.callGit
+              "cursor-dirforest-brick"
+              "https://github.com/NorfairKing/cursor-dirforest"
+              "6ad5b168e26eb4e647df9f007d812aaf59338d40"
+              (Some "cursor-dirforest-brick")
+          , H.callGit
+              "cursor-dirforest-gen"
+              "https://github.com/NorfairKing/cursor-dirforest"
+              "6ad5b168e26eb4e647df9f007d812aaf59338d40"
+              (Some "cursor-dirforest-gen")
+          , H.callHackage "cursor-gen" "0.4.0.0"
+          , H.callHackage "cursor" "0.3.2.0"
+          , H.callHackage "cryptonite" "0.30"
+          , H.callHackage "cryptohash-md5" "0.11.101.0"
+          , H.callHackage "cryptohash-sha1" "0.11.101.0"
+          , H.callHackage "cryptohash-sha256" "0.11.102.1"
+          , H.callHackage "cryptohash" "0.11.9"
+          , H.callHackage "crypto-api-tests" "0.3"
+          , H.callHackage "crypto-api" "0.13.3"
+          , H.callHackage "daemons" "0.3.0"
+          , H.callHackage "data-binary-ieee754" "0.4.4"
+          , H.callHackage "data-clist" "0.2"
+          , H.callHackage "data-default-class" "0.1.2.0"
+          , H.callHackage "data-default-instances-containers" "0.0.1"
+          , H.callHackage "data-default-instances-dlist" "0.0.1"
+          , H.callHackage "data-default-instances-old-locale" "0.0.1"
+          , H.callHackage "data-default" "0.7.1.1"
+          , H.callHackage "data-fix" "0.3.2"
+          , H.callHackage "data-sketches" "0.3.1.0"
+          , H.callHackage "data-sketches-core" "0.1.0.0"
+          , H.callHackage "dec" "0.0.5"
+          , H.callHackage "deepseq-generics" "0.2.0.0"
+          , H.callHackage "dense-linear-algebra" "0.1.0.0"
+          , H.callHackage "dependent-map" "0.4.0.0"
+          , H.callHackage "dependent-sum" "0.7.1.0"
+          , H.callHackage "derp" "0.1.6"
+          , H.callHackage "deriving-aeson" "0.2.8"
+          , H.callHackage "dhall" "1.41.2"
+          , H.callHackage "dhall-json" "1.7.11"
+          , H.callHackage "digest" "0.0.1.3"
+          , H.callHackage "dimensional" "1.5"
+          , H.callHackage "direct-sqlite" "2.3.27"
+          , H.callGit
+              "dirforest"
+              "https://github.com/NorfairKing/dirforest"
+              "69e8ae036b047fae105c1fe990e175a7572a3eba"
+              (Some "dirforest")
+          , H.callHackage "distribution-nixpkgs" "1.7.0"
+          , H.callHackage "distributive" "0.6.2.1"
+          , H.callHackage "dlist" "1.0"
+          , H.callHackage "doclayout" "0.4"
+          , H.callHackage "doctest-exitcode-stdio" "0.0"
+          , H.callHackage "doctest-lib" "0.1"
+          , H.callGit
+              "doctest"
+              "https://github.com/sol/doctest"
+              "4eb97c213acf7abe965a3a1b67397199ed155f3c"
+              (None Text)
+          , H.callHackage "doctemplates" "0.10.0.2"
+          , H.callHackage "doctest-parallel" "0.2.5"
+          , H.callHackage "dotgen" "0.4.3"
+          , H.callGit
+              "double-conversion"
+              "https://github.com/haskell/double-conversion"
+              "5d092e0664442eaac8ae1d101dba57ce9b1c9b03"
+              (None Text)
+          , H.callHackage "easy-file" "0.2.2"
+          , H.callHackage "echo" "0.1.4"
+          , H.callGit
+              "ed25519"
+              "https://gitlab.homotopic.tech/horizon/adopted/ed25519"
+              "faf8fe90aa1cd2492ea1e64c55f5c59fc0322210"
+              (None Text)
+          , H.callHackage "edit-distance" "0.2.2.1"
+          , H.callHackage "either" "5.0.2"
+          , H.callHackage "email-validate" "2.3.2.16"
+          , H.callGit
+              "effectful-cache"
+              "https://github.com/haskell-effectful/cache-effectful"
+              "0a5581da7c21a05a9ab1762a6da6997090fe311d"
+              (None Text)
+          , H.callHackage "effectful-core" "2.1.0.0"
+          , H.callHackage "effectful-th" "1.0.0.0"
+          , H.callHackage "effectful" "2.1.0.0"
+          , H.callHackage "emojis" "0.1.2"
+          , H.callHackage "enclosed-exceptions" "1.0.3"
+          , H.callHackage "entropy" "0.4.1.10"
+          , H.callHackage "envparse" "0.5.0"
+          , H.callHackage "erf" "2.0.0.0"
+          , H.callHackage "exact-pi" "0.5.0.2"
+          , H.callHackage "extensible-effects" "5.0.0.1"
+          , H.callHackage "extensible-exceptions" "0.1.1.4"
+          , H.callHackage "extra" "1.7.12"
+          , H.callHackage "expiring-cache-map" "0.0.6.1"
+          , H.callHackage "fail" "4.9.0.0"
+          , H.callHackage "fast-logger" "3.1.1"
+          , H.callHackage "fcf-containers" "0.7.1"
+          , H.callHackage "feedback" "0.1.0.1"
+          , H.callHackage "file-embed-lzma" "0.0.1"
+          , H.callHackage "file-embed" "0.0.15.0"
+          , H.callHackage "filemanip" "0.3.6.3"
+          , H.callHackage "filepattern" "0.1.3"
+          , H.callHackage "filtrable" "0.1.6.0"
+          , H.callGit
+              "fingertree-psqueue"
+              "https://gitlab.homotopic.tech/horizon/adopted/fingertree-psqueue"
+              "d466b18e18d706dc1373ed2894c1e20ea2826329"
+              (None Text)
+          , H.callHackage "fingertree" "0.1.5.0"
+          , H.callHackage "finite-field" "0.10.0"
+          , H.callHackage "first-class-families" "0.8.0.1"
+          , H.callHackage "fin" "0.2.1"
+          , H.callHackage "fixed" "0.3"
+          , H.callHackage "fmlist" "0.9.4"
+          , H.callHackage "foldl" "1.4.12"
+          , H.callHackage "foreign-store" "0.2"
+          , H.callHackage "formatting" "7.1.3"
+          , H.callHackage "foundation" "0.0.29"
+          , H.callHackage "free" "5.1.9"
+          , H.callHackage "freer-simple" "1.2.1.2"
+          , H.callHackage "friendly-time" "0.4.1"
+          , H.callHackage "fsnotify" "0.4.1.0"
+          , H.callHackage "fuzzy-time" "0.2.0.3"
+          , H.callHackage "generically" "0.1"
+          , H.callHackage "generic-deriving" "1.14.2"
+          , H.callHackage "generic-lens-core" "2.2.1.0"
+          , H.callHackage "generic-lens-lite" "0.1"
+          , H.callHackage "generic-monoid" "0.1.0.1"
+          , H.callHackage "generic-optics-lite" "0.1"
+          , H.callHackage "generic-optics" "2.2.1.0"
+          , H.callHackage "generic-random" "1.5.0.1"
+          , H.callHackage "generics-sop" "0.5.1.2"
+          , H.callHackage "genvalidity" "1.1.0.0"
+          , H.callHackage "genvalidity-aeson" "1.0.0.1"
+          , H.callHackage "genvalidity-bytestring" "1.0.0.1"
+          , H.callHackage "genvalidity-case-insensitive" "0.0.0.1"
+          , H.callHackage "genvalidity-containers" "1.0.0.1"
+          , H.callHackage "genvalidity-criterion" "1.1.0.0"
+          , H.callGit
+              "genvalidity-dirforest"
+              "https://github.com/NorfairKing/dirforest"
+              "69e8ae036b047fae105c1fe990e175a7572a3eba"
+              (Some "genvalidity-dirforest")
+          , H.callHackage "genvalidity-hspec" "1.0.0.2"
+          , H.callHackage "genvalidity-hspec-aeson" "1.0.0.0"
+          , H.callHackage "genvalidity-hspec-optics" "1.0.0.0"
+          , H.callHackage "genvalidity-path" "1.0.0.1"
+          , H.callHackage "genvalidity-persistent" "1.0.0.1"
+          , H.callHackage "genvalidity-property" "1.0.0.0"
+          , H.callHackage "genvalidity-scientific" "1.0.0.0"
+          , H.callHackage "genvalidity-sydtest" "1.0.0.0"
+          , H.callHackage "genvalidity-sydtest-aeson" "1.0.0.0"
+          , H.callHackage "genvalidity-sydtest-hashable" "1.0.0.0"
+          , H.callHackage "genvalidity-sydtest-lens" "1.0.0.0"
+          , H.callHackage "genvalidity-sydtest-persistent" "1.0.0.0"
+          , H.callHackage "genvalidity-text" "1.0.0.1"
+          , H.callHackage "genvalidity-time" "1.0.0.1"
+          , H.callHackage "genvalidity-unordered-containers" "1.0.0.0"
+          , H.callHackage "genvalidity-uuid" "1.0.0.1"
+          , H.callHackage "genvalidity-vector" "1.0.0.0"
+          , H.callHackage "ghc-byteorder" "4.11.0.0.10"
+          , H.callHackage "ghc-check" "0.5.0.8"
+          , H.callHackage "ghc-exactprint" "1.6.0"
+          , H.callHackage "ghc-lib-parser" "9.4.2.20220822"
+          , H.callHackage "ghc-lib-parser-ex" "9.4.0.0"
+          , H.callHackage "ghc-paths" "0.1.0.12"
+          , H.callHackage "ghc-tcplugins-extra" "0.4.3"
+          , H.callHackage "ghc-typelits-knownnat" "0.7.7"
+          , H.callHackage "ghc-typelits-natnormalise" "0.7.7"
+          , H.callHackage "ghcid" "0.8.8"
+          , H.callHackage "githash" "0.1.6.3"
+          , H.callHackage "gitrev" "1.3.1"
+          , H.callHackage "gridtables" "0.1.0.0"
+          , H.callHackage "groups" "0.5.3"
+          , H.callHackage "hackage-db" "2.1.2"
+          , H.callHackage "hackage-security" "0.6.2.2"
+          , H.callHackage "haddock-library" "1.11.0"
+          , H.callHackage "half" "0.3.1"
+          , H.callHackage "happy" "1.20.0"
+          , H.callHackage "hashable" "1.4.1.0"
+          , H.callHackage "hashing" "0.1.0.1"
+          , H.callHackage "hashmap" "1.3.3"
+          , H.callHackage "hashtables" "1.3"
+          , H.callHackage "haskell-lexer" "1.1"
+          , H.callHackage "haskell-src-exts" "1.23.1"
+          , H.callHackage "haskell-src-meta" "0.8.11"
+          , H.callHackage "heaps" "0.4"
+          , H.callGit
+              "hedgehog-golden"
+              "https://github.com/maybe-hedgehog-later/hedgehog-golden"
+              "4ab2906b3f0be5e31ee5a8585e45d43392694246"
+              (None Text)
+          , H.callHackage "hedgehog" "1.2"
+          , H.callHackage "hie-bios" "0.11.0"
+          , H.callHackage "hie-compat" "0.3.0.0"
+          , H.callHackage "hinotify" "0.4.1"
+          , H.callHackage "hledger-lib" "1.27.1"
+          , H.callHackage "hledger" "1.27.1"
+          , H.callHackage "hlint" "3.5"
+          , H.callHackage "hopenssl" "2.2.4"
+          , H.callHackage "hosc" "0.19.1"
+          , H.callHackage "hostname" "1.0"
+          , H.callHackage "hourglass" "0.2.12"
+          , H.callHackage "hpack-dhall" "0.5.7"
+          , H.callHackage "hpack" "0.35.0"
+          , H.callGit
+              "horizon-gen-nix"
+              "https://gitlab.homotopic.tech/horizon/horizon-gen-nix"
+              "918df757ce5c9244232c1e3a1e05e9d9e3ab4f09"
+              (None Text)
+          , H.callHackage "hscolour" "1.24.4"
+          , H.callHackage "hslua-aeson" "2.2.1"
+          , H.callHackage "hslua-core" "2.2.1"
+          , H.callHackage "hslua-classes" "2.2.0"
+          , H.callHackage "hslua-marshalling" "2.2.1"
+          , H.callHackage "hslua-module-doclayout" "1.0.4"
+          , H.callHackage "hslua-module-path" "1.0.3"
+          , H.callHackage "hslua-module-system" "1.0.2"
+          , H.callHackage "hslua-module-text" "1.0.2"
+          , H.callHackage "hslua-module-version" "1.0.3"
+          , H.callHackage "hslua-objectorientation" "2.2.1"
+          , H.callHackage "hslua-packaging" "2.2.1"
+          , H.callHackage "hslua" "2.2.1"
+          , H.callHackage "hspec-contrib" "0.5.1.1"
+          , H.callHackage "hspec-core" "2.10.0.1"
+          , H.callHackage "hspec-discover" "2.10.0.1"
+          , H.callHackage "hspec-expectations-lifted" "0.10.0"
+          , H.callHackage "hspec-expectations" "0.8.2"
+          , H.callHackage "hspec-hedgehog" "0.0.1.2"
+          , H.callHackage "hspec-megaparsec" "2.2.0"
+          , H.callHackage "hspec-meta" "2.9.3"
+          , H.callHackage "hspec-smallcheck" "0.5.3"
+          , H.callHackage "hspec-wai" "0.11.1"
+          , H.callHackage "hspec" "2.10.3"
+          , H.callHackage "html" "1.0.1.2"
+          , H.callHackage "httpd-shed" "0.4.1.1"
+          , H.callHackage "http-api-data" "0.5"
+          , H.callHackage "http-client-tls" "0.3.6.1"
+          , H.callHackage "http-client" "0.7.13.1"
+          , H.callHackage "http-date" "0.0.11"
+          , H.callHackage "http-media" "0.8.0.0"
+          , H.callHackage "http-types" "0.12.3"
+          , H.callHackage "http2" "3.0.3"
+          , H.callHackage "ieee754" "0.8.0"
+          , H.callHackage "incipit-base" "0.3.0.0"
+          , H.callHackage "incipit-core" "0.3.0.0"
+          , H.callHackage "indexed-profunctors" "0.1.1"
+          , H.callHackage "indexed-traversable-instances" "0.1.1.1"
+          , H.callHackage "indexed-traversable" "0.1.2"
+          , H.callHackage "infer-license" "0.2.0"
+          , H.callHackage "ini" "0.4.2"
+          , H.callHackage "insert-ordered-containers" "0.2.5.1"
+          , H.callHackage "inspection-testing" "0.5"
+          , H.callHackage "integer-logarithms" "1.0.3.1"
+          , H.callHackage "interpolate" "0.2.1"
+          , H.callHackage "invariant" "0.6"
+          , H.callHackage "ipynb" "0.2"
+          , H.callHackage "iproute" "1.7.12"
+          , H.callHackage "jira-wiki-markup" "1.4.0"
+          , H.callHackage "js-chart" "2.9.4.1"
+          , H.callHackage "js-dgtable" "0.5.2"
+          , H.callHackage "js-flot" "0.8.3"
+          , H.callHackage "js-jquery" "3.3.1"
+          , H.callHackage "kan-extensions" "5.2.5"
+          , H.callHackage "keys" "3.12.3"
+          , H.callGit
+              "kvstore-effectful"
+              "https://github.com/haskell-effectful/kvstore-effectful"
+              "3502825423aea3a1af9384e9d751feea4599c60b"
+              (Some "kvstore-effectful")
+          , H.callGit
+              "kvstore-effectful-cache"
+              "https://github.com/haskell-effectful/kvstore-effectful"
+              "3502825423aea3a1af9384e9d751feea4599c60b"
+              (Some "kvstore-effectful-cache")
+          , H.callGit
+              "kvstore-effectful-spec"
+              "https://github.com/haskell-effectful/kvstore-effectful"
+              "3502825423aea3a1af9384e9d751feea4599c60b"
+              (Some "kvstore-effectful-spec")
+          , H.callGit
+              "kvstore-effectful-statemap"
+              "https://github.com/haskell-effectful/kvstore-effectful"
+              "3502825423aea3a1af9384e9d751feea4599c60b"
+              (Some "kvstore-effectful-statemap")
+          , H.callHackage "language-c" "0.9.1"
+          , H.callGit
+              "language-haskell-extract"
+              "https://github.com/chessai/template-helper"
+              "f654f1e7ef47c591bb5ea23f1234289f99d09d05"
+              (None Text)
+          , H.callHackage "language-nix" "2.2.0"
+          , H.callHackage "lens-aeson" "1.2.1"
+          , H.callHackage "lens-family-core" "2.1.2"
+          , H.callHackage "lens-family-th" "0.5.2.1"
+          , H.callHackage "lens" "5.2"
+          , H.callHackage "libsodium" "1.0.18.2"
+          , H.callHackage "libxml" "0.1.1"
+          , H.callHackage "libyaml" "0.1.2"
+          , H.callHackage "lift-type" "0.1.0.1"
+          , H.callHackage "lifted-async" "0.10.2.1"
+          , H.callHackage "lifted-base" "0.2.3.12"
+          , H.callHackage "linear" "1.21.10"
+          , H.callHackage "logging-facade" "0.3.1"
+          , H.callHackage "logict" "0.8.0.0"
+          , H.callHackage "log-base" "0.12.0.0"
+          , H.callGit
+              "log-effectful"
+              "https://github.com/haskell-effectful/log-effectful/"
+              "910c79e10d5ac3353f2a1551103a2b63229c3f57"
+              (None Text)
+          , H.callHackage "lpeg" "1.0.3"
+          , H.callHackage "lsp-types" "1.6.0.0"
+          , H.callHackage "lsp" "1.6.0.0"
+          , H.callHackage "lua-arbitrary" "1.0.1"
+          , H.callHackage "lua" "2.2.1"
+          , H.callHackage "lucid-alpine" "0.1.0.7"
+          , H.callHackage "lucid-aria" "0.1.0.1"
+          , H.callHackage "lucid-svg" "0.7.1"
+          , H.callHackage "lucid" "2.11.1"
+          , H.callHackage "lukko" "0.1.1.3"
+          , H.callHackage "lzma" "0.0.0.4"
+          , H.callHackage "neat-interpolation" "0.5.1.3"
+          , H.callHackage "net-mqtt" "0.8.2.2"
+          , H.callHackage "managed" "1.0.9"
+          , H.callHackage "markdown-unlit" "0.5.1"
+          , H.callHackage "math-functions" "0.3.4.2"
+          , H.callHackage "megaparsec" "9.2.2"
+          , H.callHackage "memory" "0.18.0"
+          , H.callHackage "mersenne-random" "1.0.0.1"
+          , H.callHackage "microlens-aeson" "2.5.0"
+          , H.callHackage "microlens-ghc" "0.4.14.0"
+          , H.callHackage "microlens-mtl" "0.2.0.2"
+          , H.callHackage "microlens-platform" "0.4.3.2"
+          , H.callHackage "microlens-th" "0.4.3.10"
+          , H.callHackage "microlens" "0.4.13.0"
+          , H.callHackage "microspec" "0.2.1.3"
+          , H.callHackage "microstache" "1.0.2.2"
+          , H.callHackage "mime-types" "0.1.1.0"
+          , H.callHackage "mmorph" "1.2.0"
+          , H.callHackage "mockery" "0.3.5"
+          , H.callHackage "mod" "0.1.2.2"
+          , H.callHackage "monads-tf" "0.1.0.3"
+          , H.callHackage "monad-control" "1.0.3.1"
+          , H.callHackage "monad-logger" "0.3.37"
+          , H.callHackage "monad-loops" "0.4.3"
+          , H.callHackage "monad-time" "0.4.0.0"
+          , H.callHackage "monad-parallel" "0.8"
+          , H.callHackage "monad-par-extras" "0.3.3"
+          , H.callHackage "monad-par" "0.3.5"
+          , H.callHackage "monad-peel" "0.2.1.2"
+          , H.callHackage "mono-traversable" "1.0.15.3"
+          , H.callHackage "monoid-subclasses" "1.1.3"
+          , H.callHackage "mtl-compat" "0.2.2"
+          , H.callHackage "mwc-random" "0.15.0.2"
+          , H.callHackage "nanospec" "0.2.2"
+          , H.callHackage "nats" "1.1.2"
+          , H.callHackage "natural-transformation" "0.4"
+          , H.callHackage "network-bsd" "2.8.1.0"
+          , H.callHackage "network-byte-order" "0.1.6"
+          , H.callHackage "network-conduit-tls" "1.3.2"
+          , H.callHackage "network-info" "0.2.1"
+          , H.callHackage "network-run" "0.2.4"
+          , H.callHackage "network-uri" "2.6.4.1"
+          , H.callHackage "network" "3.1.2.7"
+          , H.callHackage "newtype-generics" "0.6.2"
+          , H.callHackage "nothunks" "0.1.3"
+          , H.callHackage "numtype-dk" "0.5.0.3"
+          , H.callGit
+              "odd-jobs"
+              "https://github.com/saurabhnanda/odd-jobs"
+              "f6c7bbbcdb383d2eb487ad7fe427ec05a747c14f"
+              (None Text)
+          , H.callHackage "old-locale" "1.0.0.7"
+          , H.callHackage "old-time" "1.1.0.3"
+          , H.callHackage "optics-core" "0.4.1"
+          , H.callHackage "optics-extra" "0.4.2.1"
+          , H.callHackage "optics-th" "0.4.1"
+          , H.callHackage "optics" "0.4.2"
+          , H.callHackage "optional-args" "1.0.2"
+          , H.callHackage "options" "1.2.1.1"
+          , H.callHackage "optparse-applicative" "0.17.0.0"
+          , H.callHackage "ordered-containers" "0.2.3"
+          , H.callHackage "pandoc-lua-marshal" "0.1.7"
+          , H.callHackage "pandoc-types" "1.22.2.1"
+          , H.callHackage "pandoc" "2.19.2"
+          , H.callHackage "parallel" "3.2.2.0"
+          , H.callHackage "parsec-class" "1.0.0.0"
+          , H.callHackage "parsec" "3.1.15.1"
+          , H.callHackage "parsers-megaparsec" "0.1.0.1"
+          , H.callHackage "parsers" "0.12.11"
+          , H.callHackage "parser-combinators" "1.3.0"
+          , H.callHackage "password-types" "1.0.0.0"
+          , H.callHackage "password" "3.0.2.0"
+          , H.callHackage "path-dhall-instance" "0.2.1.0"
+          , H.callHackage "path-pieces" "0.2.1"
+          , H.callHackage "path-io" "1.7.0"
+          , H.callHackage "path" "0.9.2"
+          , H.callHackage "patience" "0.3"
+          , H.callHackage "pcg-random" "0.1.3.7"
+          , H.callHackage "pcre-light" "0.4.1.0"
+          , H.callHackage "pcre2" "2.2.1"
+          , H.callHackage "pem" "0.2.4"
+          , H.callHackage "persistent-template" "2.12.0.0"
+          , H.callHackage "persistent" "2.14.3.0"
+          , H.callHackage "pipes" "4.3.16"
+          , H.callHackage "pg-entity" "0.0.2.0"
+          , H.callHackage "pg-transact" "0.3.2.0"
+          , H.callGit
+              "pg-transact-effectful"
+              "https://github.com/Kleidukos/pg-transact-effectful"
+              "45730b124c7c21f1dcfd85667fda1c19b8ec9723"
+              (None Text)
+          , H.callHackage "pgp-wordlist" "0.1.0.3"
+          , H.callHackage "pointed" "5.0.4"
+          , H.callHackage "polyparse" "1.13"
+          , H.callHackage "polysemy-extra" "0.2.1.0"
+          , H.callHackage "polysemy-kvstore" "0.1.3.0"
+          , H.callHackage "polysemy-methodology" "0.2.1.0"
+          , H.callHackage "polysemy-path" "0.2.1.0"
+          , H.callGit
+              "polysemy-plugin"
+              "https://github.com/locallycompact/polysemy"
+              "bd944ca000c1ca69602d4723e3859af431b9d0c4"
+              (Some "polysemy-plugin")
+          , H.callHackage "polysemy-several" "0.1.1.0"
+          , H.callHackage "polysemy-test" "0.6.0.0"
+          , H.callHackage "polysemy-time" "0.5.1.0"
+          , H.callHackage "polysemy-vinyl" "0.1.5.0"
+          , H.callHackage "polysemy-zoo" "0.8.0.0"
+          , H.callHackage "polysemy" "1.7.1.0"
+          , H.callHackage "port-utils" "0.2.1.0"
+          , H.callHackage "postgresql-libpq" "0.9.4.3"
+          , H.callHackage "postgresql-migration" "0.2.1.4"
+          , H.callHackage "postgresql-simple" "0.6.4"
+          , H.callHackage "postgresql-simple-migration" "0.1.15.0"
+          , H.callHackage "postgres-options" "0.2.0.0"
+          , H.callHackage "pretty-hex" "1.1"
+          , H.callHackage "pretty-show" "1.10"
+          , H.callHackage "pretty-simple" "4.1.1.0"
+          , H.callHackage "prettyprinter-ansi-terminal" "1.1.3"
+          , H.callHackage "prettyprinter" "1.7.1"
+          , H.callHackage "primes" "0.2.1.0"
+          , H.callHackage "primitive" "0.7.4.0"
+          , H.callHackage "primitive-addr" "0.1.0.2"
+          , H.callHackage "profunctors" "5.6.2"
+          , H.callHackage "prometheus-client" "1.1.0"
+          , H.callHackage "prometheus-proc" "0.1.4.0"
+          , H.callHackage "process-extras" "0.7.4"
+          , H.callHackage "proteaaudio-sdl" "0.9.2"
+          , H.callHackage "psqueues" "0.2.7.3"
+          , H.callHackage "pureMD5" "2.1.4"
+          , H.callHackage "quickcheck-assertions" "0.3.0"
+          , H.callHackage "quickcheck-classes-base" "0.6.2.0"
+          , H.callHackage "quickcheck-classes" "0.6.5.0"
+          , H.callHackage "quickcheck-dynamic" "2.0.0"
+          , H.callHackage "quickcheck-instances" "0.3.28"
+          , H.callHackage "quickcheck-io" "0.2.0"
+          , H.callHackage "quickcheck-text" "0.1.2.1"
+          , H.callHackage "quickcheck-unicode" "1.0.1.0"
+          , H.callHackage "random-bytestring" "0.1.4"
+          , H.callHackage "random-shuffle" "0.0.4"
+          , H.callHackage "random" "1.2.1.1"
+          , H.callHackage "raw-strings-qq" "1.1"
+          , H.callHackage "rdtsc" "1.3.0.1"
+          , H.callHackage "rebase" "1.16"
+          , H.callHackage "reducers" "3.12.4"
+          , H.callHackage "refact" "0.3.0.2"
+          , H.callHackage "regex-applicative" "0.3.4"
+          , H.callHackage "regex-base" "0.94.0.2"
+          , H.callHackage "regex-compat" "0.95.2.1"
+          , H.callHackage "regex-pcre-builtin" "0.95.2.3.8.44"
+          , H.callHackage "regex-posix" "0.96.0.1"
+          , H.callHackage "regex-tdfa" "1.3.2"
+          , H.callHackage "refined" "0.8"
+          , H.callHackage "reflection" "2.1.6"
+          , H.callHackage "relude" "1.1.0.0"
+          , H.callHackage "repline" "0.4.2.0"
+          , H.callHackage "rerebase" "1.15.0.3"
+          , H.callHackage "rere" "0.2"
+          , H.callHackage "resolv" "0.1.2.0"
+          , H.callHackage "resource-pool" "0.3.1.0"
+          , H.callHackage "resourcet" "1.3.0"
+          , H.callHackage "retry" "0.9.3.0"
+          , H.callHackage "rope-utf16-splay" "0.4.0.0"
+          , H.callHackage "safe-coloured-text-layout" "0.0.0.0"
+          , H.callHackage "safe-coloured-text-terminfo" "0.1.0.0"
+          , H.callHackage "safe-coloured-text" "0.2.0.1"
+          , H.callHackage "safe-exceptions" "0.1.7.3"
+          , H.callHackage "safe" "0.3.19"
+          , H.callHackage "saltine" "0.2.0.1"
+          , H.callHackage "sandwich" "0.1.1.2"
+          , H.callHackage "scotty" "0.12"
+          , H.callHackage "scientific" "0.3.7.0"
+          , H.callHackage "sdl2" "2.5.3.3"
+          , H.callHackage "sdl2-gfx" "0.3.0.0"
+          , H.callHackage "sdl2-image" "2.1.0.0"
+          , H.callHackage "sdl2-mixer" "1.2.0.0"
+          , H.callHackage "sdl2-ttf" "2.1.3"
+          , H.callHackage "selective" "0.5"
+          , H.callHackage "semialign" "1.2.0.1"
+          , H.callHackage "semigroups" "0.20"
+          , H.callHackage "semigroupoids" "5.3.7"
+          , H.callHackage "semirings" "0.6"
+          , H.callHackage "serialise" "0.2.6.0"
+          , H.callGit
+              "servant"
+              "https://github.com/TeofilC/servant"
+              "76fc90a51f915230bbe1e0d1dbe9727fcdc7a0fc"
+              (Some "servant")
+          , H.callHackage "servant-blaze" "0.9.1"
+          , H.callGit
+              "servant-client-core"
+              "https://github.com/TeofilC/servant"
+              "76fc90a51f915230bbe1e0d1dbe9727fcdc7a0fc"
+              (Some "servant-client-core")
+          , H.callGit
+              "servant-client"
+              "https://github.com/TeofilC/servant"
+              "76fc90a51f915230bbe1e0d1dbe9727fcdc7a0fc"
+              (Some "servant-client")
+          , H.callHackage "servant-docs" "0.12"
+          , H.callGit
+              "servant-effectful"
+              "https://github.com/kleidukos/servant-effectful"
+              "65e3041c6cfbc315b20ad22ca18f61dda104eec8"
+              (None Text)
+          , H.callGit
+              "servant-foreign"
+              "https://github.com/TeofilC/servant"
+              "76fc90a51f915230bbe1e0d1dbe9727fcdc7a0fc"
+              (Some "servant-foreign")
+          , H.callHackage "servant-lucid" "0.9.0.5"
+          , H.callHackage "servant-multipart" "0.12.1"
+          , H.callHackage "servant-multipart-api" "0.12.1"
+          , H.callHackage "servant-polysemy" "0.1.3"
+          , H.callGit
+              "servant-server"
+              "https://github.com/TeofilC/servant"
+              "76fc90a51f915230bbe1e0d1dbe9727fcdc7a0fc"
+              (Some "servant-server")
+          , H.callHackage "servant-swagger" "1.1.11"
+          , H.callHackage "servant-swagger-ui" "0.3.5.4.5.0"
+          , H.callHackage "servant-swagger-ui-core" "0.3.5"
+          , H.callHackage "servant-static-th" "1.0.0.0"
+          , H.callHackage "setenv" "0.1.1.3"
+          , H.callHackage "shakespeare" "2.0.30"
+          , H.callHackage "shake" "0.19.6"
+          , H.callHackage "shelly" "1.10.0"
+          , H.callHackage "should-not-typecheck" "2.1.0"
+          , H.callHackage "silently" "1.2.5.3"
+          , H.callHackage "simple-reflect" "0.3.3"
+          , H.callHackage "simple-sendfile" "0.2.30"
+          , H.callHackage "singleton-bool" "0.1.6"
+          , H.callHackage "singletons" "3.0.2"
+          , H.callHackage "slugify" "0.1.0.1"
+          , H.callHackage "skylighting" "0.13.1.1"
+          , H.callHackage "skylighting-core" "0.13.1.1"
+          , H.callHackage "skylighting-format-ansi" "0.1"
+          , H.callHackage "skylighting-format-blaze-html" "0.1"
+          , H.callHackage "skylighting-format-latex" "0.1"
+          , H.callHackage "smallcheck" "1.2.1"
+          , H.callHackage "socks" "0.6.1"
+          , H.callHackage "some" "1.0.4"
+          , H.callHackage "sop-core" "0.5.0.1"
+          , H.callHackage "sorted-list" "0.2.1.0"
+          , H.callHackage "souffle-haskell" "3.5.0"
+          , H.callHackage "special-values" "0.1.0.0"
+          , H.callHackage "splitmix" "0.1.0.4"
+          , H.callHackage "split" "0.2.3.3"
+          , H.callHackage "spoon" "0.3.1"
+          , H.callHackage "sqlite-simple" "0.4.18.2"
+          , H.callHackage "statistics" "0.16.1.0"
+          , H.callHackage "stm-chans" "3.0.0.6"
+          , H.callHackage "streaming-commons" "0.2.2.4"
+          , H.callHackage "streaming" "0.2.3.1"
+          , H.callHackage "store-core" "0.4.4.4"
+          , H.callHackage "store" "0.7.16"
+          , H.callHackage "strict" "0.4.0.1"
+          , H.callHackage "string-conversions" "0.4.0.1"
+          , H.callHackage "string-conv" "0.2.0"
+          , H.callHackage "string-interpolate" "0.3.1.2"
+          , H.callHackage "string-qq" "0.0.4"
+          , H.callHackage "stringbuilder" "0.5.1"
+          , H.callHackage "swagger2" "2.8.5"
+          , H.callHackage "syb" "0.7.2.1"
+          , H.callHackage "sydtest" "0.13.0.0"
+          , H.callHackage "sydtest-discover" "0.0.0.2"
+          , H.callHackage "system-filepath" "0.4.14"
+          , H.callHackage "tabular" "0.2.2.8"
+          , H.callHackage "tagged" "0.8.6.1"
+          , H.callHackage "tagsoup" "0.14.8"
+          , H.callGit
+              "tar"
+              "https://github.com/locallycompact/tar"
+              "107c0b78524acfd0e77e767b83073492008bea0c"
+              (None Text)
+          , H.callGit
+              "tasty"
+              "https://github.com/UnkindPartition/tasty"
+              "207d3453a64b414593512c1e968171d64a8dbe61"
+              (Some "core")
+          , H.callHackage "tasty-bench" "0.3.2"
+          , H.callHackage "tasty-discover" "5.0.0"
+          , H.callHackage "tasty-expected-failure" "0.12.3"
+          , H.callHackage "tasty-golden" "2.3.5"
+          , H.callGit
+              "tasty-hedgehog"
+              "https://github.com/locallycompact/tasty-hedgehog"
+              "4a3477578ed21aa82e5b74f387d08e5d750635d6"
+              (None Text)
+          , H.callHackage "tasty-hslua" "1.0.2"
+          , H.callHackage "tasty-hspec" "1.2.0.1"
+          , H.callGit
+              "tasty-hunit"
+              "https://github.com/UnkindPartition/tasty"
+              "207d3453a64b414593512c1e968171d64a8dbe61"
+              (Some "hunit")
+          , H.callHackage "tasty-inspection-testing" "0.2"
+          , H.callHackage "tasty-kat" "0.0.3"
+          , H.callHackage "tasty-lua" "1.0.2"
+          , H.callHackage "tasty-silver" "3.3.1.1"
+          , H.callHackage "tasty-smallcheck" "0.8.2"
+          , H.callHackage "tasty-th" "0.1.7"
+          , H.callHackage "tasty-quickcheck" "0.10.2"
+          , H.callHackage "tasty-wai" "0.1.2.0"
+          , H.callHackage "tdigest" "0.2.1.1"
+          , H.callHackage "temporary" "1.3"
+          , H.callHackage "terminal-size" "0.3.3"
+          , H.callHackage "test-framework" "0.8.2.0"
+          , H.callHackage "test-framework-hunit" "0.3.0.2"
+          , H.callHackage "test-framework-th" "0.2.4"
+          , H.callHackage "test-framework-quickcheck2" "0.3.0.5"
+          , H.callHackage "test-framework-smallcheck" "0.2"
+          , H.callHackage "texmath" "0.12.5.4"
+          , H.callHackage "text-conversions" "0.3.1.1"
+          , H.callHackage "text-display" "0.0.3.0"
+          , H.callHackage "text-icu" "0.8.0.2"
+          , H.callHackage "text-manipulate" "0.3.1.0"
+          , H.callHackage "text-metrics" "0.3.2"
+          , H.callHackage "text-rope" "0.2"
+          , H.callHackage "text-short" "0.1.5"
+          , H.callHackage "text-zipper" "0.12"
+          , H.callHackage "these" "1.1.1.1"
+          , H.callHackage "these-skinny" "0.7.5"
+          , H.callHackage "tf-random" "0.5"
+          , H.callHackage "th-abstraction" "0.4.5.0"
+          , H.callHackage "th-compat" "0.1.4"
+          , H.callHackage "th-env" "0.1.1"
+          , H.callHackage "th-expand-syns" "0.4.10.0"
+          , H.callHackage "th-extras" "0.0.0.6"
+          , H.callHackage "th-lift-instances" "0.1.20"
+          , H.callHackage "th-lift" "0.8.2"
+          , H.callHackage "th-orphans" "0.13.14"
+          , H.callHackage "th-reify-many" "0.1.10"
+          , H.callHackage "th-utilities" "0.2.5.0"
+          , H.callHackage "tidal" "1.8.1"
+          , H.callHackage "timing-convenience" "0.1"
+          , H.callHackage "timeit" "2.0"
+          , H.callHackage "time-compat" "1.9.6.1"
+          , H.callGit
+              "time-effectful"
+              "https://github.com/haskell-effectful/time-effectful"
+              "e212239b685e1ecf7ee95dd1e944cc563351907f"
+              (None Text)
+          , H.callHackage "time-manager" "0.0.0"
+          , H.callHackage "tls-session-manager" "0.0.4"
+          , H.callHackage "tls" "1.6.0"
+          , H.callHackage "tmp-postgres" "1.34.1.0"
+          , H.callHackage "torsor" "0.1"
+          , H.callHackage "transformers-base" "0.4.6"
+          , H.callHackage "transformers-compat" "0.7.2"
+          , H.callHackage "tree-diff" "0.2.2"
+          , H.callHackage "trifecta" "2.1.2"
+          , H.callHackage "tuple" "0.3.0.2"
+          , H.callHackage "turtle" "1.6.1"
+          , H.callHackage "typed-process" "0.2.10.1"
+          , H.callHackage "type-errors-pretty" "0.0.1.2"
+          , H.callHackage "type-errors" "0.2.0.0"
+          , H.callHackage "type-equality" "1"
+          , H.callGit
+              "typerep-map"
+              "https://github.com/parsonsmatt/typerep-map"
+              "75b7cd5d45986be07420a6821d352ad2adc0b697"
+              (None Text)
+          , H.callHackage "uglymemo" "0.1.0.1"
+          , H.callHackage "unagi-chan" "0.4.1.4"
+          , H.callHackage "unbounded-delays" "0.1.1.1"
+          , H.callHackage "unicode-collation" "0.1.3.2"
+          , H.callHackage "unicode-data" "0.4.0"
+          , H.callHackage "unicode-transforms" "0.4.0.1"
+          , H.callHackage "uniplate" "1.6.13"
+          , H.callHackage "universe-base" "1.1.3"
+          , H.callHackage "unix-compat" "0.6"
+          , H.callHackage "unix-memory" "0.1.2"
+          , H.callHackage "unix-time" "0.4.8"
+          , H.callHackage "unliftio-core" "0.2.0.1"
+          , H.callHackage "unliftio" "0.2.23.0"
+          , H.callHackage "unordered-containers" "0.2.19.1"
+          , H.callHackage "uri-bytestring" "0.3.3.1"
+          , H.callHackage "uri-encode" "1.5.0.7"
+          , H.callHackage "utf8-string" "1.0.2"
+          , H.callHackage "utility-ht" "0.0.16"
+          , H.callHackage "uuid-types" "1.0.5"
+          , H.callHackage "uuid" "1.3.15"
+          , H.callHackage "validity" "0.12.0.1"
+          , H.callHackage "validity-aeson" "0.2.0.5"
+          , H.callHackage "validity-bytestring" "0.4.1.1"
+          , H.callHackage "validity-case-insensitive" "0.0.0.0"
+          , H.callHackage "validity-containers" "0.5.0.4"
+          , H.callHackage "validity-path" "0.4.0.1"
+          , H.callHackage "validity-persistent" "0.0.0.0"
+          , H.callHackage "validity-primitive" "0.0.0.1"
+          , H.callHackage "validity-scientific" "0.2.0.3"
+          , H.callHackage "validity-text" "0.3.1.3"
+          , H.callHackage "validity-time" "0.5.0.0"
+          , H.callHackage "validity-unordered-containers" "0.2.0.3"
+          , H.callHackage "validity-uuid" "0.1.0.3"
+          , H.callHackage "validity-vector" "0.2.0.3"
+          , H.callHackage "vault" "0.3.1.5"
+          , H.callHackage "vector" "0.13.0.0"
+          , H.callHackage "vector-algorithms" "0.9.0.1"
+          , H.callHackage "vector-binary-instances" "0.2.5.2"
+          , H.callHackage "vector-instances" "3.4"
+          , H.callHackage "vector-stream" "0.1.0.0"
+          , H.callHackage "vector-th-unbox" "0.2.2"
+          , H.callHackage "vec" "0.4.1"
+          , H.callHackage "vinyl" "0.14.3"
+          , H.callHackage "void" "0.7.3"
+          , H.callHackage "vty" "5.37"
+          , H.callHackage "wai-app-static" "3.1.7.4"
+          , H.callHackage "wai-extra" "3.1.13.0"
+          , H.callGit
+              "wai-middleware-heartbeat"
+              "https://github.com/flora-pm/wai-middleware-heartbeat"
+              "bd7dbbe83d25c00fcd2cf5c77736af904910c596"
+              (None Text)
+          , H.callHackage "wai-logger" "2.4.0"
+          , H.callHackage "wai-middleware-static" "0.9.2"
+          , H.callHackage "wai" "3.2.3"
+          , H.callHackage "warp" "3.3.22"
+          , H.callHackage "warp-tls" "3.3.3"
+          , H.callHackage "websockets" "0.12.7.3"
+          , H.callHackage "weigh" "0.0.16"
+          , H.callHackage "witherable" "0.4.2"
+          , H.callHackage "with-utf8" "1.0.2.3"
+          , H.callHackage "wizards" "1.0.3"
+          , H.callHackage "wl-pprint-annotated" "0.1.0.1"
+          , H.callHackage "word-wrap" "0.5"
+          , H.callHackage "word8" "0.1.3"
+          , H.callHackage "x509-store" "1.6.9"
+          , H.callHackage "x509-system" "1.6.7"
+          , H.callHackage "x509-validation" "1.6.12"
+          , H.callHackage "x509" "1.7.7"
+          , H.callHackage "xml-conduit" "1.9.1.1"
+          , H.callHackage "xml-types" "0.3.8"
+          , H.callHackage "xml" "1.3.14"
+          , H.callHackage "yaml" "0.11.8.0"
+          , H.callHackage "zip-archive" "0.4.2.2"
+          , H.callHackage "zlib" "0.6.3.0"
+          ]
+        }
+      }
diff --git a/pkgs/Cabal-QuickCheck.nix b/pkgs/Cabal-QuickCheck.nix
index cb600942cc74dc18b34ed0aae5b5a2d56746f910..1820916992eaba7d8bda7df84245808c656b5c85 100644
--- a/pkgs/Cabal-QuickCheck.nix
+++ b/pkgs/Cabal-QuickCheck.nix
@@ -1,11 +1,11 @@
 { mkDerivation
-, base
-, bytestring
 , Cabal
 , Cabal-syntax
+, QuickCheck
+, base
+, bytestring
 , fetchgit
 , lib
-, QuickCheck
 }:
 mkDerivation {
   pname = "Cabal-QuickCheck";
diff --git a/pkgs/Cabal-described.nix b/pkgs/Cabal-described.nix
index 754b807706be7764afcfffecf7b060bb80135bca..a1ea03a97bb8a024e0bf21b18b4a07f5ec843ee0 100644
--- a/pkgs/Cabal-described.nix
+++ b/pkgs/Cabal-described.nix
@@ -1,12 +1,12 @@
 { mkDerivation
-, base
 , Cabal
 , Cabal-syntax
+, QuickCheck
+, base
 , containers
 , fetchgit
 , lib
 , pretty
-, QuickCheck
 , rere
 , tasty
 , tasty-quickcheck
diff --git a/pkgs/Cabal-tree-diff.nix b/pkgs/Cabal-tree-diff.nix
index 30878a8be1127a652764762cc617b107a7950b57..33a33ae74aa414dba564afff166b28b8665d0441 100644
--- a/pkgs/Cabal-tree-diff.nix
+++ b/pkgs/Cabal-tree-diff.nix
@@ -1,7 +1,7 @@
 { mkDerivation
-, base
 , Cabal
 , Cabal-syntax
+, base
 , fetchgit
 , lib
 , tree-diff
diff --git a/pkgs/Cabal.nix b/pkgs/Cabal.nix
index 316faa598c14124afac596aee30ed6fe0ae4f72f..bc1d0ef9bb36ab29a4d3053b76eb7bb3d4f316dc 100644
--- a/pkgs/Cabal.nix
+++ b/pkgs/Cabal.nix
@@ -1,8 +1,8 @@
 { mkDerivation
+, Cabal-syntax
 , array
 , base
 , bytestring
-, Cabal-syntax
 , containers
 , deepseq
 , directory
diff --git a/pkgs/ChasingBottoms.nix b/pkgs/ChasingBottoms.nix
index 67351d8bdbbd167df43fe6c5e0b2a1b6bfb50282..da9de97fe22ea8dbecbd355660d2b2f5fbb8f396 100644
--- a/pkgs/ChasingBottoms.nix
+++ b/pkgs/ChasingBottoms.nix
@@ -1,10 +1,10 @@
 { mkDerivation
+, QuickCheck
 , array
 , base
 , containers
 , lib
 , mtl
-, QuickCheck
 , random
 , syb
 }:
diff --git a/pkgs/Decimal.nix b/pkgs/Decimal.nix
index 8dc567c0865e1aa8d5fd351701b9d6ef9b82fc55..a02511b85e9de5fb14e3fd957ad92910c9a7dcc3 100644
--- a/pkgs/Decimal.nix
+++ b/pkgs/Decimal.nix
@@ -1,9 +1,9 @@
 { mkDerivation
+, HUnit
+, QuickCheck
 , base
 , deepseq
-, HUnit
 , lib
-, QuickCheck
 , test-framework
 , test-framework-hunit
 , test-framework-quickcheck2
diff --git a/pkgs/Diff.nix b/pkgs/Diff.nix
index f80ac4651332ddaa510703cab4b67d8b8ce8c663..d665719d94c4e045967200e20d5007dca85c396b 100644
--- a/pkgs/Diff.nix
+++ b/pkgs/Diff.nix
@@ -1,11 +1,11 @@
 { mkDerivation
+, QuickCheck
 , array
 , base
 , directory
 , lib
 , pretty
 , process
-, QuickCheck
 , test-framework
 , test-framework-quickcheck2
 }:
diff --git a/pkgs/Glob.nix b/pkgs/Glob.nix
index 90b06e0ab48358fe4a0325048f9e86eab8ea46f5..40f870ce0d337760660b3cdc04e4ece7244702e5 100644
--- a/pkgs/Glob.nix
+++ b/pkgs/Glob.nix
@@ -1,12 +1,12 @@
 { mkDerivation
+, HUnit
+, QuickCheck
 , base
 , containers
 , directory
 , dlist
 , filepath
-, HUnit
 , lib
-, QuickCheck
 , test-framework
 , test-framework-hunit
 , test-framework-quickcheck2
diff --git a/pkgs/HTTP.nix b/pkgs/HTTP.nix
index ee07b092b3cd0d6db40addc40ac2f3c09e1d1a69..f234878c5abf3ac7d4528328369d7c057029e585 100644
--- a/pkgs/HTTP.nix
+++ b/pkgs/HTTP.nix
@@ -1,10 +1,10 @@
 { mkDerivation
+, HUnit
 , array
 , base
 , bytestring
 , deepseq
 , httpd-shed
-, HUnit
 , lib
 , mtl
 , network
diff --git a/pkgs/HsYAML.nix b/pkgs/HsYAML.nix
index f3bfff20101d256e7ee1e488ef56a90f8abe5042..cf6e58ebe3168c56e7c84d1e0625a8380796d886 100644
--- a/pkgs/HsYAML.nix
+++ b/pkgs/HsYAML.nix
@@ -1,4 +1,5 @@
 { mkDerivation
+, QuickCheck
 , base
 , bytestring
 , containers
@@ -6,7 +7,6 @@
 , lib
 , mtl
 , parsec
-, QuickCheck
 , tasty
 , tasty-quickcheck
 , text
diff --git a/pkgs/ListLike.nix b/pkgs/ListLike.nix
index 9cb0e530c9eea0a80276b94bfdfae499ff290471..69342cbca5625a7e3f77e9285c346ca877e171da 100644
--- a/pkgs/ListLike.nix
+++ b/pkgs/ListLike.nix
@@ -1,4 +1,6 @@
 { mkDerivation
+, HUnit
+, QuickCheck
 , array
 , base
 , bytestring
@@ -6,9 +8,7 @@
 , deepseq
 , dlist
 , fmlist
-, HUnit
 , lib
-, QuickCheck
 , random
 , text
 , utf8-string
diff --git a/pkgs/PSQueue.nix b/pkgs/PSQueue.nix
index d76362315a0dc0fd47c99c25f2f865ba6d5b8d31..542b8dd3e97d196c2cfa5c38a6aa0786467aa110 100644
--- a/pkgs/PSQueue.nix
+++ b/pkgs/PSQueue.nix
@@ -1,4 +1,4 @@
-{ mkDerivation, base, lib, QuickCheck }:
+{ mkDerivation, QuickCheck, base, lib }:
 mkDerivation {
   pname = "PSQueue";
   version = "1.1.1";
diff --git a/pkgs/PyF.nix b/pkgs/PyF.nix
index 390031bc5780a58b70c9d7bb1fedc8ec28238fbf..d9cb229ffe9b62cb89bfd66062326c7daaaa6936 100644
--- a/pkgs/PyF.nix
+++ b/pkgs/PyF.nix
@@ -1,4 +1,5 @@
 { mkDerivation
+, HUnit
 , base
 , bytestring
 , deepseq
@@ -6,7 +7,6 @@
 , ghc
 , ghc-boot
 , hspec
-, HUnit
 , lib
 , mtl
 , parsec
diff --git a/pkgs/SHA.nix b/pkgs/SHA.nix
index d1ba4424c34dba9073cade315138fec75e7f0e17..f48c8b24121e89dd8c64aa208966046f7eccc994 100644
--- a/pkgs/SHA.nix
+++ b/pkgs/SHA.nix
@@ -1,10 +1,10 @@
 { mkDerivation
+, QuickCheck
 , array
 , base
 , binary
 , bytestring
 , lib
-, QuickCheck
 , test-framework
 , test-framework-quickcheck2
 }:
diff --git a/pkgs/aeson-pretty.nix b/pkgs/aeson-pretty.nix
index 85abc748703986542d042c0b12510ab3ab308f0c..38b7bbfabf0d3340d7f1e013cab5bf1e77d725b6 100644
--- a/pkgs/aeson-pretty.nix
+++ b/pkgs/aeson-pretty.nix
@@ -47,6 +47,5 @@ mkDerivation {
   homepage = "http://github.com/informatikr/aeson-pretty";
   description = "JSON pretty-printing library and command-line tool";
   license = lib.licenses.bsd3;
-  mainProgram = "aeson-pretty";
   broken = false;
 }
diff --git a/pkgs/aeson.nix b/pkgs/aeson.nix
index ddd6b672844ed14817175224d4c74f5296f6a373..a6825277fe48ea0735eb39ada4f118b612110626 100644
--- a/pkgs/aeson.nix
+++ b/pkgs/aeson.nix
@@ -1,4 +1,7 @@
 { mkDerivation
+, Diff
+, OneTuple
+, QuickCheck
 , attoparsec
 , base
 , base-compat
@@ -9,7 +12,6 @@
 , containers
 , data-fix
 , deepseq
-, Diff
 , directory
 , dlist
 , filepath
@@ -20,9 +22,7 @@
 , indexed-traversable
 , integer-logarithms
 , lib
-, OneTuple
 , primitive
-, QuickCheck
 , quickcheck-instances
 , scientific
 , semialign
diff --git a/pkgs/alex.nix b/pkgs/alex.nix
index 3241f554cb5fb4b6a9c31f08405dd03ec06105cb..5f895bdf7f0ea28e639f3709464c4b65b4f8afc0 100644
--- a/pkgs/alex.nix
+++ b/pkgs/alex.nix
@@ -27,6 +27,5 @@ mkDerivation {
   homepage = "http://www.haskell.org/alex/";
   description = "Alex is a tool for generating lexical analysers in Haskell";
   license = lib.licenses.bsd3;
-  mainProgram = "alex";
   broken = false;
 }
diff --git a/pkgs/algebraic-graphs.nix b/pkgs/algebraic-graphs.nix
index 3413cadc521876f2bdd4070f473bd28527c371d5..a61ab2e9234ec79d1783fa9a64f09de04453307f 100644
--- a/pkgs/algebraic-graphs.nix
+++ b/pkgs/algebraic-graphs.nix
@@ -1,4 +1,5 @@
 { mkDerivation
+, QuickCheck
 , array
 , base
 , containers
@@ -6,7 +7,6 @@
 , extra
 , inspection-testing
 , lib
-, QuickCheck
 , transformers
 }:
 mkDerivation {
diff --git a/pkgs/apecs.nix b/pkgs/apecs.nix
index 6f3bff7395314dcd107bfb8c226350abc41965e7..00e0f46eb7e95d05602e893f79ca6e0a57d5a169 100644
--- a/pkgs/apecs.nix
+++ b/pkgs/apecs.nix
@@ -1,4 +1,5 @@
 { mkDerivation
+, QuickCheck
 , array
 , base
 , containers
@@ -7,7 +8,6 @@
 , lib
 , linear
 , mtl
-, QuickCheck
 , template-haskell
 , vector
 }:
diff --git a/pkgs/async.nix b/pkgs/async.nix
index c805af70a25f7f37e207d4ad16e2906da55c2b09..ffeabeeae67b57675fe070291b4a98bf7b8f3374 100644
--- a/pkgs/async.nix
+++ b/pkgs/async.nix
@@ -1,7 +1,7 @@
 { mkDerivation
+, HUnit
 , base
 , hashable
-, HUnit
 , lib
 , stm
 , test-framework
diff --git a/pkgs/attoparsec.nix b/pkgs/attoparsec.nix
index efe4742b426a80372f69a9790ee1c41f9d3dd0e4..ddfbdf223b11bb114125f53fc40b2130500b34c6 100644
--- a/pkgs/attoparsec.nix
+++ b/pkgs/attoparsec.nix
@@ -1,4 +1,5 @@
 { mkDerivation
+, QuickCheck
 , array
 , base
 , bytestring
@@ -11,7 +12,6 @@
 , http-types
 , lib
 , parsec
-, QuickCheck
 , quickcheck-unicode
 , scientific
 , tasty
diff --git a/pkgs/auto-update.nix b/pkgs/auto-update.nix
index 34a866332828e10680fab3891900830c0c9c6a18..e12910ba53ac9897605932321518e962784ace38 100644
--- a/pkgs/auto-update.nix
+++ b/pkgs/auto-update.nix
@@ -1,4 +1,4 @@
-{ mkDerivation, base, exceptions, hspec, HUnit, lib, retry }:
+{ mkDerivation, HUnit, base, exceptions, hspec, lib, retry }:
 mkDerivation {
   pname = "auto-update";
   version = "0.1.6";
diff --git a/pkgs/barbies.nix b/pkgs/barbies.nix
index 9d4c46fc967feec092a6af511071e9ba374eb463..164458b63d56a18bcaabe621a4feacf2fa799342 100644
--- a/pkgs/barbies.nix
+++ b/pkgs/barbies.nix
@@ -1,8 +1,8 @@
 { mkDerivation
+, QuickCheck
 , base
 , distributive
 , lib
-, QuickCheck
 , tasty
 , tasty-hunit
 , tasty-quickcheck
diff --git a/pkgs/base-compat-batteries.nix b/pkgs/base-compat-batteries.nix
index 96f383f05b6cc7f99d31fe6d2800eebb02f6c286..6c28b91dae84a83296fa6f5183d09c5161d1a568 100644
--- a/pkgs/base-compat-batteries.nix
+++ b/pkgs/base-compat-batteries.nix
@@ -1,11 +1,11 @@
 { mkDerivation
+, QuickCheck
 , base
 , base-compat
 , ghc-prim
 , hspec
 , hspec-discover
 , lib
-, QuickCheck
 }:
 mkDerivation {
   pname = "base-compat-batteries";
diff --git a/pkgs/base-orphans.nix b/pkgs/base-orphans.nix
index b3aec096dcaaebcf607d46fc8303a39b163dc535..9fcb337beb23864ebd6c463a251103f322d364a8 100644
--- a/pkgs/base-orphans.nix
+++ b/pkgs/base-orphans.nix
@@ -1,10 +1,10 @@
 { mkDerivation
+, QuickCheck
 , base
 , ghc-prim
 , hspec
 , hspec-discover
 , lib
-, QuickCheck
 }:
 mkDerivation {
   pname = "base-orphans";
diff --git a/pkgs/base16-bytestring.nix b/pkgs/base16-bytestring.nix
index 53db5f2c7002126c16f7d03ac57bd2f642270759..fc36dda01174ce99707b27ecdc0fdab0af83c2b4 100644
--- a/pkgs/base16-bytestring.nix
+++ b/pkgs/base16-bytestring.nix
@@ -1,11 +1,11 @@
 { mkDerivation
+, HUnit
+, QuickCheck
 , base
 , bytestring
 , criterion
 , deepseq
-, HUnit
 , lib
-, QuickCheck
 , test-framework
 , test-framework-hunit
 , test-framework-quickcheck2
diff --git a/pkgs/base64-bytestring.nix b/pkgs/base64-bytestring.nix
index 6c27b42087588f51e3041bb8df64009faec22f39..c3fbc76db64d756225a1b18dd617262839094035 100644
--- a/pkgs/base64-bytestring.nix
+++ b/pkgs/base64-bytestring.nix
@@ -1,11 +1,11 @@
 { mkDerivation
+, HUnit
+, QuickCheck
 , base
 , bytestring
 , criterion
 , deepseq
-, HUnit
 , lib
-, QuickCheck
 , test-framework
 , test-framework-hunit
 , test-framework-quickcheck2
diff --git a/pkgs/base64.nix b/pkgs/base64.nix
index 054699136f6aa05f5c9e60dba03fc670a7f9a1c3..e87f5e87f147b656729ee70f33cc98fc68793ae0 100644
--- a/pkgs/base64.nix
+++ b/pkgs/base64.nix
@@ -1,11 +1,11 @@
 { mkDerivation
+, QuickCheck
 , base
 , base64-bytestring
 , bytestring
 , criterion
 , deepseq
 , lib
-, QuickCheck
 , random-bytestring
 , tasty
 , tasty-hunit
diff --git a/pkgs/bifunctors.nix b/pkgs/bifunctors.nix
index d0d6ad7479b616d224253b9d62fc5da4dc00eb67..34db1afef4c4aaf27c22713afa60b3655fed922a 100644
--- a/pkgs/bifunctors.nix
+++ b/pkgs/bifunctors.nix
@@ -1,4 +1,5 @@
 { mkDerivation
+, QuickCheck
 , base
 , base-orphans
 , comonad
@@ -6,7 +7,6 @@
 , hspec
 , hspec-discover
 , lib
-, QuickCheck
 , tagged
 , template-haskell
 , th-abstraction
diff --git a/pkgs/bimap.nix b/pkgs/bimap.nix
index a19a498dbb56db1b11bf86c1a8f6d2eb552ee897..48b5d33ff4246e63a2875afbbfd2fcdddf770cf0 100644
--- a/pkgs/bimap.nix
+++ b/pkgs/bimap.nix
@@ -1,10 +1,10 @@
 { mkDerivation
+, QuickCheck
 , base
 , containers
 , deepseq
 , exceptions
 , lib
-, QuickCheck
 , template-haskell
 }:
 mkDerivation {
diff --git a/pkgs/binary-orphans.nix b/pkgs/binary-orphans.nix
index 3eab8626a4d4c86a3a8867c84aaac882f66c11c4..965648563326b60bff3ba5be063af0cdb7de6f49 100644
--- a/pkgs/binary-orphans.nix
+++ b/pkgs/binary-orphans.nix
@@ -1,9 +1,9 @@
 { mkDerivation
+, OneTuple
+, QuickCheck
 , base
 , binary
 , lib
-, OneTuple
-, QuickCheck
 , quickcheck-instances
 , tagged
 , tasty
diff --git a/pkgs/blaze-builder.nix b/pkgs/blaze-builder.nix
index 09ad91da15daf985f5bedc12a18c2bae6ad7142a..4322af96ae2e1d2474e46a2673bb3297ff302d47 100644
--- a/pkgs/blaze-builder.nix
+++ b/pkgs/blaze-builder.nix
@@ -1,11 +1,11 @@
 { mkDerivation
+, HUnit
+, QuickCheck
 , base
 , bytestring
 , deepseq
 , ghc-prim
-, HUnit
 , lib
-, QuickCheck
 , test-framework
 , test-framework-hunit
 , test-framework-quickcheck2
diff --git a/pkgs/blaze-html.nix b/pkgs/blaze-html.nix
index 8fd02afef399980197d50254fbb4c85e00f18598..ddf408a80d74e41f03e50db15e6f8dba759e631f 100644
--- a/pkgs/blaze-html.nix
+++ b/pkgs/blaze-html.nix
@@ -1,12 +1,12 @@
 { mkDerivation
+, HUnit
+, QuickCheck
 , base
 , blaze-builder
 , blaze-markup
 , bytestring
 , containers
-, HUnit
 , lib
-, QuickCheck
 , test-framework
 , test-framework-hunit
 , test-framework-quickcheck2
diff --git a/pkgs/blaze-markup.nix b/pkgs/blaze-markup.nix
index 8fcc8bd5b0f1ef62c88373218d0885d6d9b7b4da..aa929fa510bc091fb75728dbfff0ddedd4aa88d8 100644
--- a/pkgs/blaze-markup.nix
+++ b/pkgs/blaze-markup.nix
@@ -1,11 +1,11 @@
 { mkDerivation
+, HUnit
+, QuickCheck
 , base
 , blaze-builder
 , bytestring
 , containers
-, HUnit
 , lib
-, QuickCheck
 , tasty
 , tasty-hunit
 , tasty-quickcheck
diff --git a/pkgs/blaze-textual.nix b/pkgs/blaze-textual.nix
index 09a2ff544cb665891864736f3c063b63f6ca79f8..65575267278b7ff967fa95d174f3bb52b5b2dc53 100644
--- a/pkgs/blaze-textual.nix
+++ b/pkgs/blaze-textual.nix
@@ -1,4 +1,5 @@
 { mkDerivation
+, QuickCheck
 , base
 , blaze-builder
 , bytestring
@@ -7,7 +8,6 @@
 , integer-gmp
 , lib
 , old-locale
-, QuickCheck
 , test-framework
 , test-framework-quickcheck2
 , text
diff --git a/pkgs/brick.nix b/pkgs/brick.nix
index c886a95a256ce15ee016c3b6941dea468d8f00ba..165dd5c4daacaa4a36870538c7ad7a4d137503e9 100644
--- a/pkgs/brick.nix
+++ b/pkgs/brick.nix
@@ -1,4 +1,5 @@
 { mkDerivation
+, QuickCheck
 , base
 , bimap
 , bytestring
@@ -15,7 +16,6 @@
 , microlens-mtl
 , microlens-th
 , mtl
-, QuickCheck
 , stm
 , template-haskell
 , text
diff --git a/pkgs/c2hs.nix b/pkgs/c2hs.nix
index fb103afc995bb4d1d2b104b889ecdc4fd0a09ec0..2c53299cd1625179509067eb62ee9247e2ed972c 100644
--- a/pkgs/c2hs.nix
+++ b/pkgs/c2hs.nix
@@ -1,4 +1,5 @@
 { mkDerivation
+, HUnit
 , array
 , base
 , bytestring
@@ -6,7 +7,6 @@
 , directory
 , dlist
 , filepath
-, HUnit
 , language-c
 , lib
 , pretty
@@ -58,6 +58,5 @@ mkDerivation {
   homepage = "https://github.com/haskell/c2hs";
   description = "C->Haskell FFI tool that gives some cross-language type safety";
   license = lib.licenses.gpl2Only;
-  mainProgram = "c2hs";
   broken = false;
 }
diff --git a/pkgs/cabal-doctest.nix b/pkgs/cabal-doctest.nix
index 3fcedc5f4c2e9f2aa2e52afb89798f4fb5345a7b..4189014eda266e7db679ae612bf7c07657f954b0 100644
--- a/pkgs/cabal-doctest.nix
+++ b/pkgs/cabal-doctest.nix
@@ -1,4 +1,4 @@
-{ mkDerivation, base, Cabal, directory, filepath, lib }:
+{ mkDerivation, Cabal, base, directory, filepath, lib }:
 mkDerivation {
   pname = "cabal-doctest";
   version = "1.0.9";
diff --git a/pkgs/cabal-install-solver.nix b/pkgs/cabal-install-solver.nix
index ff533dda7ca7e5266ad586ee9e32911814a05fc9..a91fba579dcff4c59ca0ca0bd5d358f74be1dff0 100644
--- a/pkgs/cabal-install-solver.nix
+++ b/pkgs/cabal-install-solver.nix
@@ -1,9 +1,9 @@
 { mkDerivation
+, Cabal
+, Cabal-syntax
 , array
 , base
 , bytestring
-, Cabal
-, Cabal-syntax
 , containers
 , edit-distance
 , filepath
diff --git a/pkgs/cabal-install.nix b/pkgs/cabal-install.nix
index a29eb5820659acd20ae65dc7b2344aa450f36c8e..bb3e83ec1e7003b1d252607c175c3f2193ffde5a 100644
--- a/pkgs/cabal-install.nix
+++ b/pkgs/cabal-install.nix
@@ -1,16 +1,18 @@
 { mkDerivation
+, Cabal
+, Cabal-QuickCheck
+, Cabal-described
+, Cabal-syntax
+, Cabal-tree-diff
+, HTTP
+, QuickCheck
 , array
 , async
 , base
 , base16-bytestring
 , binary
 , bytestring
-, Cabal
-, Cabal-described
 , cabal-install-solver
-, Cabal-QuickCheck
-, Cabal-syntax
-, Cabal-tree-diff
 , containers
 , cryptohash-sha256
 , directory
@@ -20,7 +22,6 @@
 , filepath
 , hackage-security
 , hashable
-, HTTP
 , lib
 , lukko
 , mtl
@@ -29,7 +30,6 @@
 , pretty
 , pretty-show
 , process
-, QuickCheck
 , random
 , regex-base
 , regex-posix
@@ -147,6 +147,5 @@ mkDerivation {
   homepage = "http://www.haskell.org/cabal/";
   description = "The command-line interface for Cabal and Hackage";
   license = lib.licenses.bsd3;
-  mainProgram = "cabal";
   broken = false;
 }
diff --git a/pkgs/cabal2nix.nix b/pkgs/cabal2nix.nix
index 372e5e8e1da3e267f537fbf1d4563f1f77f810c4..1293490a03364bf17ea60737d1d0b0ca3811cac4 100644
--- a/pkgs/cabal2nix.nix
+++ b/pkgs/cabal2nix.nix
@@ -1,9 +1,9 @@
 { mkDerivation
+, Cabal
 , aeson
 , ansi-wl-pprint
 , base
 , bytestring
-, Cabal
 , containers
 , deepseq
 , directory
diff --git a/pkgs/case-insensitive.nix b/pkgs/case-insensitive.nix
index 59fce71c253330cc1c48f54ef6892735f1189879..2d27424adc12dc2b6940f5d98f11eb6c327d8787 100644
--- a/pkgs/case-insensitive.nix
+++ b/pkgs/case-insensitive.nix
@@ -1,10 +1,10 @@
 { mkDerivation
+, HUnit
 , base
 , bytestring
 , criterion
 , deepseq
 , hashable
-, HUnit
 , lib
 , test-framework
 , test-framework-hunit
diff --git a/pkgs/cassava.nix b/pkgs/cassava.nix
index 2f0baa59439016efcab506416f786b53cf671a39..976823dd0ff7e20e6b96db0884ac31a73906b2f4 100644
--- a/pkgs/cassava.nix
+++ b/pkgs/cassava.nix
@@ -1,4 +1,7 @@
 { mkDerivation
+, HUnit
+, Only
+, QuickCheck
 , array
 , attoparsec
 , base
@@ -6,10 +9,7 @@
 , containers
 , deepseq
 , hashable
-, HUnit
 , lib
-, Only
-, QuickCheck
 , quickcheck-instances
 , scientific
 , test-framework
diff --git a/pkgs/cborg.nix b/pkgs/cborg.nix
index eefd170337be30ee247fa5ef4d5b7b2544f185e7..2b73ed4cbd8ccaea1f387b60c4f748b99768688f 100644
--- a/pkgs/cborg.nix
+++ b/pkgs/cborg.nix
@@ -1,4 +1,5 @@
 { mkDerivation
+, QuickCheck
 , aeson
 , array
 , base
@@ -13,7 +14,6 @@
 , half
 , lib
 , primitive
-, QuickCheck
 , random
 , scientific
 , tasty
diff --git a/pkgs/cereal-vector.nix b/pkgs/cereal-vector.nix
index 2334386064b86b7adbebb159c44884197bdd5b49..9a345075f23fbdb00c2ca44c586d9b8b4f32bad5 100644
--- a/pkgs/cereal-vector.nix
+++ b/pkgs/cereal-vector.nix
@@ -1,9 +1,9 @@
 { mkDerivation
+, QuickCheck
 , base
 , bytestring
 , cereal
 , lib
-, QuickCheck
 , vector
 }:
 mkDerivation {
diff --git a/pkgs/cereal.nix b/pkgs/cereal.nix
index 42e57abb57af3ce849ad4162ba14ae33795841db..1f18bcc1697b44b34de19184bb0c1996068f742d 100644
--- a/pkgs/cereal.nix
+++ b/pkgs/cereal.nix
@@ -1,11 +1,11 @@
 { mkDerivation
+, QuickCheck
 , array
 , base
 , bytestring
 , containers
 , ghc-prim
 , lib
-, QuickCheck
 , test-framework
 , test-framework-quickcheck2
 }:
diff --git a/pkgs/checkers.nix b/pkgs/checkers.nix
index cc0457167950afb1fce5578e6fafadf38f8e9940..19ee1301728e4d7b960bf458eb677fa1daca21fd 100644
--- a/pkgs/checkers.nix
+++ b/pkgs/checkers.nix
@@ -1,8 +1,8 @@
 { mkDerivation
+, QuickCheck
 , array
 , base
 , lib
-, QuickCheck
 , random
 , semigroupoids
 }:
diff --git a/pkgs/chell-quickcheck.nix b/pkgs/chell-quickcheck.nix
index 3e20ab4228e52a99ef0c12179da2347a6df4298c..9cdb92820f84bdc839edbe7c855d1f469d6b444d 100644
--- a/pkgs/chell-quickcheck.nix
+++ b/pkgs/chell-quickcheck.nix
@@ -1,4 +1,4 @@
-{ mkDerivation, base, chell, lib, QuickCheck, random }:
+{ mkDerivation, QuickCheck, base, chell, lib, random }:
 mkDerivation {
   pname = "chell-quickcheck";
   version = "0.2.5.3";
diff --git a/pkgs/citeproc.nix b/pkgs/citeproc.nix
index e11a6ec767c4ff8666e451aae0f40e0d9f84a377..001ce19bd51cdb88818b76358b584b3586a5e0a6 100644
--- a/pkgs/citeproc.nix
+++ b/pkgs/citeproc.nix
@@ -1,4 +1,5 @@
 { mkDerivation
+, Diff
 , aeson
 , attoparsec
 , base
@@ -6,7 +7,6 @@
 , case-insensitive
 , containers
 , data-default
-, Diff
 , directory
 , file-embed
 , filepath
diff --git a/pkgs/co-log-core.nix b/pkgs/co-log-core.nix
index c2f363ab7ee572d1a310575f0e825958e8525671..3d85fd7c51e12a137bd57500df6551740fefdc69 100644
--- a/pkgs/co-log-core.nix
+++ b/pkgs/co-log-core.nix
@@ -1,4 +1,4 @@
-{ mkDerivation, base, doctest, Glob, lib }:
+{ mkDerivation, Glob, base, doctest, lib }:
 mkDerivation {
   pname = "co-log-core";
   version = "0.3.1.0";
diff --git a/pkgs/co-log-polysemy.nix b/pkgs/co-log-polysemy.nix
index 7fea0b786f4b13bb1332d21ccf30042c3171f383..d4927f09b27a90acd8664ce194a1c79011c6a6b9 100644
--- a/pkgs/co-log-polysemy.nix
+++ b/pkgs/co-log-polysemy.nix
@@ -18,6 +18,5 @@ mkDerivation {
   homepage = "https://github.com/co-log/co-log-polysemy";
   description = "Composable Contravariant Comonadic Logging Library";
   license = lib.licenses.mpl20;
-  mainProgram = "play-colog-poly";
   broken = false;
 }
diff --git a/pkgs/colour.nix b/pkgs/colour.nix
index 17baf90282ff4caad5ad00490b033f30f932deac..24ef9eca2ef49fd94fde1670be163ed6b829a68a 100644
--- a/pkgs/colour.nix
+++ b/pkgs/colour.nix
@@ -1,7 +1,7 @@
 { mkDerivation
+, QuickCheck
 , base
 , lib
-, QuickCheck
 , random
 , test-framework
 , test-framework-quickcheck2
diff --git a/pkgs/compactable.nix b/pkgs/compactable.nix
index 409edbb458a5932bc457fa204e7427fc208806e7..daf44efa45c4c943e5bf5ae015a0aae29581758a 100644
--- a/pkgs/compactable.nix
+++ b/pkgs/compactable.nix
@@ -1,4 +1,5 @@
 { mkDerivation
+, QuickCheck
 , aeson
 , base
 , base-compat
@@ -12,7 +13,6 @@
 , keys
 , lens
 , lib
-, QuickCheck
 , semigroupoids
 , sydtest
 , sydtest-discover
diff --git a/pkgs/composite-base.nix b/pkgs/composite-base.nix
index 7a7bd30f21e9801f5d70e7cf8e754fbb07860488..226a9cd08fab782af980d93ad2e86d87e26efbd1 100644
--- a/pkgs/composite-base.nix
+++ b/pkgs/composite-base.nix
@@ -1,4 +1,5 @@
 { mkDerivation
+, QuickCheck
 , base
 , deepseq
 , exceptions
@@ -8,7 +9,6 @@
 , monad-control
 , mtl
 , profunctors
-, QuickCheck
 , template-haskell
 , text
 , transformers
diff --git a/pkgs/conduit-extra.nix b/pkgs/conduit-extra.nix
index a1ca472486c39031b7df1dd4b9a9a6f8e6dc463d..44d53f71b4cbc01a9c82337a9a76fd8b76641ff9 100644
--- a/pkgs/conduit-extra.nix
+++ b/pkgs/conduit-extra.nix
@@ -1,4 +1,5 @@
 { mkDerivation
+, QuickCheck
 , async
 , attoparsec
 , base
@@ -14,7 +15,6 @@
 , network
 , primitive
 , process
-, QuickCheck
 , resourcet
 , stm
 , streaming-commons
diff --git a/pkgs/conduit.nix b/pkgs/conduit.nix
index 43683395ac8fc5ec0eb047278b62a3a87f646b7e..a00fe403a85447baf444a960e49edc18bea021ce 100644
--- a/pkgs/conduit.nix
+++ b/pkgs/conduit.nix
@@ -1,4 +1,5 @@
 { mkDerivation
+, QuickCheck
 , base
 , bytestring
 , containers
@@ -14,7 +15,6 @@
 , mtl
 , mwc-random
 , primitive
-, QuickCheck
 , resourcet
 , safe
 , silently
diff --git a/pkgs/constraints-extras.nix b/pkgs/constraints-extras.nix
index 22cbeac6c05dd390971f591a0328fa82aac90322..e18d8d24f0f724c57a9fef1bc6b63c96d0fb2daf 100644
--- a/pkgs/constraints-extras.nix
+++ b/pkgs/constraints-extras.nix
@@ -20,6 +20,5 @@ mkDerivation {
   homepage = "https://github.com/obsidiansystems/constraints-extras";
   description = "Utility package for constraints";
   license = lib.licenses.bsd3;
-  mainProgram = "readme";
   broken = false;
 }
diff --git a/pkgs/contravariant.nix b/pkgs/contravariant.nix
index f8ffa01e9b9d0065767f834f6e2284e2339fc81d..79c6932c2e0e25819c9266f87e2db083d8f5f4b2 100644
--- a/pkgs/contravariant.nix
+++ b/pkgs/contravariant.nix
@@ -1,4 +1,4 @@
-{ mkDerivation, base, lib, StateVar, transformers }:
+{ mkDerivation, StateVar, base, lib, transformers }:
 mkDerivation {
   pname = "contravariant";
   version = "1.5.5";
diff --git a/pkgs/cookie.nix b/pkgs/cookie.nix
index 756da9a06bab69c87517cee05cd0349aa89e8599..10f4583006740699e283a125b11819ea25f7cb94 100644
--- a/pkgs/cookie.nix
+++ b/pkgs/cookie.nix
@@ -1,11 +1,11 @@
 { mkDerivation
+, HUnit
+, QuickCheck
 , base
 , bytestring
 , data-default-class
 , deepseq
-, HUnit
 , lib
-, QuickCheck
 , tasty
 , tasty-hunit
 , tasty-quickcheck
diff --git a/pkgs/cpphs.nix b/pkgs/cpphs.nix
index 9d186949cb939c68f41ba3be6ee0d789e6870c3e..a83b6851a4d4644e9cb4d214a1c98bb20b92b4f2 100644
--- a/pkgs/cpphs.nix
+++ b/pkgs/cpphs.nix
@@ -20,6 +20,5 @@ mkDerivation {
   homepage = "http://projects.haskell.org/cpphs/";
   description = "A liberalised re-implementation of cpp, the C pre-processor";
   license = "LGPL";
-  mainProgram = "cpphs";
   broken = false;
 }
diff --git a/pkgs/criterion.nix b/pkgs/criterion.nix
index e0a094f7b0a7e4c10a8b799214739a88634544e8..c8bb9820e1b4853fe9129daf3612ab2a9253ff39 100644
--- a/pkgs/criterion.nix
+++ b/pkgs/criterion.nix
@@ -1,4 +1,7 @@
 { mkDerivation
+, Glob
+, HUnit
+, QuickCheck
 , aeson
 , ansi-wl-pprint
 , base
@@ -15,8 +18,6 @@
 , directory
 , exceptions
 , filepath
-, Glob
-, HUnit
 , js-chart
 , lib
 , microstache
@@ -24,7 +25,6 @@
 , mwc-random
 , optparse-applicative
 , parsec
-, QuickCheck
 , statistics
 , tasty
 , tasty-hunit
@@ -107,6 +107,5 @@ mkDerivation {
   homepage = "http://www.serpentine.com/criterion";
   description = "Robust, reliable performance measurement and analysis";
   license = lib.licenses.bsd3;
-  mainProgram = "criterion-report";
   broken = false;
 }
diff --git a/pkgs/crypto-api-tests.nix b/pkgs/crypto-api-tests.nix
index 173959fb77cf1ca3f2c0f3e7240ef3ad81b5362a..2928d45328c4ea55698969d55a9debd9a4ffaefa 100644
--- a/pkgs/crypto-api-tests.nix
+++ b/pkgs/crypto-api-tests.nix
@@ -1,13 +1,13 @@
 { mkDerivation
+, HUnit
+, QuickCheck
 , base
 , bytestring
 , cereal
 , crypto-api
 , directory
 , filepath
-, HUnit
 , lib
-, QuickCheck
 , test-framework
 , test-framework-hunit
 , test-framework-quickcheck2
diff --git a/pkgs/cryptohash-sha1.nix b/pkgs/cryptohash-sha1.nix
index a9d56a40989eb3cd8e5a42f4142beee3e5c9945a..e66e21c78ec22697df0b6d98721c3aac0a8bdb6e 100644
--- a/pkgs/cryptohash-sha1.nix
+++ b/pkgs/cryptohash-sha1.nix
@@ -1,10 +1,10 @@
 { mkDerivation
+, SHA
 , base
 , base16-bytestring
 , bytestring
 , criterion
 , lib
-, SHA
 , tasty
 , tasty-hunit
 , tasty-quickcheck
diff --git a/pkgs/cryptohash-sha256.nix b/pkgs/cryptohash-sha256.nix
index 8753f907a40fc88b5bdee1de3ebc1a7e1d933c30..3a98c5ef4e7b9d1be3129da49613a98eb6846d71 100644
--- a/pkgs/cryptohash-sha256.nix
+++ b/pkgs/cryptohash-sha256.nix
@@ -1,10 +1,10 @@
 { mkDerivation
+, SHA
 , base
 , base16-bytestring
 , bytestring
 , criterion
 , lib
-, SHA
 , tasty
 , tasty-hunit
 , tasty-quickcheck
diff --git a/pkgs/cryptohash.nix b/pkgs/cryptohash.nix
index 49b15c57b1e36830c45c0b0cd2645081f28762c4..3d30d8768679117d1baef3d0be967822326ab4fc 100644
--- a/pkgs/cryptohash.nix
+++ b/pkgs/cryptohash.nix
@@ -1,14 +1,14 @@
 { mkDerivation
+, HUnit
+, QuickCheck
 , base
 , byteable
 , bytestring
 , criterion
 , cryptonite
 , ghc-prim
-, HUnit
 , lib
 , memory
-, QuickCheck
 , tasty
 , tasty-hunit
 , tasty-quickcheck
diff --git a/pkgs/cursor-dirforest-gen.nix b/pkgs/cursor-dirforest-gen.nix
index e2470e479badd6d6e6cb07c59cf0ff062f83cd4c..5de0f876642b541b872a5e974dd9802b75220cca 100644
--- a/pkgs/cursor-dirforest-gen.nix
+++ b/pkgs/cursor-dirforest-gen.nix
@@ -1,4 +1,5 @@
 { mkDerivation
+, QuickCheck
 , base
 , containers
 , criterion
@@ -17,7 +18,6 @@
 , hspec
 , lib
 , path
-, QuickCheck
 }:
 mkDerivation {
   pname = "cursor-dirforest-gen";
diff --git a/pkgs/cursor-gen.nix b/pkgs/cursor-gen.nix
index c1aefd91d6f684f8800b6f34424e779c3783042b..3a03c5f6ba09ecbd8375c458f2cad31762840a7d 100644
--- a/pkgs/cursor-gen.nix
+++ b/pkgs/cursor-gen.nix
@@ -1,4 +1,5 @@
 { mkDerivation
+, QuickCheck
 , base
 , containers
 , criterion
@@ -13,7 +14,6 @@
 , lib
 , microlens
 , pretty-show
-, QuickCheck
 , text
 }:
 mkDerivation {
diff --git a/pkgs/daemons.nix b/pkgs/daemons.nix
index c68f199904f7e11e285acd5513bbcccc7f365e69..bbd370234eb2c05aa4f77a77e276163287a23dd2 100644
--- a/pkgs/daemons.nix
+++ b/pkgs/daemons.nix
@@ -1,4 +1,5 @@
 { mkDerivation
+, HUnit
 , base
 , bytestring
 , cereal
@@ -7,7 +8,6 @@
 , directory
 , filepath
 , ghc-prim
-, HUnit
 , lib
 , network
 , pipes
diff --git a/pkgs/data-clist.nix b/pkgs/data-clist.nix
index 8b99f3fc352ac8ba0e8fa841efdb46d8ebbb0d18..eac57a471f5e58b2cd85e2112aa5a6f0c23f5185 100644
--- a/pkgs/data-clist.nix
+++ b/pkgs/data-clist.nix
@@ -1,4 +1,4 @@
-{ mkDerivation, base, deepseq, lib, QuickCheck }:
+{ mkDerivation, QuickCheck, base, deepseq, lib }:
 mkDerivation {
   pname = "data-clist";
   version = "0.2";
diff --git a/pkgs/data-sketches.nix b/pkgs/data-sketches.nix
index c353f14d082f5cad78f80dad09a009c18fbe2365..9f289b0a179663dd9e6aa4e83938790e73f66b69 100644
--- a/pkgs/data-sketches.nix
+++ b/pkgs/data-sketches.nix
@@ -1,4 +1,5 @@
 { mkDerivation
+, QuickCheck
 , base
 , criterion
 , data-sketches-core
@@ -10,7 +11,6 @@
 , mwc-random
 , pretty-show
 , primitive
-, QuickCheck
 , statistics
 , vector
 , vector-algorithms
diff --git a/pkgs/deepseq-generics.nix b/pkgs/deepseq-generics.nix
index ca64e3dd0097de3b9780fb212b831aa5d30a971a..eb0d3965790fd6889216fde7540f6d35d6041a39 100644
--- a/pkgs/deepseq-generics.nix
+++ b/pkgs/deepseq-generics.nix
@@ -1,8 +1,8 @@
 { mkDerivation
+, HUnit
 , base
 , deepseq
 , ghc-prim
-, HUnit
 , lib
 , test-framework
 , test-framework-hunit
diff --git a/pkgs/dense-linear-algebra.nix b/pkgs/dense-linear-algebra.nix
index c2d68fba571837fc95c3e08ffbf9726307c5f2f5..bb68ae5ab93d5383df760c2f07330f6b2b282356 100644
--- a/pkgs/dense-linear-algebra.nix
+++ b/pkgs/dense-linear-algebra.nix
@@ -1,11 +1,11 @@
 { mkDerivation
+, QuickCheck
 , base
 , deepseq
 , hspec
 , lib
 , math-functions
 , primitive
-, QuickCheck
 , vector
 , vector-algorithms
 , vector-binary-instances
diff --git a/pkgs/dhall.nix b/pkgs/dhall.nix
index 5a5334738227cd82ba2e7f96b7c5e7613ec8579c..96efcc20a884e54aed48e7eef3579bf8dd8a3098 100644
--- a/pkgs/dhall.nix
+++ b/pkgs/dhall.nix
@@ -1,4 +1,6 @@
 { mkDerivation
+, Diff
+, QuickCheck
 , aeson
 , aeson-pretty
 , ansi-terminal
@@ -14,7 +16,6 @@
 , cryptohash-sha256
 , data-fix
 , deepseq
-, Diff
 , directory
 , doctest
 , dotgen
@@ -45,7 +46,6 @@
 , prettyprinter
 , prettyprinter-ansi-terminal
 , profunctors
-, QuickCheck
 , quickcheck-instances
 , repline
 , scientific
@@ -75,8 +75,8 @@ mkDerivation {
   pname = "dhall";
   version = "1.41.2";
   sha256 = "6a9a026e698e5c1a1e103fcb376e8494615b03ef2450f0b6c5e6b43877cea592";
-  revision = "2";
-  editedCabalFile = "18jh1c2zinwglih5gc8av2szicyywq5q0kl2h5200sm67nxmask9";
+  revision = "4";
+  editedCabalFile = "0innb3cn98ynb8bd83jdyrm64ij7wcvajg5qcwzdwbyzpr62anfx";
   isLibrary = true;
   isExecutable = true;
   enableSeparateDataOutput = true;
@@ -316,6 +316,5 @@ mkDerivation {
   hyperlinkSource = false;
   description = "A configuration language guaranteed to terminate";
   license = lib.licenses.bsd3;
-  mainProgram = "dhall";
   broken = false;
 }
diff --git a/pkgs/dimensional.nix b/pkgs/dimensional.nix
index c95d965e69dfdbcd663041a53e735e6f64e68a4e..ce3607e2404c90c3495e585f4a416ae95e420a92 100644
--- a/pkgs/dimensional.nix
+++ b/pkgs/dimensional.nix
@@ -1,16 +1,16 @@
 { mkDerivation
+, Glob
+, QuickCheck
 , base
 , criterion
 , deepseq
 , doctest
 , exact-pi
-, Glob
 , hspec
 , hspec-discover
 , ieee754
 , lib
 , numtype-dk
-, QuickCheck
 , template-haskell
 , vector
 }:
diff --git a/pkgs/direct-sqlite.nix b/pkgs/direct-sqlite.nix
index df1e1e0822a902e40120654c36e27a350a11c37f..9cccceb4865d5ad5fc8f03037bb01dbd268fed37 100644
--- a/pkgs/direct-sqlite.nix
+++ b/pkgs/direct-sqlite.nix
@@ -1,9 +1,9 @@
 { mkDerivation
+, HUnit
 , base
 , base16-bytestring
 , bytestring
 , directory
-, HUnit
 , lib
 , temporary
 , text
diff --git a/pkgs/distribution-nixpkgs.nix b/pkgs/distribution-nixpkgs.nix
index c70ad0a037464afcbfb2a622a99a3e9a45f8da40..c9e662ee769204cbdcf10b5028d86b9f61774031 100644
--- a/pkgs/distribution-nixpkgs.nix
+++ b/pkgs/distribution-nixpkgs.nix
@@ -1,8 +1,8 @@
 { mkDerivation
+, Cabal
 , aeson
 , base
 , bytestring
-, Cabal
 , containers
 , deepseq
 , directory
diff --git a/pkgs/dlist.nix b/pkgs/dlist.nix
index fee876d8d4d177f3c54b0db1896140c27e3a8c0a..7cfb578b11a558b4286d348947071818ed362249 100644
--- a/pkgs/dlist.nix
+++ b/pkgs/dlist.nix
@@ -1,4 +1,4 @@
-{ mkDerivation, base, deepseq, lib, QuickCheck }:
+{ mkDerivation, QuickCheck, base, deepseq, lib }:
 mkDerivation {
   pname = "dlist";
   version = "1.0";
diff --git a/pkgs/doctemplates.nix b/pkgs/doctemplates.nix
index a0824fee7e3de2cba703f0cdfe62f40e01d42e09..2cd42e57f7da6e5bef22d6c181ac998ba6dc155e 100644
--- a/pkgs/doctemplates.nix
+++ b/pkgs/doctemplates.nix
@@ -1,4 +1,6 @@
 { mkDerivation
+, Glob
+, HsYAML
 , aeson
 , base
 , bytestring
@@ -6,8 +8,6 @@
 , criterion
 , doclayout
 , filepath
-, Glob
-, HsYAML
 , lib
 , mtl
 , parsec
diff --git a/pkgs/doctest-exitcode-stdio.nix b/pkgs/doctest-exitcode-stdio.nix
index 090653bddacc7330bd8ca12ac92bfdf6b5b2dc33..8075e43ee1d13bd754f0f4c2eaca3bea96f6dd00 100644
--- a/pkgs/doctest-exitcode-stdio.nix
+++ b/pkgs/doctest-exitcode-stdio.nix
@@ -1,8 +1,8 @@
 { mkDerivation
+, QuickCheck
 , base
 , doctest-lib
 , lib
-, QuickCheck
 , semigroups
 , transformers
 }:
diff --git a/pkgs/doctest-parallel.nix b/pkgs/doctest-parallel.nix
index 4b180c106ee5bdaba6c55bd08e1d1666b1103770..93b4afc276b6045d4f9b03cffd5860d7e95429ec 100644
--- a/pkgs/doctest-parallel.nix
+++ b/pkgs/doctest-parallel.nix
@@ -1,7 +1,10 @@
 { mkDerivation
+, Cabal
+, Glob
+, HUnit
+, QuickCheck
 , base
 , base-compat
-, Cabal
 , code-page
 , containers
 , deepseq
@@ -11,16 +14,13 @@
 , filepath
 , ghc
 , ghc-paths
-, Glob
 , hspec
 , hspec-core
 , hspec-discover
-, HUnit
 , lib
 , mockery
 , pretty
 , process
-, QuickCheck
 , random
 , setenv
 , silently
@@ -34,6 +34,8 @@ mkDerivation {
   pname = "doctest-parallel";
   version = "0.2.5";
   sha256 = "ec63fdcb9b26084a52d8603d39745abfcfa621b6c99be66803d8bd4ba927be1c";
+  revision = "1";
+  editedCabalFile = "1q81qjz9af9a57xyxz6kci28shl4r9y3lrl3rckknhqwcy1ahqz4";
   isLibrary = true;
   isExecutable = false;
   enableSeparateDataOutput = false;
diff --git a/pkgs/doctest.nix b/pkgs/doctest.nix
index 3f9f2baa31b43d4abf881c5ad6c1bd4f48af988d..48e74655ddc84f0da7eb20d08ec37e2c626ca221 100644
--- a/pkgs/doctest.nix
+++ b/pkgs/doctest.nix
@@ -1,4 +1,6 @@
 { mkDerivation
+, HUnit
+, QuickCheck
 , base
 , base-compat
 , code-page
@@ -12,11 +14,9 @@
 , hspec
 , hspec-core
 , hspec-discover
-, HUnit
 , lib
 , mockery
 , process
-, QuickCheck
 , setenv
 , silently
 , stringbuilder
@@ -96,6 +96,5 @@ mkDerivation {
   homepage = "https://github.com/sol/doctest#readme";
   description = "Test interactive Haskell examples";
   license = lib.licenses.mit;
-  mainProgram = "doctest";
   broken = false;
 }
diff --git a/pkgs/double-conversion.nix b/pkgs/double-conversion.nix
index 0ee9ae962c8ff28f21d9f8aec638a9fbeab909ea..7c9d8739a8e03b2f71ae7ecba38f5d3fc3e8f824 100644
--- a/pkgs/double-conversion.nix
+++ b/pkgs/double-conversion.nix
@@ -1,9 +1,9 @@
 { mkDerivation
+, HUnit
 , base
 , bytestring
 , fetchgit
 , ghc-prim
-, HUnit
 , lib
 , system-cxx-std-lib
 , test-framework
diff --git a/pkgs/ed25519.nix b/pkgs/ed25519.nix
index e78bab2cc26585fbddc50e9edbb6c7dd76d6bcb2..e4169f0231c6454ad15991976950c5ffa047f0b0 100644
--- a/pkgs/ed25519.nix
+++ b/pkgs/ed25519.nix
@@ -1,4 +1,5 @@
 { mkDerivation
+, QuickCheck
 , base
 , bytestring
 , criterion
@@ -10,7 +11,6 @@
 , ghc-prim
 , hlint
 , lib
-, QuickCheck
 }:
 mkDerivation {
   pname = "ed25519";
diff --git a/pkgs/edit-distance.nix b/pkgs/edit-distance.nix
index 35c9e38f0c9230fa4549b450d651c955f0289723..06f6fc637677980907ae97c4459bb6f2d4a6b616 100644
--- a/pkgs/edit-distance.nix
+++ b/pkgs/edit-distance.nix
@@ -1,4 +1,5 @@
 { mkDerivation
+, QuickCheck
 , array
 , base
 , containers
@@ -6,7 +7,6 @@
 , deepseq
 , lib
 , process
-, QuickCheck
 , random
 , test-framework
 , test-framework-quickcheck2
diff --git a/pkgs/either.nix b/pkgs/either.nix
index dd778bad49f6835738f37939ec02e5d351d4a434..090f87bf296f5aaf71c7f20fa07cedf9e0f654d7 100644
--- a/pkgs/either.nix
+++ b/pkgs/either.nix
@@ -1,10 +1,10 @@
 { mkDerivation
+, QuickCheck
 , base
 , bifunctors
 , lib
 , mtl
 , profunctors
-, QuickCheck
 , semigroupoids
 , test-framework
 , test-framework-quickcheck2
diff --git a/pkgs/email-validate.nix b/pkgs/email-validate.nix
index 8f2aae3fba6281bb1ee9d9134c411f7c964f08ed..28f92a36943a0f7ee663840ed3518f38d6b98c11 100644
--- a/pkgs/email-validate.nix
+++ b/pkgs/email-validate.nix
@@ -1,11 +1,11 @@
 { mkDerivation
+, QuickCheck
 , attoparsec
 , base
 , bytestring
 , doctest
 , hspec
 , lib
-, QuickCheck
 , template-haskell
 }:
 mkDerivation {
diff --git a/pkgs/emojis.nix b/pkgs/emojis.nix
index b8814823fe1e5534a3873e6a9a628bb3aa7a39fe..b5d10dec0a5076449ea0d8fce8d79e10582c4b4d 100644
--- a/pkgs/emojis.nix
+++ b/pkgs/emojis.nix
@@ -1,4 +1,4 @@
-{ mkDerivation, base, containers, HUnit, lib, text }:
+{ mkDerivation, HUnit, base, containers, lib, text }:
 mkDerivation {
   pname = "emojis";
   version = "0.1.2";
diff --git a/pkgs/enclosed-exceptions.nix b/pkgs/enclosed-exceptions.nix
index 1be9dc95fc29c87b3aa09ad75b7b3570a86ff050..2ff32dd854983195f449352c691fb6a2f891b9aa 100644
--- a/pkgs/enclosed-exceptions.nix
+++ b/pkgs/enclosed-exceptions.nix
@@ -1,4 +1,5 @@
 { mkDerivation
+, QuickCheck
 , async
 , base
 , deepseq
@@ -6,7 +7,6 @@
 , lib
 , lifted-base
 , monad-control
-, QuickCheck
 , stm
 , transformers
 , transformers-base
diff --git a/pkgs/entropy.nix b/pkgs/entropy.nix
index 64035531e2a26af1291cd3bb18a19a20e48e3340..0c3e1371aafdd571b3afbd6b99e84f7448b32c72 100644
--- a/pkgs/entropy.nix
+++ b/pkgs/entropy.nix
@@ -1,7 +1,7 @@
 { mkDerivation
+, Cabal
 , base
 , bytestring
-, Cabal
 , directory
 , filepath
 , lib
diff --git a/pkgs/exact-pi.nix b/pkgs/exact-pi.nix
index 82c087d93efdde1d76cb4302852fa1b18cbd96fe..c4d71f7e1c730910301a1ef1fd409ead6b28a00d 100644
--- a/pkgs/exact-pi.nix
+++ b/pkgs/exact-pi.nix
@@ -1,8 +1,8 @@
 { mkDerivation
+, QuickCheck
 , base
 , lib
 , numtype-dk
-, QuickCheck
 , tasty
 , tasty-hunit
 , tasty-quickcheck
diff --git a/pkgs/extensible-effects.nix b/pkgs/extensible-effects.nix
index 2a9dcd5e551524a754d19cdf4c29d3cb577a7037..983e7df65b94e452e5c0eb9b1292657660d34bfc 100644
--- a/pkgs/extensible-effects.nix
+++ b/pkgs/extensible-effects.nix
@@ -1,12 +1,12 @@
 { mkDerivation
+, HUnit
+, QuickCheck
 , base
 , criterion
 , doctest
-, HUnit
 , lib
 , monad-control
 , mtl
-, QuickCheck
 , silently
 , test-framework
 , test-framework-hunit
diff --git a/pkgs/extra.nix b/pkgs/extra.nix
index aba0bb32e76fff94d02ff841c88fb693092b30c7..98336c52a4e7960e8ca4afcf47162a0880d28cf6 100644
--- a/pkgs/extra.nix
+++ b/pkgs/extra.nix
@@ -1,11 +1,11 @@
 { mkDerivation
+, QuickCheck
 , base
 , clock
 , directory
 , filepath
 , lib
 , process
-, QuickCheck
 , quickcheck-instances
 , time
 , unix
diff --git a/pkgs/filepattern.nix b/pkgs/filepattern.nix
index aa1f8a628234558ee9b26a3a583718a2e44ae4cd..757f61d6d96d2b3608e9fcbff7f3c3eb9da3c3b4 100644
--- a/pkgs/filepattern.nix
+++ b/pkgs/filepattern.nix
@@ -1,10 +1,10 @@
 { mkDerivation
+, QuickCheck
 , base
 , directory
 , extra
 , filepath
 , lib
-, QuickCheck
 }:
 mkDerivation {
   pname = "filepattern";
diff --git a/pkgs/fin.nix b/pkgs/fin.nix
index 723c7ed4295a94919ea215265433b4d6c03053de..ad8a1bd3638cad03f9780dcaea6d3c16373859ae 100644
--- a/pkgs/fin.nix
+++ b/pkgs/fin.nix
@@ -1,4 +1,5 @@
 { mkDerivation
+, QuickCheck
 , base
 , boring
 , dec
@@ -6,7 +7,6 @@
 , hashable
 , inspection-testing
 , lib
-, QuickCheck
 , some
 , tagged
 , universe-base
diff --git a/pkgs/fingertree.nix b/pkgs/fingertree.nix
index 0f7290e745bbb3af7e6d94217a83e01083bc425e..f7f4e57cefb5673197a683ba8c44c65124c721e8 100644
--- a/pkgs/fingertree.nix
+++ b/pkgs/fingertree.nix
@@ -1,8 +1,8 @@
 { mkDerivation
-, base
 , HUnit
-, lib
 , QuickCheck
+, base
+, lib
 , test-framework
 , test-framework-hunit
 , test-framework-quickcheck2
diff --git a/pkgs/finite-field.nix b/pkgs/finite-field.nix
index 27b104093ab0bf2130e3988694fa9015d5778d36..11f73e8fcb21bb722a84cf5601313110f59fc9d5 100644
--- a/pkgs/finite-field.nix
+++ b/pkgs/finite-field.nix
@@ -1,11 +1,11 @@
 { mkDerivation
+, QuickCheck
 , base
 , containers
 , deepseq
 , hashable
 , lib
 , primes
-, QuickCheck
 , singletons
 , tasty
 , tasty-hunit
diff --git a/pkgs/formatting.nix b/pkgs/formatting.nix
index 8e23852399f58142131cab8163bfc4b01f9da66e..fb6f84c815a60508c43f5c35fb34e1e54663e0f7 100644
--- a/pkgs/formatting.nix
+++ b/pkgs/formatting.nix
@@ -1,4 +1,5 @@
 { mkDerivation
+, QuickCheck
 , base
 , clock
 , criterion
@@ -7,7 +8,6 @@
 , hspec
 , lib
 , old-locale
-, QuickCheck
 , scientific
 , text
 , time
diff --git a/pkgs/freer-simple.nix b/pkgs/freer-simple.nix
index 41924d87b2a86eecb1ad9eb33d5243b11b41f246..c442b48ab3f1e2c032d0f039783d5f0c38cd31a5 100644
--- a/pkgs/freer-simple.nix
+++ b/pkgs/freer-simple.nix
@@ -1,4 +1,5 @@
 { mkDerivation
+, QuickCheck
 , base
 , criterion
 , extensible-effects
@@ -6,7 +7,6 @@
 , lib
 , mtl
 , natural-transformation
-, QuickCheck
 , tasty
 , tasty-hunit
 , tasty-quickcheck
@@ -51,6 +51,5 @@ mkDerivation {
   homepage = "https://github.com/lexi-lambda/freer-simple";
   description = "A friendly effect system for Haskell";
   license = lib.licenses.bsd3;
-  mainProgram = "freer-simple-examples";
   broken = false;
 }
diff --git a/pkgs/generic-optics.nix b/pkgs/generic-optics.nix
index 8ceddb021dcf2fd385826da0ff9c12624b607045..687608abe8f7351b4226ed46a55d6765e965d1a7 100644
--- a/pkgs/generic-optics.nix
+++ b/pkgs/generic-optics.nix
@@ -1,8 +1,8 @@
 { mkDerivation
+, HUnit
 , base
 , doctest
 , generic-lens-core
-, HUnit
 , inspection-testing
 , lib
 , optics-core
diff --git a/pkgs/generic-random.nix b/pkgs/generic-random.nix
index f7e9c1ec4a4c2c5e7e10a9db742c27905f2fcf62..4e6fa39c134174bb5dc86f99edcf2523a5abab39 100644
--- a/pkgs/generic-random.nix
+++ b/pkgs/generic-random.nix
@@ -1,4 +1,4 @@
-{ mkDerivation, base, deepseq, lib, QuickCheck }:
+{ mkDerivation, QuickCheck, base, deepseq, lib }:
 mkDerivation {
   pname = "generic-random";
   version = "1.5.0.1";
diff --git a/pkgs/genvalidity-aeson.nix b/pkgs/genvalidity-aeson.nix
index 0b2fffde5d33b958268775fae1266329bad552d3..11355ee1c676e42d2e037a13a88cefb274ad5f74 100644
--- a/pkgs/genvalidity-aeson.nix
+++ b/pkgs/genvalidity-aeson.nix
@@ -1,4 +1,5 @@
 { mkDerivation
+, QuickCheck
 , aeson
 , base
 , criterion
@@ -12,7 +13,6 @@
 , genvalidity-vector
 , hspec
 , lib
-, QuickCheck
 , validity
 , validity-aeson
 }:
diff --git a/pkgs/genvalidity-bytestring.nix b/pkgs/genvalidity-bytestring.nix
index 2010c0af702404b6afc055eed1e0d05cd58d456b..e1dce6de0ce38a57f8ba559dcbe938a80e3f8fa8 100644
--- a/pkgs/genvalidity-bytestring.nix
+++ b/pkgs/genvalidity-bytestring.nix
@@ -1,4 +1,5 @@
 { mkDerivation
+, QuickCheck
 , base
 , bytestring
 , criterion
@@ -8,7 +9,6 @@
 , genvalidity-hspec
 , hspec
 , lib
-, QuickCheck
 , random
 , validity
 , validity-bytestring
diff --git a/pkgs/genvalidity-case-insensitive.nix b/pkgs/genvalidity-case-insensitive.nix
index 6b2cf408038a504335e147da3ecdfd524da2afea..23bf4c189a1d94beea0a068f5ce02e197b216e07 100644
--- a/pkgs/genvalidity-case-insensitive.nix
+++ b/pkgs/genvalidity-case-insensitive.nix
@@ -1,4 +1,5 @@
 { mkDerivation
+, QuickCheck
 , base
 , case-insensitive
 , criterion
@@ -7,7 +8,6 @@
 , genvalidity-hspec
 , hspec
 , lib
-, QuickCheck
 , validity-case-insensitive
 }:
 mkDerivation {
diff --git a/pkgs/genvalidity-containers.nix b/pkgs/genvalidity-containers.nix
index c2458e4de40ad64cd7b5bb3c95a7f1f80e5624e0..d127e2da2ead5aaf4dba8c65f95a460b109f924b 100644
--- a/pkgs/genvalidity-containers.nix
+++ b/pkgs/genvalidity-containers.nix
@@ -1,4 +1,5 @@
 { mkDerivation
+, QuickCheck
 , base
 , containers
 , criterion
@@ -8,7 +9,6 @@
 , genvalidity-property
 , hspec
 , lib
-, QuickCheck
 , validity
 , validity-containers
 }:
diff --git a/pkgs/genvalidity-criterion.nix b/pkgs/genvalidity-criterion.nix
index e69310a12a23ac4205a80881473edea3d6fbd95b..ba07f01a4beb2f6bcd035dbf7a5cc0adbc008b0a 100644
--- a/pkgs/genvalidity-criterion.nix
+++ b/pkgs/genvalidity-criterion.nix
@@ -1,10 +1,10 @@
 { mkDerivation
+, QuickCheck
 , base
 , criterion
 , deepseq
 , genvalidity
 , lib
-, QuickCheck
 , vector
 }:
 mkDerivation {
diff --git a/pkgs/genvalidity-dirforest.nix b/pkgs/genvalidity-dirforest.nix
index 47424757d895f193bc6febbca859ef1b09acf559..39a5b6f3eacae25f5977201b91ed923a0dd66ead 100644
--- a/pkgs/genvalidity-dirforest.nix
+++ b/pkgs/genvalidity-dirforest.nix
@@ -1,4 +1,5 @@
 { mkDerivation
+, QuickCheck
 , base
 , bytestring
 , containers
@@ -19,7 +20,6 @@
 , path
 , path-io
 , pretty-show
-, QuickCheck
 }:
 mkDerivation {
   pname = "genvalidity-dirforest";
diff --git a/pkgs/genvalidity-hspec-aeson.nix b/pkgs/genvalidity-hspec-aeson.nix
index a8c80101dc42f3e3d5cbe6a431b6a6a1d0bab8c4..2149ffda1100580d7620cdc8847d30bf8174102f 100644
--- a/pkgs/genvalidity-hspec-aeson.nix
+++ b/pkgs/genvalidity-hspec-aeson.nix
@@ -1,4 +1,5 @@
 { mkDerivation
+, QuickCheck
 , aeson
 , base
 , bytestring
@@ -10,7 +11,6 @@
 , genvalidity-text
 , hspec
 , lib
-, QuickCheck
 , text
 , validity
 }:
diff --git a/pkgs/genvalidity-hspec-optics.nix b/pkgs/genvalidity-hspec-optics.nix
index 840ce9d4aa7365b76534f75621e6f30619590c4c..e7127c28ed4092ca5d7bb79f66c8be393edbb0a7 100644
--- a/pkgs/genvalidity-hspec-optics.nix
+++ b/pkgs/genvalidity-hspec-optics.nix
@@ -1,4 +1,5 @@
 { mkDerivation
+, QuickCheck
 , base
 , genvalidity
 , genvalidity-hspec
@@ -6,7 +7,6 @@
 , hspec
 , lib
 , microlens
-, QuickCheck
 , validity
 }:
 mkDerivation {
diff --git a/pkgs/genvalidity-hspec.nix b/pkgs/genvalidity-hspec.nix
index 4d2ebd34cdf0eeade74df6077a1292a7e993efda..30e0f624f0bf2775816915c771d61576b6481961 100644
--- a/pkgs/genvalidity-hspec.nix
+++ b/pkgs/genvalidity-hspec.nix
@@ -1,11 +1,11 @@
 { mkDerivation
+, QuickCheck
 , base
 , genvalidity
 , genvalidity-property
 , hspec
 , hspec-core
 , lib
-, QuickCheck
 , transformers
 , validity
 }:
diff --git a/pkgs/genvalidity-path.nix b/pkgs/genvalidity-path.nix
index 8f696a489e7f84499fa64f2cfef0a08eef31ef51..92ffbcedae06eb411436b7b2c42f89195aed45a8 100644
--- a/pkgs/genvalidity-path.nix
+++ b/pkgs/genvalidity-path.nix
@@ -1,4 +1,5 @@
 { mkDerivation
+, QuickCheck
 , base
 , criterion
 , genvalidity
@@ -7,7 +8,6 @@
 , hspec
 , lib
 , path
-, QuickCheck
 , validity-path
 }:
 mkDerivation {
diff --git a/pkgs/genvalidity-persistent.nix b/pkgs/genvalidity-persistent.nix
index c5ad4d761efaad5956e852875140128e2a0e528e..185b58874def93fef6fe181394447b4fa74fce7f 100644
--- a/pkgs/genvalidity-persistent.nix
+++ b/pkgs/genvalidity-persistent.nix
@@ -1,4 +1,5 @@
 { mkDerivation
+, QuickCheck
 , base
 , containers
 , criterion
@@ -11,7 +12,6 @@
 , lib
 , persistent
 , persistent-template
-, QuickCheck
 , validity-containers
 , validity-persistent
 }:
diff --git a/pkgs/genvalidity-property.nix b/pkgs/genvalidity-property.nix
index 793b4e9a8f83441ea44a9d7eb2a481791a7d72f5..e07825c36dc82bd023bae298b8a25a132b16f33e 100644
--- a/pkgs/genvalidity-property.nix
+++ b/pkgs/genvalidity-property.nix
@@ -1,10 +1,10 @@
 { mkDerivation
+, QuickCheck
 , base
 , genvalidity
 , hspec
 , lib
 , pretty-show
-, QuickCheck
 , validity
 }:
 mkDerivation {
diff --git a/pkgs/genvalidity-scientific.nix b/pkgs/genvalidity-scientific.nix
index 5f05e182fe261b3ee6f71650f517ed93ca9260fc..ff861d5f4bd30b8e7821a033770e0a5156100594 100644
--- a/pkgs/genvalidity-scientific.nix
+++ b/pkgs/genvalidity-scientific.nix
@@ -1,10 +1,10 @@
 { mkDerivation
+, QuickCheck
 , base
 , genvalidity
 , genvalidity-hspec
 , hspec
 , lib
-, QuickCheck
 , scientific
 , validity
 , validity-scientific
diff --git a/pkgs/genvalidity-sydtest-aeson.nix b/pkgs/genvalidity-sydtest-aeson.nix
index 09be744a0457d6395e72ed08b8b553c01241ad24..575fc1e420cb5f2047b1d8aa741eeb331ad12486 100644
--- a/pkgs/genvalidity-sydtest-aeson.nix
+++ b/pkgs/genvalidity-sydtest-aeson.nix
@@ -1,4 +1,5 @@
 { mkDerivation
+, QuickCheck
 , aeson
 , base
 , bytestring
@@ -8,7 +9,6 @@
 , genvalidity-sydtest
 , genvalidity-text
 , lib
-, QuickCheck
 , sydtest
 , sydtest-discover
 , text
diff --git a/pkgs/genvalidity-sydtest-hashable.nix b/pkgs/genvalidity-sydtest-hashable.nix
index 67e36d1529ca1673f2c0a8982f32106ee06b5ef9..9ace0ee3e21a187a2ed9481017942626029243de 100644
--- a/pkgs/genvalidity-sydtest-hashable.nix
+++ b/pkgs/genvalidity-sydtest-hashable.nix
@@ -1,10 +1,10 @@
 { mkDerivation
+, QuickCheck
 , base
 , genvalidity
 , genvalidity-sydtest
 , hashable
 , lib
-, QuickCheck
 , sydtest
 , sydtest-discover
 , validity
diff --git a/pkgs/genvalidity-sydtest-lens.nix b/pkgs/genvalidity-sydtest-lens.nix
index 4be498287586a2fc599cd21e040e92fb352918ef..5efe689e7a09485474a8f1afc27afce2ad9313db 100644
--- a/pkgs/genvalidity-sydtest-lens.nix
+++ b/pkgs/genvalidity-sydtest-lens.nix
@@ -1,10 +1,10 @@
 { mkDerivation
+, QuickCheck
 , base
 , genvalidity
 , genvalidity-sydtest
 , lib
 , microlens
-, QuickCheck
 , sydtest
 , sydtest-discover
 , validity
diff --git a/pkgs/genvalidity-sydtest-persistent.nix b/pkgs/genvalidity-sydtest-persistent.nix
index 29cb3f265e6824ff10b2ae3b1533e4d655b4033c..18b04d1a3e70301b64f1fc97166f89a1230bede6 100644
--- a/pkgs/genvalidity-sydtest-persistent.nix
+++ b/pkgs/genvalidity-sydtest-persistent.nix
@@ -1,11 +1,11 @@
 { mkDerivation
+, QuickCheck
 , base
 , genvalidity
 , genvalidity-sydtest
 , genvalidity-text
 , lib
 , persistent
-, QuickCheck
 , sydtest
 , sydtest-discover
 , text
diff --git a/pkgs/genvalidity-sydtest.nix b/pkgs/genvalidity-sydtest.nix
index 024f602e776ca9ef0e93f1a16c36458a5f2e9604..8430e7f51231a6cf4c3204d8c4941e589f1d2cbb 100644
--- a/pkgs/genvalidity-sydtest.nix
+++ b/pkgs/genvalidity-sydtest.nix
@@ -1,9 +1,9 @@
 { mkDerivation
+, QuickCheck
 , base
 , genvalidity
 , lib
 , pretty-show
-, QuickCheck
 , sydtest
 , sydtest-discover
 , validity
diff --git a/pkgs/genvalidity-text.nix b/pkgs/genvalidity-text.nix
index 999eb8172df435dd59ace1eb9363e38acc07f258..40324acc916505b06bf9e65fa6825c28375fe51e 100644
--- a/pkgs/genvalidity-text.nix
+++ b/pkgs/genvalidity-text.nix
@@ -1,4 +1,5 @@
 { mkDerivation
+, QuickCheck
 , array
 , base
 , criterion
@@ -7,7 +8,6 @@
 , genvalidity-hspec
 , hspec
 , lib
-, QuickCheck
 , random
 , text
 , validity
diff --git a/pkgs/genvalidity-time.nix b/pkgs/genvalidity-time.nix
index 963f3efcc67c432424c1baa68e99372e6d51bd62..0f0b3c7b7ab0adaaea5ab29bbfcd61f6500173fe 100644
--- a/pkgs/genvalidity-time.nix
+++ b/pkgs/genvalidity-time.nix
@@ -1,4 +1,5 @@
 { mkDerivation
+, QuickCheck
 , base
 , criterion
 , genvalidity
@@ -6,7 +7,6 @@
 , genvalidity-hspec
 , hspec
 , lib
-, QuickCheck
 , time
 , validity-time
 }:
diff --git a/pkgs/genvalidity-unordered-containers.nix b/pkgs/genvalidity-unordered-containers.nix
index a7b62b2a7e51866dc5794a197ba18704d19fce41..fcaf27dc7d90a0330b9e739b3cabb7978bd6643e 100644
--- a/pkgs/genvalidity-unordered-containers.nix
+++ b/pkgs/genvalidity-unordered-containers.nix
@@ -1,11 +1,11 @@
 { mkDerivation
+, QuickCheck
 , base
 , genvalidity
 , genvalidity-hspec
 , hashable
 , hspec
 , lib
-, QuickCheck
 , unordered-containers
 , validity
 , validity-unordered-containers
diff --git a/pkgs/genvalidity-uuid.nix b/pkgs/genvalidity-uuid.nix
index c19cd6c78029826523a8b01ddc273912711b6f75..34be197bd905ceefd7232117ecc0c77823287ceb 100644
--- a/pkgs/genvalidity-uuid.nix
+++ b/pkgs/genvalidity-uuid.nix
@@ -1,4 +1,5 @@
 { mkDerivation
+, QuickCheck
 , base
 , criterion
 , genvalidity
@@ -6,7 +7,6 @@
 , genvalidity-hspec
 , hspec
 , lib
-, QuickCheck
 , uuid
 , validity
 , validity-uuid
diff --git a/pkgs/genvalidity-vector.nix b/pkgs/genvalidity-vector.nix
index 61a3fa0d47b42a5ac0a7f234139ba85ff50b2052..00e44638f773362d4a91925341accfea559dc83d 100644
--- a/pkgs/genvalidity-vector.nix
+++ b/pkgs/genvalidity-vector.nix
@@ -1,10 +1,10 @@
 { mkDerivation
+, QuickCheck
 , base
 , genvalidity
 , genvalidity-hspec
 , hspec
 , lib
-, QuickCheck
 , validity
 , validity-vector
 , vector
diff --git a/pkgs/genvalidity.nix b/pkgs/genvalidity.nix
index c97f37d4081cf60590b649cc5aa12d6a107b0887..6e592274a2a42cdf6da8712666b63f292781e895 100644
--- a/pkgs/genvalidity.nix
+++ b/pkgs/genvalidity.nix
@@ -1,9 +1,9 @@
 { mkDerivation
+, QuickCheck
 , base
 , hspec
 , hspec-core
 , lib
-, QuickCheck
 , random
 , validity
 }:
diff --git a/pkgs/ghc-exactprint.nix b/pkgs/ghc-exactprint.nix
index 160198a2d8ddc652b5d5898933dc8bdb9b74751f..40514344af8cd29505b5dba93cf8c524974289eb 100644
--- a/pkgs/ghc-exactprint.nix
+++ b/pkgs/ghc-exactprint.nix
@@ -1,10 +1,11 @@
 { mkDerivation
+, Cabal-syntax
+, Diff
+, HUnit
 , base
 , bytestring
-, Cabal-syntax
 , containers
 , data-default
-, Diff
 , directory
 , fail
 , filemanip
@@ -13,7 +14,6 @@
 , ghc
 , ghc-boot
 , ghc-paths
-, HUnit
 , lib
 , mtl
 , ordered-containers
diff --git a/pkgs/ghc-paths.nix b/pkgs/ghc-paths.nix
index 3f5edd22ab060959d75bc284ae59cd8c4e7a72d5..79a68fc6f1698cec7d8236742da35b3f2399c5d7 100644
--- a/pkgs/ghc-paths.nix
+++ b/pkgs/ghc-paths.nix
@@ -1,4 +1,4 @@
-{ mkDerivation, base, Cabal, directory, lib }:
+{ mkDerivation, Cabal, base, directory, lib }:
 mkDerivation {
   pname = "ghc-paths";
   version = "0.1.0.12";
diff --git a/pkgs/ghcid.nix b/pkgs/ghcid.nix
index 3b04ba526fa62e3e7ba016e51beb43390866639b..c92aa12c75ae6421d194ccd034227f857470b801 100644
--- a/pkgs/ghcid.nix
+++ b/pkgs/ghcid.nix
@@ -72,6 +72,5 @@ mkDerivation {
   homepage = "https://github.com/ndmitchell/ghcid#readme";
   description = "GHCi based bare bones IDE";
   license = lib.licenses.bsd3;
-  mainProgram = "ghcid";
   broken = false;
 }
diff --git a/pkgs/hackage-db.nix b/pkgs/hackage-db.nix
index 218e6c6c3824ba5a0c5d652fe72039419631432b..438709906fc51bfd5b6eb17e965bddd6608b5e6f 100644
--- a/pkgs/hackage-db.nix
+++ b/pkgs/hackage-db.nix
@@ -1,8 +1,8 @@
 { mkDerivation
+, Cabal
 , aeson
 , base
 , bytestring
-, Cabal
 , containers
 , directory
 , exceptions
diff --git a/pkgs/hackage-security.nix b/pkgs/hackage-security.nix
index f4f1c35227b1d858deac371aa8860749db575bbe..4957f4e84af06f5ca37fd854b261ec167f553988 100644
--- a/pkgs/hackage-security.nix
+++ b/pkgs/hackage-security.nix
@@ -1,11 +1,12 @@
 { mkDerivation
+, Cabal
+, Cabal-syntax
+, QuickCheck
 , aeson
 , base
 , base16-bytestring
 , base64-bytestring
 , bytestring
-, Cabal
-, Cabal-syntax
 , containers
 , cryptohash-sha256
 , directory
@@ -19,7 +20,6 @@
 , network-uri
 , parsec
 , pretty
-, QuickCheck
 , tar
 , tasty
 , tasty-hunit
@@ -37,8 +37,8 @@ mkDerivation {
   pname = "hackage-security";
   version = "0.6.2.2";
   sha256 = "a833a31610220506557e96fb6e3e8b05a2e1db8e7ebc06e91bbb699ddde0b276";
-  revision = "1";
-  editedCabalFile = "01fhp3kzc1wfvixzgnz4y52bzm4sickk1cj7pksrwmbi90dghv0s";
+  revision = "2";
+  editedCabalFile = "12mrnjyl5z5ng1w4748xi6l8iyq3wcs94qq42kx9hx09d4qklsq0";
   isLibrary = true;
   isExecutable = false;
   enableSeparateDataOutput = false;
diff --git a/pkgs/haddock-library.nix b/pkgs/haddock-library.nix
index d4c5cc3e9ef330d4cb1c19b601a45bb404f7cd87..088a54da0250233c3810e5b72ee159d0244fa4aa 100644
--- a/pkgs/haddock-library.nix
+++ b/pkgs/haddock-library.nix
@@ -1,4 +1,5 @@
 { mkDerivation
+, QuickCheck
 , base
 , base-compat
 , containers
@@ -10,7 +11,6 @@
 , lib
 , optparse-applicative
 , parsec
-, QuickCheck
 , text
 , tree-diff
 }:
diff --git a/pkgs/half.nix b/pkgs/half.nix
index 2c1f20d66a76a97a03a98a25b318ba0d64a56fba..cb5994f0aad63ef3a1b92e3b9163b0c81864e09c 100644
--- a/pkgs/half.nix
+++ b/pkgs/half.nix
@@ -1,10 +1,10 @@
 { mkDerivation
+, QuickCheck
 , base
 , binary
 , bytestring
 , deepseq
 , lib
-, QuickCheck
 , template-haskell
 , test-framework
 , test-framework-quickcheck2
diff --git a/pkgs/happy.nix b/pkgs/happy.nix
index efc123a79747092674423c09482fe2e126adae8a..938ff5218dbb5f72320a9d507c0eb0c459ca8ea8 100644
--- a/pkgs/happy.nix
+++ b/pkgs/happy.nix
@@ -20,6 +20,5 @@ mkDerivation {
   homepage = "https://www.haskell.org/happy/";
   description = "Happy is a parser generator for Haskell";
   license = lib.licenses.bsd2;
-  mainProgram = "happy";
   broken = false;
 }
diff --git a/pkgs/hashable.nix b/pkgs/hashable.nix
index e26573d8193e9168071b05f1f1382efb5f4370f3..f107e41505b721cc9b130cf0fede071a4d40af21 100644
--- a/pkgs/hashable.nix
+++ b/pkgs/hashable.nix
@@ -1,13 +1,13 @@
 { mkDerivation
+, HUnit
+, QuickCheck
 , base
 , bytestring
 , containers
 , deepseq
 , ghc-bignum
 , ghc-prim
-, HUnit
 , lib
-, QuickCheck
 , random
 , test-framework
 , test-framework-hunit
diff --git a/pkgs/hashing.nix b/pkgs/hashing.nix
index c0052a0a583e756d53cfc7785d994824711c194a..d9c29aed90ca115bf5734f6afd3a4d780e502bb3 100644
--- a/pkgs/hashing.nix
+++ b/pkgs/hashing.nix
@@ -1,11 +1,11 @@
 { mkDerivation
+, QuickCheck
 , array
 , base
 , bytestring
 , cryptonite
 , lib
 , mtl
-, QuickCheck
 , template-haskell
 }:
 mkDerivation {
@@ -44,6 +44,5 @@ mkDerivation {
   homepage = "https://github.com/wangbj/hashing";
   description = "A pure haskell library implements several hash algorithms";
   license = lib.licenses.mit;
-  mainProgram = "hashing-exe";
   broken = false;
 }
diff --git a/pkgs/hashtables.nix b/pkgs/hashtables.nix
index 50d63b89ba1843d402387f17285bb62f6c0ef9d9..d7bb5929a3d9aaa36b17c6da16679cf81a362d38 100644
--- a/pkgs/hashtables.nix
+++ b/pkgs/hashtables.nix
@@ -1,12 +1,12 @@
 { mkDerivation
+, HUnit
+, QuickCheck
 , base
 , ghc-prim
 , hashable
-, HUnit
 , lib
 , mwc-random
 , primitive
-, QuickCheck
 , test-framework
 , test-framework-hunit
 , test-framework-quickcheck2
diff --git a/pkgs/haskell-src-meta.nix b/pkgs/haskell-src-meta.nix
index 2c89ea97af5cc3df6e836ca3d8651ebd7f2fb04e..ea819ae9235abf179ce6672441adcd80ad93bff3 100644
--- a/pkgs/haskell-src-meta.nix
+++ b/pkgs/haskell-src-meta.nix
@@ -1,8 +1,8 @@
 { mkDerivation
+, HUnit
 , base
 , containers
 , haskell-src-exts
-, HUnit
 , lib
 , pretty
 , syb
diff --git a/pkgs/hedgehog-golden.nix b/pkgs/hedgehog-golden.nix
index 41a3f2a3698694d75040a718f7d124a740eddba4..41e54310683a308f66c858d5de066aa1b2503ee8 100644
--- a/pkgs/hedgehog-golden.nix
+++ b/pkgs/hedgehog-golden.nix
@@ -1,10 +1,10 @@
 { mkDerivation
+, Diff
 , aeson
 , aeson-pretty
 , base
 , bytestring
 , containers
-, Diff
 , directory
 , extra
 , fetchgit
diff --git a/pkgs/hie-bios.nix b/pkgs/hie-bios.nix
index 6bf3312266d43fed095f84dbabec67a3fd9099d8..42ce9a6478defad32597c6d71a8b5505cb2e759f 100644
--- a/pkgs/hie-bios.nix
+++ b/pkgs/hie-bios.nix
@@ -36,6 +36,8 @@ mkDerivation {
   pname = "hie-bios";
   version = "0.11.0";
   sha256 = "9708bf4309e904771bf590dd4e683e0b5c18e486ed499be8ceff5119a25f0eef";
+  revision = "1";
+  editedCabalFile = "041zzf7m2xmg8l5ywrr62c0gxx3q0211yrsz8sg7c4s2456aghk0";
   isLibrary = true;
   isExecutable = true;
   enableSeparateDataOutput = false;
@@ -103,6 +105,5 @@ mkDerivation {
   homepage = "https://github.com/mpickering/hie-bios";
   description = "Set up a GHC API session";
   license = lib.licenses.bsd3;
-  mainProgram = "hie-bios";
   broken = false;
 }
diff --git a/pkgs/hledger-lib.nix b/pkgs/hledger-lib.nix
index 4d7d8183e2cb71762456cf3452be99f6cd9f5bce..622ddbd6eb860e93b8d4c96bda348867707a1863 100644
--- a/pkgs/hledger-lib.nix
+++ b/pkgs/hledger-lib.nix
@@ -1,4 +1,6 @@
 { mkDerivation
+, Decimal
+, Glob
 , aeson
 , aeson-pretty
 , ansi-terminal
@@ -13,7 +15,6 @@
 , cmdargs
 , containers
 , data-default
-, Decimal
 , deepseq
 , directory
 , doclayout
@@ -21,7 +22,6 @@
 , extra
 , file-embed
 , filepath
-, Glob
 , hashtables
 , lib
 , megaparsec
diff --git a/pkgs/hledger.nix b/pkgs/hledger.nix
index b3fa942f3927463f0b3c21568c1b778512e1242b..18d64759cfb3ade736accbd6c6865dc3091dc148 100644
--- a/pkgs/hledger.nix
+++ b/pkgs/hledger.nix
@@ -1,4 +1,6 @@
 { mkDerivation
+, Decimal
+, Diff
 , aeson
 , ansi-terminal
 , base
@@ -7,8 +9,6 @@
 , cmdargs
 , containers
 , data-default
-, Decimal
-, Diff
 , directory
 , extra
 , filepath
@@ -174,6 +174,5 @@ mkDerivation {
   homepage = "http://hledger.org";
   description = "Command-line interface for the hledger accounting system";
   license = lib.licenses.gpl3Only;
-  mainProgram = "hledger";
   broken = false;
 }
diff --git a/pkgs/hlint.nix b/pkgs/hlint.nix
index 6cde9d35d2b660a8920109ce16b941ee0227a709..dad3d690c7d1f355813a348e2429d8846b561a05 100644
--- a/pkgs/hlint.nix
+++ b/pkgs/hlint.nix
@@ -73,6 +73,5 @@ mkDerivation {
   homepage = "https://github.com/ndmitchell/hlint#readme";
   description = "Source code suggestions";
   license = lib.licenses.bsd3;
-  mainProgram = "hlint";
   broken = false;
 }
diff --git a/pkgs/hopenssl.nix b/pkgs/hopenssl.nix
index a65b52f06d2d88fee44eef7d233c9173737bb90c..86e08ac57d09ef4c71683cf18a6a39621fdfc078 100644
--- a/pkgs/hopenssl.nix
+++ b/pkgs/hopenssl.nix
@@ -1,4 +1,4 @@
-{ mkDerivation, base, bytestring, HUnit, lib, openssl }:
+{ mkDerivation, HUnit, base, bytestring, lib, openssl }:
 mkDerivation {
   pname = "hopenssl";
   version = "2.2.4";
diff --git a/pkgs/horizon-gen-nix.nix b/pkgs/horizon-gen-nix.nix
index f589815929a048f6ad1e65f92a1436144cc07730..fcd5286e955ef8f2724beb9886162965fa8fbb7f 100644
--- a/pkgs/horizon-gen-nix.nix
+++ b/pkgs/horizon-gen-nix.nix
@@ -1,6 +1,6 @@
 { mkDerivation
-, base
 , Cabal-syntax
+, base
 , cabal2nix
 , containers
 , data-fix
@@ -54,6 +54,5 @@ mkDerivation {
   hyperlinkSource = false;
   description = "Short description of your package";
   license = lib.licenses.bsd3;
-  mainProgram = "horizon-gen-nix";
   broken = false;
 }
diff --git a/pkgs/hpack-dhall.nix b/pkgs/hpack-dhall.nix
index 6c3e0f5c88611e83ac838d3ede93ee8493c9c4f9..59ade8e92de0f0b1178f573cf5dd87c345f87f37 100644
--- a/pkgs/hpack-dhall.nix
+++ b/pkgs/hpack-dhall.nix
@@ -1,12 +1,12 @@
 { mkDerivation
+, Cabal
+, Diff
 , aeson
 , aeson-pretty
 , base
 , bytestring
-, Cabal
 , dhall
 , dhall-json
-, Diff
 , directory
 , filepath
 , hpack
diff --git a/pkgs/hpack.nix b/pkgs/hpack.nix
index 46ee5a603c8bcd9e3ddf3c8d913a9a1a3638754e..db4fccd22a031cee284ec74780ee52ef84c8ad31 100644
--- a/pkgs/hpack.nix
+++ b/pkgs/hpack.nix
@@ -1,27 +1,27 @@
 { mkDerivation
+, Cabal
+, Glob
+, HUnit
+, QuickCheck
 , aeson
 , base
 , bifunctors
 , bytestring
-, Cabal
 , containers
 , cryptonite
 , deepseq
 , directory
 , filepath
-, Glob
 , hspec
 , hspec-discover
 , http-client
 , http-client-tls
 , http-types
-, HUnit
 , infer-license
 , interpolate
 , lib
 , mockery
 , pretty
-, QuickCheck
 , scientific
 , template-haskell
 , temporary
@@ -130,6 +130,5 @@ mkDerivation {
   homepage = "https://github.com/sol/hpack#readme";
   description = "A modern format for Haskell packages";
   license = lib.licenses.mit;
-  mainProgram = "hpack";
   broken = false;
 }
diff --git a/pkgs/hscolour.nix b/pkgs/hscolour.nix
index 5166f9e3026df133b302d930dff879cf7dcf4929..42a48f7cf6c9f7b9301803b081e0128dcb6f7252 100644
--- a/pkgs/hscolour.nix
+++ b/pkgs/hscolour.nix
@@ -18,6 +18,5 @@ mkDerivation {
   homepage = "http://code.haskell.org/~malcolm/hscolour/";
   description = "Colourise Haskell code";
   license = "LGPL";
-  mainProgram = "HsColour";
   broken = false;
 }
diff --git a/pkgs/hslua-aeson.nix b/pkgs/hslua-aeson.nix
index 5bc43f9ecdc9e184e4317815d6325fb1cb2ef784..30b333ffe4757f2ae6d0e507bcc2b9b00b049464 100644
--- a/pkgs/hslua-aeson.nix
+++ b/pkgs/hslua-aeson.nix
@@ -1,4 +1,5 @@
 { mkDerivation
+, QuickCheck
 , aeson
 , base
 , bytestring
@@ -8,7 +9,6 @@
 , hslua-marshalling
 , lib
 , mtl
-, QuickCheck
 , quickcheck-instances
 , scientific
 , tasty
diff --git a/pkgs/hslua-classes.nix b/pkgs/hslua-classes.nix
index 149d021719a2200141f492d982bfb274975ee806..149d48fc961a721cc1ac033df9e916e73f0fa832 100644
--- a/pkgs/hslua-classes.nix
+++ b/pkgs/hslua-classes.nix
@@ -1,4 +1,5 @@
 { mkDerivation
+, QuickCheck
 , base
 , bytestring
 , containers
@@ -7,7 +8,6 @@
 , hslua-marshalling
 , lib
 , lua-arbitrary
-, QuickCheck
 , quickcheck-instances
 , tasty
 , tasty-hslua
diff --git a/pkgs/hslua-core.nix b/pkgs/hslua-core.nix
index c254a7a958ce8fbb4e08edc2fef8a8e1bcab92eb..3c4c1e2fbb44e0fddd1c5fdaa802a5a517631ef8 100644
--- a/pkgs/hslua-core.nix
+++ b/pkgs/hslua-core.nix
@@ -1,4 +1,5 @@
 { mkDerivation
+, QuickCheck
 , base
 , bytestring
 , exceptions
@@ -6,7 +7,6 @@
 , lua
 , lua-arbitrary
 , mtl
-, QuickCheck
 , quickcheck-instances
 , tasty
 , tasty-hunit
diff --git a/pkgs/hslua-marshalling.nix b/pkgs/hslua-marshalling.nix
index 28331bc340dc138756a371315d6cfd2ebfb2f234..a9a9b6594b3e4e8a8add567a43931459e70b2d15 100644
--- a/pkgs/hslua-marshalling.nix
+++ b/pkgs/hslua-marshalling.nix
@@ -1,4 +1,5 @@
 { mkDerivation
+, QuickCheck
 , base
 , bytestring
 , containers
@@ -6,7 +7,6 @@
 , lib
 , lua-arbitrary
 , mtl
-, QuickCheck
 , quickcheck-instances
 , tasty
 , tasty-hslua
diff --git a/pkgs/hslua-objectorientation.nix b/pkgs/hslua-objectorientation.nix
index df5a1626862000ea2bdb468f28759fd0f5fcff94..ee05f578e634aa452682a5d6f93758ad4660f265 100644
--- a/pkgs/hslua-objectorientation.nix
+++ b/pkgs/hslua-objectorientation.nix
@@ -1,4 +1,5 @@
 { mkDerivation
+, QuickCheck
 , base
 , bytestring
 , containers
@@ -8,7 +9,6 @@
 , lib
 , lua-arbitrary
 , mtl
-, QuickCheck
 , quickcheck-instances
 , tasty
 , tasty-hslua
diff --git a/pkgs/hslua.nix b/pkgs/hslua.nix
index a893fea290fafd76c68aa929a9d305c54959ec03..7f1a297bcfe685553db34a346265d3f8ee26aa14 100644
--- a/pkgs/hslua.nix
+++ b/pkgs/hslua.nix
@@ -1,4 +1,5 @@
 { mkDerivation
+, QuickCheck
 , base
 , bytestring
 , containers
@@ -13,7 +14,6 @@
 , lua
 , lua-arbitrary
 , mtl
-, QuickCheck
 , quickcheck-instances
 , tasty
 , tasty-hslua
diff --git a/pkgs/hspec-contrib.nix b/pkgs/hspec-contrib.nix
index 487a51d39f31bb6691cd6dd648ecc425c100be89..59869911e422c4ec2e5e9655d91087d168844674 100644
--- a/pkgs/hspec-contrib.nix
+++ b/pkgs/hspec-contrib.nix
@@ -1,11 +1,11 @@
 { mkDerivation
+, HUnit
+, QuickCheck
 , base
 , hspec
 , hspec-core
 , hspec-discover
-, HUnit
 , lib
-, QuickCheck
 }:
 mkDerivation {
   pname = "hspec-contrib";
diff --git a/pkgs/hspec-core.nix b/pkgs/hspec-core.nix
index dde71c9b88d1dd73c87fdc08d943f164c3ee7cb2..2063f81893880559dc3c6479fcbe7a7eef303009 100644
--- a/pkgs/hspec-core.nix
+++ b/pkgs/hspec-core.nix
@@ -1,4 +1,6 @@
 { mkDerivation
+, HUnit
+, QuickCheck
 , ansi-terminal
 , array
 , base
@@ -12,10 +14,8 @@
 , ghc-boot-th
 , hspec-expectations
 , hspec-meta
-, HUnit
 , lib
 , process
-, QuickCheck
 , quickcheck-io
 , random
 , setenv
diff --git a/pkgs/hspec-discover.nix b/pkgs/hspec-discover.nix
index 12bd11efe0c7529d5f78b3f3c596bbbba6990186..446341209643202734cf54d4bb41e2623a283e5d 100644
--- a/pkgs/hspec-discover.nix
+++ b/pkgs/hspec-discover.nix
@@ -1,11 +1,11 @@
 { mkDerivation
+, QuickCheck
 , base
 , directory
 , filepath
 , hspec-meta
 , lib
 , mockery
-, QuickCheck
 }:
 mkDerivation {
   pname = "hspec-discover";
@@ -35,6 +35,5 @@ mkDerivation {
   homepage = "http://hspec.github.io/";
   description = "Automatically discover and run Hspec tests";
   license = lib.licenses.mit;
-  mainProgram = "hspec-discover";
   broken = false;
 }
diff --git a/pkgs/hspec-expectations.nix b/pkgs/hspec-expectations.nix
index 6c67df6745c9b690da6f28e6d737c36a8f44fd2c..cbbefdcc0371d44496a18628b572fc1e15f1dc5a 100644
--- a/pkgs/hspec-expectations.nix
+++ b/pkgs/hspec-expectations.nix
@@ -1,4 +1,4 @@
-{ mkDerivation, base, call-stack, HUnit, lib, nanospec }:
+{ mkDerivation, HUnit, base, call-stack, lib, nanospec }:
 mkDerivation {
   pname = "hspec-expectations";
   version = "0.8.2";
diff --git a/pkgs/hspec-hedgehog.nix b/pkgs/hspec-hedgehog.nix
index ac4f08441dff72dad8cc8f1a2f03ed0918eed120..77d9482ddeeb8a4c4669175c53d93c3405e4bec3 100644
--- a/pkgs/hspec-hedgehog.nix
+++ b/pkgs/hspec-hedgehog.nix
@@ -1,11 +1,11 @@
 { mkDerivation
+, HUnit
+, QuickCheck
 , base
 , hedgehog
 , hspec
 , hspec-core
-, HUnit
 , lib
-, QuickCheck
 , splitmix
 }:
 mkDerivation {
diff --git a/pkgs/hspec-meta.nix b/pkgs/hspec-meta.nix
index 6c38c781c1770ff3be4549670140cc6bf71d6498..21e56e0a297727de9bff9a11d24432bd459074d2 100644
--- a/pkgs/hspec-meta.nix
+++ b/pkgs/hspec-meta.nix
@@ -1,4 +1,5 @@
 { mkDerivation
+, QuickCheck
 , ansi-terminal
 , array
 , base
@@ -10,7 +11,6 @@
 , ghc
 , ghc-boot-th
 , lib
-, QuickCheck
 , quickcheck-io
 , random
 , setenv
@@ -72,6 +72,5 @@ mkDerivation {
   homepage = "http://hspec.github.io/";
   description = "A version of Hspec which is used to test Hspec itself";
   license = lib.licenses.mit;
-  mainProgram = "hspec-meta-discover";
   broken = false;
 }
diff --git a/pkgs/hspec-smallcheck.nix b/pkgs/hspec-smallcheck.nix
index 0459c487e294e094db7c7aa20a50e50b3ee95ba3..0e94f97bb7126892c591314eabd68c277b5a0798 100644
--- a/pkgs/hspec-smallcheck.nix
+++ b/pkgs/hspec-smallcheck.nix
@@ -1,13 +1,13 @@
 { mkDerivation
+, HUnit
+, QuickCheck
 , base
 , base-orphans
 , call-stack
 , hspec
 , hspec-core
 , hspec-discover
-, HUnit
 , lib
-, QuickCheck
 , smallcheck
 }:
 mkDerivation {
diff --git a/pkgs/hspec-wai.nix b/pkgs/hspec-wai.nix
index 2d9212b81d36bf6504a3f5f0ea5767550ec736f3..15cd879c4060f5d704cecb59e25a59330c584c0a 100644
--- a/pkgs/hspec-wai.nix
+++ b/pkgs/hspec-wai.nix
@@ -1,4 +1,5 @@
 { mkDerivation
+, QuickCheck
 , base
 , base-compat
 , bytestring
@@ -8,7 +9,6 @@
 , hspec-expectations
 , http-types
 , lib
-, QuickCheck
 , text
 , transformers
 , wai
diff --git a/pkgs/hspec.nix b/pkgs/hspec.nix
index 52204b032f806c69ca0d8ad5ae937267e6c5f408..7ab2ff5c685c30efaa91e33ec9f4dbb29ff3908e 100644
--- a/pkgs/hspec.nix
+++ b/pkgs/hspec.nix
@@ -1,10 +1,10 @@
 { mkDerivation
+, QuickCheck
 , base
 , hspec-core
 , hspec-discover
 , hspec-expectations
 , lib
-, QuickCheck
 }:
 mkDerivation {
   pname = "hspec";
diff --git a/pkgs/http-api-data.nix b/pkgs/http-api-data.nix
index 03ff14064d01af05f80fd15619ceb5e4c6cca4fb..96133d4bc78fdb4737d782e1d24484e002d6e17a 100644
--- a/pkgs/http-api-data.nix
+++ b/pkgs/http-api-data.nix
@@ -1,4 +1,6 @@
 { mkDerivation
+, HUnit
+, QuickCheck
 , attoparsec
 , attoparsec-iso8601
 , base
@@ -10,9 +12,7 @@
 , hspec
 , hspec-discover
 , http-types
-, HUnit
 , lib
-, QuickCheck
 , quickcheck-instances
 , tagged
 , text
diff --git a/pkgs/http-media.nix b/pkgs/http-media.nix
index e0b23499e42a77f741617cd2b28620672058fea2..01bee60458363ce7f8030b9cbb31862167178d39 100644
--- a/pkgs/http-media.nix
+++ b/pkgs/http-media.nix
@@ -1,10 +1,10 @@
 { mkDerivation
+, QuickCheck
 , base
 , bytestring
 , case-insensitive
 , containers
 , lib
-, QuickCheck
 , test-framework
 , test-framework-quickcheck2
 , utf8-string
diff --git a/pkgs/http-types.nix b/pkgs/http-types.nix
index a35827217469e4bf0ae6dc03bbeedb9cf4b825cc..1514284915a095e9b54d71c8a39136d58a0095e4 100644
--- a/pkgs/http-types.nix
+++ b/pkgs/http-types.nix
@@ -1,4 +1,5 @@
 { mkDerivation
+, QuickCheck
 , array
 , base
 , bytestring
@@ -6,7 +7,6 @@
 , doctest
 , hspec
 , lib
-, QuickCheck
 , quickcheck-instances
 , text
 }:
diff --git a/pkgs/http2.nix b/pkgs/http2.nix
index 15568d144a5c8b4f4d020fc5d6b8a5168165e220..6c80f6371a46d8b57146f8c3c4fb3ce8eeab786b 100644
--- a/pkgs/http2.nix
+++ b/pkgs/http2.nix
@@ -1,4 +1,5 @@
 { mkDerivation
+, Glob
 , aeson
 , aeson-pretty
 , array
@@ -12,7 +13,6 @@
 , directory
 , filepath
 , gauge
-, Glob
 , heaps
 , hspec
 , hspec-discover
diff --git a/pkgs/indexed-traversable-instances.nix b/pkgs/indexed-traversable-instances.nix
index 5e4dd1dfb997e7d5cffec38a8bbf3c26559ff138..e94fde23644ee6dcf333594ba1fac517dd14d41a 100644
--- a/pkgs/indexed-traversable-instances.nix
+++ b/pkgs/indexed-traversable-instances.nix
@@ -1,10 +1,10 @@
 { mkDerivation
+, OneTuple
+, QuickCheck
 , base
 , containers
 , indexed-traversable
 , lib
-, OneTuple
-, QuickCheck
 , quickcheck-instances
 , tagged
 , tasty
diff --git a/pkgs/insert-ordered-containers.nix b/pkgs/insert-ordered-containers.nix
index fb283e791f9da6ca48dd899ede3968c42db13a67..f0c43eff48a3a389fcc3bac34ca5a59c060ba37f 100644
--- a/pkgs/insert-ordered-containers.nix
+++ b/pkgs/insert-ordered-containers.nix
@@ -1,4 +1,5 @@
 { mkDerivation
+, QuickCheck
 , aeson
 , base
 , base-compat
@@ -9,7 +10,6 @@
 , lib
 , optics-core
 , optics-extra
-, QuickCheck
 , semigroupoids
 , tasty
 , tasty-quickcheck
diff --git a/pkgs/integer-logarithms.nix b/pkgs/integer-logarithms.nix
index a9987a697773db491bfc0001b636bfb94b8eb226..cb50e3328c8ad38dfb14da97569ddcdd4ae1553e 100644
--- a/pkgs/integer-logarithms.nix
+++ b/pkgs/integer-logarithms.nix
@@ -1,10 +1,10 @@
 { mkDerivation
+, QuickCheck
 , array
 , base
 , ghc-bignum
 , ghc-prim
 , lib
-, QuickCheck
 , smallcheck
 , tasty
 , tasty-hunit
diff --git a/pkgs/interpolate.nix b/pkgs/interpolate.nix
index 3a11b9d8ff6f4c5ca3525aed47706bfe3b3d06e8..5b80e4c43f1fa7003918503baed2f5c3a394418a 100644
--- a/pkgs/interpolate.nix
+++ b/pkgs/interpolate.nix
@@ -1,11 +1,11 @@
 { mkDerivation
+, QuickCheck
 , base
 , base-compat
 , bytestring
 , haskell-src-meta
 , hspec
 , lib
-, QuickCheck
 , quickcheck-instances
 , template-haskell
 , text
diff --git a/pkgs/invariant.nix b/pkgs/invariant.nix
index 463d7706417d15aed5eeae8564b464a54c281865..6ac24b8fa4aa982db43e9cf2b1ba2289c1895892 100644
--- a/pkgs/invariant.nix
+++ b/pkgs/invariant.nix
@@ -1,4 +1,6 @@
 { mkDerivation
+, QuickCheck
+, StateVar
 , array
 , base
 , bifunctors
@@ -10,8 +12,6 @@
 , hspec-discover
 , lib
 , profunctors
-, QuickCheck
-, StateVar
 , stm
 , tagged
 , template-haskell
diff --git a/pkgs/iproute.nix b/pkgs/iproute.nix
index 3806dc0626bfc1704c86ed38716c6a05f1be4ac7..744b444dee85f84e80a676f753ae9d6038494515 100644
--- a/pkgs/iproute.nix
+++ b/pkgs/iproute.nix
@@ -1,4 +1,5 @@
 { mkDerivation
+, QuickCheck
 , appar
 , base
 , byteorder
@@ -8,7 +9,6 @@
 , hspec
 , lib
 , network
-, QuickCheck
 , safe
 }:
 mkDerivation {
diff --git a/pkgs/jira-wiki-markup.nix b/pkgs/jira-wiki-markup.nix
index f80c5896f187380134c904dda5c0a639a51de513..6edfb6afaae740c0ed19f6c470f9ccd4e5eb038a 100644
--- a/pkgs/jira-wiki-markup.nix
+++ b/pkgs/jira-wiki-markup.nix
@@ -21,6 +21,5 @@ mkDerivation {
   homepage = "https://github.com/tarleb/jira-wiki-markup";
   description = "Handle Jira wiki markup";
   license = lib.licenses.mit;
-  mainProgram = "jira-wiki-markup";
   broken = false;
 }
diff --git a/pkgs/js-flot.nix b/pkgs/js-flot.nix
index 09ce387d5950b5bd7b3ac3347880f81f386c0a16..5309bf5e4fcccefdd5a2a73395ab1200961afb91 100644
--- a/pkgs/js-flot.nix
+++ b/pkgs/js-flot.nix
@@ -1,4 +1,4 @@
-{ mkDerivation, base, HTTP, lib }:
+{ mkDerivation, HTTP, base, lib }:
 mkDerivation {
   pname = "js-flot";
   version = "0.8.3";
diff --git a/pkgs/js-jquery.nix b/pkgs/js-jquery.nix
index 866e1d29ba8dd55a256fb30e5e9c77af39e71564..4e99468c8ebd737fc912a0a8f93a73638aeafcc9 100644
--- a/pkgs/js-jquery.nix
+++ b/pkgs/js-jquery.nix
@@ -1,4 +1,4 @@
-{ mkDerivation, base, HTTP, lib }:
+{ mkDerivation, HTTP, base, lib }:
 mkDerivation {
   pname = "js-jquery";
   version = "3.3.1";
diff --git a/pkgs/language-nix.nix b/pkgs/language-nix.nix
index 48476654349fe2b64a660ec5927728556538b690..d897ff1a9031bb74e9624a4b526df961d391af15 100644
--- a/pkgs/language-nix.nix
+++ b/pkgs/language-nix.nix
@@ -1,11 +1,11 @@
 { mkDerivation
+, QuickCheck
 , base
 , deepseq
 , lens
 , lib
 , parsec-class
 , pretty
-, QuickCheck
 }:
 mkDerivation {
   pname = "language-nix";
diff --git a/pkgs/lens.nix b/pkgs/lens.nix
index 401d9e22274f6ab8a9c459d68f70788cc06c3178..a30e220dd3f9216b1c71f02800fdcc475e3aa858 100644
--- a/pkgs/lens.nix
+++ b/pkgs/lens.nix
@@ -1,4 +1,6 @@
 { mkDerivation
+, HUnit
+, QuickCheck
 , array
 , assoc
 , base
@@ -19,7 +21,6 @@
 , generic-deriving
 , ghc-prim
 , hashable
-, HUnit
 , indexed-traversable
 , indexed-traversable-instances
 , kan-extensions
@@ -27,7 +28,6 @@
 , mtl
 , parallel
 , profunctors
-, QuickCheck
 , reflection
 , semigroupoids
 , simple-reflect
diff --git a/pkgs/lifted-async.nix b/pkgs/lifted-async.nix
index edd02d1f16273d73abf4c040ab4507cc77169b94..b5854c14f81ebd7c7e7d4d9ff3a322cc7be6d1fd 100644
--- a/pkgs/lifted-async.nix
+++ b/pkgs/lifted-async.nix
@@ -1,9 +1,9 @@
 { mkDerivation
+, HUnit
 , async
 , base
 , constraints
 , deepseq
-, HUnit
 , lib
 , lifted-base
 , monad-control
diff --git a/pkgs/lifted-base.nix b/pkgs/lifted-base.nix
index 6018c25c33992f9aa03f7b5f81113fcadaddd41c..2b8352d48df9ca2b48b89b69e0004326b62fb04f 100644
--- a/pkgs/lifted-base.nix
+++ b/pkgs/lifted-base.nix
@@ -1,7 +1,7 @@
 { mkDerivation
+, HUnit
 , base
 , criterion
-, HUnit
 , lib
 , monad-control
 , monad-peel
diff --git a/pkgs/linear.nix b/pkgs/linear.nix
index f5dc04b1b04baae12900ef165d9fd2d46224ce0c..34a226b60a5ca7d68254369ca4ec4202b16a9f43 100644
--- a/pkgs/linear.nix
+++ b/pkgs/linear.nix
@@ -1,4 +1,5 @@
 { mkDerivation
+, HUnit
 , adjunctions
 , base
 , base-orphans
@@ -11,7 +12,6 @@
 , distributive
 , ghc-prim
 , hashable
-, HUnit
 , indexed-traversable
 , lens
 , lib
diff --git a/pkgs/lsp-types.nix b/pkgs/lsp-types.nix
index 4679959d5e34dfb2cc35b2a1baf7d8742b89c668..9cfcfa13005c6bdd1c4ade298f6ffe0553a33a7b 100644
--- a/pkgs/lsp-types.nix
+++ b/pkgs/lsp-types.nix
@@ -1,11 +1,12 @@
 { mkDerivation
+, Diff
+, QuickCheck
 , aeson
 , base
 , binary
 , containers
 , data-default
 , deepseq
-, Diff
 , dlist
 , exceptions
 , filepath
@@ -17,7 +18,6 @@
 , mod
 , mtl
 , network-uri
-, QuickCheck
 , quickcheck-instances
 , safe
 , scientific
diff --git a/pkgs/lua-arbitrary.nix b/pkgs/lua-arbitrary.nix
index ddbf6c7652c5c7c684b40fcdfee26eae64f89877..5d6f544cab67a85f85cc1d3bc44250c76a27e70c 100644
--- a/pkgs/lua-arbitrary.nix
+++ b/pkgs/lua-arbitrary.nix
@@ -1,4 +1,4 @@
-{ mkDerivation, base, lib, lua, QuickCheck }:
+{ mkDerivation, QuickCheck, base, lib, lua }:
 mkDerivation {
   pname = "lua-arbitrary";
   version = "1.0.1";
diff --git a/pkgs/lucid-alpine.nix b/pkgs/lucid-alpine.nix
index c3aa69041652419591ca756dda7681ebde3bb754..8d3fb2ccf5020ebc881d83b02185b8d5961efe06 100644
--- a/pkgs/lucid-alpine.nix
+++ b/pkgs/lucid-alpine.nix
@@ -19,6 +19,5 @@ mkDerivation {
   homepage = "https://github.com/MonadicSystems/lucid-alpine#readme";
   description = "Use Alpine.js in your lucid templates";
   license = lib.licenses.bsd3;
-  mainProgram = "lucid-alpine-exe";
   broken = false;
 }
diff --git a/pkgs/lucid-aria.nix b/pkgs/lucid-aria.nix
index 02f267c9e9e7461d537e4af267fc1b8325140c9c..308a687de6d780d15e58a18d7efa9dfcc5fd7c63 100644
--- a/pkgs/lucid-aria.nix
+++ b/pkgs/lucid-aria.nix
@@ -1,4 +1,4 @@
-{ mkDerivation, base, hspec, HUnit, lib, lucid, text }:
+{ mkDerivation, HUnit, base, hspec, lib, lucid, text }:
 mkDerivation {
   pname = "lucid-aria";
   version = "0.1.0.1";
diff --git a/pkgs/lucid.nix b/pkgs/lucid.nix
index 546616cd7ea96f071829f25f64f007c2f0b974f7..3b41979d31f0a0003d2fb406a8417aac59971472 100644
--- a/pkgs/lucid.nix
+++ b/pkgs/lucid.nix
@@ -1,4 +1,5 @@
 { mkDerivation
+, HUnit
 , base
 , bifunctors
 , blaze-builder
@@ -8,7 +9,6 @@
 , deepseq
 , hashable
 , hspec
-, HUnit
 , lib
 , mmorph
 , mtl
diff --git a/pkgs/lzma.nix b/pkgs/lzma.nix
index 482ad4ff1998e9728e64dc717c09e88de8f944cc..7e861dae714aad8b36c22dc4b2179f412a1d8bb5 100644
--- a/pkgs/lzma.nix
+++ b/pkgs/lzma.nix
@@ -1,9 +1,9 @@
 { mkDerivation
+, HUnit
+, QuickCheck
 , base
 , bytestring
-, HUnit
 , lib
-, QuickCheck
 , tasty
 , tasty-hunit
 , tasty-quickcheck
diff --git a/pkgs/managed.nix b/pkgs/managed.nix
index f7d520840cfa2f926d6d1a28ec400e8e1080bbf6..dcd2bdc5c8beebdf35a3cf549cac73156d8d647e 100644
--- a/pkgs/managed.nix
+++ b/pkgs/managed.nix
@@ -3,8 +3,8 @@ mkDerivation {
   pname = "managed";
   version = "1.0.9";
   sha256 = "4d476da3b6e7a14220f2e3a764e5d43bf339e89a3dc46a7bdfdeb3856a54a86f";
-  revision = "2";
-  editedCabalFile = "1hnhi2d5s06bhp2klf9xw9yipymisfyfvb83b6rqfiy549z6ij27";
+  revision = "3";
+  editedCabalFile = "017h9533j7rlxlsf65ynxpva59yr0qwrdmvhp7if141i98ld4664";
   isLibrary = true;
   isExecutable = false;
   enableSeparateDataOutput = false;
diff --git a/pkgs/markdown-unlit.nix b/pkgs/markdown-unlit.nix
index d3e66cf1a14e3ed7e6180181651e62d7a2e193c6..55255bda909c33b29a2d631d594d721f10c8e6f0 100644
--- a/pkgs/markdown-unlit.nix
+++ b/pkgs/markdown-unlit.nix
@@ -1,11 +1,11 @@
 { mkDerivation
+, QuickCheck
 , base
 , base-compat
 , directory
 , hspec
 , hspec-discover
 , lib
-, QuickCheck
 , silently
 , stringbuilder
 , temporary
@@ -40,6 +40,5 @@ mkDerivation {
   homepage = "https://github.com/sol/markdown-unlit#readme";
   description = "Literate Haskell support for Markdown";
   license = lib.licenses.mit;
-  mainProgram = "markdown-unlit";
   broken = false;
 }
diff --git a/pkgs/math-functions.nix b/pkgs/math-functions.nix
index db3ec412710d74f48889e54de8b2f46eb6a7b99f..c778213c13ba4ac7a85f722ade6535fe6967581a 100644
--- a/pkgs/math-functions.nix
+++ b/pkgs/math-functions.nix
@@ -1,4 +1,5 @@
 { mkDerivation
+, QuickCheck
 , base
 , data-default-class
 , deepseq
@@ -6,7 +7,6 @@
 , gauge
 , lib
 , primitive
-, QuickCheck
 , random
 , tasty
 , tasty-hunit
diff --git a/pkgs/microspec.nix b/pkgs/microspec.nix
index a08ac3a88c8eff6196345cdd21ee942e5202fff4..3b2b36d17061950585d176d7f7dd27d09e946656 100644
--- a/pkgs/microspec.nix
+++ b/pkgs/microspec.nix
@@ -1,4 +1,4 @@
-{ mkDerivation, base, lib, QuickCheck, time }:
+{ mkDerivation, QuickCheck, base, lib, time }:
 mkDerivation {
   pname = "microspec";
   version = "0.2.1.3";
diff --git a/pkgs/monad-par.nix b/pkgs/monad-par.nix
index 08815aeaa55952ce179c3c72f299df4ff0d36b02..6655412b518158c64fae80766b89ee2c4b1c5d31 100644
--- a/pkgs/monad-par.nix
+++ b/pkgs/monad-par.nix
@@ -1,17 +1,17 @@
 { mkDerivation
+, HUnit
+, QuickCheck
 , abstract-deque
 , abstract-par
 , array
 , base
 , containers
 , deepseq
-, HUnit
 , lib
 , monad-par-extras
 , mtl
 , mwc-random
 , parallel
-, QuickCheck
 , test-framework
 , test-framework-hunit
 , test-framework-quickcheck2
diff --git a/pkgs/monad-peel.nix b/pkgs/monad-peel.nix
index 7ea1279f7738377977b108a1140dc40ba30c4490..d9d0ea51c4116c068ac9cfdfa0e8736e4573ce6c 100644
--- a/pkgs/monad-peel.nix
+++ b/pkgs/monad-peel.nix
@@ -1,7 +1,7 @@
 { mkDerivation
+, HUnit
 , base
 , extensible-exceptions
-, HUnit
 , lib
 , test-framework
 , test-framework-hunit
diff --git a/pkgs/mono-traversable.nix b/pkgs/mono-traversable.nix
index 082d7747588af4aa1cbfa251e9feddb7fd18f3a9..8be5377f9f113d87d45617b4b8893420a114589d 100644
--- a/pkgs/mono-traversable.nix
+++ b/pkgs/mono-traversable.nix
@@ -1,4 +1,6 @@
 { mkDerivation
+, HUnit
+, QuickCheck
 , base
 , bytestring
 , containers
@@ -6,10 +8,8 @@
 , gauge
 , hashable
 , hspec
-, HUnit
 , lib
 , mwc-random
-, QuickCheck
 , split
 , text
 , transformers
diff --git a/pkgs/monoid-subclasses.nix b/pkgs/monoid-subclasses.nix
index b798ac4f56d9754a3bdb975c512c5bb96004ad00..d3cc9469afec5ca6b0d96117a931346a6110f66f 100644
--- a/pkgs/monoid-subclasses.nix
+++ b/pkgs/monoid-subclasses.nix
@@ -1,10 +1,10 @@
 { mkDerivation
+, QuickCheck
 , base
 , bytestring
 , containers
 , lib
 , primes
-, QuickCheck
 , quickcheck-instances
 , tasty
 , tasty-quickcheck
diff --git a/pkgs/mwc-random.nix b/pkgs/mwc-random.nix
index d602919d49b809ed0b4e371eded964d42ba46a8f..93eaa796f00ea61674205572480ad95ec8c0c8bd 100644
--- a/pkgs/mwc-random.nix
+++ b/pkgs/mwc-random.nix
@@ -1,4 +1,5 @@
 { mkDerivation
+, QuickCheck
 , base
 , bytestring
 , doctest
@@ -7,7 +8,6 @@
 , math-functions
 , mersenne-random
 , primitive
-, QuickCheck
 , random
 , tasty
 , tasty-hunit
diff --git a/pkgs/neat-interpolation.nix b/pkgs/neat-interpolation.nix
index 61b432a902a8dac6e7c152bc76ccf9b5432efefd..113f185a8352b9db2f8f4bc9ba74395ad3041faa 100644
--- a/pkgs/neat-interpolation.nix
+++ b/pkgs/neat-interpolation.nix
@@ -1,8 +1,8 @@
 { mkDerivation
+, QuickCheck
 , base
 , lib
 , megaparsec
-, QuickCheck
 , quickcheck-instances
 , rerebase
 , tasty
diff --git a/pkgs/net-mqtt.nix b/pkgs/net-mqtt.nix
index e4ba49d4009373369e19d5d1e250f827c6bc2761..81f4ca3c786e399be394d1b699e253864fccb099 100644
--- a/pkgs/net-mqtt.nix
+++ b/pkgs/net-mqtt.nix
@@ -1,4 +1,6 @@
 { mkDerivation
+, HUnit
+, QuickCheck
 , async
 , attoparsec
 , attoparsec-binary
@@ -11,12 +13,10 @@
 , connection
 , containers
 , deepseq
-, HUnit
 , lib
 , network-conduit-tls
 , network-uri
 , optparse-applicative
-, QuickCheck
 , stm
 , tasty
 , tasty-hunit
diff --git a/pkgs/network-conduit-tls.nix b/pkgs/network-conduit-tls.nix
index 57ea7cdd5bed28b0160d23b8895f31d5d19850b9..f1c42e9e9ebd7091ddcf7357c0aa215c3534e602 100644
--- a/pkgs/network-conduit-tls.nix
+++ b/pkgs/network-conduit-tls.nix
@@ -1,11 +1,11 @@
 { mkDerivation
+, HUnit
 , base
 , bytestring
 , conduit
 , conduit-extra
 , connection
 , data-default-class
-, HUnit
 , lib
 , mtl
 , network
diff --git a/pkgs/network-uri.nix b/pkgs/network-uri.nix
index b3c539b7cb5b062887405b7d173f5f23fc9c5b15..ff5cd10cbb7f16246db78d6e2b9fe9dc46cc192e 100644
--- a/pkgs/network-uri.nix
+++ b/pkgs/network-uri.nix
@@ -1,11 +1,11 @@
 { mkDerivation
+, HUnit
+, QuickCheck
 , base
 , criterion
 , deepseq
-, HUnit
 , lib
 , parsec
-, QuickCheck
 , tasty
 , tasty-hunit
 , tasty-quickcheck
diff --git a/pkgs/network.nix b/pkgs/network.nix
index c079ca8f8e2daeb5cb18e2f3a14121d9cb69ef5f..8b8b83842eac7568d1e2bfbb35e8362da23c793d 100644
--- a/pkgs/network.nix
+++ b/pkgs/network.nix
@@ -1,13 +1,13 @@
 { mkDerivation
+, HUnit
+, QuickCheck
 , base
 , bytestring
 , deepseq
 , directory
 , hspec
 , hspec-discover
-, HUnit
 , lib
-, QuickCheck
 , temporary
 }:
 mkDerivation {
diff --git a/pkgs/optics.nix b/pkgs/optics.nix
index 098120867ca346689bc4adeafa7e4a1b9541f2f4..fbc6d1a8178fa79b6f4fc3f428eb9a95684eb12a 100644
--- a/pkgs/optics.nix
+++ b/pkgs/optics.nix
@@ -1,4 +1,5 @@
 { mkDerivation
+, QuickCheck
 , array
 , base
 , bytestring
@@ -11,7 +12,6 @@
 , optics-core
 , optics-extra
 , optics-th
-, QuickCheck
 , random
 , tasty
 , tasty-bench
diff --git a/pkgs/optparse-applicative.nix b/pkgs/optparse-applicative.nix
index ba1fb37b68ef593f14655c17a67d4faf44678bdc..bf9dd0249d52a67fc5badd0baf298c098172f508 100644
--- a/pkgs/optparse-applicative.nix
+++ b/pkgs/optparse-applicative.nix
@@ -1,9 +1,9 @@
 { mkDerivation
+, QuickCheck
 , ansi-wl-pprint
 , base
 , lib
 , process
-, QuickCheck
 , transformers
 , transformers-compat
 }:
diff --git a/pkgs/pandoc-lua-marshal.nix b/pkgs/pandoc-lua-marshal.nix
index df116ce58c9985b7481b0aedd0d9c6b0642cf891..0cca570ac453e7ac71cd57a52a270c99179edd0b 100644
--- a/pkgs/pandoc-lua-marshal.nix
+++ b/pkgs/pandoc-lua-marshal.nix
@@ -1,4 +1,5 @@
 { mkDerivation
+, QuickCheck
 , base
 , bytestring
 , containers
@@ -8,7 +9,6 @@
 , lib
 , lua
 , pandoc-types
-, QuickCheck
 , safe
 , tasty
 , tasty-hunit
diff --git a/pkgs/pandoc-types.nix b/pkgs/pandoc-types.nix
index 8dc14efbe7ec298d6074501e229b0e1c2f129dce..9e60f449a7101e9571d7c9d5c1993aff0e7d1820 100644
--- a/pkgs/pandoc-types.nix
+++ b/pkgs/pandoc-types.nix
@@ -1,4 +1,6 @@
 { mkDerivation
+, HUnit
+, QuickCheck
 , aeson
 , base
 , bytestring
@@ -6,9 +8,7 @@
 , criterion
 , deepseq
 , ghc-prim
-, HUnit
 , lib
-, QuickCheck
 , string-qq
 , syb
 , test-framework
diff --git a/pkgs/pandoc.nix b/pkgs/pandoc.nix
index 05ff6ecd00f71cc4f94e9003fe5ed45641ad87d9..cae9f7f71e0b2e2545b3911989dd911f82a1ce3a 100644
--- a/pkgs/pandoc.nix
+++ b/pkgs/pandoc.nix
@@ -1,4 +1,8 @@
 { mkDerivation
+, Diff
+, Glob
+, JuicyPixels
+, SHA
 , aeson
 , aeson-pretty
 , array
@@ -18,7 +22,6 @@
 , containers
 , data-default
 , deepseq
-, Diff
 , directory
 , doclayout
 , doctemplates
@@ -26,7 +29,6 @@
 , exceptions
 , file-embed
 , filepath
-, Glob
 , gridtables
 , haddock-library
 , hslua
@@ -41,7 +43,6 @@
 , http-types
 , ipynb
 , jira-wiki-markup
-, JuicyPixels
 , lib
 , lpeg
 , mtl
@@ -57,7 +58,6 @@
 , safe
 , scientific
 , servant-server
-, SHA
 , skylighting
 , skylighting-core
 , split
@@ -221,6 +221,5 @@ mkDerivation {
   homepage = "https://pandoc.org";
   description = "Conversion between markup formats";
   license = lib.licenses.gpl2Plus;
-  mainProgram = "pandoc";
   broken = false;
 }
diff --git a/pkgs/parsers.nix b/pkgs/parsers.nix
index 8be9744012da042c6dc27ff2984be16208ad935a..19beee1158427184aedc9e37874f5327eb6776ea 100644
--- a/pkgs/parsers.nix
+++ b/pkgs/parsers.nix
@@ -1,4 +1,5 @@
 { mkDerivation
+, QuickCheck
 , attoparsec
 , base
 , base-orphans
@@ -9,7 +10,6 @@
 , lib
 , mtl
 , parsec
-, QuickCheck
 , quickcheck-instances
 , scientific
 , text
diff --git a/pkgs/password-types.nix b/pkgs/password-types.nix
index d95eb87c7c7c7851bc348a8796cbb7236a214352..dc1f97cf07640fadd2239fe89bad8b25f64529e9 100644
--- a/pkgs/password-types.nix
+++ b/pkgs/password-types.nix
@@ -1,13 +1,13 @@
 { mkDerivation
+, Cabal
+, QuickCheck
 , base
 , base-compat
 , bytestring
-, Cabal
 , cabal-doctest
 , doctest
 , lib
 , memory
-, QuickCheck
 , quickcheck-instances
 , tasty
 , tasty-quickcheck
diff --git a/pkgs/password.nix b/pkgs/password.nix
index 8ff14fbc1d2abb0e1cd4fdad9332ca25b42c45d7..47e98c3b975f492714aea7fa48da508b1e73bccf 100644
--- a/pkgs/password.nix
+++ b/pkgs/password.nix
@@ -1,16 +1,16 @@
 { mkDerivation
+, Cabal
+, QuickCheck
 , base
 , base-compat
 , base64
 , bytestring
-, Cabal
 , cabal-doctest
 , cryptonite
 , doctest
 , lib
 , memory
 , password-types
-, QuickCheck
 , quickcheck-instances
 , scrypt
 , tasty
diff --git a/pkgs/path-pieces.nix b/pkgs/path-pieces.nix
index a04c9c446e55ce01e165f899e3459daf94d377f5..81652e2323b66522edab2f44262d7feb81ea7348 100644
--- a/pkgs/path-pieces.nix
+++ b/pkgs/path-pieces.nix
@@ -1,4 +1,4 @@
-{ mkDerivation, base, hspec, HUnit, lib, QuickCheck, text, time }:
+{ mkDerivation, HUnit, QuickCheck, base, hspec, lib, text, time }:
 mkDerivation {
   pname = "path-pieces";
   version = "0.2.1";
diff --git a/pkgs/path.nix b/pkgs/path.nix
index 08f1fca8eb72bcef16f78d0968c0f0fe1c4d5697..12af0f67951b2368ae91e6b24761fc2829289f48 100644
--- a/pkgs/path.nix
+++ b/pkgs/path.nix
@@ -1,4 +1,5 @@
 { mkDerivation
+, QuickCheck
 , aeson
 , base
 , bytestring
@@ -12,7 +13,6 @@
 , hspec
 , lib
 , mtl
-, QuickCheck
 , template-haskell
 , text
 , validity
diff --git a/pkgs/pcg-random.nix b/pkgs/pcg-random.nix
index 673ec7e930a166cd2c72d78a59972e1b30ee9863..5186af6c527ad11be893efa0acf3947d1ad57cf7 100644
--- a/pkgs/pcg-random.nix
+++ b/pkgs/pcg-random.nix
@@ -1,7 +1,7 @@
 { mkDerivation
+, Cabal
 , base
 , bytestring
-, Cabal
 , cabal-doctest
 , doctest
 , entropy
diff --git a/pkgs/pcre-light.nix b/pkgs/pcre-light.nix
index 585e7510bbb2fdf088f19738be069a3f85668261..a0feea36e4ef5fb3cf14e932668088979cad85a1 100644
--- a/pkgs/pcre-light.nix
+++ b/pkgs/pcre-light.nix
@@ -1,8 +1,8 @@
 { mkDerivation
+, HUnit
 , base
 , bytestring
 , containers
-, HUnit
 , lib
 , mtl
 , pcre
diff --git a/pkgs/pem.nix b/pkgs/pem.nix
index 63c4eadb9d094fa3c92b4aacc34e0c4c1cb3009a..199b6a1f3de8ec99bd160abb3a400c90266aec20 100644
--- a/pkgs/pem.nix
+++ b/pkgs/pem.nix
@@ -1,11 +1,11 @@
 { mkDerivation
+, HUnit
+, QuickCheck
 , base
 , basement
 , bytestring
-, HUnit
 , lib
 , memory
-, QuickCheck
 , test-framework
 , test-framework-hunit
 , test-framework-quickcheck2
diff --git a/pkgs/persistent.nix b/pkgs/persistent.nix
index 0991f3f5c5a39d4bfff16cd21e77f79b20ad61e7..b57b0d48298d410d2ee50d0fbe3693665fa4bdd4 100644
--- a/pkgs/persistent.nix
+++ b/pkgs/persistent.nix
@@ -1,4 +1,5 @@
 { mkDerivation
+, QuickCheck
 , aeson
 , attoparsec
 , base
@@ -18,7 +19,6 @@
 , monad-logger
 , mtl
 , path-pieces
-, QuickCheck
 , quickcheck-instances
 , resource-pool
 , resourcet
@@ -40,8 +40,8 @@ mkDerivation {
   pname = "persistent";
   version = "2.14.3.0";
   sha256 = "1288244f62d334dbe65cae6157098de38419b8445d5cc227281e688310189a19";
-  revision = "1";
-  editedCabalFile = "1qbi74kmjk07wgib2y6pscjbr8mazlj490928h5bvahw10jx3611";
+  revision = "2";
+  editedCabalFile = "0mv747s5g64jir461i3say83d9bfh0wl05qfwllpgq3g2nxc35p7";
   isLibrary = true;
   isExecutable = false;
   enableSeparateDataOutput = false;
diff --git a/pkgs/pgp-wordlist.nix b/pkgs/pgp-wordlist.nix
index 1cbdf3b9d0d3aa48cdd1ba51eb506dc0ece1d585..db62ac0b7f9704beeca307449ff93ba10c2e0349 100644
--- a/pkgs/pgp-wordlist.nix
+++ b/pkgs/pgp-wordlist.nix
@@ -1,10 +1,10 @@
 { mkDerivation
+, HUnit
 , base
 , bytestring
 , containers
 , deepseq
 , doctest
-, HUnit
 , lib
 , tasty
 , tasty-hunit
diff --git a/pkgs/pipes.nix b/pkgs/pipes.nix
index 257a0f98a4f49679e7dc7b49e639afe5cd606ff2..f07a90fcb9b1af618e98566bddbf62400acf2635 100644
--- a/pkgs/pipes.nix
+++ b/pkgs/pipes.nix
@@ -1,4 +1,5 @@
 { mkDerivation
+, QuickCheck
 , base
 , criterion
 , exceptions
@@ -6,7 +7,6 @@
 , mmorph
 , mtl
 , optparse-applicative
-, QuickCheck
 , test-framework
 , test-framework-quickcheck2
 , transformers
diff --git a/pkgs/polysemy-plugin.nix b/pkgs/polysemy-plugin.nix
index 2426e9bc15f1cceee8a8cd815a17ea9cc11ce352..4d496ce63c2629ae1990ae56f66032ca6eb87e7d 100644
--- a/pkgs/polysemy-plugin.nix
+++ b/pkgs/polysemy-plugin.nix
@@ -1,6 +1,6 @@
 { mkDerivation
-, base
 , Cabal
+, base
 , cabal-doctest
 , containers
 , doctest
diff --git a/pkgs/polysemy.nix b/pkgs/polysemy.nix
index 48275bb48b463c66ca99ac6906de7c89e9d576b2..454ce3d637bed23f75460b8a28e83a14b6d7474b 100644
--- a/pkgs/polysemy.nix
+++ b/pkgs/polysemy.nix
@@ -1,7 +1,8 @@
 { mkDerivation
+, Cabal
+, QuickCheck
 , async
 , base
-, Cabal
 , cabal-doctest
 , containers
 , criterion
@@ -14,7 +15,6 @@
 , inspection-testing
 , lib
 , mtl
-, QuickCheck
 , stm
 , syb
 , template-haskell
diff --git a/pkgs/postgresql-libpq.nix b/pkgs/postgresql-libpq.nix
index d9f8f32ae71b5e71961b7a53c28b9c47d93520c2..f98f13d8508e200f07ce927fbe6d67d7c7892631 100644
--- a/pkgs/postgresql-libpq.nix
+++ b/pkgs/postgresql-libpq.nix
@@ -1,4 +1,4 @@
-{ mkDerivation, base, bytestring, Cabal, lib, postgresql, unix }:
+{ mkDerivation, Cabal, base, bytestring, lib, postgresql, unix }:
 mkDerivation {
   pname = "postgresql-libpq";
   version = "0.9.4.3";
diff --git a/pkgs/postgresql-migration.nix b/pkgs/postgresql-migration.nix
index a6cee24baa4c76dcaad1d17b80a5af25561432c1..9098a6bdea8c437de98447ba9a519add9df6cb63 100644
--- a/pkgs/postgresql-migration.nix
+++ b/pkgs/postgresql-migration.nix
@@ -50,6 +50,5 @@ mkDerivation {
   homepage = "https://github.com/andrevdm/postgresql-migration";
   description = "PostgreSQL Schema Migrations";
   license = lib.licenses.bsd3;
-  mainProgram = "migrate";
   broken = false;
 }
diff --git a/pkgs/postgresql-simple-migration.nix b/pkgs/postgresql-simple-migration.nix
index c5255b98b54912e5961a3c3253ee122aa2ac8375..0ed2ac0ffb41e81c96874cdcbb53cc90b959d7ee 100644
--- a/pkgs/postgresql-simple-migration.nix
+++ b/pkgs/postgresql-simple-migration.nix
@@ -49,6 +49,5 @@ mkDerivation {
   homepage = "https://github.com/ameingast/postgresql-simple-migration";
   description = "PostgreSQL Schema Migrations";
   license = lib.licenses.bsd3;
-  mainProgram = "migrate";
   broken = false;
 }
diff --git a/pkgs/postgresql-simple.nix b/pkgs/postgresql-simple.nix
index ea90f99b5a7981b542fe91e0cdb88b3f5e7997cc..790a1c131bdfca684cb88db7bda9bd49362d1911 100644
--- a/pkgs/postgresql-simple.nix
+++ b/pkgs/postgresql-simple.nix
@@ -1,4 +1,6 @@
 { mkDerivation
+, HUnit
+, Only
 , aeson
 , attoparsec
 , base
@@ -10,10 +12,8 @@
 , cryptohash-md5
 , filepath
 , hashable
-, HUnit
 , inspection-testing
 , lib
-, Only
 , postgresql-libpq
 , scientific
 , tasty
diff --git a/pkgs/pretty-show.nix b/pkgs/pretty-show.nix
index b44523c6c4d0474e9f5dc51a1a1cba7247dd247c..8691ec1d76a2b2c44b679c857629a2668f01dd97 100644
--- a/pkgs/pretty-show.nix
+++ b/pkgs/pretty-show.nix
@@ -37,6 +37,5 @@ mkDerivation {
   homepage = "http://wiki.github.com/yav/pretty-show";
   description = "Tools for working with derived `Show` instances and generic inspection of values";
   license = lib.licenses.mit;
-  mainProgram = "ppsh";
   broken = false;
 }
diff --git a/pkgs/pretty-simple.nix b/pkgs/pretty-simple.nix
index d8eb5ba9e992361674285c802aa8277f57cf211f..6d26ed7fbb91e846161944862439e1bf2fc9bea5 100644
--- a/pkgs/pretty-simple.nix
+++ b/pkgs/pretty-simple.nix
@@ -1,17 +1,17 @@
 { mkDerivation
-, base
 , Cabal
+, Glob
+, QuickCheck
+, base
 , cabal-doctest
 , containers
 , criterion
 , doctest
-, Glob
 , lib
 , mtl
 , optparse-applicative
 , prettyprinter
 , prettyprinter-ansi-terminal
-, QuickCheck
 , template-haskell
 , text
 , transformers
@@ -52,6 +52,5 @@ mkDerivation {
   homepage = "https://github.com/cdepillabout/pretty-simple";
   description = "pretty printer for data types with a 'Show' instance";
   license = lib.licenses.bsd3;
-  mainProgram = "pretty-simple";
   broken = false;
 }
diff --git a/pkgs/prettyprinter-ansi-terminal.nix b/pkgs/prettyprinter-ansi-terminal.nix
index ae1d9c6a3744cd9f0625a6c8d4b325ac31652f59..c1ab140e7c40ec8663c77dc7a811778d9056680a 100644
--- a/pkgs/prettyprinter-ansi-terminal.nix
+++ b/pkgs/prettyprinter-ansi-terminal.nix
@@ -1,4 +1,5 @@
 { mkDerivation
+, QuickCheck
 , ansi-terminal
 , base
 , base-compat
@@ -8,7 +9,6 @@
 , gauge
 , lib
 , prettyprinter
-, QuickCheck
 , text
 }:
 mkDerivation {
diff --git a/pkgs/prettyprinter.nix b/pkgs/prettyprinter.nix
index 0f57112d8e0d743751bb3bfaeb40fb4e0d5f43ae..8ad6c825ed2101a3e647eb842e8fbcc60c27ff5f 100644
--- a/pkgs/prettyprinter.nix
+++ b/pkgs/prettyprinter.nix
@@ -1,4 +1,5 @@
 { mkDerivation
+, QuickCheck
 , ansi-wl-pprint
 , base
 , base-compat
@@ -10,7 +11,6 @@
 , lib
 , mtl
 , pgp-wordlist
-, QuickCheck
 , quickcheck-instances
 , random
 , tasty
diff --git a/pkgs/primitive.nix b/pkgs/primitive.nix
index 97b34fbac940be7d209d366f395ec4d4d1c89e1b..c24b6af3650dffefa9fc56201180c3283c826012 100644
--- a/pkgs/primitive.nix
+++ b/pkgs/primitive.nix
@@ -1,10 +1,10 @@
 { mkDerivation
+, QuickCheck
 , base
 , base-orphans
 , deepseq
 , ghc-prim
 , lib
-, QuickCheck
 , quickcheck-classes-base
 , tagged
 , tasty
diff --git a/pkgs/process-extras.nix b/pkgs/process-extras.nix
index f07c8604d3d9a7f00b9af482df156bb5c8e95546..b829575a34715b5dc39673b3d049a271e3707701 100644
--- a/pkgs/process-extras.nix
+++ b/pkgs/process-extras.nix
@@ -1,12 +1,12 @@
 { mkDerivation
+, HUnit
+, ListLike
 , base
 , bytestring
 , data-default
 , deepseq
 , generic-deriving
-, HUnit
 , lib
-, ListLike
 , mtl
 , process
 , text
diff --git a/pkgs/prometheus-client.nix b/pkgs/prometheus-client.nix
index fb02a6aa7c9e2aae24b2095d00348fb672dd9d5f..b8f785b6c4130303c41d0567d97fbc0a922739e7 100644
--- a/pkgs/prometheus-client.nix
+++ b/pkgs/prometheus-client.nix
@@ -1,4 +1,5 @@
 { mkDerivation
+, QuickCheck
 , atomic-primops
 , base
 , bytestring
@@ -13,7 +14,6 @@
 , lib
 , mtl
 , primitive
-, QuickCheck
 , random
 , random-shuffle
 , stm
diff --git a/pkgs/proteaaudio-sdl.nix b/pkgs/proteaaudio-sdl.nix
index fe8370e6e4fd4752b41c22b4e6242a6b254503a5..0fa5c6a0cd10126e958e5868c510220afd6647bf 100644
--- a/pkgs/proteaaudio-sdl.nix
+++ b/pkgs/proteaaudio-sdl.nix
@@ -1,4 +1,4 @@
-{ mkDerivation, base, bytestring, c2hs, lib, SDL2 }:
+{ mkDerivation, SDL2, base, bytestring, c2hs, lib }:
 mkDerivation {
   pname = "proteaaudio-sdl";
   version = "0.9.2";
diff --git a/pkgs/psqueues.nix b/pkgs/psqueues.nix
index c1a2a20dc249d2689b9fbf85181591b436774166..9c8edf15fdee6c445c55ff8f1caf2be770593bc7 100644
--- a/pkgs/psqueues.nix
+++ b/pkgs/psqueues.nix
@@ -1,4 +1,7 @@
 { mkDerivation
+, HUnit
+, PSQueue
+, QuickCheck
 , array
 , base
 , containers
@@ -7,11 +10,8 @@
 , fingertree-psqueue
 , ghc-prim
 , hashable
-, HUnit
 , lib
 , mtl
-, PSQueue
-, QuickCheck
 , random
 , tagged
 , tasty
diff --git a/pkgs/pureMD5.nix b/pkgs/pureMD5.nix
index 1b2076ee93d75c7114e6ebaa753b6fda05259e91..3c4fb72d5285dc95234e721ebf37609e8f7a493e 100644
--- a/pkgs/pureMD5.nix
+++ b/pkgs/pureMD5.nix
@@ -1,4 +1,5 @@
 { mkDerivation
+, QuickCheck
 , base
 , binary
 , bytestring
@@ -7,7 +8,6 @@
 , crypto-api-tests
 , lib
 , pretty-hex
-, QuickCheck
 , tagged
 , test-framework
 , test-framework-quickcheck2
diff --git a/pkgs/quickcheck-assertions.nix b/pkgs/quickcheck-assertions.nix
index 4c1fa8e6ecb94f5d102344765f25d176adde22c8..28be5f0f94f0c4107cbf8da4ab38a5816914dfff 100644
--- a/pkgs/quickcheck-assertions.nix
+++ b/pkgs/quickcheck-assertions.nix
@@ -1,10 +1,10 @@
 { mkDerivation
+, QuickCheck
 , base
 , hspec
 , ieee754
 , lib
 , pretty-show
-, QuickCheck
 }:
 mkDerivation {
   pname = "quickcheck-assertions";
diff --git a/pkgs/quickcheck-classes-base.nix b/pkgs/quickcheck-classes-base.nix
index c4aa4960bc5e756f2ce540b2dcf70c088b942eac..ed6cc1d0acb0400ff65db18580befb96c35d1813 100644
--- a/pkgs/quickcheck-classes-base.nix
+++ b/pkgs/quickcheck-classes-base.nix
@@ -1,4 +1,4 @@
-{ mkDerivation, base, containers, lib, QuickCheck, transformers }:
+{ mkDerivation, QuickCheck, base, containers, lib, transformers }:
 mkDerivation {
   pname = "quickcheck-classes-base";
   version = "0.6.2.0";
diff --git a/pkgs/quickcheck-classes.nix b/pkgs/quickcheck-classes.nix
index 4d86f3ab1ccbeb3cc3eafa83c73abe539afda3c1..a9170efa294239e59b9d7aaa3f04c8935d0e976e 100644
--- a/pkgs/quickcheck-classes.nix
+++ b/pkgs/quickcheck-classes.nix
@@ -1,4 +1,5 @@
 { mkDerivation
+, QuickCheck
 , aeson
 , base
 , base-orphans
@@ -6,7 +7,6 @@
 , lib
 , primitive
 , primitive-addr
-, QuickCheck
 , quickcheck-classes-base
 , semigroupoids
 , semirings
diff --git a/pkgs/quickcheck-dynamic.nix b/pkgs/quickcheck-dynamic.nix
index 7982a20f392fe53c263c715e459688503a35dee2..0f80c860ee919c328d8d6d97dc39e32026429620 100644
--- a/pkgs/quickcheck-dynamic.nix
+++ b/pkgs/quickcheck-dynamic.nix
@@ -1,4 +1,4 @@
-{ mkDerivation, base, lib, mtl, QuickCheck, random }:
+{ mkDerivation, QuickCheck, base, lib, mtl, random }:
 mkDerivation {
   pname = "quickcheck-dynamic";
   version = "2.0.0";
diff --git a/pkgs/quickcheck-instances.nix b/pkgs/quickcheck-instances.nix
index f878a361aebeebc846fb40aa54afea87e15b585a..b05347631d3912340e0ed693a502866bd01bc2ef 100644
--- a/pkgs/quickcheck-instances.nix
+++ b/pkgs/quickcheck-instances.nix
@@ -1,4 +1,6 @@
 { mkDerivation
+, OneTuple
+, QuickCheck
 , array
 , base
 , bytestring
@@ -9,9 +11,7 @@
 , integer-logarithms
 , lib
 , old-time
-, OneTuple
 , primitive
-, QuickCheck
 , scientific
 , splitmix
 , strict
diff --git a/pkgs/quickcheck-io.nix b/pkgs/quickcheck-io.nix
index a73120b1bccbbfe77a7fb7a2a22e73fea0e5676e..f742c7c689d6e8caa87838859aec456052644176 100644
--- a/pkgs/quickcheck-io.nix
+++ b/pkgs/quickcheck-io.nix
@@ -1,4 +1,4 @@
-{ mkDerivation, base, HUnit, lib, QuickCheck }:
+{ mkDerivation, HUnit, QuickCheck, base, lib }:
 mkDerivation {
   pname = "quickcheck-io";
   version = "0.2.0";
diff --git a/pkgs/quickcheck-text.nix b/pkgs/quickcheck-text.nix
index 54028af9f8226d5eec464508eed2e884c74752a5..6f6bc8bc16fc8c7d05af821697cf10c67acf12d2 100644
--- a/pkgs/quickcheck-text.nix
+++ b/pkgs/quickcheck-text.nix
@@ -1,4 +1,4 @@
-{ mkDerivation, base, binary, bytestring, lib, QuickCheck, text }:
+{ mkDerivation, QuickCheck, base, binary, bytestring, lib, text }:
 mkDerivation {
   pname = "quickcheck-text";
   version = "0.1.2.1";
diff --git a/pkgs/quickcheck-unicode.nix b/pkgs/quickcheck-unicode.nix
index 8336ea652888ffb8500a8d7c4a6522b3ddf9b929..5a74068992f6df2c9657542902f0ab43805f2798 100644
--- a/pkgs/quickcheck-unicode.nix
+++ b/pkgs/quickcheck-unicode.nix
@@ -1,4 +1,4 @@
-{ mkDerivation, base, lib, QuickCheck }:
+{ mkDerivation, QuickCheck, base, lib }:
 mkDerivation {
   pname = "quickcheck-unicode";
   version = "1.0.1.0";
diff --git a/pkgs/random-shuffle.nix b/pkgs/random-shuffle.nix
index a7153de3e3062f5fc089e72707ac5484e8cb2cab..55fbce9245bae09907ed4c8cf93dc0ba740769be 100644
--- a/pkgs/random-shuffle.nix
+++ b/pkgs/random-shuffle.nix
@@ -1,4 +1,4 @@
-{ mkDerivation, base, lib, MonadRandom, random }:
+{ mkDerivation, MonadRandom, base, lib, random }:
 mkDerivation {
   pname = "random-shuffle";
   version = "0.0.4";
diff --git a/pkgs/raw-strings-qq.nix b/pkgs/raw-strings-qq.nix
index 69d0dfe4e8e6862affe3e29303e72c14b2ec80a5..f18c3ec6a7d1bb07375d41f47f417acd8001eae1 100644
--- a/pkgs/raw-strings-qq.nix
+++ b/pkgs/raw-strings-qq.nix
@@ -1,4 +1,4 @@
-{ mkDerivation, base, HUnit, lib, template-haskell }:
+{ mkDerivation, HUnit, base, lib, template-haskell }:
 mkDerivation {
   pname = "raw-strings-qq";
   version = "1.1";
diff --git a/pkgs/refined.nix b/pkgs/refined.nix
index 1e8dd7b3c3d8f430968eab8aeaa59b05cfe65576..7f44b2dfa1b9eb2acdb4e5778a0e8d3d603c808e 100644
--- a/pkgs/refined.nix
+++ b/pkgs/refined.nix
@@ -1,4 +1,5 @@
 { mkDerivation
+, QuickCheck
 , aeson
 , base
 , bytestring
@@ -7,7 +8,6 @@
 , hashable
 , lib
 , mtl
-, QuickCheck
 , template-haskell
 , text
 , these-skinny
diff --git a/pkgs/reflection.nix b/pkgs/reflection.nix
index d1c18a2b276db19600e2923e9244401f3726d16b..ee87d5b7ae29d61b6e8129365a244c427c712340 100644
--- a/pkgs/reflection.nix
+++ b/pkgs/reflection.nix
@@ -1,10 +1,10 @@
 { mkDerivation
+, QuickCheck
 , base
 , containers
 , hspec
 , hspec-discover
 , lib
-, QuickCheck
 , template-haskell
 }:
 mkDerivation {
diff --git a/pkgs/relude.nix b/pkgs/relude.nix
index f7669d6e2878eef8276337047669c3e7dfb8ac6e..fb5ff2ea1a9ba57a4c881487c076032823fa9390 100644
--- a/pkgs/relude.nix
+++ b/pkgs/relude.nix
@@ -1,11 +1,11 @@
 { mkDerivation
+, Glob
 , base
 , bytestring
 , containers
 , deepseq
 , doctest
 , ghc-prim
-, Glob
 , hashable
 , hedgehog
 , lib
diff --git a/pkgs/rere.nix b/pkgs/rere.nix
index 71e0d7e761d3803db9f20f41b5750d848a888f3e..a403901bb52c3384c99958cccdb6a9bf6ecd8608 100644
--- a/pkgs/rere.nix
+++ b/pkgs/rere.nix
@@ -1,4 +1,5 @@
 { mkDerivation
+, QuickCheck
 , aeson
 , attoparsec
 , base
@@ -10,7 +11,6 @@
 , fin
 , lib
 , parsec
-, QuickCheck
 , quickcheck-instances
 , tasty
 , tasty-quickcheck
diff --git a/pkgs/retry.nix b/pkgs/retry.nix
index 32fd2d68a0fbf58294652ae89d1286e8e8df10a3..1f9bec1516ad8d55d60ee50b6fbebb3f83626abc 100644
--- a/pkgs/retry.nix
+++ b/pkgs/retry.nix
@@ -1,9 +1,9 @@
 { mkDerivation
+, HUnit
 , base
 , exceptions
 , ghc-prim
 , hedgehog
-, HUnit
 , lib
 , mtl
 , mtl-compat
diff --git a/pkgs/rope-utf16-splay.nix b/pkgs/rope-utf16-splay.nix
index e300ece4bcf078b5e70f9f51be5316c89ae26d0e..748358b675102837885bc27db9fec9282d20b286 100644
--- a/pkgs/rope-utf16-splay.nix
+++ b/pkgs/rope-utf16-splay.nix
@@ -1,7 +1,7 @@
 { mkDerivation
+, QuickCheck
 , base
 , lib
-, QuickCheck
 , tasty
 , tasty-hunit
 , tasty-quickcheck
diff --git a/pkgs/safe.nix b/pkgs/safe.nix
index 60336ebfe3465e61c6236218c221ed788e645aa9..7edc0d1f445e85c3fd102f667eb7fd7bdb47c811 100644
--- a/pkgs/safe.nix
+++ b/pkgs/safe.nix
@@ -1,4 +1,4 @@
-{ mkDerivation, base, deepseq, lib, QuickCheck }:
+{ mkDerivation, QuickCheck, base, deepseq, lib }:
 mkDerivation {
   pname = "safe";
   version = "0.3.19";
diff --git a/pkgs/saltine.nix b/pkgs/saltine.nix
index 5ead73bacf56da06aecf826e5483310b9f210ba4..8132809e22409c01a0f543a22883727b5c050ec5 100644
--- a/pkgs/saltine.nix
+++ b/pkgs/saltine.nix
@@ -1,4 +1,5 @@
 { mkDerivation
+, QuickCheck
 , base
 , bytestring
 , criterion
@@ -7,7 +8,6 @@
 , lib
 , libsodium
 , profunctors
-, QuickCheck
 , semigroups
 , test-framework
 , test-framework-quickcheck2
diff --git a/pkgs/scientific.nix b/pkgs/scientific.nix
index 0e3d8c536de51443656d017ecc40551f08275b68..57d13b957abdc4e65d35447cff34eb79c7105aa3 100644
--- a/pkgs/scientific.nix
+++ b/pkgs/scientific.nix
@@ -1,4 +1,5 @@
 { mkDerivation
+, QuickCheck
 , base
 , binary
 , bytestring
@@ -9,7 +10,6 @@
 , integer-logarithms
 , lib
 , primitive
-, QuickCheck
 , smallcheck
 , tasty
 , tasty-hunit
diff --git a/pkgs/sdl2-gfx.nix b/pkgs/sdl2-gfx.nix
index 89dacbf9d8ad61b3fe864eb22f053a123f89458e..7965c571605f47592f741d695dec0ad5c67fbfe8 100644
--- a/pkgs/sdl2-gfx.nix
+++ b/pkgs/sdl2-gfx.nix
@@ -1,11 +1,11 @@
 { mkDerivation
+, SDL2
+, SDL2_gfx
 , base
 , lib
 , lifted-base
 , monad-control
-, SDL2
 , sdl2
-, SDL2_gfx
 , template-haskell
 , vector
 }:
@@ -38,6 +38,5 @@ mkDerivation {
   hyperlinkSource = false;
   description = "Haskell bindings to SDL2_gfx";
   license = lib.licenses.mit;
-  mainProgram = "sdl2-gfx-example";
   broken = false;
 }
diff --git a/pkgs/sdl2-image.nix b/pkgs/sdl2-image.nix
index b507e2b880e6c76e729ec736091ebbe955dfb3ad..ffc876a280d59be9eb25d6cb456f5f28ded4821a 100644
--- a/pkgs/sdl2-image.nix
+++ b/pkgs/sdl2-image.nix
@@ -1,10 +1,10 @@
 { mkDerivation
+, SDL2
+, SDL2_image
 , base
 , bytestring
 , lib
-, SDL2
 , sdl2
-, SDL2_image
 , template-haskell
 , text
 }:
@@ -36,6 +36,5 @@ mkDerivation {
   hyperlinkSource = false;
   description = "Haskell bindings to SDL2_image";
   license = lib.licenses.mit;
-  mainProgram = "sdl2-image-example";
   broken = false;
 }
diff --git a/pkgs/sdl2-mixer.nix b/pkgs/sdl2-mixer.nix
index 04e569a2dc485292de66c61acf902276c9a3626c..236531a967d9555e4ebd3fd42d03e02e7ba50f30 100644
--- a/pkgs/sdl2-mixer.nix
+++ b/pkgs/sdl2-mixer.nix
@@ -1,4 +1,5 @@
 { mkDerivation
+, SDL2_mixer
 , base
 , bytestring
 , data-default-class
@@ -6,7 +7,6 @@
 , lifted-base
 , monad-control
 , sdl2
-, SDL2_mixer
 , template-haskell
 , vector
 }:
diff --git a/pkgs/sdl2-ttf.nix b/pkgs/sdl2-ttf.nix
index 41006f4746f994f35a171ded0a580521195ed2fd..6d942b7cbc7b7d213a2dbba861e82a468b99557d 100644
--- a/pkgs/sdl2-ttf.nix
+++ b/pkgs/sdl2-ttf.nix
@@ -1,10 +1,10 @@
 { mkDerivation
+, SDL2
+, SDL2_ttf
 , base
 , bytestring
 , lib
-, SDL2
 , sdl2
-, SDL2_ttf
 , template-haskell
 , text
 , th-abstraction
diff --git a/pkgs/sdl2.nix b/pkgs/sdl2.nix
index 299746a0a06bbeed4b47d7a996c100efa3f38514..bd46d3a9dde1023f1d9eb881ba8e0e9bb0edc664 100644
--- a/pkgs/sdl2.nix
+++ b/pkgs/sdl2.nix
@@ -1,12 +1,12 @@
 { mkDerivation
+, SDL2
+, StateVar
 , base
 , bytestring
 , deepseq
 , exceptions
 , lib
 , linear
-, SDL2
-, StateVar
 , text
 , transformers
 , vector
diff --git a/pkgs/selective.nix b/pkgs/selective.nix
index b729408c8c96afcbbb585423aec5bae5b60d39c8..78592b810651de65669635c1eb0efb6d3b6b1a33 100644
--- a/pkgs/selective.nix
+++ b/pkgs/selective.nix
@@ -1,4 +1,4 @@
-{ mkDerivation, base, containers, lib, QuickCheck, transformers }:
+{ mkDerivation, QuickCheck, base, containers, lib, transformers }:
 mkDerivation {
   pname = "selective";
   version = "0.5";
diff --git a/pkgs/serialise.nix b/pkgs/serialise.nix
index cf1dccc5471e6bbd42ab6c3ddfc3cd0bc9f295d6..7c4f5b95e3904c6c093077fcc0f4ce267b92a5ca 100644
--- a/pkgs/serialise.nix
+++ b/pkgs/serialise.nix
@@ -1,4 +1,5 @@
 { mkDerivation
+, QuickCheck
 , aeson
 , array
 , base
@@ -19,7 +20,6 @@
 , lib
 , pretty
 , primitive
-, QuickCheck
 , quickcheck-instances
 , semigroups
 , store
diff --git a/pkgs/servant-client-core.nix b/pkgs/servant-client-core.nix
index 800b888029a4f0b4553255cc305416011408cbad..a223db82026bca6f8faabbac7f8e4e639bf7a3e1 100644
--- a/pkgs/servant-client-core.nix
+++ b/pkgs/servant-client-core.nix
@@ -1,4 +1,5 @@
 { mkDerivation
+, QuickCheck
 , aeson
 , base
 , base-compat
@@ -16,7 +17,6 @@
 , http-types
 , lib
 , network-uri
-, QuickCheck
 , safe
 , servant
 , sop-core
diff --git a/pkgs/servant-client.nix b/pkgs/servant-client.nix
index 87409d9912f4c8c3f01949f2f42d2717e5ce56dc..bba1ef9185de05680bc1038f5859fd3be23eda2e 100644
--- a/pkgs/servant-client.nix
+++ b/pkgs/servant-client.nix
@@ -1,4 +1,6 @@
 { mkDerivation
+, HUnit
+, QuickCheck
 , aeson
 , base
 , base-compat
@@ -14,14 +16,12 @@
 , http-client
 , http-media
 , http-types
-, HUnit
 , kan-extensions
 , lib
 , markdown-unlit
 , monad-control
 , mtl
 , network
-, QuickCheck
 , semigroupoids
 , servant
 , servant-client-core
diff --git a/pkgs/servant-docs.nix b/pkgs/servant-docs.nix
index bf56c07234dfd0fdbd75d6ad6de01b4b38dc5840..7e6e7a55a4f81479f1a002b589832db82f543a3f 100644
--- a/pkgs/servant-docs.nix
+++ b/pkgs/servant-docs.nix
@@ -76,6 +76,5 @@ mkDerivation {
   homepage = "http://docs.servant.dev/";
   description = "generate API docs for your servant webservice";
   license = lib.licenses.bsd3;
-  mainProgram = "greet-docs";
   broken = false;
 }
diff --git a/pkgs/servant-server.nix b/pkgs/servant-server.nix
index e150998accbb742c95171d090038ca2f7808e71f..d649b4d2e9720a8787611c0a164e5258b2610172 100644
--- a/pkgs/servant-server.nix
+++ b/pkgs/servant-server.nix
@@ -1,4 +1,5 @@
 { mkDerivation
+, QuickCheck
 , aeson
 , base
 , base-compat
@@ -21,7 +22,6 @@
 , mtl
 , network
 , network-uri
-, QuickCheck
 , resourcet
 , safe
 , servant
@@ -126,6 +126,5 @@ mkDerivation {
   homepage = "http://docs.servant.dev/";
   description = "A family of combinators for defining webservices APIs and serving them";
   license = lib.licenses.bsd3;
-  mainProgram = "greet";
   broken = false;
 }
diff --git a/pkgs/servant-static-th.nix b/pkgs/servant-static-th.nix
index 9a5f8e1d9b59fc702e2b947375ec5d0e2dbceb12..a756a209e86d8c453655f4df4c81fcc6661d45a1 100644
--- a/pkgs/servant-static-th.nix
+++ b/pkgs/servant-static-th.nix
@@ -1,4 +1,5 @@
 { mkDerivation
+, Glob
 , base
 , blaze-html
 , bytestring
@@ -6,7 +7,6 @@
 , directory
 , doctest
 , filepath
-, Glob
 , hspec-wai
 , http-media
 , lib
diff --git a/pkgs/servant-swagger.nix b/pkgs/servant-swagger.nix
index 415b559309b3a6312b27c00035f8144df8c5ffd5..cdfb57b2e9c6502937d6bf1b9e3d34f3cbe0a654 100644
--- a/pkgs/servant-swagger.nix
+++ b/pkgs/servant-swagger.nix
@@ -1,10 +1,11 @@
 { mkDerivation
+, Cabal
+, QuickCheck
 , aeson
 , aeson-pretty
 , base
 , base-compat
 , bytestring
-, Cabal
 , cabal-doctest
 , directory
 , doctest
@@ -16,7 +17,6 @@
 , lens
 , lens-aeson
 , lib
-, QuickCheck
 , servant
 , singleton-bool
 , swagger2
diff --git a/pkgs/servant.nix b/pkgs/servant.nix
index 12141450464f9bf5f3acbd9abe73e6dbf9e9a8c0..2e62c8ae235074dcbf8d36726f9a30f0642ca963 100644
--- a/pkgs/servant.nix
+++ b/pkgs/servant.nix
@@ -1,4 +1,5 @@
 { mkDerivation
+, QuickCheck
 , aeson
 , attoparsec
 , base
@@ -18,7 +19,6 @@
 , mmorph
 , mtl
 , network-uri
-, QuickCheck
 , quickcheck-instances
 , singleton-bool
 , sop-core
diff --git a/pkgs/shake.nix b/pkgs/shake.nix
index 4bea42b2e3938194b20a6491c7311e3ced4c1d1a..048c73c22ee71b2e836bb41522b10ed91721306a 100644
--- a/pkgs/shake.nix
+++ b/pkgs/shake.nix
@@ -1,4 +1,5 @@
 { mkDerivation
+, QuickCheck
 , base
 , binary
 , bytestring
@@ -15,7 +16,6 @@
 , lib
 , primitive
 , process
-, QuickCheck
 , random
 , time
 , transformers
@@ -110,6 +110,5 @@ mkDerivation {
   homepage = "https://shakebuild.com";
   description = "Build system library, like Make, but more accurate dependencies";
   license = lib.licenses.bsd3;
-  mainProgram = "shake";
   broken = false;
 }
diff --git a/pkgs/shakespeare.nix b/pkgs/shakespeare.nix
index faf01dd375ab3ba4915e6309dbce855461c84c35..e5677a1d403091123d3768927bb5f8b248659fc7 100644
--- a/pkgs/shakespeare.nix
+++ b/pkgs/shakespeare.nix
@@ -1,4 +1,5 @@
 { mkDerivation
+, HUnit
 , aeson
 , base
 , blaze-html
@@ -10,7 +11,6 @@
 , file-embed
 , ghc-prim
 , hspec
-, HUnit
 , lib
 , parsec
 , process
diff --git a/pkgs/shelly.nix b/pkgs/shelly.nix
index dda59a14431a3d85ba161fbec33b8997698da364..15076baa5ea40945f7d559ad11950d24c093b991 100644
--- a/pkgs/shelly.nix
+++ b/pkgs/shelly.nix
@@ -1,4 +1,5 @@
 { mkDerivation
+, HUnit
 , async
 , base
 , bytestring
@@ -9,7 +10,6 @@
 , filepath
 , hspec
 , hspec-contrib
-, HUnit
 , lib
 , lifted-async
 , lifted-base
diff --git a/pkgs/should-not-typecheck.nix b/pkgs/should-not-typecheck.nix
index 89958d8ff974a30b4ec09d7991ba5ca88d2841e3..9e1ee26cd73223a2930b49be96a2c177d33fa14f 100644
--- a/pkgs/should-not-typecheck.nix
+++ b/pkgs/should-not-typecheck.nix
@@ -1,9 +1,9 @@
 { mkDerivation
+, HUnit
 , base
 , deepseq
 , hspec
 , hspec-expectations
-, HUnit
 , lib
 }:
 mkDerivation {
diff --git a/pkgs/simple-sendfile.nix b/pkgs/simple-sendfile.nix
index 94cbc39f43754ef8dff80ef4cb6afa5a6d3f778e..1cf01d1ea753f0243a81665b28a88695cf03b358 100644
--- a/pkgs/simple-sendfile.nix
+++ b/pkgs/simple-sendfile.nix
@@ -1,11 +1,11 @@
 { mkDerivation
+, HUnit
 , base
 , bytestring
 , conduit
 , conduit-extra
 , directory
 , hspec
-, HUnit
 , lib
 , network
 , process
diff --git a/pkgs/skylighting-core.nix b/pkgs/skylighting-core.nix
index 4e6833a2315eb0c68d05ab65378b5c6733701394..8f9b4907795be90548b2de5d768afad11fe422ff 100644
--- a/pkgs/skylighting-core.nix
+++ b/pkgs/skylighting-core.nix
@@ -1,4 +1,6 @@
 { mkDerivation
+, Diff
+, QuickCheck
 , aeson
 , attoparsec
 , base
@@ -9,13 +11,11 @@
 , colour
 , containers
 , criterion
-, Diff
 , directory
 , filepath
 , lib
 , mtl
 , pretty-show
-, QuickCheck
 , safe
 , tasty
 , tasty-golden
diff --git a/pkgs/skylighting.nix b/pkgs/skylighting.nix
index abd9a8bfe10e8556c766e50c53db804eaeeef71d..0196d6327b88135f17dead8b459ce3fce0b9e909 100644
--- a/pkgs/skylighting.nix
+++ b/pkgs/skylighting.nix
@@ -47,6 +47,5 @@ mkDerivation {
   homepage = "https://github.com/jgm/skylighting";
   description = "syntax highlighting library";
   license = lib.licenses.gpl2Only;
-  mainProgram = "skylighting";
   broken = false;
 }
diff --git a/pkgs/slugify.nix b/pkgs/slugify.nix
index ddf63447c990b804f3785dcdc57f4abc4d218514..f4c5d45aa85834bb16cbe2c7ce19cc88659b6c93 100644
--- a/pkgs/slugify.nix
+++ b/pkgs/slugify.nix
@@ -1,9 +1,9 @@
 { mkDerivation
+, QuickCheck
 , base
 , hspec
 , hspec-discover
 , lib
-, QuickCheck
 , text
 , unicode-transforms
 }:
diff --git a/pkgs/split.nix b/pkgs/split.nix
index 725548affaffa69b76233a5eb5bf5d3c206e878e..a2f870ed7d27f779dc7470bc84fe7ec8c0ceaf91 100644
--- a/pkgs/split.nix
+++ b/pkgs/split.nix
@@ -1,4 +1,4 @@
-{ mkDerivation, base, lib, QuickCheck }:
+{ mkDerivation, QuickCheck, base, lib }:
 mkDerivation {
   pname = "split";
   version = "0.2.3.3";
diff --git a/pkgs/splitmix.nix b/pkgs/splitmix.nix
index ff34792b2f6fbefc70329a3e2ef8532a5718699e..0e0e9d64cc7fdd55bf8ca4f82a1ae0ba7fe2cf0a 100644
--- a/pkgs/splitmix.nix
+++ b/pkgs/splitmix.nix
@@ -1,4 +1,5 @@
 { mkDerivation
+, HUnit
 , async
 , base
 , base-compat
@@ -8,7 +9,6 @@
 , containers
 , criterion
 , deepseq
-, HUnit
 , lib
 , math-functions
 , process
diff --git a/pkgs/sqlite-simple.nix b/pkgs/sqlite-simple.nix
index 3dfef65f454b3121af9ede04e4444a2ed82a8086..51eddc446b46fd3421a7f7f2cc275e873250fd4e 100644
--- a/pkgs/sqlite-simple.nix
+++ b/pkgs/sqlite-simple.nix
@@ -1,4 +1,6 @@
 { mkDerivation
+, HUnit
+, Only
 , attoparsec
 , base
 , base16-bytestring
@@ -7,9 +9,7 @@
 , bytestring
 , containers
 , direct-sqlite
-, HUnit
 , lib
-, Only
 , template-haskell
 , text
 , time
diff --git a/pkgs/statistics.nix b/pkgs/statistics.nix
index f24575edf62ffb37a7136a80d4bd4b385608da13..8fab24a06e7e5f358f69ed8beb555216b10b8674 100644
--- a/pkgs/statistics.nix
+++ b/pkgs/statistics.nix
@@ -1,4 +1,5 @@
 { mkDerivation
+, QuickCheck
 , aeson
 , async
 , base
@@ -13,7 +14,6 @@
 , mwc-random
 , parallel
 , primitive
-, QuickCheck
 , random
 , tasty
 , tasty-expected-failure
diff --git a/pkgs/streaming-commons.nix b/pkgs/streaming-commons.nix
index fa7afe205b547ec26c24f2486bff58fdafce1551..b7997328b264ec8f42892f8f7c72229c7f20112a 100644
--- a/pkgs/streaming-commons.nix
+++ b/pkgs/streaming-commons.nix
@@ -1,4 +1,5 @@
 { mkDerivation
+, QuickCheck
 , array
 , async
 , base
@@ -10,7 +11,6 @@
 , lib
 , network
 , process
-, QuickCheck
 , random
 , stm
 , text
diff --git a/pkgs/streaming.nix b/pkgs/streaming.nix
index e6c62549445c5e2e5e8cdd104314c8e1dbac4a32..04bf2e7ecd495075c0ce33290008c606d08c4925 100644
--- a/pkgs/streaming.nix
+++ b/pkgs/streaming.nix
@@ -1,4 +1,5 @@
 { mkDerivation
+, QuickCheck
 , base
 , containers
 , ghc-prim
@@ -6,7 +7,6 @@
 , lib
 , mmorph
 , mtl
-, QuickCheck
 , transformers
 , transformers-base
 }:
diff --git a/pkgs/string-conversions.nix b/pkgs/string-conversions.nix
index a629720059895975190ff174107263b269bd39ea..2d00b75249bd592565c69d80693fb7f01b474cbe 100644
--- a/pkgs/string-conversions.nix
+++ b/pkgs/string-conversions.nix
@@ -1,10 +1,10 @@
 { mkDerivation
+, QuickCheck
 , base
 , bytestring
 , deepseq
 , hspec
 , lib
-, QuickCheck
 , quickcheck-instances
 , text
 , utf8-string
diff --git a/pkgs/string-interpolate.nix b/pkgs/string-interpolate.nix
index b0fabd21bd75c57ac8d534cad7289f3bcb9d18b3..e4d3465ecbbece6623afd2bccab47574ab2414d4 100644
--- a/pkgs/string-interpolate.nix
+++ b/pkgs/string-interpolate.nix
@@ -1,4 +1,5 @@
 { mkDerivation
+, QuickCheck
 , base
 , bytestring
 , criterion
@@ -11,7 +12,6 @@
 , interpolate
 , lib
 , neat-interpolation
-, QuickCheck
 , quickcheck-instances
 , quickcheck-text
 , quickcheck-unicode
diff --git a/pkgs/string-qq.nix b/pkgs/string-qq.nix
index dbc427ff2a1d04201e45ab61720aaf161a8534c8..20d816cf98199f0c99209a80cc087f7689885d38 100644
--- a/pkgs/string-qq.nix
+++ b/pkgs/string-qq.nix
@@ -1,4 +1,4 @@
-{ mkDerivation, base, HUnit, lib, template-haskell, text }:
+{ mkDerivation, HUnit, base, lib, template-haskell, text }:
 mkDerivation {
   pname = "string-qq";
   version = "0.0.4";
diff --git a/pkgs/stringbuilder.nix b/pkgs/stringbuilder.nix
index 5dd9c0b92abde30b42e027b6741ce31199be4ade..3c19bafffd011a01b475404f6705ebb548c01fed 100644
--- a/pkgs/stringbuilder.nix
+++ b/pkgs/stringbuilder.nix
@@ -1,4 +1,4 @@
-{ mkDerivation, base, hspec, lib, QuickCheck }:
+{ mkDerivation, QuickCheck, base, hspec, lib }:
 mkDerivation {
   pname = "stringbuilder";
   version = "0.5.1";
diff --git a/pkgs/swagger2.nix b/pkgs/swagger2.nix
index cc49b62d03ea60a676af95de1c062f8c2bd81221..ec3d66bc0b6953f959996ce753639356ee58002c 100644
--- a/pkgs/swagger2.nix
+++ b/pkgs/swagger2.nix
@@ -1,21 +1,22 @@
 { mkDerivation
+, Cabal
+, Glob
+, HUnit
+, QuickCheck
 , aeson
 , aeson-pretty
 , base
 , base-compat-batteries
 , bytestring
-, Cabal
 , cabal-doctest
 , containers
 , cookie
 , doctest
 , generics-sop
-, Glob
 , hashable
 , hspec
 , hspec-discover
 , http-media
-, HUnit
 , insert-ordered-containers
 , lens
 , lib
@@ -23,7 +24,6 @@
 , network
 , optics-core
 , optics-th
-, QuickCheck
 , quickcheck-instances
 , scientific
 , template-haskell
diff --git a/pkgs/sydtest-discover.nix b/pkgs/sydtest-discover.nix
index d8e87edf34a735d891881be7c3e8e1918fbc48ae..80576477a2b243614c7ed64cd71048423d37d2bb 100644
--- a/pkgs/sydtest-discover.nix
+++ b/pkgs/sydtest-discover.nix
@@ -31,6 +31,5 @@ mkDerivation {
   homepage = "https://github.com/NorfairKing/sydtest#readme";
   description = "Automatic test suite discovery for sydtest";
   license = "unknown";
-  mainProgram = "sydtest-discover";
   broken = false;
 }
diff --git a/pkgs/sydtest.nix b/pkgs/sydtest.nix
index 0c1234916949965671657ec5890499bdf4052541..f1389119abb40c8bcdfd39c89ed5785c40b7bcf3 100644
--- a/pkgs/sydtest.nix
+++ b/pkgs/sydtest.nix
@@ -1,22 +1,22 @@
 { mkDerivation
+, Diff
+, MonadRandom
+, QuickCheck
 , async
 , autodocodec
 , autodocodec-yaml
 , base
 , bytestring
 , containers
-, Diff
 , dlist
 , envparse
 , filepath
 , lib
-, MonadRandom
 , mtl
 , optparse-applicative
 , path
 , path-io
 , pretty-show
-, QuickCheck
 , quickcheck-io
 , random
 , random-shuffle
diff --git a/pkgs/system-filepath.nix b/pkgs/system-filepath.nix
index 1e999c21c2269687223b7bda9f661a638065f6d8..12b50d65d0ffef9da574208113368c47a1bae060 100644
--- a/pkgs/system-filepath.nix
+++ b/pkgs/system-filepath.nix
@@ -1,12 +1,12 @@
 { mkDerivation
+, Cabal
+, QuickCheck
 , base
 , bytestring
-, Cabal
 , chell
 , chell-quickcheck
 , deepseq
 , lib
-, QuickCheck
 , text
 }:
 mkDerivation {
diff --git a/pkgs/tagsoup.nix b/pkgs/tagsoup.nix
index aaaf2a295cde4d4829879dca174ab2896c52da37..1f4721d09499f8dcddcdc728fb8955076673f967 100644
--- a/pkgs/tagsoup.nix
+++ b/pkgs/tagsoup.nix
@@ -1,4 +1,5 @@
 { mkDerivation
+, QuickCheck
 , base
 , bytestring
 , containers
@@ -6,7 +7,6 @@
 , directory
 , lib
 , process
-, QuickCheck
 , text
 , time
 }:
diff --git a/pkgs/tar.nix b/pkgs/tar.nix
index 60260ec1b80c6c8fee48a1b446596bb5ae835589..294d9ed9179300793a72313f31b29298cd6274c0 100644
--- a/pkgs/tar.nix
+++ b/pkgs/tar.nix
@@ -1,4 +1,5 @@
 { mkDerivation
+, QuickCheck
 , array
 , base
 , bytestring
@@ -8,7 +9,6 @@
 , fetchgit
 , filepath
 , lib
-, QuickCheck
 , tasty
 , tasty-bench
 , tasty-quickcheck
diff --git a/pkgs/tasty-discover.nix b/pkgs/tasty-discover.nix
index 1f08a44753af9885db3e00224052e456f7f4f01a..f9b12a3bccc031baa32e18d0aea547ee7ae32818 100644
--- a/pkgs/tasty-discover.nix
+++ b/pkgs/tasty-discover.nix
@@ -1,10 +1,10 @@
 { mkDerivation
+, Glob
 , base
 , bytestring
 , containers
 , directory
 , filepath
-, Glob
 , hedgehog
 , hspec
 , hspec-core
@@ -69,6 +69,5 @@ mkDerivation {
   homepage = "https://github.com/haskell-works/tasty-discover";
   description = "Test discovery for the tasty framework";
   license = lib.licenses.mit;
-  mainProgram = "tasty-discover";
   broken = false;
 }
diff --git a/pkgs/tasty-hspec.nix b/pkgs/tasty-hspec.nix
index a50f75f6e1b1ddebe098c52781a8d4bee74956a7..f4ec366c2ae350f08cc57b7bebdc12b9c2abbb3a 100644
--- a/pkgs/tasty-hspec.nix
+++ b/pkgs/tasty-hspec.nix
@@ -1,9 +1,9 @@
 { mkDerivation
+, QuickCheck
 , base
 , hspec
 , hspec-core
 , lib
-, QuickCheck
 , tasty
 , tasty-quickcheck
 , tasty-smallcheck
diff --git a/pkgs/tasty-lua.nix b/pkgs/tasty-lua.nix
index 06c29cd481f176e217d2db194854fa7e53dd624c..70c40c4b160f47519789473fbc6a0b476d4e35c5 100644
--- a/pkgs/tasty-lua.nix
+++ b/pkgs/tasty-lua.nix
@@ -1,4 +1,5 @@
 { mkDerivation
+, QuickCheck
 , base
 , bytestring
 , directory
@@ -8,7 +9,6 @@
 , hslua-marshalling
 , lib
 , lua-arbitrary
-, QuickCheck
 , tasty
 , tasty-hunit
 , text
diff --git a/pkgs/tasty-quickcheck.nix b/pkgs/tasty-quickcheck.nix
index 033fa610eb7b0579ad6a1644696235070e1b3263..ba1773d2ed208985e71199a4d2b9f17e51b80149 100644
--- a/pkgs/tasty-quickcheck.nix
+++ b/pkgs/tasty-quickcheck.nix
@@ -1,9 +1,9 @@
 { mkDerivation
+, QuickCheck
 , base
 , lib
 , optparse-applicative
 , pcre-light
-, QuickCheck
 , random
 , tagged
 , tasty
diff --git a/pkgs/tasty-wai.nix b/pkgs/tasty-wai.nix
index fe62d598e041e93cde0b6ce47af31d77175c1650..c4ee0a393fb0e095b8135c2292ce271f1ec26910 100644
--- a/pkgs/tasty-wai.nix
+++ b/pkgs/tasty-wai.nix
@@ -1,8 +1,8 @@
 { mkDerivation
+, HUnit
 , base
 , bytestring
 , http-types
-, HUnit
 , lib
 , tasty
 , wai
diff --git a/pkgs/test-framework-hunit.nix b/pkgs/test-framework-hunit.nix
index 3167fad6d959100a6a02847cb96aaa1a658f4659..f952c5ea27c41aa24aab0944eb964ffac841572f 100644
--- a/pkgs/test-framework-hunit.nix
+++ b/pkgs/test-framework-hunit.nix
@@ -1,7 +1,7 @@
 { mkDerivation
+, HUnit
 , base
 , extensible-exceptions
-, HUnit
 , lib
 , test-framework
 }:
diff --git a/pkgs/test-framework-quickcheck2.nix b/pkgs/test-framework-quickcheck2.nix
index 3f91c685a6db468a131c273d82939118dbec8bca..3818b62b8061a3bc2cea802651716b793270b528 100644
--- a/pkgs/test-framework-quickcheck2.nix
+++ b/pkgs/test-framework-quickcheck2.nix
@@ -1,8 +1,8 @@
 { mkDerivation
+, QuickCheck
 , base
 , extensible-exceptions
 , lib
-, QuickCheck
 , random
 , test-framework
 }:
diff --git a/pkgs/test-framework.nix b/pkgs/test-framework.nix
index 9b9da354fd26d49f5fcbf96714fcfe1d53384aa3..3a6d618cc8988b37530accf6cb7e82d2739e7ba7 100644
--- a/pkgs/test-framework.nix
+++ b/pkgs/test-framework.nix
@@ -1,15 +1,15 @@
 { mkDerivation
+, HUnit
+, QuickCheck
 , ansi-terminal
 , ansi-wl-pprint
 , base
 , bytestring
 , containers
 , hostname
-, HUnit
 , lib
 , libxml
 , old-locale
-, QuickCheck
 , random
 , regex-posix
 , semigroups
diff --git a/pkgs/text-icu.nix b/pkgs/text-icu.nix
index fadda0ef06e921780a534c30de5fcae7e0aa2bd9..3c4a2209a2287a77468e484e27260232249f52f1 100644
--- a/pkgs/text-icu.nix
+++ b/pkgs/text-icu.nix
@@ -1,15 +1,15 @@
 { mkDerivation
+, HUnit
+, QuickCheck
 , array
 , base
 , bytestring
 , deepseq
 , directory
 , ghc-prim
-, HUnit
 , icu
 , icu-i18n
 , lib
-, QuickCheck
 , random
 , test-framework
 , test-framework-hunit
diff --git a/pkgs/text-metrics.nix b/pkgs/text-metrics.nix
index db99b0ddcaacbe85985a70b180b9320fe1336ff3..a3dee2183f9c91b4084322d1fef4758c63e7ab2b 100644
--- a/pkgs/text-metrics.nix
+++ b/pkgs/text-metrics.nix
@@ -1,11 +1,11 @@
 { mkDerivation
+, QuickCheck
 , base
 , containers
 , criterion
 , deepseq
 , hspec
 , lib
-, QuickCheck
 , text
 , vector
 , weigh
diff --git a/pkgs/text-zipper.nix b/pkgs/text-zipper.nix
index 056e0369bbc07348fe04a8428a561d0b1c6ca8f5..86191581d2745e140a5adf8ad791ce4da3d7ff1e 100644
--- a/pkgs/text-zipper.nix
+++ b/pkgs/text-zipper.nix
@@ -1,9 +1,9 @@
 { mkDerivation
+, QuickCheck
 , base
 , deepseq
 , hspec
 , lib
-, QuickCheck
 , text
 , vector
 }:
diff --git a/pkgs/th-lift-instances.nix b/pkgs/th-lift-instances.nix
index b56de3f84df0ee003134c4a0637af8e90bd0749c..d746f03f575e8d800d72c036914a1b4fbaf48dc8 100644
--- a/pkgs/th-lift-instances.nix
+++ b/pkgs/th-lift-instances.nix
@@ -1,9 +1,9 @@
 { mkDerivation
+, QuickCheck
 , base
 , bytestring
 , containers
 , lib
-, QuickCheck
 , template-haskell
 , text
 , th-lift
diff --git a/pkgs/time-compat.nix b/pkgs/time-compat.nix
index aa399f8cdf132dcd17a7cc8d69da83135f32dbd8..a2df91975f30ca73c3aefeecd95d9b59ddd541fd 100644
--- a/pkgs/time-compat.nix
+++ b/pkgs/time-compat.nix
@@ -1,12 +1,12 @@
 { mkDerivation
+, HUnit
+, QuickCheck
 , base
 , base-compat
 , base-orphans
 , deepseq
 , hashable
-, HUnit
 , lib
-, QuickCheck
 , tagged
 , tasty
 , tasty-hunit
diff --git a/pkgs/tls.nix b/pkgs/tls.nix
index 7a620d2c9a79c1cb94acc46f6833bb54c210e0da..f65763d5969edee0a62d18be3252313fc938e830 100644
--- a/pkgs/tls.nix
+++ b/pkgs/tls.nix
@@ -1,4 +1,5 @@
 { mkDerivation
+, QuickCheck
 , asn1-encoding
 , asn1-types
 , async
@@ -13,7 +14,6 @@
 , memory
 , mtl
 , network
-, QuickCheck
 , tasty
 , tasty-quickcheck
 , transformers
diff --git a/pkgs/tree-diff.nix b/pkgs/tree-diff.nix
index b1646d0be43678783b648e54de23000bc4a22dd5..553a17fb44548523d4cb3b1011a9e2d3ce4da563 100644
--- a/pkgs/tree-diff.nix
+++ b/pkgs/tree-diff.nix
@@ -1,4 +1,6 @@
 { mkDerivation
+, Diff
+, QuickCheck
 , aeson
 , ansi-terminal
 , ansi-wl-pprint
@@ -9,14 +11,12 @@
 , containers
 , criterion
 , deepseq
-, Diff
 , hashable
 , lib
 , parsec
 , parsers
 , pretty
 , primitive
-, QuickCheck
 , scientific
 , semialign
 , strict
diff --git a/pkgs/trifecta.nix b/pkgs/trifecta.nix
index dfe816d13d39571ce301d11a73cfd04ddd0dc749..be775fe839958643fbdbe149fe145c9edf487cb9 100644
--- a/pkgs/trifecta.nix
+++ b/pkgs/trifecta.nix
@@ -1,4 +1,5 @@
 { mkDerivation
+, QuickCheck
 , ansi-terminal
 , array
 , base
@@ -21,7 +22,6 @@
 , prettyprinter
 , prettyprinter-ansi-terminal
 , profunctors
-, QuickCheck
 , reducers
 , transformers
 , unordered-containers
diff --git a/pkgs/tuple.nix b/pkgs/tuple.nix
index 5b440c6ee8edc13d5c78b9e559113d9dd884fe62..17c46d34c414ee2beabfb4eb9cab13ae7ccda82f 100644
--- a/pkgs/tuple.nix
+++ b/pkgs/tuple.nix
@@ -1,4 +1,4 @@
-{ mkDerivation, base, lib, OneTuple }:
+{ mkDerivation, OneTuple, base, lib }:
 mkDerivation {
   pname = "tuple";
   version = "0.3.0.2";
diff --git a/pkgs/type-errors-pretty.nix b/pkgs/type-errors-pretty.nix
index c0c59a1a36ad886d9257f23845006bd104bf3455..9e755fea1bfe5f51458850a0251ad484bea9c98a 100644
--- a/pkgs/type-errors-pretty.nix
+++ b/pkgs/type-errors-pretty.nix
@@ -1,4 +1,4 @@
-{ mkDerivation, base, doctest, Glob, lib }:
+{ mkDerivation, Glob, base, doctest, lib }:
 mkDerivation {
   pname = "type-errors-pretty";
   version = "0.0.1.2";
diff --git a/pkgs/unicode-collation.nix b/pkgs/unicode-collation.nix
index e28ac77c9e635fe1602debe5f98873f9503dd497..2efa67695e79a7ec212822d2abd5d48e1ecd93ef 100644
--- a/pkgs/unicode-collation.nix
+++ b/pkgs/unicode-collation.nix
@@ -1,11 +1,11 @@
 { mkDerivation
+, QuickCheck
 , base
 , binary
 , bytestring
 , containers
 , lib
 , parsec
-, QuickCheck
 , quickcheck-instances
 , tasty
 , tasty-bench
diff --git a/pkgs/unicode-transforms.nix b/pkgs/unicode-transforms.nix
index 8b19c22ed4ef32ddba1001abe06e49581fe2a5f4..bcaf400ab47552527af990304cf592a00c72e514 100644
--- a/pkgs/unicode-transforms.nix
+++ b/pkgs/unicode-transforms.nix
@@ -1,4 +1,5 @@
 { mkDerivation
+, QuickCheck
 , base
 , bytestring
 , deepseq
@@ -8,7 +9,6 @@
 , lib
 , path
 , path-io
-, QuickCheck
 , split
 , tasty-bench
 , text
diff --git a/pkgs/universe-base.nix b/pkgs/universe-base.nix
index 5b17837edae35523b1a27d1d89f6131f20ce4935..90043a0e1c9f472a5236c17675ff5fab387fca26 100644
--- a/pkgs/universe-base.nix
+++ b/pkgs/universe-base.nix
@@ -1,8 +1,8 @@
 { mkDerivation
+, QuickCheck
 , base
 , containers
 , lib
-, QuickCheck
 , tagged
 , transformers
 }:
diff --git a/pkgs/unix-compat.nix b/pkgs/unix-compat.nix
index 7c82b6b7c93056a1c14c57892204a1f6acf0d080..b478535369a129e1a86b7eda2cd3b2ebc38c8fbc 100644
--- a/pkgs/unix-compat.nix
+++ b/pkgs/unix-compat.nix
@@ -1,9 +1,9 @@
 { mkDerivation
+, HUnit
 , base
 , directory
 , extra
 , hspec
-, HUnit
 , lib
 , monad-parallel
 , temporary
diff --git a/pkgs/unix-memory.nix b/pkgs/unix-memory.nix
index b7d012056af2219f7b952b35451b61e9a5435366..aa98f21d6b185fed249348fe7d099e99f5c46301 100644
--- a/pkgs/unix-memory.nix
+++ b/pkgs/unix-memory.nix
@@ -1,8 +1,8 @@
 { mkDerivation
+, QuickCheck
 , base
 , lib
 , mtl
-, QuickCheck
 , tasty
 , tasty-hunit
 , tasty-quickcheck
diff --git a/pkgs/unix-time.nix b/pkgs/unix-time.nix
index 08315bbf5f9d7eb98f79392dff518808dfdad1a9..2d428e63e2e2d47b7770cbe872809e1d910752e9 100644
--- a/pkgs/unix-time.nix
+++ b/pkgs/unix-time.nix
@@ -1,4 +1,5 @@
 { mkDerivation
+, QuickCheck
 , base
 , binary
 , bytestring
@@ -7,7 +8,6 @@
 , lib
 , old-locale
 , old-time
-, QuickCheck
 , time
 }:
 mkDerivation {
diff --git a/pkgs/unliftio.nix b/pkgs/unliftio.nix
index 9a694516d55b7b82a479f47b03cf593ee7709a0e..a3843310c206eb93c6da2f19cebbc644f0d9479a 100644
--- a/pkgs/unliftio.nix
+++ b/pkgs/unliftio.nix
@@ -1,4 +1,5 @@
 { mkDerivation
+, QuickCheck
 , async
 , base
 , bytestring
@@ -10,7 +11,6 @@
 , hspec
 , lib
 , process
-, QuickCheck
 , safe-exceptions
 , stm
 , time
diff --git a/pkgs/unordered-containers.nix b/pkgs/unordered-containers.nix
index 67de63611335dea0fcac07b61112e042c7de1898..eedcc265c0f09fed51caf8b722d5f6e56bfb9355 100644
--- a/pkgs/unordered-containers.nix
+++ b/pkgs/unordered-containers.nix
@@ -1,16 +1,16 @@
 { mkDerivation
+, ChasingBottoms
+, HUnit
+, QuickCheck
 , base
 , bytestring
-, ChasingBottoms
 , containers
 , deepseq
 , hashable
 , hashmap
-, HUnit
 , lib
 , mtl
 , nothunks
-, QuickCheck
 , random
 , tasty
 , tasty-bench
diff --git a/pkgs/uri-bytestring.nix b/pkgs/uri-bytestring.nix
index 28b296a521f8023538ba097b7ea744e520d1609c..b294470a006923fd677b849d634dded6c8468fb1 100644
--- a/pkgs/uri-bytestring.nix
+++ b/pkgs/uri-bytestring.nix
@@ -1,4 +1,5 @@
 { mkDerivation
+, HUnit
 , attoparsec
 , base
 , base-compat
@@ -9,7 +10,6 @@
 , deepseq
 , deepseq-generics
 , hedgehog
-, HUnit
 , lib
 , network-uri
 , safe
diff --git a/pkgs/utf8-string.nix b/pkgs/utf8-string.nix
index 8faf36b8750531a9c10a04a4b6a48aa9cb8c2fc3..9a16b54cbc85003d03bc0aa5e0ad866d485fe330 100644
--- a/pkgs/utf8-string.nix
+++ b/pkgs/utf8-string.nix
@@ -1,4 +1,4 @@
-{ mkDerivation, base, bytestring, HUnit, lib }:
+{ mkDerivation, HUnit, base, bytestring, lib }:
 mkDerivation {
   pname = "utf8-string";
   version = "1.0.2";
diff --git a/pkgs/utility-ht.nix b/pkgs/utility-ht.nix
index 0bf3d1063271e5603dec07d573d6f3576bedde7a..995ecacf239b036753f709c86f14ac98a99e9a9f 100644
--- a/pkgs/utility-ht.nix
+++ b/pkgs/utility-ht.nix
@@ -1,9 +1,9 @@
 { mkDerivation
+, QuickCheck
 , base
 , doctest-exitcode-stdio
 , doctest-lib
 , lib
-, QuickCheck
 }:
 mkDerivation {
   pname = "utility-ht";
diff --git a/pkgs/uuid-types.nix b/pkgs/uuid-types.nix
index db076c884762c2a83fe0bb41e3ea1785ef9bbb22..0b078e7eadb7dd9f3b0112f2e82a71c2ac2b2fca 100644
--- a/pkgs/uuid-types.nix
+++ b/pkgs/uuid-types.nix
@@ -1,4 +1,5 @@
 { mkDerivation
+, QuickCheck
 , base
 , binary
 , bytestring
@@ -6,7 +7,6 @@
 , ghc-byteorder
 , hashable
 , lib
-, QuickCheck
 , random
 , tasty
 , tasty-hunit
diff --git a/pkgs/uuid.nix b/pkgs/uuid.nix
index 175dbe75b4a3fbbc0db86abadabd3aaa3b967979..e6d29de629c1c4c86e0db9932e3988acf8b06e52 100644
--- a/pkgs/uuid.nix
+++ b/pkgs/uuid.nix
@@ -1,4 +1,5 @@
 { mkDerivation
+, QuickCheck
 , base
 , binary
 , bytestring
@@ -7,7 +8,6 @@
 , entropy
 , lib
 , network-info
-, QuickCheck
 , random
 , tasty
 , tasty-hunit
diff --git a/pkgs/vec.nix b/pkgs/vec.nix
index 37ca809d5f0a2050502c245de7962d2cdc961388..a4faae1ec569614af98291f09f637ef0cb881e3f 100644
--- a/pkgs/vec.nix
+++ b/pkgs/vec.nix
@@ -1,4 +1,5 @@
 { mkDerivation
+, QuickCheck
 , adjunctions
 , base
 , base-compat
@@ -11,7 +12,6 @@
 , indexed-traversable
 , inspection-testing
 , lib
-, QuickCheck
 , semigroupoids
 , tagged
 , transformers
diff --git a/pkgs/vector-algorithms.nix b/pkgs/vector-algorithms.nix
index 0ed80afb3a5087fac3b01b62be38eeac71c15d61..54e5d89dda008fe6574672b7915aae2d278f08a7 100644
--- a/pkgs/vector-algorithms.nix
+++ b/pkgs/vector-algorithms.nix
@@ -1,4 +1,5 @@
 { mkDerivation
+, QuickCheck
 , base
 , bitvec
 , bytestring
@@ -6,7 +7,6 @@
 , lib
 , mwc-random
 , primitive
-, QuickCheck
 , vector
 }:
 mkDerivation {
diff --git a/pkgs/vector-binary-instances.nix b/pkgs/vector-binary-instances.nix
index 097051ae5396c9a07a0dd6cb15f6acbaf6f9dbf1..8553cb7da7f4f351511c4017070273af59bad5c6 100644
--- a/pkgs/vector-binary-instances.nix
+++ b/pkgs/vector-binary-instances.nix
@@ -13,8 +13,8 @@ mkDerivation {
   pname = "vector-binary-instances";
   version = "0.2.5.2";
   sha256 = "b72e3b2109a02c75cb8f07ef0aabba0dba6ec0148e21321a0a2b2197c9a2f54d";
-  revision = "2";
-  editedCabalFile = "149gn5n722r2skj5w46av3944fbw3882qkaydq7asm6zx5kc0nj6";
+  revision = "3";
+  editedCabalFile = "0av0k2gn90mf5ai74575bd368x73ljnr7xlkwsqmrs6zdzkw0i83";
   isLibrary = true;
   isExecutable = false;
   enableSeparateDataOutput = false;
diff --git a/pkgs/vector.nix b/pkgs/vector.nix
index 63544f6cf38374c92c4385ca91e24177cf257946..009f720c7c83458696631d2ddd2546a2494a7800 100644
--- a/pkgs/vector.nix
+++ b/pkgs/vector.nix
@@ -1,12 +1,12 @@
 { mkDerivation
+, HUnit
+, QuickCheck
 , base
 , base-orphans
 , deepseq
 , doctest
-, HUnit
 , lib
 , primitive
-, QuickCheck
 , random
 , tasty
 , tasty-bench
diff --git a/pkgs/vty.nix b/pkgs/vty.nix
index dcc9fedf19fc64c3852ceccc16b724b8df6a92de..110b274d7d4244e6eea71b3fe761bf204394ec5a 100644
--- a/pkgs/vty.nix
+++ b/pkgs/vty.nix
@@ -1,16 +1,17 @@
 { mkDerivation
+, Cabal
+, HUnit
+, QuickCheck
 , ansi-terminal
 , base
 , binary
 , blaze-builder
 , bytestring
-, Cabal
 , containers
 , deepseq
 , directory
 , filepath
 , hashable
-, HUnit
 , lib
 , microlens
 , microlens-mtl
@@ -18,7 +19,6 @@
 , mtl
 , parallel
 , parsec
-, QuickCheck
 , quickcheck-assertions
 , random
 , smallcheck
diff --git a/pkgs/wai-app-static.nix b/pkgs/wai-app-static.nix
index 2fcab0211fe3d4edea0d57ae14e2c33cb5a4873e..ae3cd64a28170be97e848f979a3b7af8e6e58a32 100644
--- a/pkgs/wai-app-static.nix
+++ b/pkgs/wai-app-static.nix
@@ -102,6 +102,5 @@ mkDerivation {
   homepage = "http://www.yesodweb.com/book/web-application-interface";
   description = "WAI application for static serving";
   license = lib.licenses.mit;
-  mainProgram = "warp";
   broken = false;
 }
diff --git a/pkgs/wai-extra.nix b/pkgs/wai-extra.nix
index 8fcd8c78eef04458f92b0586ab93a099912d6929..af70f3c15e38788a6102db0b7df92e1e373405c5 100644
--- a/pkgs/wai-extra.nix
+++ b/pkgs/wai-extra.nix
@@ -1,4 +1,5 @@
 { mkDerivation
+, HUnit
 , aeson
 , ansi-terminal
 , base
@@ -14,7 +15,6 @@
 , hspec
 , hspec-discover
 , http-types
-, HUnit
 , iproute
 , lib
 , network
diff --git a/pkgs/wai-logger.nix b/pkgs/wai-logger.nix
index e8da9f49d2c3c8e67fa0c347163a11cde555ece0..5b6cc69ae5868d0ea8b866798a59a77b460207aa 100644
--- a/pkgs/wai-logger.nix
+++ b/pkgs/wai-logger.nix
@@ -1,8 +1,8 @@
 { mkDerivation
+, Cabal
 , base
 , byteorder
 , bytestring
-, Cabal
 , cabal-doctest
 , doctest
 , fast-logger
diff --git a/pkgs/warp.nix b/pkgs/warp.nix
index ba99db3f80dc777c37a57f3090edf9550bdc02d9..feddd434cd0daaba31961556451a314c850f4395 100644
--- a/pkgs/warp.nix
+++ b/pkgs/warp.nix
@@ -1,4 +1,6 @@
 { mkDerivation
+, HUnit
+, QuickCheck
 , array
 , async
 , auto-update
@@ -17,12 +19,10 @@
 , http-date
 , http-types
 , http2
-, HUnit
 , iproute
 , lib
 , network
 , process
-, QuickCheck
 , simple-sendfile
 , stm
 , streaming-commons
diff --git a/pkgs/websockets.nix b/pkgs/websockets.nix
index b0a9df8c4da8550c8df40ca19eafc534cab69505..e266570448a80ebbff42f98c0e6e95edf89057da 100644
--- a/pkgs/websockets.nix
+++ b/pkgs/websockets.nix
@@ -1,4 +1,7 @@
 { mkDerivation
+, HUnit
+, QuickCheck
+, SHA
 , async
 , attoparsec
 , base
@@ -11,12 +14,9 @@
 , containers
 , criterion
 , entropy
-, HUnit
 , lib
 , network
-, QuickCheck
 , random
-, SHA
 , streaming-commons
 , test-framework
 , test-framework-hunit
diff --git a/pkgs/with-utf8.nix b/pkgs/with-utf8.nix
index dd1b20ce7d24f88959f52720d67ce810a7ecf3ac..0fed113b7777a140dc0914d1f8be376055ffa077 100644
--- a/pkgs/with-utf8.nix
+++ b/pkgs/with-utf8.nix
@@ -1,10 +1,10 @@
 { mkDerivation
+, HUnit
 , base
 , deepseq
 , directory
 , filepath
 , hedgehog
-, HUnit
 , lib
 , process
 , safe-exceptions
@@ -58,6 +58,5 @@ mkDerivation {
   homepage = "https://github.com/serokell/haskell-with-utf8#readme";
   description = "Get your IO right on the first try";
   license = lib.licenses.mpl20;
-  mainProgram = "utf8-troubleshoot";
   broken = false;
 }
diff --git a/pkgs/witherable.nix b/pkgs/witherable.nix
index 4693cef7b69b1e851680ff11f077ad908eff042b..7c88af1f144e55ee9eaca0e3ba3e05a86086a0fd 100644
--- a/pkgs/witherable.nix
+++ b/pkgs/witherable.nix
@@ -1,4 +1,5 @@
 { mkDerivation
+, QuickCheck
 , base
 , base-orphans
 , containers
@@ -6,7 +7,6 @@
 , indexed-traversable
 , indexed-traversable-instances
 , lib
-, QuickCheck
 , quickcheck-instances
 , tasty
 , tasty-quickcheck
diff --git a/pkgs/xml-conduit.nix b/pkgs/xml-conduit.nix
index 26c0801216b39941a821cbd6e0b0c3bace1cf18a..3d67cb188ec5b007ed8679af7ed4d5f80a1be9c8 100644
--- a/pkgs/xml-conduit.nix
+++ b/pkgs/xml-conduit.nix
@@ -1,10 +1,11 @@
 { mkDerivation
+, Cabal
+, HUnit
 , attoparsec
 , base
 , blaze-html
 , blaze-markup
 , bytestring
-, Cabal
 , cabal-doctest
 , conduit
 , conduit-extra
@@ -13,7 +14,6 @@
 , deepseq
 , doctest
 , hspec
-, HUnit
 , lib
 , resourcet
 , text
diff --git a/pkgs/yaml.nix b/pkgs/yaml.nix
index c3d47d68bb4ca9501bf27cecb346eb3cc886a7f4..9d4acacf8227f6a1c7b43cb248345b2aac957e7f 100644
--- a/pkgs/yaml.nix
+++ b/pkgs/yaml.nix
@@ -1,4 +1,5 @@
 { mkDerivation
+, HUnit
 , aeson
 , attoparsec
 , base
@@ -9,7 +10,6 @@
 , directory
 , filepath
 , hspec
-, HUnit
 , lib
 , libyaml
 , mockery
diff --git a/pkgs/zip-archive.nix b/pkgs/zip-archive.nix
index a73014997e2c3168a9d9cb0dba24e021f2934fd0..e66f5842a711a3b8a1acae26981ac66f6f088c64 100644
--- a/pkgs/zip-archive.nix
+++ b/pkgs/zip-archive.nix
@@ -1,4 +1,5 @@
 { mkDerivation
+, HUnit
 , array
 , base
 , binary
@@ -7,7 +8,6 @@
 , digest
 , directory
 , filepath
-, HUnit
 , lib
 , mtl
 , pretty
diff --git a/pkgs/zlib.nix b/pkgs/zlib.nix
index 542ad95afea8f0e4047bfaa805bc4bbbef37e185..4c0616c79f7383ae45d62e11528972395e059818 100644
--- a/pkgs/zlib.nix
+++ b/pkgs/zlib.nix
@@ -1,8 +1,8 @@
 { mkDerivation
+, QuickCheck
 , base
 , bytestring
 , lib
-, QuickCheck
 , tasty
 , tasty-quickcheck
 , zlib